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

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

[Robin H. Johnson (robbat2)]

robbat2     08/09/25 08:21:14

  Added:                dhcpcd-4.0.1-no-empty-clientid.patch
  Log:
  Minor bugfix to 4.0.1, restoring the old -I behavior better. Stable candidate now.
  (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.0.1-no-empty-clientid.patch

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

Index: dhcpcd-4.0.1-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: http://bugs.marples.name/attachment.cgi?id=56

diff --git a/dhcpcd.c b/dhcpcd.c
index 0219b02..d492a2d 100644
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -511,7 +511,7 @@ parse_option(int opt, char *oarg, struct options *options)
 	case 'I':
 		/* Strings have a type of 0 */;
 		options->clientid[1] = 0;
-		if (oarg)
+		if (oarg && *oarg)
 			s = parse_string_hwaddr((char *)options->clientid + 1,
 						CLIENTID_MAX_LEN, oarg, 1);
 		else