configure.ac               | 11 -----------

 docs/Makefile.in           |  2 +-

 logsrvd/logsrvd.c          | 10 +++++-----

 plugins/sudoers/sudoers.in | 20 ++++++++++++++++----

 4 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/configure.ac b/configure.ac

index 488bc784a..3b12661ed 100644

--- a/configure.ac

+++ b/configure.ac

@@ -2656,17 +2656,6 @@ AC_CHECK_FUNCS([getgrouplist], [], [

 			AC_DEFINE([HAVE__NSS_XBYY_BUF_ALLOC])

 		    ])

 		])

-	    ], [

-		dnl HP-UX support disabled until "group: compat" fixed

-		dnl # HP-UX

-		dnl AC_CHECK_FUNC([__nss_XbyY_buf_alloc], [

-		dnl     AC_CHECK_FUNC([__nss_initf_group], [

-		dnl	AC_CHECK_HEADERS([nss_dbdefs.h])

-		dnl	AC_DEFINE([HAVE_NSS_SEARCH])

-		dnl	AC_DEFINE([HAVE___NSS_XBYY_BUF_ALLOC])

-		dnl	AC_DEFINE([HAVE___NSS_INITF_GROUP])

-		dnl    ])

-		dnl])

 		:

 	    ])

 	])

diff --git a/docs/Makefile.in b/docs/Makefile.in

index d8614d69f..9f89dc9fe 100644

--- a/docs/Makefile.in

+++ b/docs/Makefile.in

@@ -376,7 +376,7 @@ install-doc: install-dirs

 	else \

 	    rm -f $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu); \

 	    echo ln -s sudo.$(mansectsu) $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu); \

-	    ln -s sudo.$(mansectsu) $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu); \

+	    echo ".so man$(mansectsu)/sudo.$(mansectsu)" > $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu); \

 	fi

 install-plugin:

diff --git a/logsrvd/logsrvd.c b/logsrvd/logsrvd.c

index 25c94fc3d..51128dd6e 100644

--- a/logsrvd/logsrvd.c

+++ b/logsrvd/logsrvd.c

@@ -527,12 +527,12 @@ handle_exit(ExitMessage *msg, uint8_t *buf, size_t len,

     /* Check that message is valid. */

     if (msg->run_time == NULL) {

-	sudo_warnx(U_("%s: %s"), source, U_("invalid ExitMessage"));

-	closure->errstr = _("invalid ExitMessage");

-	debug_return_bool(false);

+	sudo_debug_printf(SUDO_DEBUG_INFO, "%s: received ExitMessage from %s (without run_time could be invalid)",

+	    source, __func__);

+    } else {

+	sudo_debug_printf(SUDO_DEBUG_INFO, "%s: received ExitMessage from %s",

+	    source, __func__);

     }

-    sudo_debug_printf(SUDO_DEBUG_INFO, "%s: received ExitMessage from %s",

-	source, __func__);

     ret = closure->cms->exit(msg, buf, len, closure);

     if (ret) {

diff --git a/plugins/sudoers/sudoers.in b/plugins/sudoers/sudoers.in

index 914d45e9b..dc6b3d6e0 100644

--- a/plugins/sudoers/sudoers.in

+++ b/plugins/sudoers/sudoers.in

@@ -20,6 +20,9 @@

 ## Groups of users.  These may consist of user names, uids, Unix groups,

 ## or netgroups.

 # User_Alias	ADMINS = millert, dowdy, mikef

+User_Alias	WHEEL_USERS = %wheel

+User_Alias	XGRP_USERS = %xgrp

+# User_Alias	SUDO_USERS = %sudo

 ##

 ## Cmnd alias specification

@@ -76,6 +79,15 @@

 # Defaults!REBOOT !log_output

 # Defaults maxseq = 1000

+# If env_reset is disabled, sudo will NOT reset the environment

+# to only contain the fixed list of variables.

+# See sudoers(5) for details.

+#Defaults:WHEEL_USERS !env_reset

+

+# Preserve DISPLAY and XAUTHORITY environment variables

+# for "xgrp" group members.

+Defaults:XGRP_USERS env_keep += "DISPLAY XAUTHORITY"

+

 ##

 ## Runas alias specification

 ##

@@ -83,16 +95,16 @@

 ##

 ## User privilege specification

 ##

-root ALL=(ALL:ALL) ALL

+# root ALL=(ALL:ALL) ALL

 ## Uncomment to allow members of group wheel to execute any command

-# %wheel ALL=(ALL:ALL) ALL

+# WHEEL_USERS ALL=(ALL:ALL) ALL

 ## Same thing without a password

-# %wheel ALL=(ALL:ALL) NOPASSWD: ALL

+# WHEEL_USERS ALL=(ALL:ALL) NOPASSWD: ALL

 ## Uncomment to allow members of group sudo to execute any command

-# %sudo	ALL=(ALL:ALL) ALL

+# SUDO_USERS	ALL=(ALL:ALL) ALL

 ## Uncomment to allow any user to run sudo if they know the password

 ## of the user they are running the command as (root by default).