Changeset 599 for trunk/server/source3/libads/sasl.c

Timestamp:

Jul 6, 2011, 8:21:13 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update trunk to 3.5.9

File:

• trunk/server/source3/libads/sasl.c (modified) (1 diff)

trunk/server/source3/libads/sasl.c

@@ -650 +650 @@
            the SASL bind reply.  So we guess based on server
            name and realm.  --jerry  */
-        /* Also try best guess when we get the w2k8 ignore
-           principal back - gd */
-
-        if (!given_principal ||
+        /* Also try best guess when we get the w2k8 ignore principal
+           back, or when we are configured to ignore it - gd,
+           abartlet */
+
+        if (!lp_client_use_spnego_principal() ||
+            !given_principal ||
             strequal(given_principal, ADS_IGNORE_PRINCIPAL)) {