From: Markus Stenberg <markus.stenberg@iki.fi>
Date: Tue, 26 Mar 2013 13:16:24 +0000 (+0200)
Subject: Merge branch 'bugfix' into hnet
X-Git-Tag: debian/1.1+git20160131-1~133^2~6
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=odhcp6c.git;a=commitdiff_plain;h=95ec756737ef80ce929de4bd63cc2291eb6497b2;hp=-c

Merge branch 'bugfix' into hnet
---

95ec756737ef80ce929de4bd63cc2291eb6497b2
diff --combined src/odhcp6c.c
index 64d363f,88f2ae5..3e989a2
--- a/src/odhcp6c.c
+++ b/src/odhcp6c.c
@@@ -139,13 -139,6 +139,6 @@@ int main(_unused int argc, char* const 
  	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);
@@@ -154,6 -147,13 +147,13 @@@
  	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)) {
@@@ -427,7 -427,6 +427,7 @@@ void odhcp6c_update_entry_safe(enum odh
  		if (x) {
  			x->valid = new->valid;
  			x->preferred = new->preferred;
 +                        x->prefix_class = new->prefix_class;
  		} else {
  			odhcp6c_add_state(state, new, sizeof(*new));
  		}