dhcp: Only send client identifier if identity_lease is enabled

The client identifier serves as unique identifier just like a unique MAC
address would, so even with identity_leases disabled some DHCP servers
might assign unique leases per identity.

diff --git a/conf/plugins/dhcp.opt b/conf/plugins/dhcp.opt
index 9c7b86091dfbfd949bf2643faee4ef97dfbe68f8..6b337bc3478b09308a08d17abba235baa3745952 100644 (file)
--- a/conf/plugins/dhcp.opt
+++ b/conf/plugins/dhcp.opt
@@ -9,7 +9,8 @@ charon.plugins.dhcp.force_server_address = no
        192.168.0.255) as server address might work.
 
 charon.plugins.dhcp.identity_lease = no
-       Derive user-defined MAC address from hash of IKE identity.
+       Derive user-defined MAC address from hash of IKE identity and send client
+       identity DHCP option.
 
 charon.plugins.dhcp.server = 255.255.255.255
        DHCP server unicast or broadcast IP address.

diff --git a/src/libcharon/plugins/dhcp/dhcp_socket.c b/src/libcharon/plugins/dhcp/dhcp_socket.c
index 320b17b1ecfcd97a554bdafe7d0b34a2f406ca1f..c26fcc9209146b75e4ca531bdb2efad4913fc919 100644 (file)
--- a/src/libcharon/plugins/dhcp/dhcp_socket.c
+++ b/src/libcharon/plugins/dhcp/dhcp_socket.c
@@ -268,7 +268,8 @@ static int prepare_dhcp(private_dhcp_socket_t *this,
                remaining -= sizeof(dhcp_option_t) + option->len;
        }
 
-       if (remaining >= sizeof(dhcp_option_t) + 2)
+       if (this->identity_lease &&
+               remaining >= sizeof(dhcp_option_t) + 2)
        {
                option = (dhcp_option_t*)&dhcp->options[optlen];
                option->type = DHCP_CLIENT_ID;

diff --git a/testing/tests/ikev2/dhcp-dynamic/posttest.dat b/testing/tests/ikev2/dhcp-dynamic/posttest.dat
index d4a05b28b26e4b68129dc44adc3b7ca8d1191b2a..60be3f95ce4fb7042f0cd1470bfd2fa728b9f689 100644 (file)
--- a/testing/tests/ikev2/dhcp-dynamic/posttest.dat
+++ b/testing/tests/ikev2/dhcp-dynamic/posttest.dat
@@ -1,8 +1,9 @@
 moon::ipsec stop
 carol::ipsec stop
 dave::ipsec stop
-venus::cat /var/state/dhcp/dhcpd.leases
+venus::cat /var/lib/dhcp/dhcpd.leases
 venus::service isc-dhcp-server stop 2> /dev/null
+venus::rm /var/lib/dhcp/dhcpd.leases*; touch /var/lib/dhcp/dhcpd.leases
 moon::iptables-restore < /etc/iptables.flush
 carol::iptables-restore < /etc/iptables.flush
 dave::iptables-restore < /etc/iptables.flush

diff --git a/testing/tests/ikev2/dhcp-static-client-id/hosts/moon/etc/strongswan.conf b/testing/tests/ikev2/dhcp-static-client-id/hosts/moon/etc/strongswan.conf
index c4a0ff8bbfe3d01d91d05dbb04a2ed5da483e261..0883bf0581ae1adb02f7fc94b97ff87700dcee98 100644 (file)
--- a/testing/tests/ikev2/dhcp-static-client-id/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/ikev2/dhcp-static-client-id/hosts/moon/etc/strongswan.conf
@@ -6,6 +6,7 @@ charon {
   plugins {
     dhcp {
       server = 10.1.255.255
+      identity_lease = yes
     }
   }
 }

diff --git a/testing/tests/swanctl/dhcp-dynamic/posttest.dat b/testing/tests/swanctl/dhcp-dynamic/posttest.dat
index 37e8b02d8cfb07ec9bc5df1ad2d6e58be2eaf052..466fc931cc0ed596ab6ab7d5ba0883674858c696 100644 (file)
--- a/testing/tests/swanctl/dhcp-dynamic/posttest.dat
+++ b/testing/tests/swanctl/dhcp-dynamic/posttest.dat
@@ -3,8 +3,9 @@ dave::swanctl --terminate --ike home
 carol::systemctl stop strongswan-swanctl
 dave::systemctl stop strongswan-swanctl
 moon::systemctl stop strongswan-swanctl
-venus::cat /var/state/dhcp/dhcpd.leases
-venus::server isc-dhcp-server stop 2> /dev/null
+venus::cat /var/lib/dhcp/dhcpd.leases
+venus::service isc-dhcp-server stop 2> /dev/null
+venus::rm /var/lib/dhcp/dhcpd.leases*; touch /var/lib/dhcp/dhcpd.leases
 moon::iptables-restore < /etc/iptables.flush
 carol::iptables-restore < /etc/iptables.flush
 dave::iptables-restore < /etc/iptables.flush