diff options
| author | Hajimu UMEMOTO <ume@FreeBSD.org> | 2005-05-13 16:31:11 +0000 |
|---|---|---|
| committer | Hajimu UMEMOTO <ume@FreeBSD.org> | 2005-05-13 16:31:11 +0000 |
| commit | 4f101318489d72d2eeada2463a8fc3d105855628 (patch) | |
| tree | 9ae1266a1a3de18e5409202ab088ec8928d3410e /libexec | |
| parent | 8dcb56dc7885d7310299a09a04fb5334f8d75d7a (diff) | |
| download | src-4f101318489d72d2eeada2463a8fc3d105855628.tar.gz src-4f101318489d72d2eeada2463a8fc3d105855628.zip | |
NI_WITHSCOPEID cleanup. Neither RFC 2553 nor RFC 3493 defines
NI_WITHSCOPEID, and our getaddrinfo(3) does nothing special
for it, now.
Notes
Notes:
svn path=/head/; revision=146187
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/rlogind/rlogind.c | 7 | ||||
| -rw-r--r-- | libexec/tftpd/tftpd.c | 5 |
2 files changed, 3 insertions, 9 deletions
diff --git a/libexec/rlogind/rlogind.c b/libexec/rlogind/rlogind.c index 366524d877ad..c4db3c7ae6bf 100644 --- a/libexec/rlogind/rlogind.c +++ b/libexec/rlogind/rlogind.c @@ -94,11 +94,6 @@ __FBSDID("$FreeBSD$"); #define ARGSTR "Daln" -/* wrapper for KAME-special getnameinfo() */ -#ifndef NI_WITHSCOPEID -#define NI_WITHSCOPEID 0 -#endif - char *env[2]; #define NMAX 30 char lusername[NMAX+1], rusername[NMAX+1]; @@ -233,7 +228,7 @@ doit(int f, union sockunion *fromp) getnameinfo((struct sockaddr *)fromp, fromp->su_len, nameinfo, sizeof(nameinfo), NULL, 0, - NI_NUMERICHOST|NI_WITHSCOPEID); + NI_NUMERICHOST); /* error check ? */ syslog(LOG_NOTICE, "Connection from %s on illegal port", nameinfo); diff --git a/libexec/tftpd/tftpd.c b/libexec/tftpd/tftpd.c index 84c961cabb11..9c1ec2ac79e5 100644 --- a/libexec/tftpd/tftpd.c +++ b/libexec/tftpd/tftpd.c @@ -266,7 +266,7 @@ main(int argc, char *argv[]) unmappedaddr((struct sockaddr_in6 *)&ss); getnameinfo((struct sockaddr *)&ss, ss.ss_len, hbuf, sizeof(hbuf), NULL, 0, - NI_NUMERICHOST | NI_WITHSCOPEID); + NI_NUMERICHOST); asprintf(&tempchroot, "%s/%s", chroot_dir, hbuf); if (ipchroot == 2) statret = stat(tempchroot, &sb); @@ -487,8 +487,7 @@ option_fail: char hbuf[NI_MAXHOST]; getnameinfo((struct sockaddr *)&from, from.ss_len, - hbuf, sizeof(hbuf), NULL, 0, - NI_WITHSCOPEID); + hbuf, sizeof(hbuf), NULL, 0, 0); syslog(LOG_INFO, "%s: %s request for %s: %s", hbuf, tp->th_opcode == WRQ ? "write" : "read", filename, errtomsg(ecode)); |