Re-parent the SNMP MIBs to use our own OID, rather than gnome's

	OID.  Gnome also seems to be using 3317 rather than 3319, which
	is what IANA says was assigned to them.

diff --git a/mibs/GNOME-PRODUCT-RADIUSD-MIB b/mibs/FREERADIUS-PRODUCT-RADIUSD-MIB.txt
similarity index 55%
rename from mibs/GNOME-PRODUCT-RADIUSD-MIB
rename to mibs/FREERADIUS-PRODUCT-RADIUSD-MIB.txt
index fa55691..4d1e67d 100644 (file)
--- a/mibs/GNOME-PRODUCT-RADIUSD-MIB
+++ b/mibs/FREERADIUS-PRODUCT-RADIUSD-MIB.txt
@@ -1,40 +1,37 @@
-GNOME-PRODUCT-RADIUSD-MIB DEFINITIONS ::= BEGIN
+FREERADIUS-PRODUCT-RADIUSD-MIB DEFINITIONS ::= BEGIN
 
 IMPORTS
        MODULE-IDENTITY,
        OBJECT-IDENTITY
                FROM SNMPv2-SMI
        gnomeProducts
-               FROM GNOME-SMI;
+               FROM FREERADIUS-SMI;
 
 freeradius MODULE-IDENTITY
-       LAST-UPDATED "200009260000Z"
-       ORGANIZATION "GNOME project"
+       LAST-UPDATED "200703090000Z"
+       ORGANIZATION "FreeRADIUS Project"
        CONTACT-INFO
-               "GNU Network Object Model Environment project
+               "FreeRADIUS Network Object Model Environment project
                
-               see http://www.gnome.org for contact persons of a particular
-               area or subproject of GNOME.
+               see http://www.freeradius.org for contact persons of a particular
+               area or subproject of FREERADIUS.
 
                Administrative contact for MIB module:
 
-               Jochen Friedrich
-               Wingertstr. 70/1
-               68809 Neulussheim
-               Germany 
+               Alan DeKok
 
-               email: snmp@gnome.org"
+               email: aland@freeradius.org"
        DESCRIPTION
                "The product registrations for the FreeRADIUS SNMP subagent.
                These registrations are guaranteed to be unique and are used
                for SMUX registration by default (if not overridden manually)."
-       ::= { gnomeProducts 3 }
+       ::= { freeradiusProducts 1 }
 
 radiusd OBJECT-IDENTITY
        STATUS  current
        DESCRIPTION
                "radiusd is the RADIUS protocol deamon of the FreeRADIUS
                project."
-       ::= { freeradius 1 }
+       ::= { radiusd 1 }
 
 END

diff --git a/mibs/FREERADIUS-SMI.txt b/mibs/FREERADIUS-SMI.txt
new file mode 100644 (file)
index 0000000..d947478
--- /dev/null
+++ b/mibs/FREERADIUS-SMI.txt
@@ -0,0 +1,50 @@
+FREERADIUS-SMI DEFINITIONS ::= BEGIN
+
+IMPORTS
+       MODULE-IDENTITY,
+       OBJECT-IDENTITY,
+       enterprises
+               FROM SNMPv2-SMI;
+
+freeRadius MODULE-IDENTITY
+       LAST-UPDATED "9809010000Z"
+       ORGANIZATION "FREERADIUS project"
+       CONTACT-INFO
+               "FreeRADIUS Network Object Model Environment project
+               
+               see http://www.freeradius.org for contact persons of a particular
+               area or subproject of FREERADIUS.
+
+               Administrative contact for MIB module:
+
+               Alan DeKok
+
+               email: aland@freeradius.org"
+       DESCRIPTION
+               "The Structure of FREERADIUS."
+       ::= { enterprises 11344 }       -- assigned by IANA
+
+freeRadiusProducts OBJECT-IDENTITY
+       STATUS  current
+       DESCRIPTION
+               "freeRadiusProducts is the root OBJECT IDENTIFIER from
+               which sysObjectID values are assigned."
+       ::= { freeRadius 1 }
+
+freeRadiusMgmt OBJECT-IDENTITY
+       STATUS  current
+       DESCRIPTION
+               "freeRadiusMgmt defines the subtree for production FREERADIUS related
+               MIB registrations."
+       ::= { freeRadius 2 }
+
+freeRadiusTest OBJECT-IDENTITY
+       STATUS  current
+       DESCRIPTION
+               "freeRadiusTest defines the subtree for testing FREERADIUS related
+               MIB registrations."
+       ::= { freeRadius 3 }
+
+-- more to come if necessary.
+
+END

diff --git a/raddb/snmp.conf b/raddb/snmp.conf
index 3fc11a9..5b9ee40 100644 (file)
--- a/raddb/snmp.conf
+++ b/raddb/snmp.conf
@@ -17,14 +17,14 @@
 #
 #  Specifies password used when connecting to the SNMP master agent.
 #  This must match the password as configured on the agent. The OID
-#  used to register the radius subagent is 1.3.6.1.4.1.3317.1.3.1.
+#  used to register the radius subagent is 1.3.6.1.4.1.11344.1.1.1.
 #  A sample entry for the ucd-snmp deamon looks like this:
 #
-#  smuxpeer .1.3.6.1.4.1.3317.1.3.1 verysecret
+#  smuxpeer .1.3.6.1.4.1.11344.1.1.1 verysecret
 #
 #  A sample entry for AIX 4.3 is:
 #
-#  smux 1.3.6.1.4.1.3317.1.3.1 verysecret
+#  smux 1.3.6.1.4.1.11344.1.1.1 verysecret
 #
 #  The default password is an empty password.
 #

diff --git a/src/main/listen.c b/src/main/listen.c
index b294b57..138e026 100644 (file)
--- a/src/main/listen.c
+++ b/src/main/listen.c
@@ -1278,7 +1278,7 @@ static int radius_snmp_recv(rad_listen_t *listener,
 
 static int radius_snmp_print(rad_listen_t *this, char *buffer, size_t bufsize)
 {
-       return snprintf(buffer, bufsize, "SMUX with OID .1.3.6.1.4.1.3317.1.3.1");
+       return snprintf(buffer, bufsize, "SMUX with OID .1.3.6.1.4.1.11344.1.1.1");
 }
 
 #endif

diff --git a/src/main/radius_snmp.c b/src/main/radius_snmp.c
index c193d38..a25066b 100644 (file)
--- a/src/main/radius_snmp.c
+++ b/src/main/radius_snmp.c
@@ -39,7 +39,7 @@ rad_snmp_t            rad_snmp;
 
 #define RADACCOID  1,3,6,1,2,1,67,2,1,1,1
 #define RADAUTHOID 1,3,6,1,2,1,67,1,1,1,1
-#define RADIUSOID  1,3,6,1,4,1,3317,1,3,1
+#define RADIUSOID  1,3,6,1,4,1,11344,1,1,1
 
 static const oid radacc_oid [] = { RADACCOID };
 static const oid radauth_oid [] = { RADAUTHOID };