206-radius_config.patch 2.3 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576
  1. Index: ppp-2.4.3/pppd/plugins/radius/config.c
  2. ===================================================================
  3. --- ppp-2.4.3.orig/pppd/plugins/radius/config.c 2007-06-04 13:22:07.980642040 +0200
  4. +++ ppp-2.4.3/pppd/plugins/radius/config.c 2007-06-04 13:22:13.139857720 +0200
  5. @@ -369,31 +369,37 @@
  6. }
  7. #endif
  8. +#if 0
  9. if (rc_conf_int("login_tries") <= 0)
  10. {
  11. error("%s: login_tries <= 0 is illegal", filename);
  12. return (-1);
  13. }
  14. +#endif
  15. if (rc_conf_str("seqfile") == NULL)
  16. {
  17. error("%s: seqfile not specified", filename);
  18. return (-1);
  19. }
  20. +#if 0
  21. if (rc_conf_int("login_timeout") <= 0)
  22. {
  23. error("%s: login_timeout <= 0 is illegal", filename);
  24. return (-1);
  25. }
  26. +#endif
  27. if (rc_conf_str("mapfile") == NULL)
  28. {
  29. error("%s: mapfile not specified", filename);
  30. return (-1);
  31. }
  32. +#if 0
  33. if (rc_conf_str("nologin") == NULL)
  34. {
  35. error("%s: nologin not specified", filename);
  36. return (-1);
  37. }
  38. +#endif
  39. return 0;
  40. }
  41. Index: ppp-2.4.3/pppd/plugins/radius/options.h
  42. ===================================================================
  43. --- ppp-2.4.3.orig/pppd/plugins/radius/options.h 2007-06-04 13:22:07.989640672 +0200
  44. +++ ppp-2.4.3/pppd/plugins/radius/options.h 2007-06-04 13:22:13.139857720 +0200
  45. @@ -31,24 +31,21 @@
  46. static SERVER acctserver = {0};
  47. static SERVER authserver = {0};
  48. -int default_tries = 4;
  49. -int default_timeout = 60;
  50. -
  51. static OPTION config_options[] = {
  52. /* internally used options */
  53. {"config_file", OT_STR, ST_UNDEF, NULL},
  54. /* General options */
  55. {"auth_order", OT_AUO, ST_UNDEF, NULL},
  56. -{"login_tries", OT_INT, ST_UNDEF, &default_tries},
  57. -{"login_timeout", OT_INT, ST_UNDEF, &default_timeout},
  58. -{"nologin", OT_STR, ST_UNDEF, "/etc/nologin"},
  59. -{"issue", OT_STR, ST_UNDEF, "/etc/radiusclient/issue"},
  60. +{"login_tries", OT_INT, ST_UNDEF, NULL},
  61. +{"login_timeout", OT_INT, ST_UNDEF, NULL},
  62. +{"nologin", OT_STR, ST_UNDEF, NULL},
  63. +{"issue", OT_STR, ST_UNDEF, NULL},
  64. /* RADIUS specific options */
  65. {"authserver", OT_SRV, ST_UNDEF, &authserver},
  66. {"acctserver", OT_SRV, ST_UNDEF, &acctserver},
  67. {"servers", OT_STR, ST_UNDEF, NULL},
  68. {"dictionary", OT_STR, ST_UNDEF, NULL},
  69. -{"login_radius", OT_STR, ST_UNDEF, "/usr/sbin/login.radius"},
  70. +{"login_radius", OT_STR, ST_UNDEF, NULL},
  71. {"seqfile", OT_STR, ST_UNDEF, NULL},
  72. {"mapfile", OT_STR, ST_UNDEF, NULL},
  73. {"default_realm", OT_STR, ST_UNDEF, NULL},