summaryrefslogtreecommitdiff
path: root/source3/libnet/libnet_join.c
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2010-08-10 08:25:02 +1000
committerSimo Sorce <idra@samba.org>2010-08-13 09:08:27 -0400
commit71d80e6be0687ac7c2f3caab5e7b8caf400fe37e (patch)
treea30d558e704bac324809908c55a93bc17cb0c436 /source3/libnet/libnet_join.c
parentfff6fa72ffa7890cee516bd7e65b50bdb8daf51d (diff)
downloadsamba-71d80e6be0687ac7c2f3caab5e7b8caf400fe37e.tar.gz
samba-71d80e6be0687ac7c2f3caab5e7b8caf400fe37e.tar.bz2
samba-71d80e6be0687ac7c2f3caab5e7b8caf400fe37e.zip
s3-krb5 Only build ADS support if arcfour-hmac-md5 is available
Modern Kerberos implementations have either defines or enums for these key types, which makes doing #ifdef difficult. This shows up in files such as libnet_samsync_keytab.c, the bulk of which is not compiled on current Fedora 12, for example. The downside is that this makes Samba unconditionally depend on the arcfour-hmac-md5 encryption type at build time. We will no longer support libraries that only support the DES based encryption types. However, the single-DES types that are supported in common with AD are already painfully weak - so much so that they are disabled by default in modern Kerberos libraries. If not found, ADS support will not be compiled in. This means that our 'net ads join' will no longer set the ACB_USE_DES_KEY_ONLY flag, and we will always try to use arcfour-hmac-md5. A future improvement would be to remove the use of the DES encryption types totally, but this would require that any ACB_USE_DES_KEY_ONLY flag be removed from existing joins. Andrew Bartlett Signed-off-by: Simo Sorce <idra@samba.org>
Diffstat (limited to 'source3/libnet/libnet_join.c')
-rw-r--r--source3/libnet/libnet_join.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index c710f9e1b1..7d83dc3253 100644
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -982,12 +982,6 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX *mem_ctx,
/* Fill in the additional account flags now */
acct_flags |= ACB_PWNOEXP;
- if (r->out.domain_is_ad) {
-#if !defined(ENCTYPE_ARCFOUR_HMAC)
- acct_flags |= ACB_USE_DES_KEY_ONLY;
-#endif
- ;;
- }
/* Set account flags on machine account */
ZERO_STRUCT(user_info.info16);