summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuslan Ermilov <ru@FreeBSD.org>2000-08-17 07:34:44 +0000
committerRuslan Ermilov <ru@FreeBSD.org>2000-08-17 07:34:44 +0000
commit64fc9f8550a83cf79910c693edefd556a751c13a (patch)
tree6bf3f793a21cc1d93cb20fd753abf3ea01faf8cc
parentea4091610571ccf36d3a6332c82ae67a3086072d (diff)
Notes
-rw-r--r--libexec/ftpd/ftpd.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c
index 6c6502890447..1465df610535 100644
--- a/libexec/ftpd/ftpd.c
+++ b/libexec/ftpd/ftpd.c
@@ -408,8 +408,6 @@ main(argc, argv, envp)
error = getaddrinfo(bindname, "ftp", &hints,
&res);
}
- if (error == 0 && res->ai_addr != NULL)
- family = res->ai_addr->sa_family;
}
if (error) {
syslog(LOG_ERR, gai_strerror(error));
@@ -420,7 +418,8 @@ main(argc, argv, envp)
if (res->ai_addr == NULL) {
syslog(LOG_ERR, "-a %s: getaddrinfo failed", hostname);
exit(1);
- }
+ } else
+ family = res->ai_addr->sa_family;
/*
* Open a socket, bind it to the FTP port, and start
* listening.