diff options
| author | Björn Jacke <bj@sernet.de> | 2011-08-15 14:46:12 +0200 |
|---|---|---|
| committer | Bjoern Jacke <bj@sernet.de> | 2011-08-18 12:48:37 +0200 |
| commit | dcb5720ad01fabac300da478368c140e2b6313d2 (patch) | |
| tree | 07bd91432fd948312862c28baa2e31f8f2c70b48 /source3 | |
| parent | 5f3301759e33a498803748f30e57712ac67a9965 (diff) | |
| download | samba-dcb5720ad01fabac300da478368c140e2b6313d2.tar.gz samba-dcb5720ad01fabac300da478368c140e2b6313d2.tar.bz2 samba-dcb5720ad01fabac300da478368c140e2b6313d2.zip | |
s3/ldap: don't continue if we couldn't get the domain info on startup
while some things work without the domain info, some important things don't,
which is highly irritating. As even calls like EnumTrustDom fail and
thus clients' domain logins fail we are sufficiently broken to refuse to go on.
Autobuild-User: Björn Jacke <bj@sernet.de>
Autobuild-Date: Thu Aug 18 12:48:37 CEST 2011 on sn-devel-104
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/passdb/pdb_ldap.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c index 74dcceca4e..8b6f07c025 100644 --- a/source3/passdb/pdb_ldap.c +++ b/source3/passdb/pdb_ldap.c @@ -6576,13 +6576,10 @@ NTSTATUS pdb_init_ldapsam(struct pdb_methods **pdb_method, const char *location) ldap_state->domain_name, True); if ( !NT_STATUS_IS_OK(nt_status) ) { - DEBUG(2, ("pdb_init_ldapsam: WARNING: Could not get domain " - "info, nor add one to the domain\n")); - DEBUGADD(2, ("pdb_init_ldapsam: Continuing on regardless, " - "will be unable to allocate new users/groups, " - "and will risk BDCs having inconsistent SIDs\n")); - sid_copy(&ldap_state->domain_sid, get_global_sam_sid()); - return NT_STATUS_OK; + DEBUG(0, ("pdb_init_ldapsam: WARNING: Could not get domain " + "info, nor add one to the domain. " + "We cannot work reliably without it.\n")); + return NT_STATUS_CANT_ACCESS_DOMAIN_INFO; } /* Given that the above might fail, everything below this must be |