From f9ee4db2ba74e4f1f1b6d6f32082e5b0fe60f9b9 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 11 Sep 2024 18:21:58 +0200 Subject: [PATCH] s3:utils: use the correct secrets.tdb in net_use_krb_machine_account() On a cluster we need to use the ctdb controlled database and not a local secrets.tdb... BUG: https://bugzilla.samba.org/show_bug.cgi?id=15714 Signed-off-by: Stefan Metzmacher Reviewed-by: Martin Schwenke Autobuild-User(master): Stefan Metzmacher Autobuild-Date(master): Fri Sep 20 05:54:43 UTC 2024 on atb-devel-224 --- selftest/knownfail.d/net_ads_testjoin | 4 ---- source3/utils/net_util.c | 6 +++++- 2 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 selftest/knownfail.d/net_ads_testjoin diff --git a/selftest/knownfail.d/net_ads_testjoin b/selftest/knownfail.d/net_ads_testjoin deleted file mode 100644 index 4e88d4a9031..00000000000 --- a/selftest/knownfail.d/net_ads_testjoin +++ /dev/null @@ -1,4 +0,0 @@ -^samba3.blackbox.update_keytab_clustered.net_ads_testjoin_initial.clusteredmember -^samba3.blackbox.update_keytab_clustered.net_ads_testjoin_after_sync.clusteredmember -^samba3.blackbox.update_keytab_clustered.wbinfo_change_secret_after_sync.clusteredmember -^samba3.blackbox.update_keytab_clustered.net_ads_testjoin_final.clusteredmember diff --git a/source3/utils/net_util.c b/source3/utils/net_util.c index 93e08cafbf1..5039902bc5e 100644 --- a/source3/utils/net_util.c +++ b/source3/utils/net_util.c @@ -259,12 +259,16 @@ NTSTATUS connect_dst_pipe(struct net_context *c, struct cli_state **cli_dst, int net_use_krb_machine_account(struct net_context *c) { + struct db_context *db_ctx = NULL; + if (!secrets_init()) { d_fprintf(stderr,_("ERROR: Unable to open secrets database\n")); exit(1); } - cli_credentials_set_machine_account(c->creds, c->lp_ctx); + db_ctx = secrets_db_ctx(); + + cli_credentials_set_machine_account_db_ctx(c->creds, c->lp_ctx, db_ctx); c->explicit_credentials = true; return 0; } -- 2.47.2