From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Tue, 30 Dec 2003 22:34:28 +0000 (+0000)
Subject: Adjust code for --without-lecture to match new values.
X-Git-Tag: SUDO_1_6_8~291
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ffbc43afb306b42d23e656ab211115d4b9631c4b;p=sudo

Adjust code for --without-lecture to match new values.
---

diff --git a/configure b/configure
index 23d6319d2..ea767bbf9 100755
--- a/configure
+++ b/configure
@@ -1391,7 +1391,7 @@ password_timeout=5
 sudo_umask=0022
 passprompt="Password:"
 long_otp_prompt=off
-lecture=on
+lecture=once
 logfac=local2
 goodpri=notice
 badpri=alert
@@ -1920,9 +1920,9 @@ echo $ECHO_N "checking whether to lecture users the first time they run sudo...
 if test "${with_lecture+set}" = set; then
   withval="$with_lecture"
   case $with_lecture in
-    yes|short)	lecture=on
+    yes|short|always)	lecture=once
 		;;
-    no|none)	lecture=off
+    no|none|never)	lecture=never
 		;;
     *)		{ { echo "$as_me:$LINENO: error: \"unknown argument to --with-lecture: $with_lecture\"" >&5
 echo "$as_me: error: \"unknown argument to --with-lecture: $with_lecture\"" >&2;}
@@ -1930,7 +1930,7 @@ echo "$as_me: error: \"unknown argument to --with-lecture: $with_lecture\"" >&2;
 		;;
 esac
 fi;
-if test "$lecture" = "on"; then
+if test "$lecture" = "once"; then
     echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
diff --git a/configure.in b/configure.in
index 329f4779a..4534de829 100644
--- a/configure.in
+++ b/configure.in
@@ -68,7 +68,7 @@ password_timeout=5
 sudo_umask=0022
 passprompt="Password:"
 long_otp_prompt=off
-lecture=on
+lecture=once
 logfac=local2
 goodpri=notice
 badpri=alert
@@ -392,14 +392,14 @@ esac])
 AC_MSG_CHECKING(whether to lecture users the first time they run sudo)
 AC_ARG_WITH(lecture, [  --without-lecture       don't print lecture for first-time sudoer],
 [case $with_lecture in  
-    yes|short)	lecture=on
+    yes|short|always)	lecture=once
 		;;
-    no|none)	lecture=off
+    no|none|never)	lecture=never
 		;;
     *)		AC_MSG_ERROR(["unknown argument to --with-lecture: $with_lecture"])
 		;;
 esac])
-if test "$lecture" = "on"; then
+if test "$lecture" = "once"; then
     AC_MSG_RESULT(yes)
 else
     AC_DEFINE(NO_LECTURE, 1, [Define if you don't want users to get the lecture the first they user sudo.])