rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-05 01:16:27 +00:00
Code Issues Releases Wiki Activity

a few small fixes

Browse source
This commit is contained in:
chapeau 2020-11-29 22:37:42 +01:00
parent f689d6640a
commit 1bc5b51439
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
freeradius_utils/auth.py
View file

@ -193,9 +193,7 @@ def post_auth(data):
if switch: if switch:
# For logging # For logging
sw_name = switch["name"] or "?" sw_name = switch["name"] or "?"
room = "Unknown port" room = port["room"] or "Unknown room" if port else "Unknown port"
if port:
room = port["room"] or "Unknown room"
out = decide_vlan_switch(data_from_api, mac, nas_port) out = decide_vlan_switch(data_from_api, mac, nas_port)
reason, vlan_id, decision, attributes = out reason, vlan_id, decision, attributes = out
@ -388,7 +386,7 @@ def decide_vlan_switch(data_from_api, user_mac, nas_port):
# If a vlan is precised in port config, we use it # If a vlan is precised in port config, we use it
if port_profile["vlan_untagged"]: if port_profile["vlan_untagged"]:
DECISION_VLAN = int(port_profile["vlan_untagged"]["vlan_id"]) DECISION_VLAN = int(port_profile["vlan_untagged"]["vlan_id"])
extra_log = "Force sur vlan " + str(DECISION_VLAN) extra_log = "Force sur vlan %s" % str(DECISION_VLAN)
attributes = () attributes = ()
else: else:
DECISION_VLAN = radius_option["vlan_decision_ok"]["vlan_id"] DECISION_VLAN = radius_option["vlan_decision_ok"]["vlan_id"]

1
re2o/acl.py
View file

@ -6,6 +6,7 @@
# Copyright © 2017 Gabriel Détraz # Copyright © 2017 Gabriel Détraz
# Copyright © 2017 Lara Kermarec # Copyright © 2017 Lara Kermarec
# Copyright © 2017 Augustin Lemesle # Copyright © 2017 Augustin Lemesle
# Copyright © 2020 Corentin Canebier
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by

1
re2o/mixins.py
View file

@ -5,6 +5,7 @@
# #
# Copyright © 2018 Gabriel Détraz # Copyright © 2018 Gabriel Détraz
# Copyright © 2017 Charlie Jacomme # Copyright © 2017 Charlie Jacomme
# Copyright © 2020 Corentin Canebier
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by