Marius Tomaschewski
d2a944c552
along with this package or online at: - Replaced hostname patch with a dhcpv6 and fqdn aware variant: [- 0006-dhcp-4.2.5-dhclient-send-hostname-rml.patch, + 0006-dhcp-4.3.2-dhclient-send-hostname-or-fqdn.patch] - Adjusted patch numbers in the spec file: [- 0008-dhcp-4.1.1-P1-lpf-bind-msg-fix.patch, - 0010-dhcp-4.2.2-dhclient-option-checks.patch, - 0011-dhcp-4.2.6-close-on-exec.patch, - 0012-dhcp-4.2.2-quiet-dhclient.patch, - 0014-Fixed-linux-interface-discovery-using-getifaddrs.patch, - 0020-dhcp-4.2.x-chown-server-leases.bnc868253.patch, - 0024-dhcp-4.2.x-dhcpv6-decline-on-DAD-failure.872609.patch, + 0008-dhcp-4.2.2-dhclient-option-checks.patch, + 0009-dhcp-4.2.6-close-on-exec.patch, + 0010-dhcp-4.2.2-quiet-dhclient.patch, + 0011-Fixed-linux-interface-discovery-using-getifaddrs.patch, + 0012-dhcp-4.2.x-chown-server-leases.bnc868253.patch, + 0013-dhcp-4.2.x-dhcpv6-decline-on-DAD-failure.872609.patch] - Fixed to not pass DHCPv6 address lifetimes a positive (unsigned 32bit) integers to scripts and properly format timestamps as long to not break them on 64bit architectures (bsc#926159). [+ 0014-dhclient6-unsigned-lifetimes-for-script-bsc-926159.patch] - dhclient: expose next-server DHCPv4 option to script (bsc#928390) [+ 0015-Expose-next-server-DHCPv4-option-to-dhclient-script.patch] - Replaced infiniband support patch with fixed variant (bsc#910984): [- 0017-dhcp-4.2.6-lpf-ip-over-ib-support.patch, - 0018-dhcp-4.2.6-improved-xid.patch, + 0016-infiniband-support.patch] - Moved dhcp-devel package include files and static libraries OBS-URL: https://build.opensuse.org/package/show/network:dhcp/dhcp?expand=0&rev=154
59 lines
1.6 KiB
Diff
59 lines
1.6 KiB
Diff
From 48c1bbb9cbd6d6e71178e82fd45a7409efbb9d72 Mon Sep 17 00:00:00 2001
|
|
From: Marius Tomaschewski <mt@suse.de>
|
|
Date: Wed, 27 Apr 2011 13:56:47 +0200
|
|
Subject: [PATCH] dhcp-4.2.2-dhclient-option-checks
|
|
References: bnc#643845
|
|
|
|
---
|
|
client/dhclient.c | 6 +++---
|
|
common/options.c | 2 +-
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/client/dhclient.c b/client/dhclient.c
|
|
index b7a14fe..19a527b 100644
|
|
--- a/client/dhclient.c
|
|
+++ b/client/dhclient.c
|
|
@@ -3301,7 +3301,7 @@ void script_write_params (client, prefix, lease)
|
|
} else {
|
|
log_error("suspect value in %s "
|
|
"option - discarded",
|
|
- lease->filename);
|
|
+ "filename");
|
|
}
|
|
}
|
|
|
|
@@ -3314,7 +3314,7 @@ void script_write_params (client, prefix, lease)
|
|
} else {
|
|
log_error("suspect value in %s "
|
|
"option - discarded",
|
|
- lease->server_name);
|
|
+ "server-name");
|
|
}
|
|
}
|
|
|
|
@@ -4283,7 +4283,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 56bb151..be44a70 100644
|
|
--- a/common/options.c
|
|
+++ b/common/options.c
|
|
@@ -3979,7 +3979,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;
|
|
|
|
--
|
|
1.8.4
|
|
|