mirrors/iodine
1
0
Fork 0
mirror of https://github.com/yarrick/iodine.git synced 2024-11-22 14:41:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added setuid/gid and getopt parsing of -u user

Browse source
This commit is contained in:
Erik Ekman 2006-06-09 20:35:26 +00:00
parent 7782693e2b
commit 12d79f6e25
2 changed files with 83 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
dnstun.c
View file

@ -24,6 +24,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#include <err.h> #include <err.h>
#include <pwd.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <zlib.h> #include <zlib.h>
@ -115,22 +116,59 @@ tunnel(int tun_fd, int dns_fd)
return 0; return 0;
} }
static void
usage() {
printf("Usage: dnstun [-u user] nameserver topdomain\n");
exit(2);
}
int int
main(int argc, char **argv) main(int argc, char **argv)
{ {
int tun_fd; int tun_fd;
int dns_fd; int dns_fd;
int choice;
char *username;
struct passwd *pw;
if (argc != 3) { username = NULL;
printf("Usage: %s nameserver topdomain\n", argv[0]); while ((choice = getopt(argc, argv, "u:")) != -1) {
exit(2); switch(choice) {
case 'u':
username = optarg;
pw = getpwnam(username);
if (!pw) {
printf("User %s does not exist!\n", username);
usage();
}
break;
default:
usage();
break;
}
}
argc -= optind;
argv += optind;
if (argc != 2) {
usage();
} }
tun_fd = open_tun(); tun_fd = open_tun();
dns_fd = open_dns(argv[1], argv[2]); dns_fd = open_dns(argv[0], argv[1]);
printf("Sending queries for %s to %s\n", argv[1], argv[0]);
signal(SIGINT, sigint); signal(SIGINT, sigint);
if (username) {
if (setgid(pw->pw_gid) < 0 || setuid(pw->pw_uid) < 0) {
printf("Could not switch to user %s!\n", username);
usage();
}
printf("Now running as user %s\n", username);
}
tunnel(tun_fd, dns_fd); tunnel(tun_fd, dns_fd);
printf("Closing tunnel\n"); printf("Closing tunnel\n");

45
dnstund.c
View file

@ -24,6 +24,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#include <err.h> #include <err.h>
#include <pwd.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <zlib.h> #include <zlib.h>
@ -112,21 +113,57 @@ tunnel(int tun_fd, int dns_fd)
return 0; return 0;
} }
static void
usage() {
printf("Usage: dnstund [-u user] topdomain\n");
exit(2);
}
int int
main(int argc, char **argv) main(int argc, char **argv)
{ {
int tun_fd; int tun_fd;
int dnsd_fd; int dnsd_fd;
int choice;
char *username;
struct passwd *pw;
if (argc != 2) { username = NULL;
printf("Usage: %s topdomain\n", argv[0]); while ((choice = getopt(argc, argv, "u:")) != -1) {
exit(2); switch(choice) {
case 'u':
username = optarg;
pw = getpwnam(username);
if (!pw) {
printf("User %s does not exist!\n", username);
usage();
}
break;
default:
usage();
break;
}
}
argc -= optind;
argv += optind;
if (argc != 1) {
usage();
} }
tun_fd = open_tun(); tun_fd = open_tun();
dnsd_fd = open_dnsd(argv[1]); dnsd_fd = open_dnsd(argv[0]);
printf("Listening to dns for domain %s\n", argv[0]);
signal(SIGINT, sigint); signal(SIGINT, sigint);
if (username) {
if (setgid(pw->pw_gid) < 0 || setuid(pw->pw_uid) < 0) {
printf("Could not switch to user %s!\n", username);
usage();
}
printf("Now running as user %s\n", username);
}
tunnel(tun_fd, dnsd_fd); tunnel(tun_fd, dnsd_fd);