Module Name: src
Committed By: tls
Date: Sun Aug 10 07:10:13 UTC 2014
Modified Files:
src/external/bsd/tcpdump/dist [tls-earlyentropy]: tcpdump.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.2.1 src/external/bsd/tcpdump/dist/tcpdump.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/tcpdump/dist/tcpdump.c
diff -u src/external/bsd/tcpdump/dist/tcpdump.c:1.7 src/external/bsd/tcpdump/dist/tcpdump.c:1.7.2.1
--- src/external/bsd/tcpdump/dist/tcpdump.c:1.7 Tue Dec 31 17:33:31 2013
+++ src/external/bsd/tcpdump/dist/tcpdump.c Sun Aug 10 07:10:13 2014
@@ -34,7 +34,7 @@ The Regents of the University of Califor
static const char rcsid[] _U_ =
"@(#) Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.283 2008-09-25 21:45:50 guy Exp (LBL)";
#else
-__RCSID("$NetBSD: tcpdump.c,v 1.7 2013/12/31 17:33:31 christos Exp $");
+__RCSID("$NetBSD: tcpdump.c,v 1.7.2.1 2014/08/10 07:10:13 tls Exp $");
#endif
#endif
@@ -1482,8 +1482,12 @@ main(int argc, char **argv)
#endif /* HAVE_CAP_NG_H */
if (getuid() == 0 || geteuid() == 0) {
- if (username || chroot_dir)
+ if (username || chroot_dir) {
+#ifndef HAVE_CAP_NG_H
+ if (!WFileName)
+#endif
droproot(username, chroot_dir);
+ }
}
#endif /* WIN32 */
