Attached Files | dhcp_classid.patch [^] (1,777 bytes) 2011-03-22 11:23 [Show Content] [Hide Content]#
# old_revision [7d95979a7a190aeb208c1529f15daeaf5ac3e9a3]
#
# patch "pf/conf/ui.conf"
# from [754db03e72d1019e16845c586f054e35187dd7a0]
# to [fb943c4ae471a2e8661a05188838489cce5c9bd3]
#
# patch "pf/lib/pf/os.pm"
# from [ca14f54db6eca66a86331969949b4a8d5e1863d9]
# to [d883df96414f2f4abcc19f717fe27e87cc8b6069]
#
============================================================
--- pf/conf/ui.conf 754db03e72d1019e16845c586f054e35187dd7a0
+++ pf/conf/ui.conf fb943c4ae471a2e8661a05188838489cce5c9bd3
@@ -320,9 +320,10 @@ command=violationconfig add
command=violationconfig add
[ui.configuration.fingerprint]
-display=id,class,os,fingerprint
+display=id,classid,class,os,fingerprint
id=ID
class=OS Class
+classid=OS Class ID
os=Operating System
fingerprint=Fingerprint
command=fingerprint view
============================================================
--- pf/lib/pf/os.pm ca14f54db6eca66a86331969949b4a8d5e1863d9
+++ pf/lib/pf/os.pm d883df96414f2f4abcc19f717fe27e87cc8b6069
@@ -68,7 +68,7 @@ sub os_db_prepare {
qq [ SELECT d.fingerprint,o.os_id,o.description as os,c.class_id,c.description as class FROM dhcp_fingerprint d LEFT JOIN os_type o ON o.os_id=d.os_id LEFT JOIN os_mapping m ON m.os_type=o.os_id LEFT JOIN os_class c ON m.os_class=c.class_id WHERE d.fingerprint=? GROUP BY c.class_id ORDER BY class_id ]);
$os_statements->{'dhcp_fingerprint_view_all_sql'} = get_db_handle()->prepare(qq[
- SELECT d.os_id AS id, d.fingerprint, o.description AS os, c.description AS class
+ SELECT d.os_id AS id, d.fingerprint, o.description AS os, c.class_id AS classid, c.description AS class
FROM dhcp_fingerprint d
LEFT JOIN os_type o ON o.os_id=d.os_id
LEFT JOIN os_mapping m ON m.os_type=o.os_id
|