[Midnightbsd-cvs] src: config.h: Update config.h for new version of sudo.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Wed Mar 4 18:48:04 EST 2009
Log Message:
-----------
Update config.h for new version of sudo.
Modified Files:
--------------
src/contrib/sudo:
config.h (r1.2 -> r1.3)
-------------- next part --------------
Index: config.h
===================================================================
RCS file: /home/cvs/src/contrib/sudo/config.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -L contrib/sudo/config.h -L contrib/sudo/config.h -u -r1.2 -r1.3
--- contrib/sudo/config.h
+++ contrib/sudo/config.h
@@ -1,9 +1,13 @@
-/* config.h. Generated by configure. */
+/* config.h. Generated from config.h.in by configure. */
/* config.h.in. Generated from configure.in by autoheader. */
#ifndef _SUDO_CONFIG_H
#define _SUDO_CONFIG_H
+#define SUDOERS_UID 0
+#define SUDOERS_GID 0
+#define SUDOERS_MODE 0440
+
/* Define to 1 if the `syslog' function returns a non-zero int to denote
failure. */
/* #undef BROKEN_SYSLOG */
@@ -17,7 +21,7 @@
/* #undef CRAY_STACKSEG_END */
/* Define to 1 if you want insults culled from the twisted minds of CSOps. */
-#define CSOPS_INSULTS 1
+/* #undef CSOPS_INSULTS */
/* Define to 1 if using `alloca.c'. */
/* #undef C_ALLOCA */
@@ -48,8 +52,11 @@
/* Define to 1 if you use AFS. */
/* #undef HAVE_AFS */
+/* 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 HAVE_ALLOCA 1
/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
*/
@@ -58,9 +65,12 @@
/* Define to 1 if you have the `asprintf' function. */
#define HAVE_ASPRINTF 1
-/* Define to 1 if you use AIX general authentication. */
+/* 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 */
@@ -76,6 +86,9 @@
/* Define to 1 if your `DIR' contains dd_fd. */
/* #undef HAVE_DD_FD */
+/* Define to 1 if you have the `dgettext' function. */
+/* #undef HAVE_DGETTEXT */
+
/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
*/
#define HAVE_DIRENT_H 1
@@ -89,6 +102,12 @@
/* Define to 1 if you have the <err.h> header file. */
#define HAVE_ERR_H 1
+/* Define to 1 if your glob.h defines the GLOB_BRACE and GLOB_TILDE flags. */
+#define HAVE_EXTENDED_GLOB 1
+
+/* Define to 1 if your system has the F_CLOSEM fcntl. */
+/* #undef HAVE_FCNTL_CLOSEM */
+
/* Define to 1 if you have the `flock' function. */
/* #undef HAVE_FLOCK */
@@ -113,6 +132,9 @@
/* Define to 1 if you use the FWTK authsrv daemon. */
/* #undef HAVE_FWTK */
+/* Define to 1 if you have the `getaddrinfo' function. */
+#define HAVE_GETADDRINFO 1
+
/* Define to 1 if you have the `getauthuid' function. (ULTRIX 4.x shadow
passwords) */
/* #undef HAVE_GETAUTHUID */
@@ -123,6 +145,9 @@
/* Define to 1 if you have the `getdomainname' function. */
#define HAVE_GETDOMAINNAME 1
+/* Define to 1 if you have the `getgroups' function. */
+#define HAVE_GETGROUPS 1
+
/* Define to 1 if you have the `getifaddrs' function. */
#define HAVE_GETIFADDRS 1
@@ -148,9 +173,15 @@
/* Define to 1 if you have the `gettimeofday' function. */
#define HAVE_GETTIMEOFDAY 1
+/* Define to 1 if you have the `glob' function. */
+#define HAVE_GLOB 1
+
/* Define to 1 if your Kerberos is Heimdal. */
/* #undef HAVE_HEIMDAL */
+/* Define to 1 if <netinet/in.h> contains struct in6_addr. */
+#define HAVE_IN6_ADDR 1
+
/* Define to 1 if you have the `initgroups' function. */
#define HAVE_INITGROUPS 1
@@ -180,6 +211,18 @@
/* Define to 1 if you use Kerberos V. */
/* #undef HAVE_KERB5 */
+/* 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. */
+/* #undef HAVE_KRB5_GET_INIT_CREDS_OPT_FREE_TWO_ARGS */
+
+/* Define to 1 if you have the `krb5_init_secure_context' function. */
+/* #undef HAVE_KRB5_INIT_SECURE_CONTEXT */
+
+/* Define to 1 if you have the `krb5_verify_user' function. */
+/* #undef HAVE_KRB5_VERIFY_USER */
+
/* Define to 1 if your LDAP needs <lber.h>. (OpenLDAP does not) */
/* #undef HAVE_LBER_H */
@@ -189,18 +232,30 @@
/* Define to 1 if you have the `ldap_initialize' function. */
/* #undef HAVE_LDAP_INITIALIZE */
+/* Define to 1 if you have the <ldap_ssl.h> header file. */
+/* #undef HAVE_LDAP_SSL_H */
+
/* Define to 1 if you have the `ldap_start_tls_s' function. */
/* #undef HAVE_LDAP_START_TLS_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. */
#define HAVE_LOCKF 1
/* Define to 1 if you have the <login_cap.h> header file. */
-/* #undef HAVE_LOGIN_CAP_H */
+#define HAVE_LOGIN_CAP_H 1
/* Define if your compiler supports the "long long" type. */
#define HAVE_LONG_LONG 1
+/* Define to 1 if you have the `lrand48' function. */
+/* #undef HAVE_LRAND48 */
+
/* Define to 1 if you have the `lsearch' function. */
#define HAVE_LSEARCH 1
@@ -216,9 +271,18 @@
/* Define to 1 if you have the <memory.h> header file. */
#define HAVE_MEMORY_H 1
+/* Define to 1 if you have the `memrchr' function. */
+/* #undef HAVE_MEMRCHR */
+
/* Define to 1 if you have the `memset' function. */
#define HAVE_MEMSET 1
+/* Define to 1 if you have the `mkstemp' function. */
+#define HAVE_MKSTEMP 1
+
+/* Define to 1 if you have the <mps/ldap_ssl.h> header file. */
+/* #undef HAVE_MPS_LDAP_SSL_H */
+
/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
/* #undef HAVE_NDIR_H */
@@ -237,15 +301,30 @@
/* Define to 1 if you have the <paths.h> header file. */
#define HAVE_PATHS_H 1
+/* Define to 1 if you have the <project.h> header file. */
+/* #undef HAVE_PROJECT_H */
+
+/* Define to 1 if you have the `random' function. */
+/* #undef HAVE_RANDOM */
+
/* Define if your struct sockadr has an sa_len field. */
#define HAVE_SA_LEN 1
/* 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. */
+#define HAVE_SECURITY_PAM_APPL_H 1
+
+/* Define to 1 to enable SELinux RBAC support. */
+/* #undef HAVE_SELINUX */
+
/* Define to 1 if you have the `seteuid' function. */
#define HAVE_SETEUID 1
+/* Define to 1 if you have the `setlocale' function. */
+#define HAVE_SETLOCALE 1
+
/* Define to 1 if you have the `setresuid' function. */
#define HAVE_SETRESUID 1
@@ -255,11 +334,14 @@
/* Define to 1 if you have the `setrlimit' function. */
#define HAVE_SETRLIMIT 1
+/* Define to 1 if you have the `setsid' function. */
+#define HAVE_SETSID 1
+
/* Define to 1 if you have the `set_auth_parameters' function. */
/* #undef HAVE_SET_AUTH_PARAMETERS */
-/* Define to 1 if you use SIA authentication. */
-/* #undef HAVE_SIA */
+/* Define to 1 if you have the `sia_ses_init' function. */
+/* #undef HAVE_SIA_SES_INIT */
/* Define to 1 if you have the `sigaction' function. */
#define HAVE_SIGACTION 1
@@ -315,6 +397,9 @@
/* 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 */
#define HAVE_ST_MTIMESPEC 1
@@ -354,8 +439,8 @@
/* Define to 1 if you have struct timespec in sys/time.h */
#define HAVE_TIMESPEC 1
-/* Define to 1 if you have a timespecsub macro or function that takes
- two arguments (not three) */
+/* Define to 1 if you have a timespecsub macro or function that takes two
+ arguments (not three) */
/* #undef HAVE_TIMESPECSUB2 */
/* Define to 1 if you have the `tzset' function. */
@@ -364,6 +449,9 @@
/* Define to 1 if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1
+/* Define to 1 if you have the `unsetenv' function. */
+/* #undef HAVE_UNSETENV */
+
/* Define to 1 if you have the `utimes' function. */
#define HAVE_UTIMES 1
@@ -392,7 +480,7 @@
/* #undef HOST_IN_LOG */
/* Define to 1 if you want to ignore '.' and empty PATH elements */
-/* #undef IGNORE_DOT_PATH */
+#define IGNORE_DOT_PATH 1
/* The message given when a bad password is entered. */
#define INCORRECT_PASSWORD "Sorry, try again."
@@ -407,7 +495,11 @@
/* #undef LONG_IS_QUAD */
/* Define to 1 if you want a two line OTP (S/Key or OPIE) prompt. */
-/* #undef LONG_OTP_PROMPT */
+#define LONG_OTP_PROMPT 1
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+/* #undef LT_OBJDIR */
/* The subject of the mail sent by sudo to the MAILTO user/address. */
#define MAILSUBJECT "*** SECURITY information for %h ***"
@@ -429,15 +521,15 @@
sudo. */
/* #undef NO_LECTURE */
+/* 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. */
/* #undef NO_ROOT_MAILER */
/* Define to 1 if root should not be allowed to use sudo. */
/* #undef NO_ROOT_SUDO */
-/* Define to avoid using POSIX saved ids. */
-/* #undef NO_SAVED_IDS */
-
/* The default password prompt. */
#define PASSPROMPT "Password:"
@@ -482,9 +574,9 @@
/* 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 */
+ 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. */
@@ -499,22 +591,21 @@
/* The number of minutes before sudo asks for a password again. */
#define TIMEOUT 5
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+#define TIME_WITH_SYS_TIME 1
+
/* The number of tries a user gets to enter their password. */
#define TRIES_FOR_PASSWORD 3
-/* Define to 1 if you wish to use execv() instead of execvp() when running
- programs. */
-/* #undef USE_EXECV */
-
/* Define to 1 if you want to insult the user for entering an incorrect
password. */
-#define USE_INSULTS 1
+/* #undef USE_INSULTS */
/* Define to 1 if you use GNU stow packaging. */
/* #undef USE_STOW */
/* Define to 1 if you want a different ticket file for each tty. */
-/* #undef USE_TTY_TICKETS */
+#define USE_TTY_TICKETS 1
/* Define to "void" if your compiler supports void pointers, else use "char".
*/
@@ -523,20 +614,14 @@
/* Define to avoid using the passwd/shadow file for authentication. */
#define WITHOUT_PASSWD 1
-/* Enable non-POSIX extensions on AIX. */
-#ifndef _ALL_SOURCE
-/* # undef _ALL_SOURCE */
-#endif
+/* Path to the ldap.conf file */
+/* #undef _PATH_LDAP_CONF */
-/* Enable non-POSIX extensions on ConvexOS. */
-#ifndef _CONVEX_SOURCE
-/* # undef _CONVEX_SOURCE */
-#endif
+/* Path to the ldap.secret file */
+/* #undef _PATH_LDAP_SECRET */
-/* Enable GNU extensions on systems that have them. */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-#endif
+/* The fully qualified pathname of sudo_noexec.so */
+#define _PATH_SUDO_NOEXEC "/usr/libexec/sudo_noexec.so"
/* Define to empty if `const' does not conform to ANSI C. */
/* #undef const */
@@ -565,20 +650,31 @@
/* 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'. */
+#define GETGROUPS_T gid_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 */
/*
* Macros to pull sec and nsec parts of mtime from struct stat.
+ * We need to be able to convert between timeval and timespec
+ * so the last 3 digits of tv_nsec are not significant.
*/
#ifdef HAVE_ST_MTIM
-# define mtim_getsec(_x) ((_x).st_mtim.tv_sec)
-# define mtim_getnsec(_x) ((_x).st_mtim.tv_nsec)
+# ifdef HAVE_ST__TIM
+# define mtim_getsec(_x) ((_x).st_mtim.st__tim.tv_sec)
+# define mtim_getnsec(_x) (((_x).st_mtim.st__tim.tv_nsec / 1000) * 1000)
+# else
+# define mtim_getsec(_x) ((_x).st_mtim.tv_sec)
+# define mtim_getnsec(_x) (((_x).st_mtim.tv_nsec / 1000) * 1000)
+# endif
#else
# ifdef HAVE_ST_MTIMESPEC
# define mtim_getsec(_x) ((_x).st_mtimespec.tv_sec)
-# define mtim_getnsec(_x) ((_x).st_mtimespec.tv_nsec)
+# define mtim_getnsec(_x) (((_x).st_mtimespec.tv_nsec / 1000) * 1000)
# else
# define mtim_getsec(_x) ((_x).st_mtime)
# define mtim_getnsec(_x) (0)
@@ -603,12 +699,6 @@
# define stat_sudoers lstat
#endif
-#ifdef USE_EXECV
-# define EXECV execv
-#else
-# define EXECV execvp
-#endif /* USE_EXECV */
-
/* Macros to set/clear/test flags. */
/* #undef SET */
#define SET(t, f) ((t) |= (f))
@@ -631,10 +721,4 @@
# define BSD_COMP
#endif /* __svr4__ */
-#define SUDOERS_UID 0
-#define SUDOERS_GID 0
-#define SUDOERS_MODE 0440
-
-#define HAVE_EXTENDED_GLOB 1
-
#endif /* _SUDO_CONFIG_H */
More information about the Midnightbsd-cvs
mailing list