[gentoo-commits] gentoo-x86 commit in net-misc/dhcpcd/files: dhcpcd-4.99.2-no-empty-clientid.patch

[Robin H. Johnson (robbat2)]

robbat2     08/09/25 08:34:18

  Added:                dhcpcd-4.99.2-no-empty-clientid.patch
  Log:
  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.
  (Portage version: 2.2_rc9/cvs/Linux 2.6.27-rc1-10246-gca5de40 x86_64)

Revision  Changes    Path
1.1                  net-misc/dhcpcd/files/dhcpcd-4.99.2-no-empty-clientid.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/dhcpcd/files/dhcpcd-4.99.2-no-empty-clientid.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/dhcpcd/files/dhcpcd-4.99.2-no-empty-clientid.patch?rev=1.1&content-type=text/plain

Index: dhcpcd-4.99.2-no-empty-clientid.patch
===================================================================
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@g.o>

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