Browse Source

host_* now returns pointers, so the error return is NULL and not 0

OPENBSD_3_6
henning 20 years ago
parent
commit
21aaad0466
1 changed files with 5 additions and 5 deletions
  1. +5
    -5
      src/usr.sbin/ntpd/config.c

+ 5
- 5
src/usr.sbin/ntpd/config.c View File

@ -1,4 +1,4 @@
/* $OpenBSD: config.c,v 1.4 2004/07/07 03:15:37 henning Exp $ */
/* $OpenBSD: config.c,v 1.5 2004/07/07 03:53:14 henning Exp $ */
/* /*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@ -66,7 +66,7 @@ host(const char *s, u_int8_t *len)
mask = strtol(p+1, &q, 0); mask = strtol(p+1, &q, 0);
if (errno == ERANGE || !q || *q || mask > 128 || q == (p+1)) { if (errno == ERANGE || !q || *q || mask > 128 || q == (p+1)) {
log_warnx("invalid netmask"); log_warnx("invalid netmask");
return (0);
return (NULL);
} }
if ((ps = malloc(strlen(s) - strlen(p) + 1)) == NULL) if ((ps = malloc(strlen(s) - strlen(p) + 1)) == NULL)
fatal("host: malloc"); fatal("host: malloc");
@ -107,10 +107,10 @@ host_v4(const char *s, u_int8_t *len)
bzero(&ina, sizeof(struct in_addr)); bzero(&ina, sizeof(struct in_addr));
if (strrchr(s, '/') != NULL) { if (strrchr(s, '/') != NULL) {
if ((bits = inet_net_pton(AF_INET, s, &ina, sizeof(ina))) == -1) if ((bits = inet_net_pton(AF_INET, s, &ina, sizeof(ina))) == -1)
return (0);
return (NULL);
} else { } else {
if (inet_pton(AF_INET, s, &ina) != 1) if (inet_pton(AF_INET, s, &ina) != 1)
return (0);
return (NULL);
} }
if ((h = calloc(1, sizeof(struct ntp_addr))) == NULL) if ((h = calloc(1, sizeof(struct ntp_addr))) == NULL)
@ -167,7 +167,7 @@ host_dns(const char *s, u_int8_t *len)
hints.ai_socktype = SOCK_STREAM; /* DUMMY */ hints.ai_socktype = SOCK_STREAM; /* DUMMY */
error = getaddrinfo(s, NULL, &hints, &res0); error = getaddrinfo(s, NULL, &hints, &res0);
if (error) if (error)
return (0);
return (NULL);
for (res = res0; res; res = res->ai_next) { for (res = res0; res; res = res->ai_next) {
if (res->ai_family != AF_INET && if (res->ai_family != AF_INET &&


Loading…
Cancel
Save