diff options
| author |   martijn <martijn@openbsd.org> | 2020-06-30 19:26:40 +0000 |
|---|---|---|
| committer | martijn <martijn@openbsd.org> | 2020-06-30 19:26:40 +0000 |
| commit | 9b9b25beda810cd8053648e1b0988c8ef14f1255 (patch) | |
| tree | 2ebf1472334e9a082adb5410cb5adc792e57ac37 | |
| parent | Nuke unneeded 'sa_inqbuf' member of struct scsi_attach_args. It always (diff) | |
| download | wireguard-openbsd-9b9b25beda810cd8053648e1b0988c8ef14f1255.tar.xz wireguard-openbsd-9b9b25beda810cd8053648e1b0988c8ef14f1255.zip | |
Fix two minor issues in snmpc_parseagent.
| -rw-r--r-- | usr.bin/snmp/snmpc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.bin/snmp/snmpc.c b/usr.bin/snmp/snmpc.c index 62fb1201a38..2c7f85172d2 100644 --- a/usr.bin/snmp/snmpc.c +++ b/usr.bin/snmp/snmpc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: snmpc.c,v 1.26 2020/05/31 21:01:59 martijn Exp $ */ +/* $OpenBSD: snmpc.c,v 1.27 2020/06/30 19:26:40 martijn Exp $ */ /* * Copyright (c) 2019 Martijn van Duren <martijn@openbsd.org> @@ -1237,7 +1237,7 @@ snmpc_parseagent(char *agent, char *defaultport) port = defaultport; error = getaddrinfo(hostname, port, &hints, &ai0); if (error) { - if (error != EAI_NODATA && port != defaultport) + if (error != EAI_NODATA || port == defaultport) errx(1, "%s", gai_strerror(error)); *--port = ':'; error = getaddrinfo(hostname, defaultport, &hints, @@ -1252,6 +1252,8 @@ snmpc_parseagent(char *agent, char *defaultport) connect(s, (struct sockaddr *)ai->ai_addr, ai->ai_addrlen) != -1) break; + close(s); + s = -1; } } else { s = socket(AF_UNIX, SOCK_STREAM, 0); |