Browse Source

netifd: don't send a default client identifier in DHCP requests if no clientid uci option is given (#12426)

SVN-Revision: 34089
Jo-Philipp Wich 13 years ago
parent
commit
611b2e8bb3
1 changed files with 2 additions and 2 deletions
  1. 2 2
      package/network/config/netifd/files/lib/netifd/proto/dhcp.sh

+ 2 - 2
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() {