merge new-crypto branch
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5332 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -65,6 +65,7 @@ krb5_get_host_realm(krb5_context context,
|
||||
const krb5_config_binding *l;
|
||||
struct in_addr addr;
|
||||
struct hostent *hostent;
|
||||
char *orig_host;
|
||||
|
||||
if (host == NULL) {
|
||||
if (gethostname (hostname, sizeof(hostname)))
|
||||
@@ -72,6 +73,8 @@ krb5_get_host_realm(krb5_context context,
|
||||
host = hostname;
|
||||
}
|
||||
|
||||
orig_host = host;
|
||||
|
||||
addr.s_addr = inet_addr(host);
|
||||
hostent = roken_gethostbyname (host);
|
||||
if (hostent == NULL && addr.s_addr != INADDR_NONE)
|
||||
@@ -111,6 +114,9 @@ krb5_get_host_realm(krb5_context context,
|
||||
} else {
|
||||
const char *dot = strchr (host, '.');
|
||||
|
||||
if (dot == NULL)
|
||||
dot = strchr (orig_host, '.');
|
||||
|
||||
if (dot != NULL) {
|
||||
(*realms)[0] = strdup (dot + 1);
|
||||
if ((*realms)[0] == NULL) {
|
||||
|
Reference in New Issue
Block a user