English Language flag
// Log In ​
// CVSweb ​
Project: FreeWRT
// Summary ​ // Activity ​ // Search ​ // Tracker ​ // Lists ​ // News ​ // SCM ​ // Wiki ​
// Access Source Code ​ // Browse Source Code ​

SCM Repository

project home | /[freewrt]/branches/freewrt_1_0/package/ppp/patches/206-radius_config.patch
ViewVC logotype

Diff of /branches/freewrt_1_0/package/ppp/patches/206-radius_config.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3748 by wbx, Thu Sep 28 10:42:55 2006 UTC revision 3749 by dnehring, Mon May 19 11:28:20 2008 UTC
# Line 1  Line 1 
1  diff -ruN ppp-2.4.3-orig/pppd/plugins/radius/config.c ppp-2.4.3-3/pppd/plugins/radius/config.c  diff -Nur ppp-2.4.4-orig/pppd/plugins/radius/etc/radiusclient.conf ppp-2.4.4/pppd/plugins/radius/etc/radiusclient.conf
2  --- ppp-2.4.3-orig/pppd/plugins/radius/config.c 2004-11-14 08:26:26.000000000 +0100  --- ppp-2.4.4-orig/pppd/plugins/radius/etc/radiusclient.conf    2004-11-14 00:48:39.000000000 +0100
3  +++ ppp-2.4.3-3/pppd/plugins/radius/config.c    2004-12-16 04:03:46.000000000 +0100  +++ ppp-2.4.4/pppd/plugins/radius/etc/radiusclient.conf 2007-01-23 23:56:52.000000000 +0100
4  @@ -369,31 +369,37 @@  @@ -22,7 +22,7 @@
5          }  
6   #endif   # name of the issue file. it's only display when no username is passed
7     # on the radlogin command line  (default /etc/radiusclient/issue)
8  +#if 0  -issue  /usr/local/etc/radiusclient/issue
9          if (rc_conf_int("login_tries") <= 0)  +issue  /etc/radiusclient/issue
10          {  
11                  error("%s: login_tries <= 0 is illegal", filename);   # RADIUS settings
12                  return (-1);  
13          }  @@ -43,22 +43,22 @@
14  +#endif  
15          if (rc_conf_str("seqfile") == NULL)   # file holding shared secrets used for the communication
16          {   # between the RADIUS client and server
17                  error("%s: seqfile not specified", filename);  -servers                /usr/local/etc/radiusclient/servers
18                  return (-1);  +servers                /etc/radiusclient/servers
19          }  
20  +#if 0   # dictionary of allowed attributes and values
21          if (rc_conf_int("login_timeout") <= 0)   # just like in the normal RADIUS distributions
22          {  -dictionary     /usr/local/etc/radiusclient/dictionary
23                  error("%s: login_timeout <= 0 is illegal", filename);  +dictionary     /etc/radiusclient/dictionary
24                  return (-1);  
25          }   # program to call for a RADIUS authenticated login
26  +#endif   # (default /usr/sbin/login.radius)
27          if (rc_conf_str("mapfile") == NULL)  -login_radius   /usr/local/sbin/login.radius
28          {  +login_radius   /sbin/login.radius
29                  error("%s: mapfile not specified", filename);  
30                  return (-1);   # file which holds sequence number for communication with the
31          }   # RADIUS server
32  +#if 0   seqfile                /var/run/radius.seq
33          if (rc_conf_str("nologin") == NULL)  
34          {   # file which specifies mapping between ttyname and NAS-Port attribute
35                  error("%s: nologin not specified", filename);  -mapfile                /usr/local/etc/radiusclient/port-id-map
36                  return (-1);  +mapfile                /etc/radiusclient/port-id-map
37          }  
38  +#endif   # default authentication realm to append to all usernames if no
39     # realm was explicitly specified by the user
         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};  
   
 -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},  
Legend:
Removed from v.3748  
changed lines
  Added in v.3749
root@freewrt.org:443
 ViewVC Help
Powered by ViewVC 1.1.20