diff options
| author | Ralph Boehme <slow@samba.org> | 2017-03-29 11:13:46 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2017-04-20 12:26:11 +0200 |
| commit | 490f72216c915b25a4a4b2aa24da5894255c85ef (patch) | |
| tree | cc12113b9c8f1071b8d749b98b07d70e6bb3a919 | |
| parent | 46abe7f06c3cbaee205f82da8e91f49859a488ed (diff) | |
| download | samba-490f72216c915b25a4a4b2aa24da5894255c85ef.tar.gz | |
winbindd: trigger possible passdb_dsdb initialisation
If the passdb backend is passdb_dsdb the domain SID comes from dsdb, not
from secrets.tdb. As we use the domain SID in various places, we must
ensure the domain SID is migrated from dsdb to secrets.tdb before
get_global_sam_sid() is called the first time.
The migration is done as part of the passdb_dsdb initialisation, calling
pdb_get_domain_info() triggers it.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=12729
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Sat Apr 1 21:18:59 CEST 2017 on sn-devel-144
(cherry picked from commit 8b32fc4006ae338ddee7c0e5991958ec3463da0d)
| -rw-r--r-- | selftest/knownfail | 4 | ||||
| -rw-r--r-- | source3/winbindd/winbindd_util.c | 14 |
2 files changed, 12 insertions, 6 deletions
diff --git a/selftest/knownfail b/selftest/knownfail index 7dde43cb97f..17667cd29d0 100644 --- a/selftest/knownfail +++ b/selftest/knownfail @@ -215,10 +215,6 @@ # ^samba4.winbind.struct.domain_info\(s4member:local\) ^samba4.winbind.struct.getdcname\(s4member:local\) -^samba.blackbox.wbinfo\(s4member:local\).wbinfo -r against s4member\(s4member:local\) -^samba.blackbox.wbinfo\(s4member:local\).wbinfo --user-sids against s4member\(s4member:local\) -^samba.wbinfo_simple.\(s4member:local\).--user-groups -^samba.nss.test using winbind\(s4member:local\) # # These fail since ad_dc_ntvfs assigns the local user's uid to SAMBADOMAIN/Administrator # hence we have a duplicate UID in nsswitch. diff --git a/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c index 24fe6c52f22..c6f3f8f015d 100644 --- a/source3/winbindd/winbindd_util.c +++ b/source3/winbindd/winbindd_util.c @@ -802,6 +802,7 @@ static bool migrate_secrets_tdb_to_ldb(struct winbindd_domain *domain) bool init_domain_list(void) { int role = lp_server_role(); + struct pdb_domain_info *pdb_domain_info = NULL; NTSTATUS status; /* Free existing list */ @@ -814,15 +815,24 @@ bool init_domain_list(void) /* Local SAM */ + /* + * In case the passdb backend is passdb_dsdb the domain SID comes from + * dsdb, not from secrets.tdb. As we use the domain SID in various + * places, we must ensure the domain SID is migrated from dsdb to + * secrets.tdb before get_global_sam_sid() is called the first time. + * + * The migration is done as part of the passdb_dsdb initialisation, + * calling pdb_get_domain_info() triggers it. + */ + pdb_domain_info = pdb_get_domain_info(talloc_tos()); + if ( role == ROLE_ACTIVE_DIRECTORY_DC ) { struct winbindd_domain *domain; enum netr_SchannelType sec_chan_type; const char *account_name; struct samr_Password current_nt_hash; - struct pdb_domain_info *pdb_domain_info; bool ok; - pdb_domain_info = pdb_get_domain_info(talloc_tos()); if (pdb_domain_info == NULL) { DEBUG(0, ("Failed to fetch our own, local AD " "domain info from sam.ldb\n")); |