package/ppp/patches/204-radius_config.patch

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