isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move warning about plaintext password to the end of configure.

Browse Source 
It is unlikely to be noticed at the beginning of the output.
This commit is contained in:
Todd C. Miller
2020-09-20 19:18:39 -06:00
parent 874c2b27c6
commit e2c72300cf
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
configure vendored
View File

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

6
configure.ac
View File

@@ -4014,9 +4014,6 @@ if test ${with_passwd-'no'} != "no"; then
AC_DEFINE(HAVE_CRYPT) AC_DEFINE(HAVE_CRYPT)
]) ])
LIBS="$_LIBS" LIBS="$_LIBS"
if test test "${ac_cv_search_crypt}" = "no"; then
AC_MSG_WARN([No crypt function found, assuming plaintext passwords])
fi
if test "$CHECKSHADOW" = "true" -a -n "$shadow_funcs"; then if test "$CHECKSHADOW" = "true" -a -n "$shadow_funcs"; then
_LIBS="$LIBS" _LIBS="$LIBS"
@@ -4615,6 +4612,9 @@ dnl
case "$with_passwd" in case "$with_passwd" in
yes|maybe) yes|maybe)
AUTH_OBJS="$AUTH_OBJS getspwuid.lo passwd.lo" AUTH_OBJS="$AUTH_OBJS getspwuid.lo passwd.lo"
if test test "${ac_cv_search_crypt}" = "no"; then
AC_MSG_WARN([No crypt function found, assuming plaintext passwords])
fi
;; ;;
*) *)
AC_DEFINE(WITHOUT_PASSWD) AC_DEFINE(WITHOUT_PASSWD)