Changeset 6c58591 in freewrt

Timestamp:

Jan 24, 2007, 12:13:05 AM (19 years ago)

Author:

Dirk Nehring <dnehring@…>

Children:

ae31a91

Parents:

0537d79

Message:

Fix the ppp radius plugin. Drop customized configs, take configs from upstream.

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@1740 afb5a338-a214-0410-bd46-81f09a774fd1

Location:

package/ppp

Files:

• Makefile (modified) (1 diff)
• files/etc/ppp/radius.conf (deleted)
• files/etc/ppp/radius/dictionary (deleted)
• files/etc/ppp/radius/dictionary.asnet (deleted)
• files/etc/ppp/radius/dictionary.microsoft (deleted)
• files/etc/ppp/radius/servers (deleted)
• ipkg/ppp-mod-radius.conffiles (modified) (1 diff)
• patches/206-radius_config.patch (modified) (1 diff)

package/ppp/Makefile

@@ -83 +83 @@
 
 mod-radius-install:
-        ${INSTALL_DIR} ${IDIR_PPP_MOD_RADIUS}/etc/ppp/radius
-        ${INSTALL_DATA} ./files/etc/ppp/radius.conf ${IDIR_PPP_MOD_RADIUS}/etc/ppp/
-        ${CP} ./files/etc/ppp/radius/dictionary* \
-                ${IDIR_PPP_MOD_RADIUS}/etc/ppp/radius/
-        install -m600 ./files/etc/ppp/radius/servers \
-                ${IDIR_PPP_MOD_RADIUS}/etc/ppp/radius/
+        ${INSTALL_DIR} ${IDIR_PPP_MOD_RADIUS}/etc/radiusclient
+        ${CP} ${WRKBUILD}/pppd/plugins/radius/etc/* ${IDIR_PPP_MOD_RADIUS}/etc/radiusclient
+        rm ${IDIR_PPP_MOD_RADIUS}/etc/radiusclient/radiusclient.conf.in
         $(call PKG_mod_template,PPP_MOD_RADIUS,radius)
 

package/ppp/ipkg/ppp-mod-radius.conffiles

@@ -1 @@
-/etc/ppp/radius.conf
-/etc/ppp/radius/servers
+/etc/radiusclient/dictionary
+/etc/radiusclient/dictionary.ascend
+/etc/radiusclient/dictionary.compat
+/etc/radiusclient/dictionary.merit
+/etc/radiusclient/dictionary.microsoft
+/etc/radiusclient/issue
+/etc/radiusclient/port-id-map
+/etc/radiusclient/radiusclient.conf
+/etc/radiusclient/realms
+/etc/radiusclient/servers

package/ppp/patches/206-radius_config.patch

@@ -1 @@
-diff -ruN ppp-2.4.3-orig/pppd/plugins/radius/config.c ppp-2.4.3-3/pppd/plugins/radius/config.c
---- ppp-2.4.3-orig/pppd/plugins/radius/config.c 2004-11-14 08:26:26.000000000 +0100
-+++ ppp-2.4.3-3/pppd/plugins/radius/config.c    2004-12-16 04:03:46.000000000 +0100
-@@ -369,31 +369,37 @@
-        }
- #endif
+diff -Nur ppp-2.4.4-orig/pppd/plugins/radius/etc/radiusclient.conf ppp-2.4.4/pppd/plugins/radius/etc/radiusclient.conf
+--- ppp-2.4.4-orig/pppd/plugins/radius/etc/radiusclient.conf    2004-11-14 00:48:39.000000000 +0100
++++ ppp-2.4.4/pppd/plugins/radius/etc/radiusclient.conf 2007-01-23 23:56:52.000000000 +0100
+@@ -22,7 +22,7 @@
  
-+#if 0
-        if (rc_conf_int("login_tries") <= 0)
-        {
-                error("%s: login_tries <= 0 is illegal", filename);
-                return (-1);
-        }
-+#endif
-        if (rc_conf_str("seqfile") == NULL)
-        {
-                error("%s: seqfile not specified", filename);
-                return (-1);
-        }
-+#if 0
-        if (rc_conf_int("login_timeout") <= 0)
-        {
-                error("%s: login_timeout <= 0 is illegal", filename);
-                return (-1);
-        }
-+#endif
-        if (rc_conf_str("mapfile") == NULL)
-        {
-                error("%s: mapfile not specified", filename);
-                return (-1);
-        }
-+#if 0
-        if (rc_conf_str("nologin") == NULL)
-        {
-                error("%s: nologin not specified", filename);
-                return (-1);
-        }
-+#endif
+ # name of the issue file. it's only display when no username is passed
+ # on the radlogin command line  (default /etc/radiusclient/issue)
+-issue  /usr/local/etc/radiusclient/issue
++issue  /etc/radiusclient/issue
  
-        return 0;
- }
-diff -ruN ppp-2.4.3-orig/pppd/plugins/radius/options.h ppp-2.4.3-3/pppd/plugins/radius/options.h
---- ppp-2.4.3-orig/pppd/plugins/radius/options.h        2004-11-14 08:26:26.000000000 +0100
-+++ ppp-2.4.3-3/pppd/plugins/radius/options.h   2004-12-16 04:09:16.000000000 +0100
-@@ -31,24 +31,21 @@
- static SERVER acctserver = {0};
- static SERVER authserver = {0};
+ # RADIUS settings
  
--int default_tries = 4;
--int default_timeout = 60;
--
- static OPTION config_options[] = {
- /* internally used options */
- {"config_file",                OT_STR, ST_UNDEF, NULL},
- /* General options */
- {"auth_order",         OT_AUO, ST_UNDEF, NULL},
--{"login_tries",                OT_INT, ST_UNDEF, &default_tries},
--{"login_timeout",      OT_INT, ST_UNDEF, &default_timeout},
--{"nologin",            OT_STR, ST_UNDEF, "/etc/nologin"},
--{"issue",              OT_STR, ST_UNDEF, "/etc/radiusclient/issue"},
-+{"login_tries",                OT_INT, ST_UNDEF, NULL},
-+{"login_timeout",      OT_INT, ST_UNDEF, NULL},
-+{"nologin",            OT_STR, ST_UNDEF, NULL},
-+{"issue",              OT_STR, ST_UNDEF, NULL},
- /* RADIUS specific options */
- {"authserver",         OT_SRV, ST_UNDEF, &authserver},
- {"acctserver",         OT_SRV, ST_UNDEF, &acctserver},
- {"servers",            OT_STR, ST_UNDEF, NULL},
- {"dictionary",         OT_STR, ST_UNDEF, NULL},
--{"login_radius",       OT_STR, ST_UNDEF, "/usr/sbin/login.radius"},
-+{"login_radius",       OT_STR, ST_UNDEF, NULL},
- {"seqfile",            OT_STR, ST_UNDEF, NULL},
- {"mapfile",            OT_STR, ST_UNDEF, NULL},
- {"default_realm",      OT_STR, ST_UNDEF, NULL},
+@@ -43,22 +43,22 @@
+ 
+ # file holding shared secrets used for the communication
+ # between the RADIUS client and server
+-servers                /usr/local/etc/radiusclient/servers
++servers                /etc/radiusclient/servers
+ 
+ # dictionary of allowed attributes and values
+ # just like in the normal RADIUS distributions
+-dictionary     /usr/local/etc/radiusclient/dictionary
++dictionary     /etc/radiusclient/dictionary
+ 
+ # program to call for a RADIUS authenticated login 
+ # (default /usr/sbin/login.radius)
+-login_radius   /usr/local/sbin/login.radius
++login_radius   /sbin/login.radius
+ 
+ # file which holds sequence number for communication with the
+ # RADIUS server
+ seqfile                /var/run/radius.seq
+ 
+ # file which specifies mapping between ttyname and NAS-Port attribute
+-mapfile                /usr/local/etc/radiusclient/port-id-map
++mapfile                /etc/radiusclient/port-id-map
+ 
+ # default authentication realm to append to all usernames if no
+ # realm was explicitly specified by the user