From c0c36e50dc65d07511d259aa3218d6213b0bb62d Mon Sep 17 00:00:00 2001 From: Daniel STAN Date: Tue, 24 Feb 2015 16:39:55 +0100 Subject: [PATCH] dhcpd: corrige omapi (my fault) --- freeradius/test.py | 5 +++-- gestion/gen_confs/dhcpd_new.py | 6 +++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/freeradius/test.py b/freeradius/test.py index 388221ce..7654698e 100755 --- a/freeradius/test.py +++ b/freeradius/test.py @@ -16,9 +16,10 @@ delattr(sys, 'argv') auth.instantiate(()) +# Test avec l'interface wifi d'apprentis p=( - ('Calling-Station-Id', 'b0:79:94:cf:d1:9a'), - ('User-Name', 'moo-torola'), + ('Calling-Station-Id', '02:69:75:42:24:03'), + ('User-Name', 'apprentis-wifi'), ) print repr(auth.authorize_wifi(p)) diff --git a/gestion/gen_confs/dhcpd_new.py b/gestion/gen_confs/dhcpd_new.py index 266dbca9..0144fc5d 100644 --- a/gestion/gen_confs/dhcpd_new.py +++ b/gestion/gen_confs/dhcpd_new.py @@ -48,11 +48,15 @@ class dydhcp: msg.obj.append((b"hardware-address", pack_mac(mac))) msg.obj.append((b"hardware-type", struct.pack("!I", 1))) msg.obj.append((b"ip-address", pack_ip(ip))) + # See patch for hostnames at + # http://jpmens.net/2011/07/20/dynamically-add-static-leases-to-dhcpd/ if name: + statem = b'supersede host-name "%s";' % bytes(name) msg.obj.append((b"name", bytes(name))) - msg.obj.append((b"client-hostname", bytes(name))) + msg.obj.append((b"statements", statem)) conn=Omapi(self.server, 9991,self.dhcp_omapi_keyname, self.dhcp_omapi_key) response = conn.query_server(msg) + # print response.dump() # DEBUG purpose (repr() marche po) conn.close() def del_host(self, ip,mac):