summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2008-01-11 18:49:20 +0100
committerGünther Deschner <gd@samba.org>2008-01-12 01:35:51 +0100
commitfbd6d14fc8b0e459d9f105989c449ef9f3f98c79 (patch)
treeca065bd39fd27e1df4ef2690530e31ae63cff384
parent2ec41571a3efbea254cc3e132280a194c86a2f89 (diff)
downloadsamba-fbd6d14fc8b0e459d9f105989c449ef9f3f98c79.tar.gz
samba-fbd6d14fc8b0e459d9f105989c449ef9f3f98c79.tar.bz2
samba-fbd6d14fc8b0e459d9f105989c449ef9f3f98c79.zip
Use domain_is_ad one more time in libnetjoin.
Guenther (This used to be commit 82bd6322b691506ddea2b274973e614fa8c6ee5e)
-rw-r--r--source3/libnet/libnet_join.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index 1df85ebb61..ea92059fb4 100644
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -678,14 +678,13 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX *mem_ctx,
memcpy(&pwbuf[516], md5buffer, sizeof(md5buffer));
acb_info |= ACB_PWNOEXP;
-#if 0
- if ( dom_type == ND_TYPE_AD ) {
+ if (r->out.domain_is_ad) {
#if !defined(ENCTYPE_ARCFOUR_HMAC)
acb_info |= ACB_USE_DES_KEY_ONLY;
#endif
;;
}
-#endif
+
ZERO_STRUCT(ctr);
ZERO_STRUCT(p25);