sync with sudo cvs repo

7 files changed, 19 insertions, 15 deletions

diff --git a/usr.bin/sudo/Makefile.in b/usr.bin/sudo/Makefile.in
index 264f4e0d5c6..c097af7eee1 100644
--- a/usr.bin/sudo/Makefile.in
+++ b/usr.bin/sudo/Makefile.in
@@ -21,7 +21,7 @@
 #
 # @configure_input@
 #
-# $Sudo: Makefile.in,v 1.325 2008/11/03 18:19:14 millert Exp $
+# $Sudo: Makefile.in,v 1.326 2008/12/03 20:40:47 millert Exp $
 #
 
 #### Start of system configuration section. ####
@@ -435,8 +435,7 @@ check:
 	@echo nothing to check
 
 clean:
-	-rm -f *.o *.lo $(PROGS) testsudoers core sudo.core visudo.core \
-	       testsudoers.core
+	-rm -f *.o *.lo stamp-* $(PROGS) testsudoers core *.core core.*
 
 mostlyclean: clean
 
diff --git a/usr.bin/sudo/auth/sudo_auth.h b/usr.bin/sudo/auth/sudo_auth.h
index 5214fb1a57d..ed1545f40e8 100644
--- a/usr.bin/sudo/auth/sudo_auth.h
+++ b/usr.bin/sudo/auth/sudo_auth.h
@@ -13,7 +13,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Sudo: sudo_auth.h,v 1.27 2008/11/18 12:54:51 millert Exp $
+ * $Sudo: sudo_auth.h,v 1.28 2008/12/02 17:30:39 millert Exp $
  */
 
 #ifndef SUDO_AUTH_H
@@ -94,7 +94,7 @@ int securid_verify __P((struct passwd *pw, char *pass, sudo_auth *auth));
 #  define AUTH_STANDALONE \
 	AUTH_ENTRY(0, "SecurId", \
 	    securid_init, securid_setup, securid_verify, NULL)
-#elif defined(HAVE_SIA)
+#elif defined(HAVE_SIA_SES_INIT)
 #  define AUTH_STANDALONE \
 	AUTH_ENTRY(0, "sia", \
 	    NULL, sia_setup, sia_verify, sia_cleanup)
diff --git a/usr.bin/sudo/config.h.in b/usr.bin/sudo/config.h.in
index 66901192f59..70de108a3b6 100644
--- a/usr.bin/sudo/config.h.in
+++ b/usr.bin/sudo/config.h.in
@@ -354,8 +354,8 @@
 /* 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. */
 #undef HAVE_SIGACTION
diff --git a/usr.bin/sudo/configure b/usr.bin/sudo/configure
index f6384086e9c..0bf4e23cf85 100644
--- a/usr.bin/sudo/configure
+++ b/usr.bin/sudo/configure
@@ -12058,6 +12058,10 @@ done
 		: ${mansectsu='1m'}
 		: ${mansectform='4'}
 
+		# HP-UX bundled compiler can't generate shared objects
+		if test "x$ac_cv_prog_cc_c89" = "xno"; then
+		    with_noexec=no
+		fi
 		case "$host" in
 			*-*-hpux1-8.*)
 			    cat >>confdefs.h <<\_ACEOF
@@ -24917,5 +24921,3 @@ fi
 
 
 
-
-
diff --git a/usr.bin/sudo/configure.in b/usr.bin/sudo/configure.in
index 92ee8afbb79..6b09b5f18fd 100644
--- a/usr.bin/sudo/configure.in
+++ b/usr.bin/sudo/configure.in
@@ -1,6 +1,6 @@
 dnl
 dnl Process this file with GNU autoconf to produce a configure script.
-dnl $Sudo: configure.in,v 1.535 2008/10/23 16:06:22 millert Exp $
+dnl $Sudo: configure.in,v 1.538 2008/12/09 21:13:01 millert Exp $
 dnl
 dnl Copyright (c) 1994-1996,1998-2008 Todd C. Miller <Todd.Miller@courtesan.com>
 dnl
@@ -1350,6 +1350,10 @@ case "$host" in
 		: ${mansectsu='1m'}
 		: ${mansectform='4'}
 
+		# HP-UX bundled compiler can't generate shared objects
+		if test "x$ac_cv_prog_cc_c89" = "xno"; then
+		    with_noexec=no
+		fi
 		case "$host" in
 			*-*-hpux[1-8].*)
 			    AC_DEFINE(BROKEN_SYSLOG)
@@ -2567,7 +2571,6 @@ AH_TEMPLATE(HAVE_PAM, [Define to 1 if you use PAM authentication.])
 AH_TEMPLATE(HAVE_PROJECT_H, [Define to 1 if you have the <project.h> header file.])
 AH_TEMPLATE(HAVE_SECURID, [Define to 1 if you use SecurID for authentication.])
 AH_TEMPLATE(HAVE_SELINUX, [Define to 1 to enable SELinux RBAC support.])
-AH_TEMPLATE(HAVE_SIA, [Define to 1 if you use SIA authentication.])
 AH_TEMPLATE(HAVE_SIGACTION_T, [Define to 1 if <signal.h> has the sigaction_t typedef.])
 AH_TEMPLATE(HAVE_SKEY, [Define to 1 if you use S/Key.])
 AH_TEMPLATE(HAVE_SKEYACCESS, [Define to 1 if your S/Key library has skeyaccess().])
diff --git a/usr.bin/sudo/lbuf.c b/usr.bin/sudo/lbuf.c
index 7131094fa3f..ef898eb7be3 100644
--- a/usr.bin/sudo/lbuf.c
+++ b/usr.bin/sudo/lbuf.c
@@ -46,7 +46,7 @@
 #include "lbuf.h"
 
 #ifndef lint
-__unused static const char rcsid[] = "$Sudo: lbuf.c,v 1.6 2008/11/09 14:13:12 millert Exp $";
+__unused static const char rcsid[] = "$Sudo: lbuf.c,v 1.7 2008/12/09 20:55:49 millert Exp $";
 #endif /* lint */
 
 #if !defined(TIOCGSIZE) && defined(TIOCGWINSZ)
@@ -106,7 +106,7 @@ void
 #ifdef __STDC__
 lbuf_append_quoted(struct lbuf *lbuf, const char *set, ...)
 #else
-lbuf_append_quoted(lbuf, va_alist)
+lbuf_append_quoted(lbuf, set, va_alist)
 	struct lbuf *lbuf;
 	const char *set;
 	va_dcl
diff --git a/usr.bin/sudo/tgetpass.c b/usr.bin/sudo/tgetpass.c
index a0ee7ec9042..62faead2345 100644
--- a/usr.bin/sudo/tgetpass.c
+++ b/usr.bin/sudo/tgetpass.c
@@ -71,7 +71,7 @@
 #include "sudo.h"
 
 #ifndef lint
-__unused static const char rcsid[] = "$Sudo: tgetpass.c,v 1.125 2008/11/25 17:01:34 millert Exp $";
+__unused static const char rcsid[] = "$Sudo: tgetpass.c,v 1.126 2008/12/09 20:55:49 millert Exp $";
 #endif /* lint */
 
 #ifndef TCSASOFT
@@ -115,7 +115,7 @@ static volatile sig_atomic_t signo;
 
 static void handler __P((int));
 static char *getln __P((int, char *, size_t));
-static char *sudo_askpass(const char *);
+static char *sudo_askpass __P((const char *));
 
 /*
  * Like getpass(3) but with timeout and echo flags.