From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Sun, 16 Feb 2014 18:00:41 +0000 (-0700)
Subject: Use correct init.d dir on HP-UX.
X-Git-Tag: SUDO_1_8_10^2~22
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0bf299c690ed19e33c73b976191c94bd8aeaf3a0;p=sudo

Use correct init.d dir on HP-UX.
Fix pp warnings from rc.d and init.d dirs.
---

diff --git a/configure b/configure
index b55eced05..ac741beea 100755
--- a/configure
+++ b/configure
@@ -14256,8 +14256,25 @@ done
 		: ${mansectsu='1m'}
 		: ${mansectform='4'}
 
+		# HP-UX does not clear /var/run so we need to do it
+		INIT_SCRIPT=hpux.sh
+		INIT_DIR=/sbin/rc.d/init.d
+		RC_LINK=/sbin/rc2.d/S900sudo
+
 		# HP-UX shared libs must be executable
 		SHLIB_MODE=0755
+
+		for ac_func in pstat_getproc
+do :
+  ac_fn_c_check_func "$LINENO" "pstat_getproc" "ac_cv_func_pstat_getproc"
+if test "x$ac_cv_func_pstat_getproc" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_PSTAT_GETPROC 1
+_ACEOF
+
+fi
+done
+
 		;;
     *-*-hpux*)
 		# AFS support needs -lBSD
@@ -14269,7 +14286,7 @@ done
 
 		# HP-UX does not clear /var/run so we need to do it
 		INIT_SCRIPT=hpux.sh
-		INIT_DIR=/etc/rc.d/init.d
+		INIT_DIR=/sbin/rc.d/init.d
 		RC_LINK=/sbin/rc2.d/S900sudo
 
 		# HP-UX shared libs must be executable
diff --git a/configure.ac b/configure.ac
index 6d21732cb..4cc650bd8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1691,8 +1691,15 @@ case "$host" in
 		: ${mansectsu='1m'}
 		: ${mansectform='4'}
 
+		# HP-UX does not clear /var/run so we need to do it
+		INIT_SCRIPT=hpux.sh
+		INIT_DIR=/sbin/rc.d/init.d
+		RC_LINK=/sbin/rc2.d/S900sudo
+
 		# HP-UX shared libs must be executable
 		SHLIB_MODE=0755
+
+		AC_CHECK_FUNCS(pstat_getproc)
 		;;
     *-*-hpux*)
 		# AFS support needs -lBSD
@@ -1704,7 +1711,7 @@ case "$host" in
 
 		# HP-UX does not clear /var/run so we need to do it
 		INIT_SCRIPT=hpux.sh
-		INIT_DIR=/etc/rc.d/init.d
+		INIT_DIR=/sbin/rc.d/init.d
 		RC_LINK=/sbin/rc2.d/S900sudo
 
 		# HP-UX shared libs must be executable
diff --git a/sudo.pp b/sudo.pp
index 74344bfc5..cd3a72ff2 100644
--- a/sudo.pp
+++ b/sudo.pp
@@ -292,9 +292,16 @@ still allow people to get their work done."
 	/usr/sbin/visudo    	0755 root: symlink $sbindir/visudo
 %endif
 %if [aix]
+	/etc/rc.d/		ignore
+	/etc/rc.d/rc2.d/	ignore
+	/etc/rc.d/rc2.d/**	ignore
+	/etc/rc.d/init.d/	ignore
 	/etc/rc.d/init.d/sudo	0755 root:
 %endif
 %if [sd]
+	/sbin/rc2.d/		ignore
+	/sbin/rc2.d/**		ignore
+	/sbin/init.d/		ignore
 	/sbin/init.d/sudo	0755 root:
 %endif
 
@@ -377,12 +384,12 @@ still allow people to get their work done."
 		rm -f /etc/rc.d/rc2.d/S90sudo
 		ln -s /etc/rc.d/init.d/sudo /etc/rc.d/rc2.d/S90sudo
 	fi
-%endif
+
 %post [sd]
 	# Create /sbin/rc2.d/S900sudo link
 	rm -f /sbin/rc2.d/S900sudo
 	ln -s /sbin/init.d/sudo /sbin/rc2.d/S900sudo
-%endif
+
 %preun
 	# Remove the time stamp dir and its contents
 	# We currently leave the lecture status files installed