Changeset 478 for vendor/current/source3/libads/kerberos.c

Timestamp:

Aug 2, 2010, 6:40:21 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.5: vendor update to 3.5.4

File:

• vendor/current/source3/libads/kerberos.c (modified) (10 diffs)

vendor/current/source3/libads/kerberos.c

@@ -716 +716 @@
 static char *print_kdc_line(char *mem_ctx,
                         const char *prev_line,
-                        const struct sockaddr_storage *pss)
+                        const struct sockaddr_storage *pss,
+                        const char *kdc_name)
 {
         char *kdc_str = NULL;
@@ -727 +728 @@
                 char addr[INET6_ADDRSTRLEN];
                 uint16_t port = get_sockaddr_port(pss);
+
+                DEBUG(10,("print_kdc_line: IPv6 case for kdc_name: %s, port: %d\n",
+                        kdc_name, port));
 
                 if (port != 0 && port != DEFAULT_KRB5_PORT) {
@@ -744 +748 @@
                                         print_canonical_sockaddr(mem_ctx, pss),
                                         gai_strerror(ret)));
+                                return NULL;
                         }
                         /* Success, use host:port */
@@ -752 +757 @@
                                         (unsigned int)port);
                 } else {
-                        kdc_str = talloc_asprintf(mem_ctx, "%s\tkdc = %s\n",
-                                        prev_line,
-                                        print_sockaddr(addr,
-                                                sizeof(addr),
-                                                pss));
+
+                        /* no krb5 lib currently supports "kdc = ipv6 address"
+                         * at all, so just fill in just the kdc_name if we have
+                         * it and let the krb5 lib figure out the appropriate
+                         * ipv6 address - gd */
+
+                        if (kdc_name) {
+                                kdc_str = talloc_asprintf(mem_ctx, "%s\tkdc = %s\n",
+                                                prev_line, kdc_name);
+                        } else {
+                                kdc_str = talloc_asprintf(mem_ctx, "%s\tkdc = %s\n",
+                                                prev_line,
+                                                print_sockaddr(addr,
+                                                        sizeof(addr),
+                                                        pss));
+                        }
                 }
         }
@@ -773 +789 @@
                 const char *realm,
                 const char *sitename,
-                struct sockaddr_storage *pss)
+                struct sockaddr_storage *pss,
+                const char *kdc_name)
 {
         int i;
@@ -780 +797 @@
         int count_site = 0;
         int count_nonsite;
-        char *kdc_str = print_kdc_line(mem_ctx, "", pss);
+        char *kdc_str = print_kdc_line(mem_ctx, "", pss, kdc_name);
 
         if (kdc_str == NULL) {
@@ -804 +821 @@
                         kdc_str = print_kdc_line(mem_ctx,
                                                 kdc_str,
-                                                &ip_srv_site[i].ss);
+                                                &ip_srv_site[i].ss,
+                                                NULL);
                         if (!kdc_str) {
                                 SAFE_FREE(ip_srv_site);
@@ -841 +859 @@
                 kdc_str = print_kdc_line(mem_ctx,
                                 kdc_str,
-                                &ip_srv_nonsite[i].ss);
+                                &ip_srv_nonsite[i].ss,
+                                NULL);
                 if (!kdc_str) {
                         SAFE_FREE(ip_srv_site);
@@ -869 +888 @@
                                                 const char *domain,
                                                 const char *sitename,
-                                                struct sockaddr_storage *pss)
+                                                struct sockaddr_storage *pss,
+                                                const char *kdc_name)
 {
         char *dname;
@@ -913 +933 @@
         strupper_m(realm_upper);
 
-        kdc_ip_string = get_kdc_ip_string(dname, realm, sitename, pss);
+        kdc_ip_string = get_kdc_ip_string(dname, realm, sitename, pss, kdc_name);
         if (!kdc_ip_string) {
                 goto done;