ソースを参照

cosmetic changes

Roman Dmitriev 2 年 前
コミット
bd3637ab9e

+ 2 - 2
docs/addons/dnsmasq.conf

@@ -43,5 +43,5 @@ dhcp-rapid-commit
 dhcp-option=vendor:MSFT,2,1i
 dhcp-option=vendor:MSFT,2,1i
 
 
 #log option82 fields
 #log option82 fields
-dhcp-circuitid=set:circuit,*
-dhcp-remoteid=set:remote,*
+dhcp-match=set:full,option:agent-id,*
+

+ 2 - 2
html/inc/auth.utils.php

@@ -220,14 +220,14 @@ function IsSilentAuthenticated($db)
             $_SESSION['session_id'] = session_id();
             $_SESSION['session_id'] = session_id();
         }
         }
         if (empty($_SESSION['user_id'])) {
         if (empty($_SESSION['user_id'])) {
-            LOG_INFO($db, "Silent login user [$login] from " . $_SESSION['IP'] . ": success.");
+            LOG_INFO($db, "Api login user [$login] from " . $_SESSION['IP'] . ": success.");
         }
         }
         $_SESSION['user_id'] = $auth_record['id'];
         $_SESSION['user_id'] = $auth_record['id'];
         $_SESSION['login'] = $login;
         $_SESSION['login'] = $login;
         return true;
         return true;
     }
     }
 
 
-    LOG_INFO($db, "Silent login user $login from " . $_SESSION['IP'] . ": fail!");
+    LOG_INFO($db, "Api login user $login from " . $_SESSION['IP'] . ": fail!");
     logout();
     logout();
     return false;
     return false;
 }
 }

+ 1 - 1
updates/2-4-12/mysql-devices-patch.sql

@@ -26,4 +26,4 @@ INSERT INTO `config_options` (`id`, `option_name`, `description.russian`, `descr
 ALTER TABLE `User_auth` ADD `dhcp_changed` INT NULL DEFAULT NULL AFTER `changed`;
 ALTER TABLE `User_auth` ADD `dhcp_changed` INT NULL DEFAULT NULL AFTER `changed`;
 ALTER TABLE `device_ports` ADD `tagged_vlan` VARCHAR(250) NULL DEFAULT NULL AFTER `vlan`, ADD `untagged_vlan` VARCHAR(250) NULL DEFAULT NULL AFTER `tagged_vlan`, ADD `forbidden_vlan` VARCHAR(250) NULL DEFAULT NULL AFTER `untagged_vlan`;
 ALTER TABLE `device_ports` ADD `tagged_vlan` VARCHAR(250) NULL DEFAULT NULL AFTER `vlan`, ADD `untagged_vlan` VARCHAR(250) NULL DEFAULT NULL AFTER `tagged_vlan`, ADD `forbidden_vlan` VARCHAR(250) NULL DEFAULT NULL AFTER `untagged_vlan`;
 ALTER TABLE `dhcp_log` ADD `client-id` VARCHAR(250) NULL DEFAULT NULL AFTER `remote-id`;
 ALTER TABLE `dhcp_log` ADD `client-id` VARCHAR(250) NULL DEFAULT NULL AFTER `remote-id`;
-ALTER TABLE `User_auth` CHANGE `clientid` `client-id` VARCHAR(250) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL;
+ALTER TABLE `User_auth` CHANGE `clientid` `client-id` VARCHAR(250) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL;