don't do an ADS init when not in ADS mode

(This used to be commit 68693ba4e80257bf895b1c8db18c138d5d9919bb)

diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c
index 073edd70db4600c2a563a684696cae49dae797fe..934d594853d64a96221ba343893cd2992abcb8ae 100644 (file)
--- a/source3/smbd/negprot.c
+++ b/source3/smbd/negprot.c
@@ -193,16 +193,15 @@ static int negprot_spnego(char *p)
                return 16;
        }
 #endif
-       {
+       if (lp_security() != SEC_ADS) {
+               blob = spnego_gen_negTokenInit(guid, OIDs_plain, "NONE");
+       } else {
                ADS_STRUCT *ads;
                ads = ads_init(NULL, NULL, NULL, NULL);
-               
                /* win2000 uses host$@REALM, which we will probably use eventually,
                   but for now this works */
                asprintf(&principal, "HOST/%s@%s", guid, ads->realm);
-               blob = spnego_gen_negTokenInit(guid, 
-                                              lp_security()==SEC_ADS ? OIDs_krb5 : OIDs_plain, 
-                                              principal);
+               blob = spnego_gen_negTokenInit(guid, OIDs_krb5, principal);
                free(principal);
                ads_destroy(&ads);
        }