Home Explore Help
Sign In
libreCMC
/
librecmc-fossil
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: 3c4ec5f916
Branches Tags
librecmc-fossil
/
trunk
/
package
/
network
/
services
/
ppp
/
patches
/
204-radius_config.patch

204-radius_config.patch 2.0 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172 
  1. --- a/pppd/plugins/radius/config.c
    2. 

  2. +++ b/pppd/plugins/radius/config.c
    3. 

  3. @@ -369,31 +369,37 @@ static int test_config(char *filename)
    4. 

  4.  	}
    5. 

  5.  #endif
    6. 

  6.  
    7. 

  7. +#if 0
    8. 

  8.  	if (rc_conf_int("login_tries") <= 0)
    9. 

  9.  	{
    10. 

  10.  		error("%s: login_tries <= 0 is illegal", filename);
    11. 

  11.  		return (-1);
    12. 

  12.  	}
    13. 

  13. +#endif
    14. 

  14.  	if (rc_conf_str("seqfile") == NULL)
    15. 

  15.  	{
    16. 

  16.  		error("%s: seqfile not specified", filename);
    17. 

  17.  		return (-1);
    18. 

  18.  	}
    19. 

  19. +#if 0
    20. 

  20.  	if (rc_conf_int("login_timeout") <= 0)
    21. 

  21.  	{
    22. 

  22.  		error("%s: login_timeout <= 0 is illegal", filename);
    23. 

  23.  		return (-1);
    24. 

  24.  	}
    25. 

  25. +#endif
    26. 

  26.  	if (rc_conf_str("mapfile") == NULL)
    27. 

  27.  	{
    28. 

  28.  		error("%s: mapfile not specified", filename);
    29. 

  29.  		return (-1);
    30. 

  30.  	}
    31. 

  31. +#if 0
    32. 

  32.  	if (rc_conf_str("nologin") == NULL)
    33. 

  33.  	{
    34. 

  34.  		error("%s: nologin not specified", filename);
    35. 

  35.  		return (-1);
    36. 

  36.  	}
    37. 

  37. +#endif
    38. 

  38.  
    39. 

  39.  	return 0;
    40. 

  40.  }
    41. 

  41. --- a/pppd/plugins/radius/options.h
    42. 

  42. +++ b/pppd/plugins/radius/options.h
    43. 

  43. @@ -31,24 +31,21 @@ typedef struct _option {
    44. 

  44.  static SERVER acctserver = {0};
    45. 

  45.  static SERVER authserver = {0};
    46. 

  46.  
    47. 

  47. -int default_tries = 4;
    48. 

  48. -int default_timeout = 60;
    49. 

  49. -
    50. 

  50.  static OPTION config_options[] = {
    51. 

  51.  /* internally used options */
    52. 

  52.  {"config_file",		OT_STR, ST_UNDEF, NULL},
    53. 

  53.  /* General options */
    54. 

  54.  {"auth_order",	 	OT_AUO, ST_UNDEF, NULL},
    55. 

  55. -{"login_tries",	 	OT_INT, ST_UNDEF, &default_tries},
    56. 

  56. -{"login_timeout",	OT_INT, ST_UNDEF, &default_timeout},
    57. 

  57. -{"nologin",		OT_STR, ST_UNDEF, "/etc/nologin"},
    58. 

  58. -{"issue",		OT_STR, ST_UNDEF, "/etc/radiusclient/issue"},
    59. 

  59. +{"login_tries",	 	OT_INT, ST_UNDEF, NULL},
    60. 

  60. +{"login_timeout",	OT_INT, ST_UNDEF, NULL},
    61. 

  61. +{"nologin",		OT_STR, ST_UNDEF, NULL},
    62. 

  62. +{"issue",		OT_STR, ST_UNDEF, NULL},
    63. 

  63.  /* RADIUS specific options */
    64. 

  64.  {"authserver",		OT_SRV, ST_UNDEF, &authserver},
    65. 

  65.  {"acctserver",		OT_SRV, ST_UNDEF, &acctserver},
    66. 

  66.  {"servers",		OT_STR, ST_UNDEF, NULL},
    67. 

  67.  {"dictionary",		OT_STR, ST_UNDEF, NULL},
    68. 

  68. -{"login_radius",	OT_STR, ST_UNDEF, "/usr/sbin/login.radius"},
    69. 

  69. +{"login_radius",	OT_STR, ST_UNDEF, NULL},
    70. 

  70.  {"seqfile",		OT_STR, ST_UNDEF, NULL},
    71. 

  71.  {"mapfile",		OT_STR, ST_UNDEF, NULL},
    72. 

  72.  {"default_realm",	OT_STR, ST_UNDEF, NULL},
    73.