package/ppp/patches/206-radius_config.patch

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