Marius Tomaschewski
560b29399c
- Moved lease file check to a separate action so it is not used in restart -- it can fail when the daemon rewrites the lease causing a restart failure then (bnc#762108 regression). - Request dhcp6.sntp-servers in /etc/dhclient6.conf and forward to netconfig for processing (bnc#770236). - Removed RFC 4833 TZ options from client requests [unused]. - Update to ISC dhcp-4.2.4 release, fixing a dhcpv6 server assert crash while accessing lease on heap (bnc#767661) and providing... OBS-URL: https://build.opensuse.org/package/show/network:dhcp/dhcp?expand=0&rev=92
45 lines
1.3 KiB
Diff
45 lines
1.3 KiB
Diff
diff --git a/client/dhclient.c b/client/dhclient.c
|
|
index 1afccd5..37ec809 100644
|
|
--- a/client/dhclient.c
|
|
+++ b/client/dhclient.c
|
|
@@ -3275,7 +3275,7 @@ void script_write_params (client, prefix, lease)
|
|
} else {
|
|
log_error("suspect value in %s "
|
|
"option - discarded",
|
|
- lease->filename);
|
|
+ "filename");
|
|
}
|
|
}
|
|
|
|
@@ -3288,7 +3288,7 @@ void script_write_params (client, prefix, lease)
|
|
} else {
|
|
log_error("suspect value in %s "
|
|
"option - discarded",
|
|
- lease->server_name);
|
|
+ "server-name");
|
|
}
|
|
}
|
|
|
|
@@ -4216,7 +4216,7 @@ static int check_domain_name(const char *ptr, size_t len, int dots)
|
|
const char *p;
|
|
|
|
/* not empty or complete length not over 255 characters */
|
|
- if ((len == 0) || (len > 256))
|
|
+ if ((len == 0) || (len >= 256))
|
|
return(-1);
|
|
|
|
/* consists of [[:alnum:]-]+ labels separated by [.] */
|
|
diff --git a/common/options.c b/common/options.c
|
|
index e485222..bc9bb97 100644
|
|
--- a/common/options.c
|
|
+++ b/common/options.c
|
|
@@ -3918,7 +3918,7 @@ pretty_escape(char **dst, char *dend, const unsigned char **src,
|
|
}
|
|
} else if (**src == '"' || **src == '\'' || **src == '$' ||
|
|
**src == '`' || **src == '\\' || **src == '|' ||
|
|
- **src == '&') {
|
|
+ **src == '&' || **src == ';') {
|
|
if (*dst + 2 > dend)
|
|
return -1;
|
|
|