X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=src%2Fodhcp6c.c;h=dfd99254ca7ff7bb015e000f0fd4730460775499;hb=ba6df2a68fcad5040f3746419aaac2bc3283a33d;hp=dbe2bdf04528997b0f015b39e66f9c79b0abb5dc;hpb=db2915f095db17cb10bf67d5b3bf67f891d45625;p=odhcp6c.git

diff --git a/src/odhcp6c.c b/src/odhcp6c.c
index dbe2bdf..dfd9925 100644
--- a/src/odhcp6c.c
+++ b/src/odhcp6c.c
@@ -259,7 +259,7 @@ int main(_unused int argc, char* const argv[])
 			pidfile = pidbuf;
 		}
 
-		int fd = open(pidfile, O_WRONLY | O_CREAT);
+		int fd = open(pidfile, O_WRONLY | O_CREAT, 0644);
 		if (fd >= 0) {
 			char buf[8];
 			int len = snprintf(buf, sizeof(buf), "%i\n", getpid());
@@ -434,7 +434,7 @@ static int usage(void)
 	"	-N <mode>	Mode for requesting addresses [try|force|none]\n"
 	"	-P <length>	Request IPv6-Prefix (0 = auto)\n"
 	"	-F		Force IPv6-Prefix\n"
-	"	-V <hex-string>	Set vendor-class option. string length must be a multiple of 2\n"
+	"	-V <class>	Set vendor-class option (base-16 encoded)\n"
 #ifdef EXT_BFD_PING
 	"	-B <interval>	Enable BFD ping check\n"
 #endif
@@ -446,7 +446,7 @@ static int usage(void)
 	"	-a		Don't send Accept Reconfigure option\n"
 	"	-f		Don't send Client FQDN option\n"
 	"	-k		Don't send a RELEASE when stopping\n"
-	"	-t <seconds>	Maximum timeout for DHCPv6-SOLICIT (120)\n"
+	"	-t <seconds>	Maximum timeout for DHCPv6-SOLICIT (3600)\n"
 	"\nInvocation options:\n"
 	"	-p <pidfile>	Set pidfile (/var/run/odhcp6c.pid)\n"
 	"	-d		Daemonize\n"
@@ -592,8 +592,10 @@ bool odhcp6c_update_entry_safe(enum odhcp6c_state state, struct odhcp6c_entry *n
 
 	if (new->valid > 0) {
 		if (x) {
-			if (new->valid >= x->valid && new->valid - x->valid < 60 &&
+			if (new->valid >= x->valid && new->valid != UINT32_MAX &&
+					new->valid - x->valid < 60 &&
 					new->preferred >= x->preferred &&
+					new->preferred != UINT32_MAX &&
 					new->preferred - x->preferred < 60 &&
 					x->class == new->class)
 				return false;