faraphel/chrony
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

client: handle empty hostname before slash in allow/deny commands

Browse source
This commit is contained in:
Miroslav Lichvar 2015-05-18 15:36:52 +02:00
parent 4295db25d7
commit 2c35f56612
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
client.c
View file

@ -640,7 +640,8 @@ process_cmd_manual(CMD_Request *msg, const char *line)
static int static int
parse_allow_deny(CMD_Request *msg, char *line) parse_allow_deny(CMD_Request *msg, char *line)
{ {
unsigned long a, b, c, d, n; unsigned long a, b, c, d;
int n, specified_subnet_bits;
IPAddr ip; IPAddr ip;
char *p; char *p;
@ -657,7 +658,7 @@ parse_allow_deny(CMD_Request *msg, char *line)
n = 0; n = 0;
if (!UTI_StringToIP(p, &ip) && if (!UTI_StringToIP(p, &ip) &&
(n = sscanf(p, "%lu.%lu.%lu.%lu", &a, &b, &c, &d)) == 0) { (n = sscanf(p, "%lu.%lu.%lu.%lu", &a, &b, &c, &d)) <= 0) {
/* Try to parse as the name of a machine */ /* Try to parse as the name of a machine */
if (DNS_Name2IPAddress(p, &ip, 1) != DNS_Success) { if (DNS_Name2IPAddress(p, &ip, 1) != DNS_Success) {
@ -710,7 +711,6 @@ parse_allow_deny(CMD_Request *msg, char *line)
UTI_IPHostToNetwork(&ip, &msg->data.allow_deny.ip); UTI_IPHostToNetwork(&ip, &msg->data.allow_deny.ip);
if (slashpos) { if (slashpos) {
int specified_subnet_bits, n;
n = sscanf(slashpos+1, "%d", &specified_subnet_bits); n = sscanf(slashpos+1, "%d", &specified_subnet_bits);
if (n == 1) { if (n == 1) {
msg->data.allow_deny.subnet_bits = htonl(specified_subnet_bits); msg->data.allow_deny.subnet_bits = htonl(specified_subnet_bits);