--- a/components/sudo/Makefile Fri Jan 13 13:12:57 2017 -0800
+++ b/components/sudo/Makefile Mon Jan 09 02:09:07 2017 -0800
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -64,7 +64,6 @@
CONFIGURE_OPTIONS += --with-rundir=/system/volatile/sudo
CONFIGURE_OPTIONS += --with-pam
CONFIGURE_OPTIONS += --with-pam-login
-CONFIGURE_OPTIONS += --disable-pam-session
CONFIGURE_OPTIONS += --with-tty-tickets
CONFIGURE_OPTIONS += --without-insults
CONFIGURE_OPTIONS += --without-lecture
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/sudo/files/sudo Mon Jan 09 02:09:07 2017 -0800
@@ -0,0 +1,7 @@
+#
+# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+#
+# PAM configuration for sudo(8) (explicit because we exclude
+# pam_unix_session(7)).
+#
+session required pam_allow.so.1
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/sudo/files/sudo-i Mon Jan 09 02:09:07 2017 -0800
@@ -0,0 +1,7 @@
+#
+# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+#
+# PAM configuration for 'sudo -i' (or 'sudo --login') (explicit because
+# we exclude pam_unix_session(7)).
+#
+session required pam_allow.so.1
--- a/components/sudo/sudo.p5m Fri Jan 13 13:12:57 2017 -0800
+++ b/components/sudo/sudo.p5m Mon Jan 09 02:09:07 2017 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -34,6 +34,10 @@
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=org.opensolaris.arc-caseid value=PSARC/2011/252
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file files/sudo path=etc/pam.d/sudo group=sys mode=0644 overlay=allow \
+ preserve=renamenew
+file files/sudo-i path=etc/pam.d/sudo-i group=sys mode=0644 overlay=allow \
+ preserve=renamenew
file path=etc/sudoers group=root mode=0440 original_name=SUNWsudo:etc/sudoers \
overlay=allow preserve=true
dir path=etc/sudoers.d group=root mode=0750