From e2c72300cff5a6822b024adf09a2adc81bce3f12 Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <Todd.Miller@sudo.ws>
Date: Sun, 20 Sep 2020 19:18:39 -0600
Subject: [PATCH] Move warning about plaintext password to the end of
 configure. It is unlikely to be noticed at the beginning of the output.

---
 configure    | 8 ++++----
 configure.ac | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/configure b/configure
index 8e60a15fa..9c07c4365 100755
--- a/configure
+++ b/configure
@@ -25537,10 +25537,6 @@ if test "$ac_res" != no; then :
 fi
 
     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
 	_LIBS="$LIBS"
@@ -27921,6 +27917,10 @@ fi
 case "$with_passwd" in
 yes|maybe)
     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
diff --git a/configure.ac b/configure.ac
index 69495381a..a0d46308f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4014,9 +4014,6 @@ if test ${with_passwd-'no'} != "no"; then
 	AC_DEFINE(HAVE_CRYPT)
     ])
     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
 	_LIBS="$LIBS"
@@ -4615,6 +4612,9 @@ dnl
 case "$with_passwd" in
 yes|maybe)
     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)