In sn2princ, getaddrinfo without AI_ADDRCONFIG
[krb5.git] / src / lib / krb5 / os / sn2princ.c
index cbc6eb1edce16c6dd8abcde09c6c868ff5a6f9a0..f149febdadef32235a33b70fefff6b27f3c6e72f 100644 (file)
@@ -1,6 +1,6 @@
+/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* lib/krb5/os/sn2princ.c */
 /*
- * lib/krb5/os/sn2princ.c
- *
  * Copyright 1991,2002 by the Massachusetts Institute of Technology.
  * All Rights Reserved.
  *
@@ -8,7 +8,7 @@
  *   require a specific license from the United States Government.
  *   It is the responsibility of any person or organization contemplating
  *   export to obtain such a license before exporting.
- * 
+ *
  * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
  * distribute this software and its documentation for any purpose and
  * without fee is hereby granted, provided that the above copyright
  * M.I.T. makes no representations about the suitability of
  * this software for any purpose.  It is provided "as is" without express
  * or implied warranty.
- * 
- *
- * Convert a hostname and service name to a principal in the "standard"
- * form.
  */
 
+/* Convert a hostname and service name to a principal in the "standard"
+ * form. */
+
 #include "k5-int.h"
 #include "os-proto.h"
 #include "fake-addrinfo.h"
@@ -47,13 +46,13 @@ maybe_use_reverse_dns (krb5_context context, int defalt)
     char * value = NULL;
     int use_rdns = 0;
 
-    code = profile_get_string(context->profile, "libdefaults",
-                              "rdns", 0, 0, &value);
+    code = profile_get_string(context->profile, KRB5_CONF_LIBDEFAULTS,
+                              KRB5_CONF_RDNS, 0, 0, &value);
     if (code)
         return defalt;
 
     if (value == 0)
-       return defalt;
+        return defalt;
 
     use_rdns = _krb5_conf_boolean(value);
     profile_release_string(value);
@@ -75,59 +74,52 @@ krb5_sname_to_principal(krb5_context context, const char *hostname, const char *
 #endif
 
     if ((type == KRB5_NT_UNKNOWN) ||
-       (type == KRB5_NT_SRV_HST)) {
-
-       /* if hostname is NULL, use local hostname */
-       if (! hostname) {
-           if (gethostname(localname, MAXHOSTNAMELEN))
-               return SOCKET_ERRNO;
-           hostname = localname;
-       }
-
-       /* if sname is NULL, use "host" */
-       if (! sname)
-           sname = "host";
-
-       /* copy the hostname into non-volatile storage */
-
-       if (type == KRB5_NT_SRV_HST) {
-           struct addrinfo *ai, hints;
-           int err;
-           char hnamebuf[NI_MAXHOST];
-
-           /* Note that the old code would accept numeric addresses,
-              and if the gethostbyaddr step could convert them to
-              real hostnames, you could actually get reasonable
-              results.  If the mapping failed, you'd get dotted
-              triples as realm names.  *sigh*
-
-              The latter has been fixed in hst_realm.c, but we should
-              keep supporting numeric addresses if they do have
-              hostnames associated.  */
-
-           memset(&hints, 0, sizeof(hints));
-           hints.ai_family = AF_INET;
-           hints.ai_flags = AI_CANONNAME;
-       try_getaddrinfo_again:
-           err = getaddrinfo(hostname, 0, &hints, &ai);
-           if (err) {
+        (type == KRB5_NT_SRV_HST)) {
+
+        /* if hostname is NULL, use local hostname */
+        if (! hostname) {
+            if (gethostname(localname, MAXHOSTNAMELEN))
+                return SOCKET_ERRNO;
+            hostname = localname;
+        }
+
+        /* if sname is NULL, use "host" */
+        if (! sname)
+            sname = "host";
+
+        /* copy the hostname into non-volatile storage */
+
+        if (type == KRB5_NT_SRV_HST) {
+            struct addrinfo *ai = NULL, hints;
+            int err;
+            char hnamebuf[NI_MAXHOST];
+
+            /* Note that the old code would accept numeric addresses,
+               and if the gethostbyaddr step could convert them to
+               real hostnames, you could actually get reasonable
+               results.  If the mapping failed, you'd get dotted
+               triples as realm names.  *sigh*
+
+               The latter has been fixed in hst_realm.c, but we should
+               keep supporting numeric addresses if they do have
+               hostnames associated.  */
+
+            memset(&hints, 0, sizeof(hints));
+            hints.ai_flags = AI_CANONNAME;
+            err = getaddrinfo(hostname, 0, &hints, &ai);
+            if (err) {
 #ifdef DEBUG_REFERRALS
-               printf("sname_to_princ: probably punting due to bad hostname of %s\n",hostname);
+                printf("sname_to_princ: failed to canonicalize %s; using as-is", hostname);
 #endif
-               if (hints.ai_family == AF_INET) {
-                   /* Just in case it's an IPv6-only name.  */
-                   hints.ai_family = 0;
-                   goto try_getaddrinfo_again;
-               }
-               return KRB5_ERR_BAD_HOSTNAME;
-           }
-           remote_host = strdup(ai->ai_canonname ? ai->ai_canonname : hostname);
-           if (!remote_host) {
-               freeaddrinfo(ai);
-               return ENOMEM;
-           }
-
-            if (maybe_use_reverse_dns(context, DEFAULT_RDNS_LOOKUP)) {
+            }
+            remote_host = strdup((ai && ai->ai_canonname) ? ai->ai_canonname : hostname);
+            if (!remote_host) {
+                if(ai)
+                    freeaddrinfo(ai);
+                return ENOMEM;
+            }
+
+            if ((!err) && maybe_use_reverse_dns(context, DEFAULT_RDNS_LOOKUP)) {
                 /*
                  * Do a reverse resolution to get the full name, just in
                  * case there's some funny business going on.  If there
@@ -140,7 +132,7 @@ krb5_sname_to_principal(krb5_context context, const char *hostname, const char *
                    preserve the current behavior and only shake things up
                    once when it comes time to fix this lossage.  */
                 err = getnameinfo(ai->ai_addr, ai->ai_addrlen,
-                                   hnamebuf, sizeof(hnamebuf), 0, 0, NI_NAMEREQD);
+                                  hnamebuf, sizeof(hnamebuf), 0, 0, NI_NAMEREQD);
                 freeaddrinfo(ai);
                 if (err == 0) {
                     free(remote_host);
@@ -149,68 +141,67 @@ krb5_sname_to_principal(krb5_context context, const char *hostname, const char *
                         return ENOMEM;
                 }
             } else
-               freeaddrinfo(ai);
-       } else /* type == KRB5_NT_UNKNOWN */ {
-           remote_host = strdup(hostname);
-       }
-       if (!remote_host)
-           return ENOMEM;
+                freeaddrinfo(ai);
+        } else /* type == KRB5_NT_UNKNOWN */ {
+            remote_host = strdup(hostname);
+        }
+        if (!remote_host)
+            return ENOMEM;
 #ifdef DEBUG_REFERRALS
-       printf("sname_to_princ: hostname <%s> after rdns processing\n",remote_host);
+        printf("sname_to_princ: hostname <%s> after rdns processing\n",remote_host);
 #endif
 
-       if (type == KRB5_NT_SRV_HST)
-           for (cp = remote_host; *cp; cp++)
-               if (isupper((unsigned char) (*cp)))
-                   *cp = tolower((unsigned char) (*cp));
-
-       /*
-        * Windows NT5's broken resolver gratuitously tacks on a
-        * trailing period to the hostname (at least it does in
-        * Beta2).  Find and remove it.
-        */
-       if (remote_host[0]) {
-               cp = remote_host + strlen(remote_host)-1;
-               if (*cp == '.')
-                       *cp = 0;
-       }
-       
-
-       if ((retval = krb5_get_host_realm(context, remote_host, &hrealms))) {
-           free(remote_host);
-           return retval;
-       }
+        if (type == KRB5_NT_SRV_HST)
+            for (cp = remote_host; *cp; cp++)
+                if (isupper((unsigned char) (*cp)))
+                    *cp = tolower((unsigned char) (*cp));
+
+        /*
+         * Windows NT5's broken resolver gratuitously tacks on a
+         * trailing period to the hostname (at least it does in
+         * Beta2).  Find and remove it.
+         */
+        if (remote_host[0]) {
+            cp = remote_host + strlen(remote_host)-1;
+            if (*cp == '.')
+                *cp = 0;
+        }
+
+
+        if ((retval = krb5_get_host_realm(context, remote_host, &hrealms))) {
+            free(remote_host);
+            return retval;
+        }
 
 #ifdef DEBUG_REFERRALS
-       printf("sname_to_princ:  realm <%s> after krb5_get_host_realm\n",hrealms[0]);
+        printf("sname_to_princ:  realm <%s> after krb5_get_host_realm\n",hrealms[0]);
 #endif
 
-       if (!hrealms[0]) {
-           free(remote_host);
-           krb5_xfree(hrealms);
-           return KRB5_ERR_HOST_REALM_UNKNOWN;
-       }
-       realm = hrealms[0];
+        if (!hrealms[0]) {
+            free(remote_host);
+            free(hrealms);
+            return KRB5_ERR_HOST_REALM_UNKNOWN;
+        }
+        realm = hrealms[0];
 
-       retval = krb5_build_principal(context, ret_princ, strlen(realm),
-                                     realm, sname, remote_host,
-                                     (char *)0);
-
-       krb5_princ_type(context, *ret_princ) = type;
+        retval = krb5_build_principal(context, ret_princ, strlen(realm),
+                                      realm, sname, remote_host,
+                                      (char *)0);
+        if (retval == 0)
+            krb5_princ_type(context, *ret_princ) = type;
 
 #ifdef DEBUG_REFERRALS
-       printf("krb5_sname_to_principal returning\n");
-       printf("realm: <%s>, sname: <%s>, remote_host: <%s>\n",
-              realm,sname,remote_host);
-       krb5int_dbgref_dump_principal("krb5_sname_to_principal",*ret_princ);
+        printf("krb5_sname_to_principal returning\n");
+        printf("realm: <%s>, sname: <%s>, remote_host: <%s>\n",
+               realm,sname,remote_host);
+        krb5int_dbgref_dump_principal("krb5_sname_to_principal",*ret_princ);
 #endif
 
-       free(remote_host);
+        free(remote_host);
 
-       krb5_free_host_realm(context, hrealms);
-       return retval;
+        krb5_free_host_realm(context, hrealms);
+        return retval;
     } else {
-       return KRB5_SNAME_UNSUPP_NAMETYPE;
+        return KRB5_SNAME_UNSUPP_NAMETYPE;
     }
 }
-