ntpd/ntpd.c: DROPROOT cleanup

bk: 5b20a077o3dYXNJsGwKx9Nbm4b1ojw

diff --git a/ChangeLog b/ChangeLog
index ed90929882983179abe268ea944399413d104a93..df0c65ff638597ee04ae723010e3fa7c7570cd47 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -36,6 +36,7 @@
 * [Bug 2821] minor build issues <perlinger@ntp.org>
   - applied patches by Christos Zoulas, including real bug fixes
 * html/authopt.html: cleanup, from <stenn@ntp.org>
+* ntpd/ntpd.c: DROPROOT cleanup.  <stenn@ntp.org>
 
 ---
 (4.2.8p11) 2018/02/27 Released by Harlan Stenn <stenn@ntp.org>

diff --git a/ntpd/ntpd.c b/ntpd/ntpd.c
index 242d9f19e0bdae6c5b9984ae53633efc6b74cb8a..645099f05155aa3f4a6703fa079884d73e7d4327 100644 (file)
--- a/ntpd/ntpd.c
+++ b/ntpd/ntpd.c
@@ -611,6 +611,7 @@ detach_from_terminal(
        return;
 }
 
+#ifdef HAVE_DROPROOT
 /*
  * Map user name/number to user ID
 */
@@ -732,6 +733,7 @@ set_user_group_ids(
 
        return 1;
 }
+#endif /* HAVE_DROPROOT */
 #endif /* !SIM */
 
 /*