stop testing for stuff we have.
Index: ftpd.c
===================================================================
RCS file: /cvs/src/libexec/ftpd/ftpd.c,v
retrieving revision 1.219
diff -u -p -r1.219 ftpd.c
--- ftpd.c 26 Aug 2016 06:32:10 -0000 1.219
+++ ftpd.c 30 Aug 2016 12:50:04 -0000
@@ -151,9 +151,6 @@ char remotehost[HOST_NAME_MAX+1];
char dhostname[HOST_NAME_MAX+1];
char *guestpw;
char ttyline[20];
-#if 0
-char *tty = ttyline; /* for klogin */
-#endif
static struct utmp utmp; /* for utmp */
static login_cap_t *lc;
static auth_session_t *as;
@@ -529,7 +526,6 @@ main(int argc, char *argv[])
}
if (his_addr.su_family == AF_INET6 &&
IN6_IS_ADDR_V4MAPPED(&his_addr.su_sin6.sin6_addr)) {
-#if 1
/*
* IPv4 control connection arrived to AF_INET6 socket.
* I hate to do this, but this is the easiest solution.
@@ -554,33 +550,18 @@ main(int argc, char *argv[])
&tmp_addr.su_sin6.sin6_addr.s6_addr[off],
sizeof(ctrl_addr.su_sin.sin_addr));
ctrl_addr.su_sin.sin_port = tmp_addr.su_sin6.sin6_port;
-#else
- while (fgets(line, sizeof(line), fd) != NULL) {
- line[strcspn(line, "\n")] = '\0';
- lreply(530, "%s", line);
- }
- (void) fflush(stdout);
- (void) close(fd);
- reply(530,
- "Connection from IPv4 mapped address is not
supported.");
- exit(0);
-#endif
}
-#ifdef IP_TOS
if (his_addr.su_family == AF_INET) {
tos = IPTOS_LOWDELAY;
if (setsockopt(0, IPPROTO_IP, IP_TOS, &tos,
sizeof(int)) < 0)
syslog(LOG_WARNING, "setsockopt (IP_TOS): %m");
}
-#endif
data_source.su_port = htons(ntohs(ctrl_addr.su_port) - 1);
/* Try to handle urgent data inline */
-#ifdef SO_OOBINLINE
if (setsockopt(0, SOL_SOCKET, SO_OOBINLINE, &on, sizeof(on)) < 0)
syslog(LOG_ERR, "setsockopt: %m");
-#endif
dolog((struct sockaddr *)&his_addr);
@@ -1332,15 +1313,12 @@ getdatasock(char *mode)
}
sigprocmask (SIG_UNBLOCK, &allsigs, NULL);
-#ifdef IP_TOS
if (ctrl_addr.su_family == AF_INET) {
on = IPTOS_THROUGHPUT;
if (setsockopt(s, IPPROTO_IP, IP_TOS, &on,
sizeof(int)) < 0)
syslog(LOG_WARNING, "setsockopt (IP_TOS): %m");
}
-#endif
-#ifdef TCP_NOPUSH
/*
* Turn off push flag to keep sender TCP from sending short packets
* at the boundaries of each write(). Should probably do a SO_SNDBUF
@@ -1350,12 +1328,9 @@ getdatasock(char *mode)
on = 1;
if (setsockopt(s, IPPROTO_TCP, TCP_NOPUSH, &on, sizeof(on)) < 0)
syslog(LOG_WARNING, "setsockopt (TCP_NOPUSH): %m");
-#endif
-#ifdef SO_SNDBUF
on = 65536;
if (setsockopt(s, SOL_SOCKET, SO_SNDBUF, &on, sizeof(on)) < 0)
syslog(LOG_WARNING, "setsockopt (SO_SNDBUF): %m");
-#endif
return (fdopen(s, mode));
bad:
@@ -2845,10 +2820,8 @@ set_slave_signals(void)
sa.sa_handler = toolong;
(void) sigaction(SIGALRM, &sa, NULL);
-#ifdef F_SETOWN
if (fcntl(fileno(stdin), F_SETOWN, getpid()) == -1)
syslog(LOG_ERR, "fcntl F_SETOWN: %m");
-#endif
}
/*
