oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

do SRV lookups for admin server as well.

Browse Source 
some clean-up.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@6462 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1999-07-14 14:02:12 +00:00
parent fb46297ba6
commit 439ad99768
1 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lib/krb5/krbhst.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997, 1998 Kungliga Tekniska H<>gskolan * Copyright (c) 1997, 1998, 1999 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -41,10 +41,15 @@
RCSID("$Id$"); RCSID("$Id$");
/*
* assuming that `*res' contains `*count' strings, add a copy of `string'.
*/
static int static int
add_string(char ***res, int *count, const char *string) add_string(char ***res, int *count, const char *string)
{ {
char **tmp = realloc(*res, (*count + 1) * sizeof(**res)); char **tmp = realloc(*res, (*count + 1) * sizeof(**res));
if(tmp == NULL) if(tmp == NULL)
return ENOMEM; return ENOMEM;
*res = tmp; *res = tmp;
@@ -86,7 +91,12 @@ srv_find_realm(krb5_context context, char ***res, int *count,
for(rr = r->head; rr; rr = rr->next){ for(rr = r->head; rr; rr = rr->next){
if(rr->type == T_SRV){ if(rr->type == T_SRV){
char buf[1024]; char buf[1024];
*res = realloc(*res, (*count + 1) * sizeof(**res)); char **tmp;
tmp = realloc(*res, (*count + 1) * sizeof(**res));
if (tmp == NULL)
return ENOMEM;
*res = tmp;
snprintf (buf, sizeof(buf), snprintf (buf, sizeof(buf),
"%s/%s:%u", "%s/%s:%u",
proto, proto,
@@ -105,10 +115,17 @@ srv_find_realm(krb5_context context, char ***res, int *count,
return 0; return 0;
} }
/*
* lookup the servers for realm `realm', looking for the config string
* `conf_string' in krb5.conf or for `serv_string' in SRV records.
* return a malloc-ed list of servers in hostlist.
*/
static krb5_error_code static krb5_error_code
get_krbhst (krb5_context context, get_krbhst (krb5_context context,
const krb5_realm *realm, const krb5_realm *realm,
const char *conf_string, const char *conf_string,
const char *serv_string,
char ***hostlist) char ***hostlist)
{ {
char **res, **r; char **res, **r;
@@ -122,7 +139,8 @@ get_krbhst (krb5_context context,
if(context->srv_lookup) { if(context->srv_lookup) {
char *s[] = { "udp", "tcp", "http" }, **q; char *s[] = { "udp", "tcp", "http" }, **q;
for(q = s; q < s + sizeof(s) / sizeof(s[0]); q++) { for(q = s; q < s + sizeof(s) / sizeof(s[0]); q++) {
ret = srv_find_realm(context, &res, &count, *realm, *q, "kerberos"); ret = srv_find_realm(context, &res, &count, *realm, *q,
serv_string);
if(ret) { if(ret) {
krb5_config_free_strings(res); krb5_config_free_strings(res);
return ret; return ret;
@@ -149,7 +167,8 @@ krb5_get_krb_admin_hst (krb5_context context,
const krb5_realm *realm, const krb5_realm *realm,
char ***hostlist) char ***hostlist)
{ {
return get_krbhst (context, realm, "admin_server", hostlist); return get_krbhst (context, realm, "admin_server", "kerberos-adm",
hostlist);
} }
krb5_error_code krb5_error_code
@@ -157,7 +176,7 @@ krb5_get_krbhst (krb5_context context,
const krb5_realm *realm, const krb5_realm *realm,
char ***hostlist) char ***hostlist)
{ {
return get_krbhst (context, realm, "kdc", hostlist); return get_krbhst (context, realm, "kdc", "kerberos", hostlist);
} }
krb5_error_code krb5_error_code