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

bk: 5242d602B1Hewz3_4-7RNDVNNrseUQ

diff --git a/ChangeLog b/ChangeLog
index c9f40d93178287cdb4375e95682cc7af8493a995..055358a73cecadeae86eb0dea7a80afbd2d0c033 100644 (file)
--- 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 7207653f240ec06621bdb8f65592e844157e2a64..49a9cbf3fd2ed565fa815f69df060f7e0ca933f1 100644 (file)
--- 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) {