| author | Tomas Klacko <tomas.klacko@oracle.com> |
| Tue, 11 Feb 2014 09:15:51 -0800 | |
| branch | s11-update |
| changeset 2945 | 181980667e6e |
| parent 2789 | b28fe4d7df32 |
| permissions | -rw-r--r-- |
|
2789
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
1 |
See: |
|
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
2 |
http://bugzilla.ntp.org/show_bug.cgi?id=2367 |
|
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
3 |
|
|
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
4 |
--- ntpd/ntp_proto.c |
|
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
5 |
+++ ntpd/ntp_proto.c |
|
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
6 |
@@ -429,9 +429,11 @@ receive( |
|
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
7 |
process_control(rbufp, restrict_mask); |
|
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
8 |
return; |
|
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
9 |
} |
|
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
10 |
- if (restrict_mask & RES_DONTSERVE) {
|
|
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
11 |
- sys_restricted++; |
|
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
12 |
- return; /* no time serve */ |
|
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
13 |
+ if (hismode == MODE_CLIENT) {
|
|
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
14 |
+ if (restrict_mask & RES_DONTSERVE) {
|
|
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
15 |
+ sys_restricted++; |
|
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
16 |
+ return; /* no time serve */ |
|
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
17 |
+ } |
|
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
18 |
} |
|
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
19 |
|
|
b28fe4d7df32
15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents:
diff
changeset
|
20 |
/* |