From: Guy Harris <guy@alum.mit.edu>
Date: Wed, 20 May 2015 23:56:06 +0000 (-0700)
Subject: Merge pull request #455 from brooksdavis/gndo-cleanup
X-Git-Tag: tcpdump-4.8.0~248
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/0b1de8f73d9b1484095a5ba484e83021ef7bc7ae

Merge pull request #455 from brooksdavis/gndo-cleanup

Remove global netdissect_object and remove non-dissection related fields
---

0b1de8f73d9b1484095a5ba484e83021ef7bc7ae
diff --cc tcpdump.c
index 0a738e75,d2df06a6..0d6cf7af
--- a/tcpdump.c
+++ b/tcpdump.c
@@@ -1683,9 -1694,11 +1694,9 @@@ main(int argc, char **argv
  #endif /* WIN32 */
  
  #ifdef HAVE_CAPSICUM
- 	cansandbox = (gndo->ndo_nflag && VFileName == NULL && zflag == NULL);
+ 	cansandbox = (ndo->ndo_nflag && VFileName == NULL && zflag == NULL);
  	if (cansandbox && cap_enter() < 0 && errno != ENOSYS)
  		error("unable to enter the capability mode");
 -	if (cap_sandboxed())
 -		fprintf(stderr, "capability mode sandbox enabled\n");
  #endif	/* HAVE_CAPSICUM */
  
  	do {