<html lang='en'>
<head>
<meta content='text/html; charset=utf-8' http-equiv='Content-Type'>
<title>
GitLab
</title>
</meta>
</head>
<style>
img {
max-width: 100%;
height: auto;
}
p.details {
font-style:italic;
color:#777
}
.footer p {
font-size:small;
color:#777
}
pre.commit-message {
white-space: pre-wrap;
}
.file-stats a {
text-decoration: none;
}
.file-stats .new-file {
color: #090;
}
.file-stats .deleted-file {
color: #B00;
}
</style>
<body>
<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/a80eb558fad7046b482430ef6c5601c323cd0f92">a80eb558</a></strong>
<div>
<span>by Eric S. Raymond</span>
<i>at 2015-12-09T17:42:14Z</i>
</div>
<pre class='commit-message'>Cut verbosity by changing where capture mode is set.</pre>
</li>
</ul>
<h4>3 changed files:</h4>
<ul>
<li class='file-stats'>
<a href='#diff-0'>
ntpd/ntp_config.c
</a>
</li>
<li class='file-stats'>
<a href='#diff-1'>
ntpd/ntp_intercept.c
</a>
</li>
<li class='file-stats'>
<a href='#diff-2'>
ntpd/ntpd.c
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id='diff-0'>
<a href='https://gitlab.com/NTPsec/ntpsec/commit/a80eb558fad7046b482430ef6c5601c323cd0f92#diff-0'>
<strong>
ntpd/ntp_config.c
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/ntpd/ntp_config.c
</span><span style="color: #000000;background-color: #ddffdd">+++ b/ntpd/ntp_config.c
</span><span style="color: #aaaaaa">@@ -2430,8 +2430,9 @@ config_access(
</span> ? "source"
: "default";
const char *kod_warn = "KOD does nothing without LIMITED.";
<span style="color: #000000;background-color: #ffdddd">-
- fprintf(stderr, "restrict %s: %s\n", kod_where, kod_warn);
</span><span style="color: #000000;background-color: #ddffdd">+ /* FIXME: should probly just drop this */
+ if (intercept_get_mode() == none)
+ fprintf(stderr, "restrict %s: %s\n", kod_where, kod_warn);
</span> msyslog(LOG_WARNING, "restrict %s: %s", kod_where, kod_warn);
}
</code></pre>
<br>
</li>
<li id='diff-1'>
<a href='https://gitlab.com/NTPsec/ntpsec/commit/a80eb558fad7046b482430ef6c5601c323cd0f92#diff-1'>
<strong>
ntpd/ntp_intercept.c
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/ntpd/ntp_intercept.c
</span><span style="color: #000000;background-color: #ddffdd">+++ b/ntpd/ntp_intercept.c
</span><span style="color: #aaaaaa">@@ -123,27 +123,17 @@ void intercept_set_mode(intercept_mode newmode)
</span> {
mode = newmode;
if (mode != none) {
<span style="color: #000000;background-color: #ffdddd">- if (mode == replay)
- fputs("# Setting replay mode\n", stdout);
- else if (mode == capture)
- fputs("# Setting capture mode\n", stdout);
</span> syslogit = false;
<span style="color: #000000;background-color: #ffdddd">- //hashprefix = termlogit = true;
- termlogit = false;
</span><span style="color: #000000;background-color: #ddffdd">+ hashprefix = true;
+ termlogit = (debug > 0);
</span> }
}
void intercept_argparse(int *argc, char ***argv)
{
<span style="color: #000000;background-color: #ffdddd">- int i;
- for (i = 1; i < *argc; i++)
- if (strcmp((*argv)[i], "-y") == 0)
- intercept_set_mode(capture);
- else if (strcmp((*argv)[i], "-Y") == 0)
- intercept_set_mode(replay);
-
</span> if (mode == capture)
{
<span style="color: #000000;background-color: #ddffdd">+ int i;
</span> printf("event startup");
for (i = 1; i < *argc; i++)
if (strcmp((*argv)[i], "-y") != 0 && strcmp((*argv)[i], "-Y") != 0)
</code></pre>
<br>
</li>
<li id='diff-2'>
<a href='https://gitlab.com/NTPsec/ntpsec/commit/a80eb558fad7046b482430ef6c5601c323cd0f92#diff-2'>
<strong>
ntpd/ntpd.c
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/ntpd/ntpd.c
</span><span style="color: #000000;background-color: #ddffdd">+++ b/ntpd/ntpd.c
</span><span style="color: #aaaaaa">@@ -375,10 +375,10 @@ parse_cmdline_opts(
</span> /* defer */
break;
case 'y':
<span style="color: #000000;background-color: #ffdddd">- /* processed by interception code */
</span><span style="color: #000000;background-color: #ddffdd">+ intercept_set_mode(capture);
</span> break;
case 'Y':
<span style="color: #000000;background-color: #ffdddd">- /* processed by interception code */
</span><span style="color: #000000;background-color: #ddffdd">+ intercept_set_mode(replay);
</span> break;
case 'z':
/* defer */
</code></pre>
<br>
</li>
</div>
<div class='footer' style='margin-top: 10px;'>
<p>
—
<br>
<a href="https://gitlab.com/NTPsec/ntpsec/commit/a80eb558fad7046b482430ef6c5601c323cd0f92">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/a80eb558fad7046b482430ef6c5601c323cd0f92"}}</script>
</p>
</div>
</body>
</html>