<!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>
Eric S. Raymond 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/b065490caddfeb4fc91e8334984e940b1ef50f15">b065490c</a></strong>
<div>
<span>by Eric S. Raymond</span>
<i>at 2016-07-10T08:54:53-04:00</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap">Restore old behavior of ntpq -pn when there's an override label.</pre>
</li>
</ul>
<h4>1 changed file:</h4>
<ul>
<li class="file-stats">
<a href="#diff-0" style="text-decoration: none">
ntpq/ntpq-subs.c
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id="diff-0">
<a href="https://gitlab.com/NTPsec/ntpsec/commit/b065490caddfeb4fc91e8334984e940b1ef50f15#diff-0"><strong>ntpq/ntpq-subs.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">
<td class="diff-line-num js-unfold old_line unfold" data-linenumber="1791" 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 js-unfold new_line unfold" data-linenumber="1791" 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">@@ -1791,7 +1791,7 @@ doprintpeers(</td>
</tr>
<tr class="line_holder">
<td class="old_line diff-line-num" data-linenumber="1791" 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">
1791
</td>
<td class="new_line diff-line-num" data-linenumber="1791" 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">
1791
</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="LC1791" class="line"> <span class="n" style="color: #333">fprintf</span><span class="p">(</span><span class="n" style="color: #333">fp</span><span class="p">,</span> <span class="s" style="color: #d14">"%-*s "</span><span class="p">,</span> <span class="p">(</span><span class="kt" style="color: #458; font-weight: bold">int</span><span class="p">)</span><span class="n" style="color: #333">maxhostlen</span><span class="p">,</span> <span class="n" style="color: #333">serverlocal</span><span class="p">);</span></span>
</td>
</tr>
<tr class="line_holder">
<td class="old_line diff-line-num" data-linenumber="1792" 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">
1792
</td>
<td class="new_line diff-line-num" data-linenumber="1792" 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">
1792
</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="LC1792" class="line"> <span class="p">}</span></span>
</td>
</tr>
<tr class="line_holder">
<td class="old_line diff-line-num" data-linenumber="1793" 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">
1793
</td>
<td class="new_line diff-line-num" data-linenumber="1793" 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">
1793
</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="LC1793" class="line"> <span class="k" style="font-weight: bold">if</span> <span class="p">(</span><span class="n" style="color: #333">AF_UNSPEC</span> <span class="o" style="font-weight: bold">==</span> <span class="n" style="color: #333">af</span> <span class="o" style="font-weight: bold">||</span> <span class="n" style="color: #333">AF</span><span class="p">(</span><span class="o" style="font-weight: bold">&</span><span class="n" style="color: #333">srcadr</span><span class="p">)</span> <span class="o" style="font-weight: bold">==</span> <span class="n" style="color: #333">af</span><span class="p">)</span> <span class="p">{</span></span>
</td>
</tr>
<tr class="line_holder old">
<td class="diff-line-num old old_line" data-linenumber="1794" 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">
1794
</td>
<td class="diff-line-num new_line old" data-linenumber="1794" 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="LC1794" class="line"> <span class="k" style="font-weight: bold">if</span> <span class="p">(</span><span class="n" style="color: #333">displayname</span> <span class="o" style="font-weight: bold">!=</span> <span class="nb" style="color: #0086b3">NULL</span><span class="p">)</span></span>
</td>
</tr>
<tr class="line_holder new">
<td class="diff-line-num new old_line" data-linenumber="1794" style="background: #ddfbe6; border-color: #c7f0d2; 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="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="1794" style="background: #ddfbe6; border-color: #c7f0d2; 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="#ddfbe6">
1794
</td>
<td class="line_content new noteable_line" style="background: #ecfdf0; 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="#ecfdf0"> <span id="LC1794" class="line"> <span class="k" style="font-weight: bold">if</span> <span class="p">(</span><span class="n" style="color: #333">displayname</span> <span class="o" style="font-weight: bold">!=</span> <span class="nb" style="color: #0086b3">NULL</span><span class="idiff left" style="background: #c7f0d2"> </span><span class="o" style="font-weight: bold"><span class="idiff" style="background: #c7f0d2">&&</span></span><span class="idiff" style="background: #c7f0d2"> </span><span class="n" style="color: #333"><span class="idiff right" style="background: #c7f0d2">showhostnames</span></span><span class="p">)</span></span>
</td>
</tr>
<tr class="line_holder">
<td class="old_line diff-line-num" data-linenumber="1795" 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">
1795
</td>
<td class="new_line diff-line-num" data-linenumber="1795" 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">
1795
</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="LC1795" class="line"> <span class="n" style="color: #333">strlcpy</span><span class="p">(</span><span class="n" style="color: #333">clock_name</span><span class="p">,</span> <span class="n" style="color: #333">displayname</span><span class="p">,</span> <span class="k" style="font-weight: bold">sizeof</span><span class="p">(</span><span class="n" style="color: #333">clock_name</span><span class="p">));</span></span>
</td>
</tr>
<tr class="line_holder">
<td class="old_line diff-line-num" data-linenumber="1796" 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">
1796
</td>
<td class="new_line diff-line-num" data-linenumber="1796" 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">
1796
</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="LC1796" 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="o" style="font-weight: bold">!</span><span class="n" style="color: #333">have_srchost</span><span class="p">)</span></span>
</td>
</tr>
<tr class="line_holder">
<td class="old_line diff-line-num" data-linenumber="1797" 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">
1797
</td>
<td class="new_line diff-line-num" data-linenumber="1797" 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">
1797
</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="LC1797" class="line"> <span class="n" style="color: #333">strlcpy</span><span class="p">(</span><span class="n" style="color: #333">clock_name</span><span class="p">,</span> <span class="n" style="color: #333">nntohost</span><span class="p">(</span><span class="o" style="font-weight: bold">&</span><span class="n" style="color: #333">srcadr</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/b065490caddfeb4fc91e8334984e940b1ef50f15">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/b065490caddfeb4fc91e8334984e940b1ef50f15"}}</script>
</p>
</div>
</body>
</html>