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
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
|
>From c688c20e7df466a352f7263c3ec93e3e94c14e3a Mon Sep 17 00:00:00 2001
From: Mats Erik Andersson <address@hidden>
Date: Thu, 23 Aug 2012 22:10:33 +0200
Subject: [PATCH] Configuration parsing of suboptions.
The library call getsubopt() is not portable
enough to rely on a catch all case `-1'.
In particular, FreeBSD was not able to parse
`kdc-realm=EX.ORG,localhost' at all.
---
lib/cfg.c | 109 ++++++++++++++++++++++++++++++++------------------------
lib/init.c | 5 ++-
lib/realm.c | 29 +++++++++++++++
shishi.conf.in | 7 +++-
4 files changed, 100 insertions(+), 50 deletions(-)
diff --git lib/cfg.c b/lib/cfg.c
index a0e39b3..9b9414e 100644
--- lib/cfg.c
+++ lib/cfg.c
@@ -117,7 +117,6 @@ shishi_cfg (Shishi * handle, const char *option)
char *opt = option ? xstrdup (option) : NULL;
char *p = opt;
char *value;
- char *realm = NULL;
int res;
size_t i;
@@ -182,6 +181,10 @@ shishi_cfg (Shishi * handle, const char *option)
case REALM_KDC_OPTION:
{
+ struct Shishi_realminfo *ri;
+ char *realm = NULL;
+ char *protstr;
+ int transport = UDP;
int add_realm = 1;
realm = xstrdup (value);
@@ -194,6 +197,7 @@ shishi_cfg (Shishi * handle, const char *option)
free (handle->realminfos[i].kdcaddresses);
handle->realminfos[i].kdcaddresses = NULL;
handle->realminfos[i].nkdcaddresses = 0;
+ ri = &handle->realminfos[i];
add_realm = 0;
}
break;
@@ -206,19 +210,71 @@ shishi_cfg (Shishi * handle, const char *option)
memset (&handle->realminfos[handle->nrealminfos], 0,
sizeof (handle->realminfos[handle->nrealminfos]));
handle->realminfos[handle->nrealminfos].name = realm;
+ ri = &handle->realminfos[handle->nrealminfos];
handle->nrealminfos++;
}
+ if ((protstr = strchr (p, '/')))
+ {
+ *protstr = '\0';
+ protstr++;
+ if (strcasecmp (protstr, "udp") == 0)
+ transport = UDP;
+ else if (strcasecmp (protstr, "tcp") == 0)
+ transport = TCP;
+ else if (strcasecmp (protstr, "tls") == 0)
+ transport = TLS;
+ else
+ shishi_warn (handle,
+ "Ignoring unknown KDC transport: %s",
+ protstr);
+ }
+
+ ri->kdcaddresses = xrealloc (ri->kdcaddresses,
+ (ri->nkdcaddresses + 1) *
+ sizeof (*ri->kdcaddresses));
+ ri->kdcaddresses[ri->nkdcaddresses].transport = transport;
+ ri->kdcaddresses[ri->nkdcaddresses].hostname = xstrdup (p);
+ if ((protstr = strchr (value, ':')))
+ {
+ *protstr = '\0';
+ protstr++;
+ ri->kdcaddresses[ri->nkdcaddresses].port = protstr;
+ }
+ else
+ ri->kdcaddresses[ri->nkdcaddresses].port = NULL;
+ ri->nkdcaddresses++;
+
+ p = NULL; /* Done with suboptions. */
}
break;
case SERVER_REALM_OPTION:
{
struct Shishi_realminfo *ri;
- ri = _shishi_realminfo_new (handle, value);
- ri->serverwildcards = xrealloc (ri->serverwildcards,
- ++ri->nserverwildcards *
- sizeof (*ri->serverwildcards));
- ri->serverwildcards[ri->nserverwildcards - 1] = xstrdup (value);
+ char *subopts, *part, *next;
+
+ if (!p || (*p == 0))
+ {
+ shishi_warn (handle, "Empty server-realm for '%s'.", value);
+ break;
+ }
+
+ ri = _shishi_realminfo_new (handle, xstrdup (value));
+
+ part = subopts = xstrdup (p); /* List of patterns. */
+ while (part && *part)
+ {
+ next = strchr (part, ',');
+ if (next)
+ *(next++) = '\0';
+
+ ri->serverwildcards = xrealloc (ri->serverwildcards,
+ ++ri->nserverwildcards *
+ sizeof (*ri->serverwildcards));
+ ri->serverwildcards[ri->nserverwildcards - 1] = xstrdup (part);
+ part = next;
+ }
+ p = NULL; /* Done with suboptions. */
}
break;
@@ -275,47 +331,6 @@ shishi_cfg (Shishi * handle, const char *option)
case -1:
if (!value)
break;
- for (i = 0; i < handle->nrealminfos; i++)
- if (realm && strcmp (handle->realminfos[i].name, realm) == 0)
- {
- struct Shishi_realminfo *ri = &handle->realminfos[i];
- char *protstr;
- int transport = UDP;
-
- if ((protstr = strchr (value, '/')))
- {
- *protstr = '\0';
- protstr++;
- if (strcasecmp (protstr, "udp") == 0)
- transport = UDP;
- else if (strcasecmp (protstr, "tcp") == 0)
- transport = TCP;
- else if (strcasecmp (protstr, "tls") == 0)
- transport = TLS;
- else
- shishi_warn (handle,
- "Ignoring unknown KDC transport: %s",
- protstr);
- }
-
- ri->kdcaddresses = xrealloc (ri->kdcaddresses,
- (ri->nkdcaddresses + 1) *
- sizeof (*ri->kdcaddresses));
- ri->kdcaddresses[ri->nkdcaddresses].transport = transport;
- ri->kdcaddresses[ri->nkdcaddresses].hostname =
- xstrdup (value);
- if ((protstr = strchr (value, ':')))
- {
- *protstr = '\0';
- protstr++;
- ri->kdcaddresses[ri->nkdcaddresses].port = protstr;
- }
- else
- ri->kdcaddresses[ri->nkdcaddresses].port = NULL;
- ri->nkdcaddresses++;
- }
- if (realm)
- break;
/* fall through */
default:
diff --git lib/init.c b/lib/init.c
index 7fb349c..8c61001 100644
--- lib/init.c
+++ lib/init.c
@@ -175,7 +175,7 @@ shishi_done (Shishi * handle)
if (handle->realminfos)
{
- size_t i;
+ size_t i, j;
for (i = 0; i < handle->nrealminfos; i++)
{
@@ -183,6 +183,9 @@ shishi_done (Shishi * handle)
free (handle->realminfos[i].kdcaddresses);
free (handle->realminfos[i].name);
+
+ for (j = 0; j < handle->realminfos[i].nserverwildcards; j++)
+ free (handle->realminfos[i].serverwildcards[j]);
}
}
diff --git lib/realm.c b/lib/realm.c
index b17010d..1b7c005 100644
--- lib/realm.c
+++ lib/realm.c
@@ -111,6 +111,35 @@ shishi_realm_default_set (Shishi * handle, const char *realm)
char *
shishi_realm_for_server_file (Shishi * handle, char *server)
{
+ struct Shishi_realminfo *ri;
+ size_t i, j;
+ char *p;
+
+ for (i = 0; i < handle->nrealminfos; i++)
+ {
+ ri = &handle->realminfos[i];
+
+ if (!ri->nserverwildcards)
+ continue;
+
+ for (j = 0; j < ri->nserverwildcards; j++)
+ {
+ /* Exact server name match. */
+ if (strcmp (server, ri->serverwildcards[j]) == 0)
+ return ri->name;
+
+ /* Is this a tail pattern? */
+ if (*(ri->serverwildcards[j]) != '.')
+ continue;
+
+ /* Domain part matching. */
+ p = server;
+ while (p = strchr (p, '.'))
+ if (strcmp (p++, ri->serverwildcards[j]) == 0)
+ return ri->name;
+ }
+ }
+
return NULL;
}
diff --git shishi.conf.in b/shishi.conf.in
index 98db22b..2d2c285 100644
--- shishi.conf.in
+++ shishi.conf.in
@@ -70,8 +70,11 @@
# Specify realm for servers.
# Value is REALM,SERVERREGEXP[,SERVERREGEXP...]
-# SERVERREGEXP is a regular expression matching servers in the realm.
-# The first match is used.
+# SERVERREGEXP is a pattern used to establish membership in the
+# given realm. The pattern is either the exact name of a server,
+# or a trailing domain part expected in a qualified server name,
+# whenever the pattern commences with a period. The first match
+# found will be used in library calls.
#server-realm=JOSEFSSON.ORG,.josefsson.org
# How long shishi waits for a response from a KDC before continuing
--
1.7.2.5
|
