From 0905cdc03ef689db009180ea792231437793d824 Mon Sep 17 00:00:00 2001 From: jow Date: Mon, 5 Nov 2012 19:28:24 +0000 Subject: netifd: don't send a default client identifier in DHCP requests if no clientid uci option is given (#12426) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34089 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/network/config/netifd/files/lib/netifd/proto/dhcp.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/network/config') diff --git a/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh b/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh index 7b1fe37806..38308785df 100755 --- a/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh +++ b/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh @@ -27,6 +27,7 @@ proto_dhcp_setup() { done [ "$broadcast" = 1 ] && broadcast="-B" || broadcast= + [ -n "$clientid" ] && clientid="-x 0x3d:${clientid//:/}" || clientid="-C" proto_export "INTERFACE=$config" proto_run_command "$config" udhcpc \ @@ -35,9 +36,8 @@ proto_dhcp_setup() { -f -t 0 -i "$iface" \ ${ipaddr:+-r $ipaddr} \ ${hostname:+-H $hostname} \ - ${clientid:+-x 0x3d:${clientid//:/}} \ ${vendorid:+-V $vendorid} \ - $broadcast $dhcpopts + $clientid $broadcast $dhcpopts } proto_dhcp_teardown() { -- cgit v1.2.3