The branch, v3-2-test has been updated via 829de79051cd1d1cc67c4c40fdc8e08c44450a09 (commit) from b4a37a66bbd8f5346de743d4ab427d6671e29075 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log ----------------------------------------------------------------- commit 829de79051cd1d1cc67c4c40fdc8e08c44450a09 Author: Michael Adam <[EMAIL PROTECTED]> Date: Wed Jan 9 23:15:56 2008 +0100 Try to fix the build on hosts that HAVE_LDAP but don't HAVE_KRB5. Michael ----------------------------------------------------------------------- Summary of changes: source/libnet/libnet_join.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source/libnet/libnet_join.c b/source/libnet/libnet_join.c index 1bb2a82..8e6d91b 100644 --- a/source/libnet/libnet_join.c +++ b/source/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, -- Samba Shared Repository