summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-01-09 23:15:56 +0100
committerMichael Adam <obnox@samba.org>2008-01-09 23:15:56 +0100
commit1c4466cedcab04b9188569238a1e795629f3a007 (patch)
tree1f5b623fd829510aacf33c5f1e994f72497ef416 /source3
parentc0c299cb267f6c559a0a407fde536aa32efc29f6 (diff)
downloadsamba-1c4466cedcab04b9188569238a1e795629f3a007.tar.gz
samba-1c4466cedcab04b9188569238a1e795629f3a007.tar.bz2
samba-1c4466cedcab04b9188569238a1e795629f3a007.zip
Try to fix the build on hosts that HAVE_LDAP but don't HAVE_KRB5.
Michael (This used to be commit 829de79051cd1d1cc67c4c40fdc8e08c44450a09)
Diffstat (limited to 'source3')
-rw-r--r--source3/libnet/libnet_join.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index 1bb2a82959..8e6d91b38b 100644
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -1072,9 +1072,12 @@ static WERROR libnet_DomainJoin(TALLOC_CTX *mem_ctx,
return WERR_GENERAL_FAILURE;
}
+#ifdef HAVE_KRB5
if (!libnet_join_derive_salting_principal(mem_ctx, r)) {
return WERR_GENERAL_FAILURE;
}
+#endif /* HAVE_KRB5 */
+
#endif /* HAVE_LDAP */
if (!libnet_join_create_keytab(mem_ctx, r)) {
libnet_join_set_error_string(mem_ctx, r,