|
 |
1c6a1b |
--- arpwatch-2.1a10/arpwatch.c Sat Oct 14 05:07:35 2000
|
|
|
1c6a1b |
+++ arpwatch-2.1a10/arpwatch.c Sun Jun 10 16:22:57 2001
|
|
|
1c6a1b |
@@ -62,7 +62,7 @@
|
|
|
1c6a1b |
#include <string.h>
|
|
|
1c6a1b |
#include <syslog.h>
|
|
|
1c6a1b |
#include <unistd.h>
|
|
|
1c6a1b |
-
|
|
|
1c6a1b |
+#include <pwd.h>
|
|
|
1c6a1b |
#include <pcap.h>
|
|
|
1c6a1b |
|
|
|
1c6a1b |
#include "gnuc.h"
|
|
|
1c6a1b |
@@ -141,6 +141,25 @@
|
|
|
1c6a1b |
int sanity_fddi(struct fddi_header *, struct ether_arp *, int);
|
|
|
1c6a1b |
__dead void usage(void) __attribute__((volatile));
|
|
|
1c6a1b |
|
|
|
1c6a1b |
+void dropprivileges(const char* user)
|
|
|
1c6a1b |
+{
|
|
|
1c6a1b |
+ struct passwd* pw;
|
|
|
1c6a1b |
+ pw = getpwnam( user );
|
|
|
1c6a1b |
+ if ( pw ) {
|
|
|
1c6a1b |
+ if ( initgroups(pw->pw_name, NULL) != 0 || setgid(pw->pw_gid) != 0 ||
|
|
|
1c6a1b |
+ setuid(pw->pw_uid) != 0 ) {
|
|
|
1c6a1b |
+ syslog(LOG_ERR, "Couldn't change to '%.32s' uid=%d gid=%d", user,
|
|
|
1c6a1b |
+ pw->pw_uid, pw->pw_gid);
|
|
|
1c6a1b |
+ exit(1);
|
|
|
1c6a1b |
+ }
|
|
|
1c6a1b |
+ }
|
|
|
1c6a1b |
+ else {
|
|
|
1c6a1b |
+ syslog(LOG_ERR, "Couldn't find user '%.32s' in /etc/passwd", user);
|
|
|
1c6a1b |
+ exit(1);
|
|
|
1c6a1b |
+ }
|
|
|
1c6a1b |
+ syslog(LOG_DEBUG, "Running as uid=%d gid=%d", getuid(), getgid());
|
|
|
1c6a1b |
+}
|
|
|
1c6a1b |
+
|
|
|
1c6a1b |
int
|
|
|
1c6a1b |
main(int argc, char **argv)
|
|
|
1c6a1b |
{
|
|
|
1c6a1b |
@@ -153,6 +172,7 @@
|
|
|
1c6a1b |
register char *interface, *rfilename;
|
|
|
1c6a1b |
struct bpf_program code;
|
|
|
1c6a1b |
char errbuf[PCAP_ERRBUF_SIZE];
|
|
|
1c6a1b |
+ char* serveruser = NULL;
|
|
|
1c6a1b |
|
|
|
1c6a1b |
if (argv[0] == NULL)
|
|
|
1c6a1b |
prog = "arpwatch";
|
|
|
1c6a1b |
@@ -170,7 +190,7 @@
|
|
|
1c6a1b |
interface = NULL;
|
|
|
1c6a1b |
rfilename = NULL;
|
|
|
1c6a1b |
pd = NULL;
|
|
|
1c6a1b |
- while ((op = getopt(argc, argv, "df:i:n:Nr:")) != EOF)
|
|
|
1c6a1b |
+ while ((op = getopt(argc, argv, "df:i:n:Nr:u:")) != EOF)
|
|
|
1c6a1b |
switch (op) {
|
|
|
1c6a1b |
|
|
|
1c6a1b |
case 'd':
|
|
|
1c6a1b |
@@ -202,6 +222,16 @@
|
|
|
1c6a1b |
rfilename = optarg;
|
|
|
1c6a1b |
break;
|
|
|
1c6a1b |
|
|
|
1c6a1b |
+ case 'u':
|
|
|
1c6a1b |
+ if ( optarg ) {
|
|
|
1c6a1b |
+ serveruser = strdup(optarg);
|
|
|
1c6a1b |
+ }
|
|
|
1c6a1b |
+ else {
|
|
|
1c6a1b |
+ fprintf(stderr, "%s: Need username after -u\n", prog);
|
|
|
1c6a1b |
+ usage();
|
|
|
1c6a1b |
+ }
|
|
|
1c6a1b |
+ break;
|
|
|
1c6a1b |
+
|
|
|
1c6a1b |
default:
|
|
|
1c6a1b |
usage();
|
|
|
1c6a1b |
}
|
|
|
1c6a1b |
@@ -283,8 +313,11 @@
|
|
|
1c6a1b |
* Revert to non-privileged user after opening sockets
|
|
|
1c6a1b |
* (not needed on most systems).
|
|
|
1c6a1b |
*/
|
|
|
1c6a1b |
- setgid(getgid());
|
|
|
1c6a1b |
- setuid(getuid());
|
|
|
1c6a1b |
+ /*setgid(getgid());*/
|
|
|
1c6a1b |
+ /*setuid(getuid());*/
|
|
|
1c6a1b |
+ if ( serveruser ) {
|
|
|
1c6a1b |
+ dropprivileges( serveruser );
|
|
|
1c6a1b |
+ }
|
|
|
1c6a1b |
|
|
|
1c6a1b |
/* Must be ethernet or fddi */
|
|
|
1c6a1b |
linktype = pcap_datalink(pd);
|
|
|
1c6a1b |
@@ -751,6 +784,6 @@
|
|
|
1c6a1b |
|
|
|
1c6a1b |
(void)fprintf(stderr, "Version %s\n", version);
|
|
|
1c6a1b |
(void)fprintf(stderr, "usage: %s [-dN] [-f datafile] [-i interface]"
|
|
|
1c6a1b |
- " [-n net[/width]] [-r file]\n", prog);
|
|
|
1c6a1b |
+ " [-n net[/width]] [-r file] [-u username]\n", prog);
|
|
|
1c6a1b |
exit(1);
|
|
|
1c6a1b |
}
|