Skip to content

Commit e2c7230

Browse files
committed
Move warning about plaintext password to the end of configure.
It is unlikely to be noticed at the beginning of the output.
1 parent 874c2b2 commit e2c7230

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

configure

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25537,10 +25537,6 @@ if test "$ac_res" != no; then :
2553725537
fi
2553825538

2553925539
LIBS="$_LIBS"
25540-
if test test "${ac_cv_search_crypt}" = "no"; then
25541-
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No crypt function found, assuming plaintext passwords" >&5
25542-
$as_echo "$as_me: WARNING: No crypt function found, assuming plaintext passwords" >&2;}
25543-
fi
2554425540

2554525541
if test "$CHECKSHADOW" = "true" -a -n "$shadow_funcs"; then
2554625542
_LIBS="$LIBS"
@@ -27921,6 +27917,10 @@ fi
2792127917
case "$with_passwd" in
2792227918
yes|maybe)
2792327919
AUTH_OBJS="$AUTH_OBJS getspwuid.lo passwd.lo"
27920+
if test test "${ac_cv_search_crypt}" = "no"; then
27921+
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No crypt function found, assuming plaintext passwords" >&5
27922+
$as_echo "$as_me: WARNING: No crypt function found, assuming plaintext passwords" >&2;}
27923+
fi
2792427924
;;
2792527925
*)
2792627926
$as_echo "#define WITHOUT_PASSWD 1" >>confdefs.h

configure.ac

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4014,9 +4014,6 @@ if test ${with_passwd-'no'} != "no"; then
40144014
AC_DEFINE(HAVE_CRYPT)
40154015
])
40164016
LIBS="$_LIBS"
4017-
if test test "${ac_cv_search_crypt}" = "no"; then
4018-
AC_MSG_WARN([No crypt function found, assuming plaintext passwords])
4019-
fi
40204017

40214018
if test "$CHECKSHADOW" = "true" -a -n "$shadow_funcs"; then
40224019
_LIBS="$LIBS"
@@ -4615,6 +4612,9 @@ dnl
46154612
case "$with_passwd" in
46164613
yes|maybe)
46174614
AUTH_OBJS="$AUTH_OBJS getspwuid.lo passwd.lo"
4615+
if test test "${ac_cv_search_crypt}" = "no"; then
4616+
AC_MSG_WARN([No crypt function found, assuming plaintext passwords])
4617+
fi
46184618
;;
46194619
*)
46204620
AC_DEFINE(WITHOUT_PASSWD)

0 commit comments

Comments
 (0)