summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2008-09-25 08:34:18 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2008-09-25 08:34:18 +0000
commit7619acfdf18d9027d99a0a8794562fdeb0102b8c (patch)
tree1726a495800e7b189cda9e5e7ca4f027ddeedae3 /net-misc/dhcpcd/files
parentNew dhcpcd-4.99 fun. (diff)
downloadhistorical-7619acfdf18d9027d99a0a8794562fdeb0102b8c.tar.gz
historical-7619acfdf18d9027d99a0a8794562fdeb0102b8c.tar.bz2
historical-7619acfdf18d9027d99a0a8794562fdeb0102b8c.zip
Include the alpha 4.99.2 for 5.x fun testing. Please note the 3.x compatibility is no longer supported by the codebase as it was during 4.0 versions.
Package-Manager: portage-2.2_rc9/cvs/Linux 2.6.27-rc1-10246-gca5de40 x86_64
Diffstat (limited to 'net-misc/dhcpcd/files')
-rw-r--r--net-misc/dhcpcd/files/dhcpcd-4.99.2-no-empty-clientid.patch19
1 files changed, 19 insertions, 0 deletions
diff --git a/net-misc/dhcpcd/files/dhcpcd-4.99.2-no-empty-clientid.patch b/net-misc/dhcpcd/files/dhcpcd-4.99.2-no-empty-clientid.patch
new file mode 100644
index 000000000000..853cbacb7ff2
--- /dev/null
+++ b/net-misc/dhcpcd/files/dhcpcd-4.99.2-no-empty-clientid.patch
@@ -0,0 +1,19 @@
+Restore the 3.x behavior of an empty -I '' argument.
+
+Bug: http://bugs.marples.name/show_bug.cgi?id=116
+Patch: forward-ported from 4.0.1 version.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Nuar --exclude '*.orig' --exclude '*.rej' dhcpcd-4.99.2.orig/if-options.c dhcpcd-4.99.2/if-options.c
+--- dhcpcd-4.99.2.orig/if-options.c 2008-09-19 06:36:40.000000000 -0700
++++ dhcpcd-4.99.2/if-options.c 2008-09-25 01:27:46.115364821 -0700
+@@ -494,7 +494,7 @@
+ case 'I':
+ /* Strings have a type of 0 */;
+ ifo->clientid[1] = 0;
+- if (arg)
++ if (arg && *arg)
+ s = parse_string_hwaddr((char *)ifo->clientid + 1,
+ CLIENTID_MAX_LEN, arg, 1);
+ else