Merge pull request #812 from martinwilli/root-user

fxlb · web-flow · commit e77d60f67cf7 · 2023-08-24T01:11:43.000Z
Skip privilege dropping when using -Z root on --with-user builds
diff --git a/tcpdump.c b/tcpdump.c
@@ -2078,6 +2078,8 @@ main(int argc, char **argv)
 		/* Run with '-Z root' to restore old behaviour */
 		if (!username)
 			username = WITH_USER;
+		else if (strcmp(username, "root") == 0)
+			username = NULL;
 	}
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -2078,6 +2078,8 @@ main(int argc, char **argv)`
`2078`	`2078`	`/* Run with '-Z root' to restore old behaviour */`
`2079`	`2079`	`if (!username)`
`2080`	`2080`	`username = WITH_USER;`
	`2081`	`+ else if (strcmp(username, "root") == 0)`
	`2082`	`+ username = NULL;`
`2081`	`2083`	`}`
`2082`	`2084`	`#endif`
`2083`	`2085`