Move superuser check to common.c

src/common.c

@@ -82,6 +82,17 @@ int setgroups(int count, int *groups)
 }
 #endif
 
+
+void
+check_superuser(void (*usage_fn)(void))
+{
+	if (geteuid() != 0) {
+		warnx("Run as root and you'll be happy.\n");
+		usage_fn();
+		/* NOTREACHED */
+	}
+}
+
 int 
 open_dns(int localport, in_addr_t listen_ip) 
 {

src/common.h

@@ -58,6 +58,7 @@ struct query {
 	int fromlen;
 };
 
+void check_superuser(void (*usage_fn)(void));
 int open_dns(int, in_addr_t);
 void close_dns(int);
 

src/iodine.c

@@ -945,11 +945,7 @@ main(int argc, char **argv)
 		}
 	}
 	
-	if (geteuid() != 0) {
+	check_superuser(usage);
-		warnx("Run as root and you'll be happy.\n");
-		usage();
-		/* NOTREACHED */
-	}
 
 	argc -= optind;
 	argv += optind;

src/iodined.c

@@ -1002,10 +1002,7 @@ main(int argc, char **argv)
 	argc -= optind;
 	argv += optind;
 
-	if (geteuid() != 0) {
+	check_superuser(usage);
-		warnx("Run as root and you'll be happy.\n");
-		usage();
-	}
 
 	if (argc != 2) 
 		usage();