]> The Tcpdump Group git mirrors - tcpdump/commitdiff
Merge pull request #500 from atsampson/master
authorGuy Harris <[email protected]>
Wed, 18 Jan 2017 02:52:25 +0000 (18:52 -0800)
committerGitHub <[email protected]>
Wed, 18 Jan 2017 02:52:25 +0000 (18:52 -0800)
Don't drop CAP_SYS_CHROOT before chrooting.

1  2 
tcpdump.c

diff --cc tcpdump.c
index 03bf00f1a9d79a75e409f7f07603f6a2af88e327,4f31c2830e91f4cd2d957ca8750496a3ca9955a3..73bf1387659d7533ae62473a8c0934a5e1a4d793
+++ b/tcpdump.c
@@@ -640,10 -574,10 +640,10 @@@ droproot(const char *username, const ch
        else {
                fprintf(stderr, "%s: Couldn't find user '%.32s'\n",
                        program_name, username);
 -              exit(1);
 +              exit_tcpdump(1);
        }
  #ifdef HAVE_LIBCAP_NG
-       /* We don't need CAP_SETUID and CAP_SETGID any more. */
+       /* We don't need CAP_SETUID, CAP_SETGID and CAP_SYS_CHROOT any more. */
        capng_updatev(
                CAPNG_DROP,
                CAPNG_EFFECTIVE | CAPNG_PERMITTED,