From 917a53cc5875a7ea0384b906dd262b619eb2178e Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 2 Nov 2004 21:28:14 +0000 Subject: r3492: Fixes from testing kerberos salted principal fix. Jeremy. (This used to be commit b356a8fdc5a1ac45f2f7f56a0836e794bdecddc6) --- source3/utils/net_ads.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'source3/utils') diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c index 2202ee11e2..9efa45e58f 100644 --- a/source3/utils/net_ads.c +++ b/source3/utils/net_ads.c @@ -823,6 +823,20 @@ int net_ads_join(int argc, const char **argv) return -1; } +#ifdef HAVE_KRB5 + if (!kerberos_derive_salting_principal(machine_account)) { + DEBUG(1,("Failed to determine salting principal\n")); + ads_destroy(&ads); + return -1; + } + + if (!kerberos_derive_cifs_salting_principals()) { + DEBUG(1,("Failed to determine salting principals\n")); + ads_destroy(&ads); + return -1; + } +#endif + if (!secrets_store_domain_sid(short_domain_name, &dom_sid)) { DEBUG(1,("Failed to save domain sid\n")); ads_destroy(&ads); -- cgit