[Bug 1223] More final cleanup for rlimit changes

bk: 50d59b09idIiJqa8YlAUmb0KSyds9w

diff --git a/ChangeLog b/ChangeLog
index 75ce00179624aa6f84205f1d4a06a4c5c2e3551a..0352b0ebb0b0becb9134a376e82158cfca355e3e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 1223] More final cleanup for rlimit changes.
 (4.2.7p336) 2012/12/21 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 1223] Final cleanup for rlimit changes.
 (4.2.7p335) 2012/12/18 Released by Harlan Stenn <stenn@ntp.org>

diff --git a/ntpd/ntp_config.c b/ntpd/ntp_config.c
index 8fce602d367d14a469cf5e1c5386b462e69fabed..659f275205210b8d78ea0c8e952a659a196b876d 100644 (file)
--- a/ntpd/ntp_config.c
+++ b/ntpd/ntp_config.c
@@ -4865,7 +4865,7 @@ ntp_rlimit(
                 * has to be larger than the largest ntpd resident set size.
                 */
                DPRINTF(2, ("ntp_rlimit: MEMLOCK: %d %s\n",
-                       rl_value / rl_scale, rl_sstr));
+                       (int)(rl_value / rl_scale), rl_sstr));
                rl.rlim_cur = rl.rlim_max = rl_value;
                if (setrlimit(RLIMIT_MEMLOCK, &rl) == -1)
                        msyslog(LOG_ERR, "Cannot set RLIMIT_MEMLOCK: %m");
@@ -4879,7 +4879,7 @@ ntp_rlimit(
                 * stack memory.
                 */
                DPRINTF(2, ("ntp_rlimit: STACK: %d %s pages\n",
-                           rl_value / rl_scale, rl_sstr));
+                           (int)(rl_value / rl_scale), rl_sstr));
                if (-1 == getrlimit(RLIMIT_STACK, &rl)) {
                        msyslog(LOG_ERR, "getrlimit() failed: %m");
                } else {