<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html lang="en">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
<title>
GitLab
</title>
</head>
<body>
<style type="text/css">
img {
max-width: 100%; height: auto;
}
</style>
<div class="content">
<h3>
Hal Murray pushed to branch master
at <a href="https://gitlab.com/NTPsec/ntpsec">NTPsec / ntpsec</a>
</h3>
<h4>
Commits:
</h4>
<ul>
<li>
<strong><a href="https://gitlab.com/NTPsec/ntpsec/commit/5a6cdcc43b7378f422cee4a7e1148f65ae721703">5a6cdcc4</a></strong>
<div>
<span>by Hal Murray</span>
<i>at 2016-07-17T03:42:08-07:00</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap">Fix botched manual merge. I kept duplicate mlockall.
</pre>
</li>
</ul>
<h4>1 changed file:</h4>
<ul>
<li class="file-stats">
<a href="#diff-0" style="text-decoration: none">
ntpd/ntpd.c
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id="diff-0">
<a href="https://gitlab.com/NTPsec/ntpsec/commit/5a6cdcc43b7378f422cee4a7e1148f65ae721703#diff-0"><strong>ntpd/ntpd.c</strong></a>
<hr>
<table class="code white" style="-premailer-cellpadding: 0; -premailer-cellspacing: 0; -premailer-width: 100%; background: #fff; border: none; border-collapse: separate; color: #333; font-family: monospace; margin: 0; padding: 0; width: 100%" bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0">
<tr class="line_holder match" id="">
<td class=" diff-line-num old_line unfold js-unfold" data-linenumber="972" style="background: #fafafa; border-color: #f0f0f0; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
...
</td>
<td class=" diff-line-num new_line unfold js-unfold" data-linenumber="972" style="background: #fafafa; border-color: #f0f0f0; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
...
</td>
<td class="line_content match" style="background: #fafafa; border: none; color: rgba(0,0,0,0.3); display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#fafafa">@@ -972,22 +972,6 @@ ntpdmain(</td>
</tr>
<tr class="line_holder" id="5ed258e118427794a94bfd9b47ab21c60a701577_972_972">
<td class="diff-line-num old_line" data-linenumber="972" style="background: #fafafa; border-color: #f0f0f0; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
972
</td>
<td class="diff-line-num new_line" data-linenumber="972" style="background: #fafafa; border-color: #f0f0f0; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
972
</td>
<td class="line_content noteable_line" style="background: #fff; border: none; color: #333; display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#fff"> <span id="LC972" class="line"> <span class="n" style="color: #333">exit</span><span class="p">(</span><span class="mi" style="color: #099">0</span><span class="p">);</span></span>
</td>
</tr>
<tr class="line_holder" id="5ed258e118427794a94bfd9b47ab21c60a701577_973_973">
<td class="diff-line-num old_line" data-linenumber="973" style="background: #fafafa; border-color: #f0f0f0; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
973
</td>
<td class="diff-line-num new_line" data-linenumber="973" style="background: #fafafa; border-color: #f0f0f0; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
973
</td>
<td class="line_content noteable_line" style="background: #fff; border: none; color: #333; display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#fff"> <span id="LC973" class="line"> <span class="p">}</span></span>
</td>
</tr>
<tr class="line_holder" id="5ed258e118427794a94bfd9b47ab21c60a701577_974_974">
<td class="diff-line-num old_line" data-linenumber="974" style="background: #fafafa; border-color: #f0f0f0; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
974
</td>
<td class="diff-line-num new_line" data-linenumber="974" style="background: #fafafa; border-color: #f0f0f0; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
974
</td>
<td class="line_content noteable_line" style="background: #fff; border: none; color: #333; display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#fff"> <span id="LC974" class="line"> </span>
</td>
</tr>
<tr class="line_holder old" id="5ed258e118427794a94bfd9b47ab21c60a701577_975_975">
<td class="diff-line-num old old_line" data-linenumber="975" style="background: #f9d7dc; border-color: #fac5cd; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
975
</td>
<td class="diff-line-num new_line old" data-linenumber="975" style="background: #f9d7dc; border-color: #fac5cd; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content noteable_line old" style="background: #fbe9eb; border: none; color: #333; display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#fbe9eb"> <span id="LC975" class="line"> <span class="cm" style="color: #998; font-style: italic">/*</span></span>
</td>
</tr>
<tr class="line_holder old" id="5ed258e118427794a94bfd9b47ab21c60a701577_976_975">
<td class="diff-line-num old old_line" data-linenumber="976" style="background: #f9d7dc; border-color: #fac5cd; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
976
</td>
<td class="diff-line-num new_line old" data-linenumber="975" style="background: #f9d7dc; border-color: #fac5cd; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content noteable_line old" style="background: #fbe9eb; border: none; color: #333; display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#fbe9eb"> <span id="LC976" class="line"><span class="cm" style="color: #998; font-style: italic"> * ntpd's working set is never going to be large relative to memory</span></span>
</td>
</tr>
<tr class="line_holder old" id="5ed258e118427794a94bfd9b47ab21c60a701577_977_975">
<td class="diff-line-num old old_line" data-linenumber="977" style="background: #f9d7dc; border-color: #fac5cd; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
977
</td>
<td class="diff-line-num new_line old" data-linenumber="975" style="background: #f9d7dc; border-color: #fac5cd; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content noteable_line old" style="background: #fbe9eb; border: none; color: #333; display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#fbe9eb"> <span id="LC977" class="line"><span class="cm" style="color: #998; font-style: italic"> * availability on modern machines. Do what chrony does and indulge it;</span></span>
</td>
</tr>
<tr class="line_holder old" id="5ed258e118427794a94bfd9b47ab21c60a701577_978_975">
<td class="diff-line-num old old_line" data-linenumber="978" style="background: #f9d7dc; border-color: #fac5cd; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
978
</td>
<td class="diff-line-num new_line old" data-linenumber="975" style="background: #f9d7dc; border-color: #fac5cd; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content noteable_line old" style="background: #fbe9eb; border: none; color: #333; display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#fbe9eb"> <span id="LC978" class="line"><span class="cm" style="color: #998; font-style: italic"> * we get some latency improvement that way.</span></span>
</td>
</tr>
<tr class="line_holder old" id="5ed258e118427794a94bfd9b47ab21c60a701577_979_975">
<td class="diff-line-num old old_line" data-linenumber="979" style="background: #f9d7dc; border-color: #fac5cd; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
979
</td>
<td class="diff-line-num new_line old" data-linenumber="975" style="background: #f9d7dc; border-color: #fac5cd; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content noteable_line old" style="background: #fbe9eb; border: none; color: #333; display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#fbe9eb"> <span id="LC979" class="line"><span class="cm" style="color: #998; font-style: italic"> */</span></span>
</td>
</tr>
<tr class="line_holder old" id="5ed258e118427794a94bfd9b47ab21c60a701577_980_975">
<td class="diff-line-num old old_line" data-linenumber="980" style="background: #f9d7dc; border-color: #fac5cd; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
980
</td>
<td class="diff-line-num new_line old" data-linenumber="975" style="background: #f9d7dc; border-color: #fac5cd; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content noteable_line old" style="background: #fbe9eb; border: none; color: #333; display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#fbe9eb"> <span id="LC980" class="line"> <span class="p">{</span></span>
</td>
</tr>
<tr class="line_holder old" id="5ed258e118427794a94bfd9b47ab21c60a701577_981_975">
<td class="diff-line-num old old_line" data-linenumber="981" style="background: #f9d7dc; border-color: #fac5cd; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
981
</td>
<td class="diff-line-num new_line old" data-linenumber="975" style="background: #f9d7dc; border-color: #fac5cd; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content noteable_line old" style="background: #fbe9eb; border: none; color: #333; display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#fbe9eb"> <span id="LC981" class="line"> <span class="k" style="font-weight: bold">struct</span> <span class="n" style="color: #333">rlimit</span> <span class="n" style="color: #333">rlim</span><span class="p">;</span></span>
</td>
</tr>
<tr class="line_holder old" id="5ed258e118427794a94bfd9b47ab21c60a701577_982_975">
<td class="diff-line-num old old_line" data-linenumber="982" style="background: #f9d7dc; border-color: #fac5cd; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
982
</td>
<td class="diff-line-num new_line old" data-linenumber="975" style="background: #f9d7dc; border-color: #fac5cd; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content noteable_line old" style="background: #fbe9eb; border: none; color: #333; display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#fbe9eb"> <span id="LC982" class="line"> <span class="n" style="color: #333">rlim</span><span class="p">.</span><span class="n" style="color: #333">rlim_max</span> <span class="o" style="font-weight: bold">=</span> <span class="n" style="color: #333">rlim</span><span class="p">.</span><span class="n" style="color: #333">rlim_cur</span> <span class="o" style="font-weight: bold">=</span> <span class="n" style="color: #333">RLIM_INFINITY</span><span class="p">;</span></span>
</td>
</tr>
<tr class="line_holder old" id="5ed258e118427794a94bfd9b47ab21c60a701577_983_975">
<td class="diff-line-num old old_line" data-linenumber="983" style="background: #f9d7dc; border-color: #fac5cd; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
983
</td>
<td class="diff-line-num new_line old" data-linenumber="975" style="background: #f9d7dc; border-color: #fac5cd; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content noteable_line old" style="background: #fbe9eb; border: none; color: #333; display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#fbe9eb"> <span id="LC983" class="line"> <span class="k" style="font-weight: bold">if</span> <span class="p">(</span><span class="n" style="color: #333">setrlimit</span><span class="p">(</span><span class="n" style="color: #333">RLIMIT_MEMLOCK</span><span class="p">,</span> <span class="o" style="font-weight: bold">&</span><span class="n" style="color: #333">rlim</span><span class="p">)</span> <span class="o" style="font-weight: bold"><</span> <span class="mi" style="color: #099">0</span><span class="p">)</span></span>
</td>
</tr>
<tr class="line_holder old" id="5ed258e118427794a94bfd9b47ab21c60a701577_984_975">
<td class="diff-line-num old old_line" data-linenumber="984" style="background: #f9d7dc; border-color: #fac5cd; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
984
</td>
<td class="diff-line-num new_line old" data-linenumber="975" style="background: #f9d7dc; border-color: #fac5cd; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content noteable_line old" style="background: #fbe9eb; border: none; color: #333; display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#fbe9eb"> <span id="LC984" class="line"> <span class="n" style="color: #333">msyslog</span><span class="p">(</span><span class="n" style="color: #333">LOG_WARNING</span><span class="p">,</span> <span class="s" style="color: #d14">"setrlimit() failed: not locking into RAM"</span><span class="p">);</span></span>
</td>
</tr>
<tr class="line_holder old" id="5ed258e118427794a94bfd9b47ab21c60a701577_985_975">
<td class="diff-line-num old old_line" data-linenumber="985" style="background: #f9d7dc; border-color: #fac5cd; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
985
</td>
<td class="diff-line-num new_line old" data-linenumber="975" style="background: #f9d7dc; border-color: #fac5cd; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content noteable_line old" style="background: #fbe9eb; border: none; color: #333; display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#fbe9eb"> <span id="LC985" class="line"> <span class="k" style="font-weight: bold">else</span> <span class="k" style="font-weight: bold">if</span> <span class="p">(</span><span class="n" style="color: #333">mlockall</span><span class="p">(</span><span class="n" style="color: #333">MCL_CURRENT</span><span class="o" style="font-weight: bold">|</span><span class="n" style="color: #333">MCL_FUTURE</span><span class="p">)</span> <span class="o" style="font-weight: bold"><</span> <span class="mi" style="color: #099">0</span><span class="p">)</span></span>
</td>
</tr>
<tr class="line_holder old" id="5ed258e118427794a94bfd9b47ab21c60a701577_986_975">
<td class="diff-line-num old old_line" data-linenumber="986" style="background: #f9d7dc; border-color: #fac5cd; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
986
</td>
<td class="diff-line-num new_line old" data-linenumber="975" style="background: #f9d7dc; border-color: #fac5cd; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content noteable_line old" style="background: #fbe9eb; border: none; color: #333; display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#fbe9eb"> <span id="LC986" class="line"> <span class="n" style="color: #333">msyslog</span><span class="p">(</span><span class="n" style="color: #333">LOG_WARNING</span><span class="p">,</span> <span class="s" style="color: #d14">"mlockall() failed: not locking into RAM"</span><span class="p">);</span></span>
</td>
</tr>
<tr class="line_holder old" id="5ed258e118427794a94bfd9b47ab21c60a701577_987_975">
<td class="diff-line-num old old_line" data-linenumber="987" style="background: #f9d7dc; border-color: #fac5cd; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
987
</td>
<td class="diff-line-num new_line old" data-linenumber="975" style="background: #f9d7dc; border-color: #fac5cd; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content noteable_line old" style="background: #fbe9eb; border: none; color: #333; display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#fbe9eb"> <span id="LC987" class="line"> <span class="k" style="font-weight: bold">else</span></span>
</td>
</tr>
<tr class="line_holder old" id="5ed258e118427794a94bfd9b47ab21c60a701577_988_975">
<td class="diff-line-num old old_line" data-linenumber="988" style="background: #f9d7dc; border-color: #fac5cd; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
988
</td>
<td class="diff-line-num new_line old" data-linenumber="975" style="background: #f9d7dc; border-color: #fac5cd; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content noteable_line old" style="background: #fbe9eb; border: none; color: #333; display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#fbe9eb"> <span id="LC988" class="line"> <span class="n" style="color: #333">msyslog</span><span class="p">(</span><span class="n" style="color: #333">LOG_INFO</span><span class="p">,</span> <span class="s" style="color: #d14">"successfully locked into RAM"</span><span class="p">);</span></span>
</td>
</tr>
<tr class="line_holder old" id="5ed258e118427794a94bfd9b47ab21c60a701577_989_975">
<td class="diff-line-num old old_line" data-linenumber="989" style="background: #f9d7dc; border-color: #fac5cd; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
989
</td>
<td class="diff-line-num new_line old" data-linenumber="975" style="background: #f9d7dc; border-color: #fac5cd; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content noteable_line old" style="background: #fbe9eb; border: none; color: #333; display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#fbe9eb"> <span id="LC989" class="line"> <span class="p">}</span></span>
</td>
</tr>
<tr class="line_holder old" id="5ed258e118427794a94bfd9b47ab21c60a701577_990_975">
<td class="diff-line-num old old_line" data-linenumber="990" style="background: #f9d7dc; border-color: #fac5cd; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
990
</td>
<td class="diff-line-num new_line old" data-linenumber="975" style="background: #f9d7dc; border-color: #fac5cd; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content noteable_line old" style="background: #fbe9eb; border: none; color: #333; display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#fbe9eb"> <span id="LC990" class="line"></span>
</td>
</tr>
<tr class="line_holder" id="5ed258e118427794a94bfd9b47ab21c60a701577_991_975">
<td class="diff-line-num old_line" data-linenumber="991" style="background: #fafafa; border-color: #f0f0f0; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
991
</td>
<td class="diff-line-num new_line" data-linenumber="975" style="background: #fafafa; border-color: #f0f0f0; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
975
</td>
<td class="line_content noteable_line" style="background: #fff; border: none; color: #333; display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#fff"> <span id="LC975" class="line"> <span class="k" style="font-weight: bold">if</span> <span class="p">(</span><span class="n" style="color: #333">ipv4_works</span> <span class="o" style="font-weight: bold">&&</span> <span class="n" style="color: #333">ipv6_works</span><span class="p">)</span> <span class="p">{</span></span>
</td>
</tr>
<tr class="line_holder" id="5ed258e118427794a94bfd9b47ab21c60a701577_992_976">
<td class="diff-line-num old_line" data-linenumber="992" style="background: #fafafa; border-color: #f0f0f0; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
992
</td>
<td class="diff-line-num new_line" data-linenumber="976" style="background: #fafafa; border-color: #f0f0f0; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
976
</td>
<td class="line_content noteable_line" style="background: #fff; border: none; color: #333; display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#fff"> <span id="LC976" class="line"> <span class="k" style="font-weight: bold">if</span> <span class="p">(</span><span class="n" style="color: #333">opt_ipv4</span><span class="p">)</span></span>
</td>
</tr>
<tr class="line_holder" id="5ed258e118427794a94bfd9b47ab21c60a701577_993_977">
<td class="diff-line-num old_line" data-linenumber="993" style="background: #fafafa; border-color: #f0f0f0; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
993
</td>
<td class="diff-line-num new_line" data-linenumber="977" style="background: #fafafa; border-color: #f0f0f0; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
977
</td>
<td class="line_content noteable_line" style="background: #fff; border: none; color: #333; display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#fff"> <span id="LC977" class="line"> <span class="n" style="color: #333">ipv6_works</span> <span class="o" style="font-weight: bold">=</span> <span class="nb" style="color: #0086b3">false</span><span class="p">;</span></span>
</td>
</tr>
</table>
<br>
</li>
</div>
<div class="footer" style="margin-top: 10px">
<p style="color: #777; font-size: small">
—
<br>
<a href="https://gitlab.com/NTPsec/ntpsec/commit/5a6cdcc43b7378f422cee4a7e1148f65ae721703">View it on GitLab</a>.
<br>
You're receiving this email because of your account on gitlab.com.
If you'd like to receive fewer emails, you can
adjust your notification settings.
<script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":"View Commit","url":"https://gitlab.com/NTPsec/ntpsec/commit/5a6cdcc43b7378f422cee4a7e1148f65ae721703"}}</script>
</p>
</div>
</body>
</html>