diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2012-11-05 19:28:24 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2012-11-05 19:28:24 +0000 |
| commit | 4d3fffae811b32b11d1e27281da499da8ec295bf (patch) | |
| tree | eda28baf01e03e04a7d91449caaf3481e1022b94 | |
| parent | ed27b638cd6918dd41a469760f4c9735e1db6888 (diff) | |
| download | upstream-4d3fffae811b32b11d1e27281da499da8ec295bf.tar.gz upstream-4d3fffae811b32b11d1e27281da499da8ec295bf.tar.bz2 upstream-4d3fffae811b32b11d1e27281da499da8ec295bf.zip | |
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
| -rwxr-xr-x | package/network/config/netifd/files/lib/netifd/proto/dhcp.sh | 4 |
1 files changed, 2 insertions, 2 deletions
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() { |