]> The Tcpdump Group git mirrors - tcpdump/commitdiff
Merge pull request #455 from brooksdavis/gndo-cleanup
authorGuy Harris <[email protected]>
Wed, 20 May 2015 23:56:06 +0000 (16:56 -0700)
committerGuy Harris <[email protected]>
Wed, 20 May 2015 23:56:06 +0000 (16:56 -0700)
Remove global netdissect_object and remove non-dissection related fields

1  2 
netdissect.h
print.c
tcpdump.c

diff --cc netdissect.h
Simple merge
diff --cc print.c
Simple merge
diff --cc tcpdump.c
index 0a738e751803044d7aaedce8af9e6e8eb6ada8a4,d2df06a69c53b51c0f7afa3b6a0644f216b432bd..0d6cf7af84c476f211587917d0b9825e5e01273e
+++ 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 {