oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

replace inaddr2str by getnameinfo

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@7516 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1999-12-05 00:19:04 +00:00
parent bd1f61648e
commit fe81c21fd5
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
appl/ftp/ftpd/ftpd.c
View File

@@ -235,7 +235,7 @@ usage (int code)
int int
main(int argc, char **argv) main(int argc, char **argv)
{ {
int addrlen, on = 1, tos; int his_addr_len, ctrl_addr_len, on = 1, tos;
char *cp, line[LINE_MAX]; char *cp, line[LINE_MAX];
FILE *fd; FILE *fd;
int port; int port;
@@ -313,7 +313,6 @@ main(int argc, char **argv)
ftpd_timeout = maxtimeout; ftpd_timeout = maxtimeout;
#endif #endif
if(interactive_flag) if(interactive_flag)
mini_inetd (port); mini_inetd (port);
@@ -322,13 +321,13 @@ main(int argc, char **argv)
* necessary for anonymous ftp's that chroot and can't do it later. * necessary for anonymous ftp's that chroot and can't do it later.
*/ */
openlog("ftpd", LOG_PID | LOG_NDELAY, LOG_FTP); openlog("ftpd", LOG_PID | LOG_NDELAY, LOG_FTP);
addrlen = sizeof(his_addr_ss); his_addr_len = sizeof(his_addr_ss);
if (getpeername(STDIN_FILENO, his_addr, &addrlen) < 0) { if (getpeername(STDIN_FILENO, his_addr, &his_addr_len) < 0) {
syslog(LOG_ERR, "getpeername (%s): %m",argv[0]); syslog(LOG_ERR, "getpeername (%s): %m",argv[0]);
exit(1); exit(1);
} }
addrlen = sizeof(ctrl_addr_ss); ctrl_addr_len = sizeof(ctrl_addr_ss);
if (getsockname(STDIN_FILENO, ctrl_addr, &addrlen) < 0) { if (getsockname(STDIN_FILENO, ctrl_addr, &ctrl_addr_len) < 0) {
syslog(LOG_ERR, "getsockname (%s): %m",argv[0]); syslog(LOG_ERR, "getsockname (%s): %m",argv[0]);
exit(1); exit(1);
} }
@@ -365,7 +364,7 @@ main(int argc, char **argv)
if (fcntl(fileno(stdin), F_SETOWN, getpid()) == -1) if (fcntl(fileno(stdin), F_SETOWN, getpid()) == -1)
syslog(LOG_ERR, "fcntl F_SETOWN: %m"); syslog(LOG_ERR, "fcntl F_SETOWN: %m");
#endif #endif
dolog(his_addr); dolog(his_addr, his_addr_len);
/* /*
* Set up default state * Set up default state
*/ */
@@ -1775,11 +1774,9 @@ renamecmd(char *from, char *to)
} }
static void static void
dolog(struct sockaddr *sa) dolog(struct sockaddr *sa, int sa_len)
{ {
struct sockaddr_in *sin = (struct sockaddr_in *)sa; getnameinfo (sa, sa_len, remotehost, sizeof(remotehost), NULL, 0, 0);
inaddr2str (sin->sin_addr, remotehost, sizeof(remotehost));
#ifdef HAVE_SETPROCTITLE #ifdef HAVE_SETPROCTITLE
snprintf(proctitle, sizeof(proctitle), "%s: connected", remotehost); snprintf(proctitle, sizeof(proctitle), "%s: connected", remotehost);
setproctitle(proctitle); setproctitle(proctitle);