Fix up some AC_DEFINE descriptions and regen config.h.in

diff --git a/config.h.in b/config.h.in
index 5ca9e36bb83e750dadea5329424066a7c1d417f0..85fbb77799e982c96d4ef47998381890a2a6faf5 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -3,10 +3,6 @@
 #ifndef _SUDO_CONFIG_H
 #define _SUDO_CONFIG_H
 
-/* Define to `signed' or nothing if compiler does not support a signed
-   type qualifier. */
-#undef __signed
-
 /* Define to 1 if the `syslog' function returns a non-zero int to denote
    failure. */
 #undef BROKEN_SYSLOG
@@ -14,20 +10,9 @@
 /* Define to 1 if you want the insults from the "classic" version sudo. */
 #undef CLASSIC_INSULTS
 
-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
-   systems. This function is required for `alloca.c' support on those systems.
-   */
-#undef CRAY_STACKSEG_END
-
 /* Define to 1 if you want insults culled from the twisted minds of CSOps. */
 #undef CSOPS_INSULTS
 
-/* Define to 1 if using `alloca.c'. */
-#undef C_ALLOCA
-
-/* The name of the sudoers plugin, including extension. */
-#undef SUDOERS_PLUGIN
-
 /* Define to 1 if you want sudo to display "command not allowed" instead of
    "command not found" when a command cannot be found. */
 #undef DONT_LEAK_PATH_INFO
@@ -35,7 +20,7 @@
 /* A colon-separated list of pathnames to be used as the editor for visudo. */
 #undef EDITOR
 
-/* Define to enable environment debugging. */
+/* Define to 1 to enable environment function debugging. */
 #undef ENV_DEBUG
 
 /* Define to 1 if you want visudo to honor the EDITOR and VISUAL env
@@ -48,6 +33,10 @@
 /* Define to 1 if you want to require fully qualified hosts in sudoers. */
 #undef FQDN
 
+/* Define to the type of elements in the array set by `getgroups'. Usually
+   this is either `int' or `gid_t'. */
+#undef GETGROUPS_T
+
 /* Define to 1 if you want insults from the "Goon Show". */
 #undef GOONS_INSULTS
 
@@ -60,16 +49,15 @@
 /* Define to 1 if you use AIX general authentication. */
 #undef HAVE_AIXAUTH
 
-/* Define to 1 if you have `alloca', as a function or macro. */
-#undef HAVE_ALLOCA
-
-/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
-   */
-#undef HAVE_ALLOCA_H
-
 /* Define to 1 if you have the `asprintf' function. */
 #undef HAVE_ASPRINTF
 
+/* Define to 1 if you have the `authenticate' function. */
+#undef HAVE_AUTHENTICATE
+
+/* Define to 1 if you have the `auth_challenge' function. */
+#undef HAVE_AUTH_CHALLENGE
+
 /* Define to 1 if you have the `bigcrypt' function. */
 #undef HAVE_BIGCRYPT
 
@@ -88,13 +76,16 @@
 /* Define to 1 if your `DIR' contains dd_fd. */
 #undef HAVE_DD_FD
 
-/* Define to 1 if you have the 'sys_siglist' declaration. */
+/* Define to 1 if you have the declaration of `sys_siglist', and to 0 if you
+   don't. */
 #undef HAVE_DECL_SYS_SIGLIST
 
-/* Define to 1 if you have the '_sys_siglist' declaration. */
+/* Define to 1 if you have the declaration of `_sys_siglist', and to 0 if you
+   don't. */
 #undef HAVE_DECL__SYS_SIGLIST
 
-/* Define to 1 if you have the '__sys_siglist' declaration. */
+/* Define to 1 if you have the declaration of `__sys_siglist', and to 0 if you
+   don't. */
 #undef HAVE_DECL___SYS_SIGLIST
 
 /* Define to 1 if you have the `dgettext' function. */
@@ -162,15 +153,15 @@
 /* Define to 1 if you have the `getdomainname' function. */
 #undef HAVE_GETDOMAINNAME
 
-/* Define to 1 if you have the `getgroups' function. */
+/* Define to 1 if you have the `getgrouplist' function. */
+#undef HAVE_GETGROUPLIST
+
+/* Define to 1 if your system has a working `getgroups' function. */
 #undef HAVE_GETGROUPS
 
 /* Define to 1 if you have the `getgrset' function. */
 #undef HAVE_GETGRSET
 
-/* Define to 1 if you have the `getgrouplist' function. */
-#undef HAVE_GETGROUPLIST
-
 /* Define to 1 if you have the `getifaddrs' function. */
 #undef HAVE_GETIFADDRS
 
@@ -211,6 +202,9 @@
 /* Define to 1 if you have the `glob' function. */
 #undef HAVE_GLOB
 
+/* Define to 1 if you have the `grantpt' function. */
+#undef HAVE_GRANTPT
+
 /* Define to 1 if you have the <gssapi/gssapi_krb5.h> header file. */
 #undef HAVE_GSSAPI_GSSAPI_KRB5_H
 
@@ -249,16 +243,17 @@
 /* Define to 1 if you use Kerberos IV. */
 #undef HAVE_KERB4
 
-/* Define to 1 if you have the `killpg' function. */
-#undef HAVE_KILLPG
-
 /* Define to 1 if you use Kerberos V. */
 #undef HAVE_KERB5
 
+/* Define to 1 if you have the `killpg' function. */
+#undef HAVE_KILLPG
+
 /* Define to 1 if you have the `krb5_get_init_creds_opt_alloc' function. */
 #undef HAVE_KRB5_GET_INIT_CREDS_OPT_ALLOC
 
-/* Define to 1 if your `krb5_get_init_creds_opt_alloc' function takes two arguments. */
+/* Define to 1 if your `krb5_get_init_creds_opt_free' function takes two
+   arguments. */
 #undef HAVE_KRB5_GET_INIT_CREDS_OPT_FREE_TWO_ARGS
 
 /* Define to 1 if you have the `krb5_init_secure_context' function. */
@@ -273,6 +268,12 @@
 /* Define to 1 if you use LDAP for sudoers. */
 #undef HAVE_LDAP
 
+/* Define to 1 if you have the `ldapssl_init' function. */
+#undef HAVE_LDAPSSL_INIT
+
+/* Define to 1 if you have the `ldapssl_set_strength' function. */
+#undef HAVE_LDAPSSL_SET_STRENGTH
+
 /* Define to 1 if you have the `ldap_create' function. */
 #undef HAVE_LDAP_CREATE
 
@@ -306,12 +307,6 @@
 /* Define to 1 if you have the `ldap_unbind_ext_s' function. */
 #undef HAVE_LDAP_UNBIND_EXT_S
 
-/* Define to 1 if you have the `ldapssl_init' function. */
-#undef HAVE_LDAPSSL_INIT
-
-/* Define to 1 if you have the `ldapssl_set_strength' function. */
-#undef HAVE_LDAPSSL_SET_STRENGTH
-
 /* Define to 1 if you have the `lockf' function. */
 #undef HAVE_LOCKF
 
@@ -378,9 +373,6 @@
 /* Define to 1 if you have the `posix_openpt' function. */
 #undef HAVE_POSIX_OPENPT
 
-/* Define to 1 if you have the `grantpt' function. */
-#undef HAVE_GRANTPT
-
 /* Define to 1 if you have the <project.h> header file. */
 #undef HAVE_PROJECT_H
 
@@ -396,6 +388,9 @@
 /* Define to 1 if you have the `revoke' function. */
 #undef HAVE_REVOKE
 
+/* Define to 1 if you have the <sasl.h> header file. */
+#undef HAVE_SASL_H
+
 /* Define to 1 if you have the <sasl/sasl.h> header file. */
 #undef HAVE_SASL_SASL_H
 
@@ -405,6 +400,9 @@
 /* Define to 1 if you use SecurID for authentication. */
 #undef HAVE_SECURID
 
+/* Define to 1 if you have the <security/pam_appl.h> header file. */
+#undef HAVE_SECURITY_PAM_APPL_H
+
 /* Define to 1 to enable SELinux RBAC support. */
 #undef HAVE_SELINUX
 
@@ -465,12 +463,6 @@
 /* Define to 1 if you have the `strchr' function. */
 #undef HAVE_STRCHR
 
-/* Define to 1 if you have the `strdup' function. */
-#undef HAVE_STRDUP
-
-/* Define to 1 if you have the `strndup' function. */
-#undef HAVE_STRNDUP
-
 /* Define to 1 if you have the `strerror' function. */
 #undef HAVE_STRERROR
 
@@ -495,15 +487,18 @@
 /* Define to 1 if you have the `strsignal' function. */
 #undef HAVE_STRSIGNAL
 
+/* Define to 1 if the system has the type `struct in6_addr'. */
+#undef HAVE_STRUCT_IN6_ADDR
+
 /* Define to 1 if your struct stat has an st_mtim member */
 #undef HAVE_ST_MTIM
 
-/* Define to 1 if your struct stat uses an st__tim union */
-#undef HAVE_ST__TIM
-
 /* Define to 1 if your struct stat has an st_mtimespec member */
 #undef HAVE_ST_MTIMESPEC
 
+/* Define to 1 if your struct stat uses an st__tim union */
+#undef HAVE_ST__TIM
+
 /* Define to 1 if you have the `sysconf' function. */
 #undef HAVE_SYSCONF
 
@@ -536,9 +531,6 @@
 /* Define to 1 if you have the <sys/types.h> header file. */
 #undef HAVE_SYS_TYPES_H
 
-/* Define to 1 if you have the `tcsetpgrp' function. */
-#undef HAVE_TCSETPGRP
-
 /* Define to 1 if you have the <termios.h> header file and the `tcgetattr'
    function. */
 #undef HAVE_TERMIOS_H
@@ -642,7 +634,7 @@
    sudo. */
 #undef NO_LECTURE
 
-/* Define to 1 if you don't want to use sudo's PAM session support. */
+/* Define to 1 if you don't want to use sudo's PAM session support */
 #undef NO_PAM_SESSION
 
 /* Define to avoid runing the mailer as root. */
@@ -682,7 +674,7 @@
 /* The syslog priority sudo will use for successful attempts. */
 #undef PRI_SUCCESS
 
-/* Define to 1 if the `putenv' has a const argument.  */
+/* Define to 1 if the `putenv' has a const argument. */
 #undef PUTENV_CONST
 
 /* Define as the return type of signal handlers (`int' or `void'). */
@@ -710,20 +702,15 @@
 /* Define to 1 if you want sudo to set $HOME in shell mode. */
 #undef SHELL_SETS_HOME
 
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at run-time.
-       STACK_DIRECTION > 0 => grows toward higher addresses
-       STACK_DIRECTION < 0 => grows toward lower addresses
-       STACK_DIRECTION = 0 => direction of growth unknown */
-#undef STACK_DIRECTION
-
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
 /* Define to 1 if the code in interfaces.c does not compile for you. */
 #undef STUB_LOAD_INTERFACES
 
+/* The name of the sudoers plugin, including extension. */
+#undef SUDOERS_PLUGIN
+
 /* The umask that the root-run prog should use. */
 #undef SUDO_UMASK
 
@@ -749,12 +736,16 @@
 /* Define to 1 if you want a different ticket file for each tty. */
 #undef USE_TTY_TICKETS
 
-/* Define to 1 if using a non-unix group lookup implementation. */
+/* Define to 1 if using a non-Unix group lookup implementation. */
 #undef USING_NONUNIX_GROUPS
 
 /* Define to avoid using the passwd/shadow file for authentication. */
 #undef WITHOUT_PASSWD
 
+/* Define to `signed' or nothing if compiler does not support a signed type
+   qualifier. */
+#undef __signed
+
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
 
@@ -773,7 +764,7 @@
 /* Define to `int' if <signal.h> does not define. */
 #undef sig_atomic_t
 
-/* Define if your system lacks the size_t type. */
+/* Define to `unsigned int' if <sys/types.h> does not define. */
 #undef size_t
 
 /* Define if your system lacks the ssize_t type. */
@@ -782,10 +773,6 @@
 /* Define to `int' if <sys/types.h> doesn't define. */
 #undef uid_t
 
-/* Define to the type of elements in the array set by `getgroups'.
-   Usually this is either `int' or `gid_t'. */
-#undef GETGROUPS_T
-
 /* Define to empty if the keyword `volatile' does not work. Warning: valid
    code using `volatile' can become incorrect without. Disable with care. */
 #undef volatile

diff --git a/configure b/configure
index 83462e8d8b836732e22d2dc0ed8cbaf852b6650c..0eb782c193a4acd4ecb8e81e0104e6fdd6d315dd 100755 (executable)
--- a/configure
+++ b/configure
@@ -22368,9 +22368,8 @@ echo "${ECHO_T}yes" >&6; }
                        ;;
                no)             { echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6; }
-
-cat >>confdefs.h <<\_ACEOF
-#define NO_PAM_SESSION
+                           cat >>confdefs.h <<\_ACEOF
+#define NO_PAM_SESSION 1
 _ACEOF
 
                            ;;
@@ -27927,6 +27926,10 @@ fi
 
 
 
+
+
+
+
 
 
 

diff --git a/configure.in b/configure.in
index 966a96f9efcbf4fb739674cfaa07f641254a69b7..e12a4ad7b71260c2b3d4ea457fd43dcc5f3ddccb 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2094,7 +2094,7 @@ if test ${with_pam-"no"} != "no"; then
                yes)    AC_MSG_RESULT(yes)
                        ;;
                no)             AC_MSG_RESULT(no)
-                           AC_DEFINE([NO_PAM_SESSION], [], [PAM session support disabled])
+                           AC_DEFINE(NO_PAM_SESSION)
                            ;;
                *)              AC_MSG_RESULT(no)
                            AC_MSG_WARN([Ignoring unknown argument to --enable-pam-session: $enableval])
@@ -2738,6 +2738,7 @@ AH_TEMPLATE(CLASSIC_INSULTS, [Define to 1 if you want the insults from the "clas
 AH_TEMPLATE(CSOPS_INSULTS, [Define to 1 if you want insults culled from the twisted minds of CSOps.])
 AH_TEMPLATE(SUDOERS_PLUGIN, [The name of the sudoers plugin, including extension.])
 AH_TEMPLATE(DONT_LEAK_PATH_INFO, [Define to 1 if you want sudo to display "command not allowed" instead of "command not found" when a command cannot be found.])
+AH_TEMPLATE(ENV_DEBUG, [Define to 1 to enable environment function debugging.])
 AH_TEMPLATE(ENV_EDITOR, [Define to 1 if you want visudo to honor the EDITOR and VISUAL env variables.])
 AH_TEMPLATE(FQDN, [Define to 1 if you want to require fully qualified hosts in sudoers.])
 AH_TEMPLATE(GOONS_INSULTS, [Define to 1 if you want insults from the "Goon Show".])
@@ -2794,6 +2795,7 @@ AH_TEMPLATE(LOGGING, [Define to SLOG_SYSLOG, SLOG_FILE, or SLOG_BOTH.])
 AH_TEMPLATE(LONG_OTP_PROMPT, [Define to 1 if you want a two line OTP (S/Key or OPIE) prompt.])
 AH_TEMPLATE(NO_AUTHENTICATION, [Define to 1 if you don't want sudo to prompt for a password by default.])
 AH_TEMPLATE(NO_LECTURE, [Define to 1 if you don't want users to get the lecture the first they user sudo.])
+AH_TEMPLATE(NO_PAM_SESSION, [Define to 1 if you don't want to use sudo's PAM session support])
 AH_TEMPLATE(NO_ROOT_MAILER, [Define to avoid runing the mailer as root.])
 AH_TEMPLATE(NO_ROOT_SUDO, [Define to 1 if root should not be allowed to use sudo.])
 AH_TEMPLATE(PC_INSULTS, [Define to 1 to replace politically incorrect insults with less offensive ones.])