Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Revert partial fix for RADSECPROXY-69 (98d7bbe).
This was potentially making things worse.
  • Loading branch information
Linus Nordberg committed Nov 1, 2016
1 parent 98d7bbe commit 829c65a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions develdoc.txt
Expand Up @@ -337,8 +337,8 @@ traverses the list of realms and for each realm:

- same thing for realm->accsrvconfs as for srvconfs

- if none of realm->srvconfs->servers and realm->accsrvonfs->servers
have dynamiclookuparg set:
- if none of the realm->srvconfs nor the realm->accsrvonfs has a
dynamiclookupcommand:

- for each srv in realm->srvconfs: free srv and decrease ref on realm

Expand Down
5 changes: 3 additions & 2 deletions radsecproxy.c
Expand Up @@ -706,7 +706,7 @@ int hasdynamicserver(struct list *srvconfs) {
struct list_node *entry;

for (entry = list_first(srvconfs); entry; entry = list_next(entry))
if (((struct clsrvconf *)entry->data)->servers->dynamiclookuparg)
if (((struct clsrvconf *)entry->data)->dynamiclookupcommand)
return 1;
return 0;
}
Expand Down Expand Up @@ -1899,13 +1899,14 @@ void *clientwr(void *arg) {
}
}
errexit:
conf->servers = NULL;
if (server->dynamiclookuparg) {
removeserversubrealms(realms, conf);
if (dynconffail)
free(conf);
else
freeclsrvconf(conf);
} else {
conf->servers = NULL;
}
freeserver(server, 1);
return NULL;
Expand Down

0 comments on commit 829c65a

Please sign in to comment.