Changeset 989 for vendor/current/source3/libads/sasl.c

Timestamp:

Nov 25, 2016, 8:04:54 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.7

File:

• vendor/current/source3/libads/sasl.c (modified) (5 diffs)

vendor/current/source3/libads/sasl.c

@@ -27 +27 @@
 #include "system/gssapi.h"
 #include "lib/param/loadparm.h"
+#include "krb5_env.h"
 
 #ifdef HAVE_LDAP
@@ -697 +698 @@
         int rc, i;
         ADS_STATUS status;
-        DATA_BLOB blob;
+        DATA_BLOB blob = data_blob_null;
         char *given_principal = NULL;
         char *OIDs[ASN1_MAX_OIDS];
@@ -749 +750 @@
             got_kerberos_mechanism) 
         {
-                status = ads_sasl_spnego_gensec_bind(ads, "GSS-SPNEGO",
-                                                     CRED_MUST_USE_KERBEROS,
-                                                     p.service, p.hostname,
-                                                     blob);
-                if (ADS_ERR_OK(status)) {
-                        ads_free_service_principal(&p);
-                        goto done;
-                }
-
-                DEBUG(10,("ads_sasl_spnego_gensec_bind(KRB5) failed with: %s, "
-                          "calling kinit\n", ads_errstr(status)));
+                if (ads->auth.password == NULL ||
+                    ads->auth.password[0] == '\0')
+                {
+
+                        status = ads_sasl_spnego_gensec_bind(ads, "GSS-SPNEGO",
+                                                             CRED_MUST_USE_KERBEROS,
+                                                             p.service, p.hostname,
+                                                             blob);
+                        if (ADS_ERR_OK(status)) {
+                                ads_free_service_principal(&p);
+                                goto done;
+                        }
+
+                        DEBUG(10,("ads_sasl_spnego_gensec_bind(KRB5) failed with: %s, "
+                                  "calling kinit\n", ads_errstr(status)));
+                }
 
                 status = ADS_ERROR_KRB5(ads_kinit_password(ads)); 
@@ -793 +799 @@
         ads_free_service_principal(&p);
         TALLOC_FREE(frame);
+        if (blob.data != NULL) {
+                data_blob_free(&blob);
+        }
         return status;
 }
@@ -1019 +1028 @@
         }
 
-        status = ads_sasl_gssapi_do_bind(ads, p.name);
-        if (ADS_ERR_OK(status)) {
-                ads_free_service_principal(&p);
-                return status;
-        }
-
-        DEBUG(10,("ads_sasl_gssapi_do_bind failed with: %s, "
-                  "calling kinit\n", ads_errstr(status)));
+        if (ads->auth.password == NULL ||
+            ads->auth.password[0] == '\0') {
+                status = ads_sasl_gssapi_do_bind(ads, p.name);
+                if (ADS_ERR_OK(status)) {
+                        ads_free_service_principal(&p);
+                        return status;
+                }
+
+                DEBUG(10,("ads_sasl_gssapi_do_bind failed with: %s, "
+                          "calling kinit\n", ads_errstr(status)));
+        }
 
         status = ADS_ERROR_KRB5(ads_kinit_password(ads));