===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tcpbench/tcpbench.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -c -r1.46 -r1.47
*** src/usr.bin/tcpbench/tcpbench.c	2015/02/09 23:46:23	1.46
--- src/usr.bin/tcpbench/tcpbench.c	2015/11/13 19:37:20	1.47
***************
*** 986,993 ****
  int
  main(int argc, char **argv)
  {
- 	extern int optind;
- 	extern char *optarg;
  	struct timeval tv;
  	unsigned int secs, rtable;
  
--- 986,991 ----
***************
*** 1108,1113 ****
--- 1106,1114 ----
  		}
  	}
  
+ 	if (pledge("stdio rpath dns inet id proc", NULL) == -1)
+ 		err(1, "pledge");
+ 
  	argv += optind;
  	argc -= optind;
  	if ((argc != (ptb->sflag ? 0 : 1)) ||
***************
*** 1125,1130 ****
--- 1126,1134 ----
  	} else
  		drop_gid();
  
+ 	if (pledge("stdio id dns inet", NULL) == -1)
+ 		err(1, "pledge");
+ 
  	if (!ptb->sflag)
  		host = argv[0];
  	/*
***************
*** 1169,1174 ****
--- 1173,1181 ----
  			errx(1, "getaddrinfo: %s", gai_strerror(herr));
  	}
  
+ 	if (pledge("stdio id inet", NULL) == -1)
+ 		err(1, "pledge");
+ 
  	if (getrlimit(RLIMIT_NOFILE, &rl) == -1)
  		err(1, "getrlimit");
  	if (rl.rlim_cur < MAX_FD)
***************
*** 1177,1183 ****
  		err(1, "setrlimit");
  	if (getrlimit(RLIMIT_NOFILE, &rl) == -1)
  		err(1, "getrlimit");
! 	
  	/* Init world */
  	TAILQ_INIT(&sc_queue);
  	if ((ptb->dummybuf = malloc(ptb->dummybuf_len)) == NULL)
--- 1184,1193 ----
  		err(1, "setrlimit");
  	if (getrlimit(RLIMIT_NOFILE, &rl) == -1)
  		err(1, "getrlimit");
! 
! 	if (pledge("stdio inet", NULL) == -1)
! 		err(1, "pledge");
! 
  	/* Init world */
  	TAILQ_INIT(&sc_queue);
  	if ((ptb->dummybuf = malloc(ptb->dummybuf_len)) == NULL)
***************
*** 1215,1222 ****
  			evtimer_add(&ev_progtimer, &tv);
  		}
  		client_init(aitop, nconn, udp_sc, aib);
  	}
! 	
  	/* libevent main loop*/
  	event_dispatch();
  
--- 1225,1235 ----
  			evtimer_add(&ev_progtimer, &tv);
  		}
  		client_init(aitop, nconn, udp_sc, aib);
+ 
+ 		if (pledge("stdio", NULL) == -1)
+ 			err(1, "pledge");
  	}
! 
  	/* libevent main loop*/
  	event_dispatch();