diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2008-09-25 08:21:13 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2008-09-25 08:21:13 +0000 |
| commit | 2e26092cb7e3afeb3d4568ab099f3487c5603eb8 (patch) | |
| tree | 8d9ad21d7aeabd0c277d8468cc33ccbbf35f60cc /net-misc/dhcpcd/files | |
| parent | Caleb's last commit broke the Manifest for 7.4.19, fix it up. (diff) | |
| download | gentoo-2-2e26092cb7e3afeb3d4568ab099f3487c5603eb8.tar.gz gentoo-2-2e26092cb7e3afeb3d4568ab099f3487c5603eb8.tar.bz2 gentoo-2-2e26092cb7e3afeb3d4568ab099f3487c5603eb8.zip | |
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)
Diffstat (limited to 'net-misc/dhcpcd/files')
| -rw-r--r-- | net-misc/dhcpcd/files/dhcpcd-4.0.1-no-empty-clientid.patch | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/net-misc/dhcpcd/files/dhcpcd-4.0.1-no-empty-clientid.patch b/net-misc/dhcpcd/files/dhcpcd-4.0.1-no-empty-clientid.patch new file mode 100644 index 000000000000..e8de24d40f93 --- /dev/null +++ b/net-misc/dhcpcd/files/dhcpcd-4.0.1-no-empty-clientid.patch @@ -0,0 +1,18 @@ +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 |