From 9406c3f2a35b925b0e7458860d00d22874fc9574 Mon Sep 17 00:00:00 2001
From: ru <ru@FreeBSD.org>
Date: Wed, 16 Aug 2000 09:12:33 +0000
Subject: Fix `control socket: Protocol not supported' failure in standalone -D
 mode when neither -4 nor -6 is specified.

---
 libexec/ftpd/ftpd.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'libexec')

diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c
index 0471c22..8c09122 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.
-- 
cgit v1.1