===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/netstat/main.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -c -r1.72 -r1.73
*** src/usr.bin/netstat/main.c	2007/12/19 01:47:00	1.72
--- src/usr.bin/netstat/main.c	2007/12/19 08:49:23	1.73
***************
*** 1,4 ****
! /*	$OpenBSD: main.c,v 1.72 2007/12/19 01:47:00 deraadt Exp $	*/
  /*	$NetBSD: main.c,v 1.9 1996/05/07 02:55:02 thorpej Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: main.c,v 1.73 2007/12/19 08:49:23 claudio Exp $	*/
  /*	$NetBSD: main.c,v 1.9 1996/05/07 02:55:02 thorpej Exp $	*/
  
  /*
***************
*** 90,98 ****
  #define N_RAWIP6TABLE	15
  	{ "_rawin6pcbtable" },
  
- #define N_RTSTAT	16
- 	{ "_rtstat" },
- 
  	{ ""}
  };
  
--- 90,95 ----
***************
*** 305,320 ****
  	if (nlistf != NULL || memf != NULL || Pflag)
  		if (setresgid(gid, gid, gid) == -1)
  			err(1, "setresgid");
! 	if (nlistf == NULL && memf == NULL && rflag && !Aflag) {
! 		/* printing the routing table no longer needs kvm */
! 		if (setresgid(gid, gid, gid) == -1)
! 			err(1, "setresgid");
! 		if (sflag)
! 			rt_stats(1, 0);
! 		else
! 			p_rttables(af, tableid);
! 		exit(0);
! 	}
  	if ((kvmd = kvm_openfiles(nlistf, memf, NULL, O_RDONLY,
  	    buf)) == NULL) {
  		fprintf(stderr, "%s: kvm_open: %s\n", __progname, buf);
--- 302,308 ----
  	if (nlistf != NULL || memf != NULL || Pflag)
  		if (setresgid(gid, gid, gid) == -1)
  			err(1, "setresgid");
! 
  	if ((kvmd = kvm_openfiles(nlistf, memf, NULL, O_RDONLY,
  	    buf)) == NULL) {
  		fprintf(stderr, "%s: kvm_open: %s\n", __progname, buf);
***************
*** 383,392 ****
  	}
  	if (rflag) {
  		if (sflag)
! 			rt_stats(0, nl[N_RTSTAT].n_value);
! 		else
  			routepr(nl[N_RTREE].n_value, nl[N_RTMASK].n_value,
  			    nl[N_AF2RTAFIDX].n_value, nl[N_RTBLIDMAX].n_value);
  		exit(0);
  	}
  	if (gflag) {
--- 371,382 ----
  	}
  	if (rflag) {
  		if (sflag)
! 			rt_stats();
! 		else if (Aflag || nlistf != NULL || memf != NULL)
  			routepr(nl[N_RTREE].n_value, nl[N_RTMASK].n_value,
  			    nl[N_AF2RTAFIDX].n_value, nl[N_RTBLIDMAX].n_value);
+ 		else
+ 			p_rttables(af, tableid);
  		exit(0);
  	}
  	if (gflag) {