More updates for bug 2817. Harlan Stenn.

bk: 5603d027uf4JuHmS_Ce_55H0XsrA1w

diff --git a/ntpd/ntpd.c b/ntpd/ntpd.c
index 2604f64645d127215a7f6ed2940c3c5ff172b212..71c021fca3f7e2f72f126baec1edba741846a77d 100644 (file)
--- a/ntpd/ntpd.c
+++ b/ntpd/ntpd.c
@@ -785,13 +785,16 @@ ntpdmain(
         */
        getconfig(argc, argv);
 
-       if (-1 == cur_memlock && -1 != DFLT_RLIMIT_MEMLOCK) {
+       if (-1 == cur_memlock) {
 # if defined(HAVE_MLOCKALL)
                /*
                 * lock the process into memory
                 */
-               if (!HAVE_OPT(SAVECONFIGQUIT) &&
-                   0 != mlockall(MCL_CURRENT|MCL_FUTURE))
+               if (   !HAVE_OPT(SAVECONFIGQUIT)
+#  ifdef HAVE_SETRLIMIT
+                   && -1 != DFLT_RLIMIT_MEMLOCK
+#  endif
+                   && 0 != mlockall(MCL_CURRENT|MCL_FUTURE))
                        msyslog(LOG_ERR, "mlockall(): %m");
 # else /* !HAVE_MLOCKALL follows */
 #  ifdef HAVE_PLOCK