diff options
| author | Garrett Wollman <wollman@FreeBSD.org> | 1996-02-06 20:36:15 +0000 |
|---|---|---|
| committer | Garrett Wollman <wollman@FreeBSD.org> | 1996-02-06 20:36:15 +0000 |
| commit | 0761cb293ed1aaeda09dabd8ea725b6f4a3e8024 (patch) | |
| tree | 3775e2813ec951933b9585e48e3c57ba7dca08e2 /usr.sbin/nslookup | |
| parent | c87204dc2da540da78912c0693724e1ff78e03d2 (diff) | |
| download | src-0761cb293ed1aaeda09dabd8ea725b6f4a3e8024.tar.gz src-0761cb293ed1aaeda09dabd8ea725b6f4a3e8024.zip | |
Remove support for OSI networking in user-land (#ifdef OSI aor CCITT)
in preparation for its removal from the kernel source tree. NB: because
a function was deleted, libc is now at version 3.0 (was 2.2 previously).
Notes
Notes:
svn path=/head/; revision=13940
Diffstat (limited to 'usr.sbin/nslookup')
| -rw-r--r-- | usr.sbin/nslookup/debug.c | 8 | ||||
| -rw-r--r-- | usr.sbin/nslookup/list.c | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/usr.sbin/nslookup/debug.c b/usr.sbin/nslookup/debug.c index 24a5ca7e60fc..d6077741ef2d 100644 --- a/usr.sbin/nslookup/debug.c +++ b/usr.sbin/nslookup/debug.c @@ -55,7 +55,7 @@ #ifndef lint static char sccsid[] = "@(#)debug.c 5.26 (Berkeley) 3/21/91"; -static char rcsid[] = "$Id: debug.c,v 1.3 1995/05/30 03:49:13 rgrimes Exp $"; +static char rcsid[] = "$Id: debug.c,v 1.4 1995/08/20 22:32:46 peter Exp $"; #endif /* not lint */ /* @@ -72,7 +72,9 @@ static char rcsid[] = "$Id: debug.c,v 1.3 1995/05/30 03:49:13 rgrimes Exp $"; #include <sys/param.h> #include <netinet/in.h> +#ifdef ISO #include <netiso/iso.h> +#endif #include <arpa/nameser.h> #include <arpa/inet.h> #include <resolv.h> @@ -254,7 +256,9 @@ Print_rr(cp, msg, eom, file) int type, class, dlen, n, c; u_int32_t rrttl, ttl; struct in_addr inaddr; +#ifdef ISO struct iso_addr isoa; +#endif u_char *cp1, *cp2; int debug; @@ -462,6 +466,7 @@ doname: (void) fputs("\"\n", file); break; +#ifdef ISO case T_NSAP: isoa.isoa_len = dlen; if (isoa.isoa_len > sizeof(isoa.isoa_genaddr)) @@ -470,6 +475,7 @@ doname: fprintf(file, "\tnsap = %s\n", iso_ntoa(&isoa)); cp += dlen; break; +#endif case T_UINFO: fprintf(file,"\tuser info = %s\n", cp); diff --git a/usr.sbin/nslookup/list.c b/usr.sbin/nslookup/list.c index da9c7e07fb8b..ea379962b240 100644 --- a/usr.sbin/nslookup/list.c +++ b/usr.sbin/nslookup/list.c @@ -55,7 +55,7 @@ #ifndef lint static char sccsid[] = "@(#)list.c 5.23 (Berkeley) 3/21/91"; -static char rcsid[] = "$Id: list.c,v 1.3 1995/05/30 03:49:15 rgrimes Exp $"; +static char rcsid[] = "$Id: list.c,v 1.4 1995/08/20 22:32:47 peter Exp $"; #endif /* not lint */ /* @@ -73,7 +73,9 @@ static char rcsid[] = "$Id: list.c,v 1.3 1995/05/30 03:49:15 rgrimes Exp $"; #include <sys/param.h> #include <sys/socket.h> #include <netinet/in.h> +#ifdef ISO #include <netiso/iso.h> +#endif #include <arpa/nameser.h> #include <arpa/inet.h> #include <resolv.h> @@ -595,7 +597,9 @@ PrintListInfo(file, msg, eom, qtype, domain) u_int32_t ttl; int n, pref; struct in_addr inaddr; +#ifdef ISO struct iso_addr isoa; +#endif char name[NAME_LEN]; char name2[NAME_LEN]; Boolean stripped; @@ -802,6 +806,7 @@ PrintListInfo(file, msg, eom, qtype, domain) } break; +#ifdef ISO case T_NSAP: isoa.isoa_len = dlen; if (isoa.isoa_len > sizeof(isoa.isoa_genaddr)) @@ -809,6 +814,7 @@ PrintListInfo(file, msg, eom, qtype, domain) bcopy(cp, isoa.isoa_genaddr, isoa.isoa_len); fprintf(file, " %s", iso_ntoa(&isoa)); break; +#endif case T_MINFO: case T_RP: |