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).

6 files changed, 36 insertions, 6 deletions

diff --git a/usr.sbin/named/db_dump.c b/usr.sbin/named/db_dump.c
index 27ffadd..e38719d 100644
--- a/usr.sbin/named/db_dump.c
+++ b/usr.sbin/named/db_dump.c
@@ -1,6 +1,6 @@
 #if !defined(lint) && !defined(SABER)
 static char sccsid[] = "@(#)db_dump.c	4.33 (Berkeley) 3/3/91";
-static char rcsid[] = "$Id: db_dump.c,v 1.4 1995/08/20 21:18:14 peter Exp $";
+static char rcsid[] = "$Id: db_dump.c,v 1.5 1996/01/07 05:48:21 peter Exp $";
 #endif /* not lint */
 
 /*
@@ -61,7 +61,9 @@ static char rcsid[] = "$Id: db_dump.c,v 1.4 1995/08/20 21:18:14 peter Exp $";
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <netinet/in.h>
+#ifdef ISO
 #include <netiso/iso.h>
+#endif
 #include <arpa/nameser.h>
 #include <arpa/inet.h>
 #include <netdb.h>
@@ -360,7 +362,9 @@ db_dump(htp, fp, zone, origin)
 	u_int32_t n;
 	u_int32_t addr;
 	int j, i;
+#ifdef ISO
 	struct iso_addr isoa;
+#endif
 	register u_char *cp;
 	u_char *end;
 	char *proto, *sep;
@@ -556,6 +560,7 @@ db_dump(htp, fp, zone, origin)
 				(void) fputs("\"", fp);
 				break;
 
+#ifdef ISO
 			case T_NSAP:
 				isoa.isoa_len = dp->d_size;
 				if (isoa.isoa_len > sizeof(isoa.isoa_genaddr))
@@ -564,6 +569,7 @@ db_dump(htp, fp, zone, origin)
 				      isoa.isoa_len);
 				(void) fputs(iso_ntoa(&isoa), fp);
 				break;
+#endif
 #ifdef LOC_RR
 			case T_LOC:
 				(void) fputs(loc_ntoa(dp->d_data, NULL), fp);
diff --git a/usr.sbin/named/db_load.c b/usr.sbin/named/db_load.c
index fbe8466..7909434 100644
--- a/usr.sbin/named/db_load.c
+++ b/usr.sbin/named/db_load.c
@@ -1,6 +1,6 @@
 #if !defined(lint) && !defined(SABER)
 static char sccsid[] = "@(#)db_load.c	4.38 (Berkeley) 3/2/91";
-static char rcsid[] = "$Id: db_load.c,v 1.4 1995/08/20 21:18:22 peter Exp $";
+static char rcsid[] = "$Id: db_load.c,v 1.5 1996/01/07 05:48:25 peter Exp $";
 #endif /* not lint */
 
 /*
@@ -65,7 +65,9 @@ static char rcsid[] = "$Id: db_load.c,v 1.4 1995/08/20 21:18:22 peter Exp $";
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <netinet/in.h>
+#ifdef ISO
 #include <netiso/iso.h>
+#endif
 #include <arpa/nameser.h>
 #include <arpa/inet.h>
 #include <stdio.h>
@@ -182,7 +184,9 @@ db_load(filename, in_origin, zp, def_domain)
 	int c, class, type, dbflags, dataflags, multiline;
 	u_int32_t ttl;
 	struct databuf *dp;
+#ifdef ISO
 	struct iso_addr *isoa;
+#endif
 	FILE *fp;
 	int slineno, i, errs, didinclude;
 	register u_int32_t n;
@@ -681,6 +685,7 @@ db_load(filename, in_origin, zp, def_domain)
 				endline(fp);
 				break;
 
+#ifdef ISO
 			case T_NSAP:
 				isoa = iso_addr(buf);
 				if (!isoa)
@@ -689,6 +694,7 @@ db_load(filename, in_origin, zp, def_domain)
 				bcopy(isoa->isoa_genaddr, data, n);
   				endline(fp);
   				break;
+#endif
 #ifdef LOC_RR
 			case T_LOC:
                                 cp = buf + (n = strlen(buf));
diff --git a/usr.sbin/named/xfer/named-xfer.c b/usr.sbin/named/xfer/named-xfer.c
index f7a5d5c..b5f384a 100644
--- a/usr.sbin/named/xfer/named-xfer.c
+++ b/usr.sbin/named/xfer/named-xfer.c
@@ -70,7 +70,7 @@ char copyright[] =
 
 #if !defined(lint) && !defined(SABER)
 static char sccsid[] = "@(#)named-xfer.c	4.18 (Berkeley) 3/7/91";
-static char rcsid[] = "$Id: named-xfer.c,v 1.4 1995/08/20 21:49:40 peter Exp $";
+static char rcsid[] = "$Id: named-xfer.c,v 1.5 1996/01/07 05:48:49 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -79,7 +79,9 @@ static char rcsid[] = "$Id: named-xfer.c,v 1.4 1995/08/20 21:49:40 peter Exp $";
 #include <sys/socket.h>
 
 #include <netinet/in.h>
+#ifdef ISO
 #include <netiso/iso.h>
+#endif
 #if defined(__osf__)
 # include <sys/mbuf.h>
 # include <net/route.h>
@@ -1155,7 +1157,9 @@ print_output(msg, msglen, rrp)
 	register HEADER *hp = (HEADER *) msg;
 	u_int32_t addr, ttl;
 	int i, j, tab, result, class, type, dlen, n1, n;
+#ifdef ISO
 	struct iso_addr isoa;
+#endif
 	char data[BUFSIZ];
 	u_char *cp1, *cp2, *temp_ptr;
 	char *cdata, *origin, *proto, dname[MAXDNAME];
@@ -1538,6 +1542,7 @@ print_output(msg, msglen, rrp)
 		(void) fputs("\"\n", dbfp);
 		break;
 
+#ifdef ISO
 	case T_NSAP:
 		isoa.isoa_len = n;
 		if (isoa.isoa_len > sizeof(isoa.isoa_genaddr))
@@ -1545,6 +1550,7 @@ print_output(msg, msglen, rrp)
 		bcopy(cp, isoa.isoa_genaddr, isoa.isoa_len);
 		fprintf(dbfp, "%s\n", iso_ntoa(&isoa));
 		break;
+#endif
 
 	case T_UINFO:
 		(void) fprintf(dbfp, "\"%s\"\n", cp);
diff --git a/usr.sbin/nslookup/debug.c b/usr.sbin/nslookup/debug.c
index 24a5ca7..d607774 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 da9c7e0..ea37996 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:
diff --git a/usr.sbin/sendmail/src/Makefile b/usr.sbin/sendmail/src/Makefile
index db63e0d..86ba9d5 100644
--- a/usr.sbin/sendmail/src/Makefile
+++ b/usr.sbin/sendmail/src/Makefile
@@ -17,7 +17,7 @@ PROG=	sendmail
 # spiral snail, but it will work.
 DBMDEF=	-DNEWDB
 
-CFLAGS+=-I${.CURDIR} ${DBMDEF} -DNETISO
+CFLAGS+=-I${.CURDIR} ${DBMDEF} #-DNETISO
 
 SRCS=	alias.c arpadate.c clock.c collect.c conf.c convtime.c daemon.c \
 	deliver.c domain.c envelope.c err.c headers.c macro.c main.c map.c \