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

try to resolve hostnames

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@13797 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2004-04-26 06:13:45 +00:00
parent 2b2581d27a
commit 4ac10a4c46
1 changed files with 47 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
lib/krb5/verify_krb5_conf.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1999 - 2003 Kungliga Tekniska H<>gskolan * Copyright (c) 1999 - 2004 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -141,23 +141,68 @@ check_host(krb5_context context, const char *path, char *data)
int ret; int ret;
char hostname[128]; char hostname[128];
const char *p = data; const char *p = data;
struct addrinfo hints;
char service[32];
int defport;
hints.ai_flags = 0;
hints.ai_family = PF_UNSPEC;
hints.ai_socktype = 0;
hints.ai_protocol = 0;
hints.ai_addrlen = 0;
hints.ai_canonname = NULL;
hints.ai_addr = NULL;
hints.ai_next = NULL;
struct addrinfo *ai; struct addrinfo *ai;
/* XXX data could be a list of hosts that this code can't handle */ /* XXX data could be a list of hosts that this code can't handle */
/* XXX copied from krbhst.c */ /* XXX copied from krbhst.c */
if(strncmp(p, "http://", 7) == 0){ if(strncmp(p, "http://", 7) == 0){
p += 7; p += 7;
hints.ai_socktype = SOCK_STREAM;
strlcpy(service, "http", sizeof(service));
defport = 80;
} else if(strncmp(p, "http/", 5) == 0) { } else if(strncmp(p, "http/", 5) == 0) {
p += 5; p += 5;
hints.ai_socktype = SOCK_STREAM;
strlcpy(service, "http", sizeof(service));
defport = 80;
}else if(strncmp(p, "tcp/", 4) == 0){ }else if(strncmp(p, "tcp/", 4) == 0){
p += 4; p += 4;
hints.ai_socktype = SOCK_STREAM;
strlcpy(service, "kerberos", sizeof(service));
defport = 88;
} else if(strncmp(p, "udp/", 4) == 0) { } else if(strncmp(p, "udp/", 4) == 0) {
p += 4; p += 4;
hints.ai_socktype = SOCK_DGRAM;
strlcpy(service, "kerberos", sizeof(service));
defport = 88;
} else {
hints.ai_socktype = SOCK_DGRAM;
strlcpy(service, "kerberos", sizeof(service));
defport = 88;
} }
if(strsep_copy(&p, ":", hostname, sizeof(hostname)) < 0) { if(strsep_copy(&p, ":", hostname, sizeof(hostname)) < 0) {
return 1; return 1;
} }
hostname[strcspn(hostname, "/")] = '\0'; hostname[strcspn(hostname, "/")] = '\0';
ret = getaddrinfo(hostname, "telnet" /* XXX */, NULL, &ai); if(p != NULL) {
char *end;
int tmp = strtol(p, &end, 0);
if(end == p) {
krb5_warnx(context, "%s: failed to parse port number in %s",
path, data);
return 1;
}
defport = tmp;
snprintf(service, sizeof(service), "%u", defport);
}
ret = getaddrinfo(hostname, service, &hints, &ai);
if(ret == EAI_SERVICE && !isdigit(service[0])) {
snprintf(service, sizeof(service), "%u", defport);
ret = getaddrinfo(hostname, service, &hints, &ai);
}
if(ret != 0) { if(ret != 0) {
krb5_warnx(context, "%s: %s (%s)", path, gai_strerror(ret), hostname); krb5_warnx(context, "%s: %s (%s)", path, gai_strerror(ret), hostname);
return 1; return 1;