1
0
mirror of https://github.com/samba-team/samba.git synced 2025-02-03 13:47:25 +03:00

r26183: The idea of a self-seeding secrets.ldb is nice, but in practice we do

this with the provision, which sets up a very different database.
Removing this ensures we are consistant.

Andrew Bartlett
(This used to be commit 6d4d20ebaf5ae5c9e2629cd58c0dc5d699aad450)
This commit is contained in:
Andrew Bartlett 2007-11-28 05:24:59 +01:00 committed by Stefan Metzmacher
parent 37fdef233e
commit a17c0a5a1a

View File

@ -105,11 +105,6 @@ struct ldb_context *secrets_db_connect(TALLOC_CTX *mem_ctx)
char *path;
const char *url;
struct ldb_context *ldb;
bool existed;
const char *init_ldif =
"dn: @ATTRIBUTES\n" \
"computerName: CASE_INSENSITIVE\n" \
"flatname: CASE_INSENSITIVE\n";
url = lp_secrets_url(global_loadparm);
if (!url || !url[0]) {
@ -121,8 +116,6 @@ struct ldb_context *secrets_db_connect(TALLOC_CTX *mem_ctx)
return NULL;
}
existed = file_exist(path);
/* Secrets.ldb *must* always be local. If we call for a
* system_session() we will recurse */
ldb = ldb_wrap_connect(mem_ctx, global_loadparm, path, NULL, NULL, 0, NULL);
@ -131,10 +124,6 @@ struct ldb_context *secrets_db_connect(TALLOC_CTX *mem_ctx)
return NULL;
}
if (!existed) {
gendb_add_ldif(ldb, init_ldif);
}
return ldb;
}