xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

merge

Browse source
This commit is contained in:
cinap_lenrek 2014-09-16 16:42:16 +02:00
commit 187aad97be
1 changed files with 22 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

29
sys/src/libauthsrv/authdial.c
View file

@ -7,6 +7,7 @@
int int
authdial(char *netroot, char *dom) authdial(char *netroot, char *dom)
{ {
Ndbtuple *t, *nt;
char *p; char *p;
int rv; int rv;
@ -15,22 +16,36 @@ authdial(char *netroot, char *dom)
return dial(netmkaddr("$auth", netroot, "ticket"), 0, 0, 0); return dial(netmkaddr("$auth", netroot, "ticket"), 0, 0, 0);
/* look up an auth server in an authentication domain */ /* look up an auth server in an authentication domain */
p = csgetvalue(netroot, "authdom", dom, "auth", nil); p = csgetvalue(netroot, "authdom", dom, "auth", &t);
/* if that didn't work, just try the IP domain */ /* if that didn't work, just try the IP domain */
if(p == nil) if(p == nil)
p = csgetvalue(netroot, "dom", dom, "auth", nil); p = csgetvalue(netroot, "dom", dom, "auth", &t);
/* /*
* if that didn't work, try p9auth.$dom. this is very helpful if * if that didn't work, try p9auth.$dom. this is very helpful if
* you can't edit /lib/ndb. * you can't edit /lib/ndb.
*/ */
if(p == nil) if(p == nil) {
p = smprint("p9auth.%s", dom); p = smprint("p9auth.%s", dom);
if(p == nil){ /* should no longer ever happen */ t = ndbnew("auth", p);
werrstr("no auth server found for %s", dom);
return -1;
} }
rv = dial(netmkaddr(p, netroot, "ticket"), 0, 0, 0);
free(p); free(p);
/*
* allow multiple auth= attributes for backup auth servers,
* try each one in order.
*/
rv = -1;
for(nt = t; nt != nil; nt = nt->entry) {
if(strcmp(nt->attr, "auth") == 0) {
p = netmkaddr(nt->val, netroot, "ticket");
rv = dial(p, 0, 0, 0);
if(rv >= 0)
break;
}
}
ndbfree(t);
return rv; return rv;
} }