summaryrefslogtreecommitdiff
path: root/source3/utils
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2004-11-02 21:28:14 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:53:07 -0500
commit917a53cc5875a7ea0384b906dd262b619eb2178e (patch)
tree269ebeabd508a25eed00d1627cff3c1265376a18 /source3/utils
parent951ebacf452ea03e5abe6652b1adc09b845f0d92 (diff)
downloadsamba-917a53cc5875a7ea0384b906dd262b619eb2178e.tar.gz
samba-917a53cc5875a7ea0384b906dd262b619eb2178e.tar.bz2
samba-917a53cc5875a7ea0384b906dd262b619eb2178e.zip
r3492: Fixes from testing kerberos salted principal fix.
Jeremy. (This used to be commit b356a8fdc5a1ac45f2f7f56a0836e794bdecddc6)
Diffstat (limited to 'source3/utils')
-rw-r--r--source3/utils/net_ads.c14
1 files changed, 14 insertions, 0 deletions
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);