X-Git-Url: https://git.decadent.org.uk/gitweb/?p=odhcp6c.git;a=blobdiff_plain;f=src%2Fodhcp6c.c;h=a97e4c914cf646d680edd869bcfe258e4f652372;hp=f4f83f1efb846cbb2250c0827763b144d5ad365a;hb=a300c7335c5ad78fb053e7c73b45e95e1f3c2ad1;hpb=82e0235c10dda8b9baeb06b6383bec1f43bb61a2

diff --git a/src/odhcp6c.c b/src/odhcp6c.c
index f4f83f1..a97e4c9 100644
--- a/src/odhcp6c.c
+++ b/src/odhcp6c.c
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2012 Steven Barth <steven@midlink.org>
+ * Copyright (C) 2012-2013 Steven Barth <steven@midlink.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License v2 as published by
@@ -46,8 +46,6 @@ static bool bound = false, allow_slaac_only = true, release = true;
 
 int main(_unused int argc, char* const argv[])
 {
-	openlog("odhcp6c", LOG_PERROR | LOG_PID, LOG_DAEMON);
-
 	// Allocate ressources
 	const char *pidfile = NULL;
 	const char *script = "/usr/sbin/odhcp6c-update";
@@ -58,8 +56,9 @@ int main(_unused int argc, char* const argv[])
 	enum odhcp6c_ia_mode ia_na_mode = IA_MODE_TRY;
 
 	bool help = false, daemonize = false;
+	int logopt = LOG_PID;
 	int c, request_pd = 0;
-	while ((c = getopt(argc, argv, "SN:P:c:r:s:khdp:")) != -1) {
+	while ((c = getopt(argc, argv, "SN:P:c:r:s:khedp:")) != -1) {
 		switch (c) {
 		case 'S':
 			allow_slaac_only = false;
@@ -116,6 +115,10 @@ int main(_unused int argc, char* const argv[])
 			release = false;
 			break;
 
+		case 'e':
+			logopt |= LOG_PERROR;
+			break;
+
 		case 'd':
 			daemonize = true;
 			break;
@@ -130,18 +133,12 @@ int main(_unused int argc, char* const argv[])
 		}
 	}
 
+	openlog("odhcp6c", logopt, LOG_DAEMON);
 	const char *ifname = argv[optind];
 
 	if (help || !ifname)
 		return usage();
 
-	if ((urandom_fd = open("/dev/urandom", O_CLOEXEC | O_RDONLY)) < 0 ||
-			init_dhcpv6(ifname, request_pd) || ra_init(ifname) ||
-			script_init(script, ifname)) {
-		syslog(LOG_ERR, "failed to initialize: %s", strerror(errno));
-		return 3;
-	}
-
 	signal(SIGIO, sighandler);
 	signal(SIGHUP, sighandler);
 	signal(SIGINT, sighandler);
@@ -150,6 +147,13 @@ int main(_unused int argc, char* const argv[])
 	signal(SIGUSR1, sighandler);
 	signal(SIGUSR2, sighandler);
 
+	if ((urandom_fd = open("/dev/urandom", O_CLOEXEC | O_RDONLY)) < 0 ||
+			init_dhcpv6(ifname, request_pd) || ra_init(ifname) ||
+			script_init(script, ifname)) {
+		syslog(LOG_ERR, "failed to initialize: %s", strerror(errno));
+		return 3;
+	}
+
 	if (daemonize) {
 		openlog("odhcp6c", LOG_PID, LOG_DAEMON); // Disable LOG_PERROR
 		if (daemon(0, 0)) {
@@ -313,6 +317,7 @@ static int usage(void)
 	"\nInvocation options:\n"
 	"	-p <pidfile>	Set pidfile (/var/run/6relayd.pid)\n"
 	"	-d		Daemonize\n"
+	"	-e		Write logmessages to stderr\n"
 	//"	-v		Increase logging verbosity\n"
 	"	-h		Show this help\n\n";
 	write(STDERR_FILENO, buf, sizeof(buf));