From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 25 Sep 2013 12:24:34 +0000 (-0400)
Subject: [Bug 2482] Cleanup of droproot and jail support for Solaris
X-Git-Tag: NTP_4_2_7P390~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a07279dc7e683b69b8ddc7f5a290c94401fbd184;p=thirdparty%2Fntp.git

[Bug 2482] Cleanup of droproot and jail support for Solaris

bk: 5242d602B1Hewz3_4-7RNDVNNrseUQ
---

diff --git a/ChangeLog b/ChangeLog
index c9f40d931..055358a73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,10 @@
+* [Bug 2482] Cleanup of droproot and jail support for Solaris.
 (4.2.7p389) 2013/09/24 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 2473] revisited: NTPD exits after clock is stepped backwards
   Avoid possible unsigned underrun for startup condition when testing
   for clock backstep.
 * [Bug 2481] ntpd aborts when both user and group are specified with -u.
-* [Bug 2482] Add droproot ahd jail support for Solaris.
+* [Bug 2482] Add droproot and jail support for Solaris.
 (4.2.7p388) 2013/09/19 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 2473] NTPD exits after clock is stepped backwards externally
 (4.2.7p387) 2013/09/16 Released by Harlan Stenn <stenn@ntp.org>
diff --git a/ntpd/ntpd.c b/ntpd/ntpd.c
index 7207653f2..49a9cbf3f 100644
--- a/ntpd/ntpd.c
+++ b/ntpd/ntpd.c
@@ -831,9 +831,7 @@ ntpdmain(
 			exit(-1);
 		}
 #  elif HAVE_SOLARIS_PRIVS
-#   ifdef PRIV_AWARE_RESET
-		(void) setpflags(PRIV_AWARE_RESET, 1);
-#   endif
+		/* Nothing to do here */
 #  else
 		/* we need a user to switch to */
 		if (user == NULL) {