aboutsummaryrefslogtreecommitdiffstats
path: root/package/ppp/patches/204-radius_config.patch
blob: 2cb1b19527f98654839a8ecfc484a4e40488c456 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
diff -Naur ppp-2.4.4.orig/pppd/plugins/radius/config.c ppp-2.4.4/pppd/plugins/radius/config.c
--- ppp-2.4.4.orig/pppd/plugins/radius/config.c	2004-11-14 02:26:26.000000000 -0500
+++ ppp-2.4.4/pppd/plugins/radius/config.c	2009-05-07 19:31:14.000000000 -0400
@@ -369,31 +369,37 @@
 	}
 #endif
 
+#if 0
 	if (rc_conf_int("login_tries") <= 0)
 	{
 		error("%s: login_tries <= 0 is illegal", filename);
 		return (-1);
 	}
+#endif
 	if (rc_conf_str("seqfile") == NULL)
 	{
 		error("%s: seqfile not specified", filename);
 		return (-1);
 	}
+#if 0
 	if (rc_conf_int("login_timeout") <= 0)
 	{
 		error("%s: login_timeout <= 0 is illegal", filename);
 		return (-1);
 	}
+#endif
 	if (rc_conf_str("mapfile") == NULL)
 	{
 		error("%s: mapfile not specified", filename);
 		return (-1);
 	}
+#if 0
 	if (rc_conf_str("nologin") == NULL)
 	{
 		error("%s: nologin not specified", filename);
 		return (-1);
 	}
+#endif
 
 	return 0;
 }
diff -Naur ppp-2.4.4.orig/pppd/plugins/radius/options.h ppp-2.4.4/pppd/plugins/radius/options.h
--- ppp-2.4.4.orig/pppd/plugins/radius/options.h	2004-11-14 02:26:26.000000000 -0500
+++ ppp-2.4.4/pppd/plugins/radius/options.h	2009-05-07 19:31:14.000000000 -0400
@@ -31,24 +31,21 @@
 static SERVER acctserver = {0};
 static SERVER authserver = {0};
 
-int default_tries = 4;
-int default_timeout = 60;
-
 static OPTION config_options[] = {
 /* internally used options */
 {"config_file",		OT_STR, ST_UNDEF, NULL},
 /* General options */
 {"auth_order",	 	OT_AUO, ST_UNDEF, NULL},
-{"login_tries",	 	OT_INT, ST_UNDEF, &default_tries},
-{"login_timeout",	OT_INT, ST_UNDEF, &default_timeout},
-{"nologin",		OT_STR, ST_UNDEF, "/etc/nologin"},
-{"issue",		OT_STR, ST_UNDEF, "/etc/radiusclient/issue"},
+{"login_tries",	 	OT_INT, ST_UNDEF, NULL},
+{"login_timeout",	OT_INT, ST_UNDEF, NULL},
+{"nologin",		OT_STR, ST_UNDEF, NULL},
+{"issue",		OT_STR, ST_UNDEF, NULL},
 /* RADIUS specific options */
 {"authserver",		OT_SRV, ST_UNDEF, &authserver},
 {"acctserver",		OT_SRV, ST_UNDEF, &acctserver},
 {"servers",		OT_STR, ST_UNDEF, NULL},
 {"dictionary",		OT_STR, ST_UNDEF, NULL},
-{"login_radius",	OT_STR, ST_UNDEF, "/usr/sbin/login.radius"},
+{"login_radius",	OT_STR, ST_UNDEF, NULL},
 {"seqfile",		OT_STR, ST_UNDEF, NULL},
 {"mapfile",		OT_STR, ST_UNDEF, NULL},
 {"default_realm",	OT_STR, ST_UNDEF, NULL},
diff -Naur ppp-2.4.4.orig/pppd/plugins/radius/config.c ppp-2.4.4/pppd/plugins/radius/config.c
--- ppp-2.4.4.orig/pppd/plugins/radius/config.c	2004-11-14 02:26:26.000000000 -0500
+++ ppp-2.4.4/pppd/plugins/radius/config.c	2009-05-07 19:31:14.000000000 -0400
@@ -369,31 +369,37 @@
 	}
 #endif
 
+#if 0
 	if (rc_conf_int("login_tries") <= 0)
 	{
 		error("%s: login_tries <= 0 is illegal", filename);
 		return (-1);
 	}
+#endif
 	if (rc_conf_str("seqfile") == NULL)
 	{
 		error("%s: seqfile not specified", filename);
 		return (-1);
 	}
+#if 0
 	if (rc_conf_int("login_timeout") <= 0)
 	{
 		error("%s: login_timeout <= 0 is illegal", filename);
 		return (-1);
 	}
+#endif
 	if (rc_conf_str("mapfile") == NULL)
 	{
 		error("%s: mapfile not specified", filename);
 		return (-1);
 	}
+#if 0
 	if (rc_conf_str("nologin") == NULL)
 	{
 		error("%s: nologin not specified", filename);
 		return (-1);
 	}
+#endif
 
 	return 0;
 }
diff -Naur ppp-2.4.4.orig/pppd/plugins/radius/options.h ppp-2.4.4/pppd/plugins/radius/options.h
--- ppp-2.4.4.orig/pppd/plugins/radius/options.h	2004-11-14 02:26:26.000000000 -0500
+++ ppp-2.4.4/pppd/plugins/radius/options.h	2009-05-07 19:31:14.000000000 -0400
@@ -31,24 +31,21 @@
 static SERVER acctserver = {0};
 static SERVER authserver = {0};
 
-int default_tries = 4;
-int default_timeout = 60;
-
 static OPTION config_options[] = {
 /* internally used options */
 {"config_file",		OT_STR, ST_UNDEF, NULL},
 /* General options */
 {"auth_order",	 	OT_AUO, ST_UNDEF, NULL},
-{"login_tries",	 	OT_INT, ST_UNDEF, &default_tries},
-{"login_timeout",	OT_INT, ST_UNDEF, &default_timeout},
-{"nologin",		OT_STR, ST_UNDEF, "/etc/nologin"},
-{"issue",		OT_STR, ST_UNDEF, "/etc/radiusclient/issue"},
+{"login_tries",	 	OT_INT, ST_UNDEF, NULL},
+{"login_timeout",	OT_INT, ST_UNDEF, NULL},
+{"nologin",		OT_STR, ST_UNDEF, NULL},
+{"issue",		OT_STR, ST_UNDEF, NULL},
 /* RADIUS specific options */
 {"authserver",		OT_SRV, ST_UNDEF, &authserver},
 {"acctserver",		OT_SRV, ST_UNDEF, &acctserver},
 {"servers",		OT_STR, ST_UNDEF, NULL},
 {"dictionary",		OT_STR, ST_UNDEF, NULL},
-{"login_radius",	OT_STR, ST_UNDEF, "/usr/sbin/login.radius"},
+{"login_radius",	OT_STR, ST_UNDEF, NULL},
 {"seqfile",		OT_STR, ST_UNDEF, NULL},
 {"mapfile",		OT_STR, ST_UNDEF, NULL},
 {"default_realm",	OT_STR, ST_UNDEF, NULL},