hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

SVN-Revision: 34089
owl
Jo-Philipp Wich 2012-11-05 19:28:24 +00:00
parent e92da5e7ae
commit 611b2e8bb3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
View File

@ -27,6 +27,7 @@ proto_dhcp_setup() {
done done
[ "$broadcast" = 1 ] && broadcast="-B" || broadcast= [ "$broadcast" = 1 ] && broadcast="-B" || broadcast=
[ -n "$clientid" ] && clientid="-x 0x3d:${clientid//:/}" || clientid="-C"
proto_export "INTERFACE=$config" proto_export "INTERFACE=$config"
proto_run_command "$config" udhcpc \ proto_run_command "$config" udhcpc \
@ -35,9 +36,8 @@ proto_dhcp_setup() {
-f -t 0 -i "$iface" \ -f -t 0 -i "$iface" \
${ipaddr:+-r $ipaddr} \ ${ipaddr:+-r $ipaddr} \
${hostname:+-H $hostname} \ ${hostname:+-H $hostname} \
${clientid:+-x 0x3d:${clientid//:/}} \
${vendorid:+-V $vendorid} \ ${vendorid:+-V $vendorid} \
$broadcast $dhcpopts $clientid $broadcast $dhcpopts
} }
proto_dhcp_teardown() { proto_dhcp_teardown() {