summaryrefslogtreecommitdiffstats
path: root/source/smbd/negprot.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2002-02-22 03:14:58 +0000
committerAndrew Tridgell <tridge@samba.org>2002-02-22 03:14:58 +0000
commit68693ba4e80257bf895b1c8db18c138d5d9919bb (patch)
tree8d826d0d98baf4972ee8bc719c6763e6333cce52 /source/smbd/negprot.c
parentfbfb7ee896469e79043fab02481bacd2621a302d (diff)
downloadsamba-68693ba4e80257bf895b1c8db18c138d5d9919bb.tar.gz
samba-68693ba4e80257bf895b1c8db18c138d5d9919bb.tar.xz
samba-68693ba4e80257bf895b1c8db18c138d5d9919bb.zip
don't do an ADS init when not in ADS mode
Diffstat (limited to 'source/smbd/negprot.c')
-rw-r--r--source/smbd/negprot.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/source/smbd/negprot.c b/source/smbd/negprot.c
index 073edd70db4..934d594853d 100644
--- a/source/smbd/negprot.c
+++ b/source/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);
}