openwrt/package/ppp/patches/ppp-2.4.3-radius-config.patch

   1 diff -ruN ppp-2.4.3-orig/pppd/plugins/radius/config.c ppp-2.4.3-3/pppd/plugins/radius/config.c
   2 --- ppp-2.4.3-orig/pppd/plugins/radius/config.c 2004-11-14 08:26:26.000000000 +0100
   3 +++ ppp-2.4.3-3/pppd/plugins/radius/config.c    2004-12-16 04:03:46.000000000 +0100
   4 @@ -369,31 +369,37 @@
   5         }
   6  #endif
   7
   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
  40         return 0;
  41  }
  42 diff -ruN ppp-2.4.3-orig/pppd/plugins/radius/options.h ppp-2.4.3-3/pppd/plugins/radius/options.h
  43 --- ppp-2.4.3-orig/pppd/plugins/radius/options.h        2004-11-14 08:26:26.000000000 +0100
  44 +++ ppp-2.4.3-3/pppd/plugins/radius/options.h   2004-12-16 04:09:16.000000000 +0100
  45 @@ -31,24 +31,21 @@
  46  static SERVER acctserver = {0};
  47  static SERVER authserver = {0};
  48
  49 -int default_tries = 4;
  50 -int default_timeout = 60;
  51 -
  52  static OPTION config_options[] = {
  53  /* internally used options */
  54  {"config_file",                OT_STR, ST_UNDEF, NULL},
  55  /* General options */
  56  {"auth_order",         OT_AUO, ST_UNDEF, NULL},
  57 -{"login_tries",                OT_INT, ST_UNDEF, &default_tries},
  58 -{"login_timeout",      OT_INT, ST_UNDEF, &default_timeout},
  59 -{"nologin",            OT_STR, ST_UNDEF, "/etc/nologin"},
  60 -{"issue",              OT_STR, ST_UNDEF, "/etc/radiusclient/issue"},
  61 +{"login_tries",                OT_INT, ST_UNDEF, NULL},
  62 +{"login_timeout",      OT_INT, ST_UNDEF, NULL},
  63 +{"nologin",            OT_STR, ST_UNDEF, NULL},
  64 +{"issue",              OT_STR, ST_UNDEF, NULL},
  65  /* RADIUS specific options */
  66  {"authserver",         OT_SRV, ST_UNDEF, &authserver},
  67  {"acctserver",         OT_SRV, ST_UNDEF, &acctserver},
  68  {"servers",            OT_STR, ST_UNDEF, NULL},
  69  {"dictionary",         OT_STR, ST_UNDEF, NULL},
  70 -{"login_radius",       OT_STR, ST_UNDEF, "/usr/sbin/login.radius"},
  71 +{"login_radius",       OT_STR, ST_UNDEF, NULL},
  72  {"seqfile",            OT_STR, ST_UNDEF, NULL},
  73  {"mapfile",            OT_STR, ST_UNDEF, NULL},
  74  {"default_realm",      OT_STR, ST_UNDEF, NULL},