diff options
| author | Volker Lendecke <vl@samba.org> | 2015-03-12 12:45:12 +0000 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2015-03-17 11:30:51 +0100 |
| commit | d699e1db803df3ace797742c3af33fabbfd14cf3 (patch) | |
| tree | c10fe95e41dd1822549a0c5f4792b7cc78108ea8 /source3 | |
| parent | b08117976d1d0a9e42b860f8971a4d9bc639bf4b (diff) | |
| download | samba-d699e1db803df3ace797742c3af33fabbfd14cf3.tar.gz | |
lib: Remove "use_ntdb" param from secrets_init_path
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/include/secrets.h | 2 | ||||
| -rw-r--r-- | source3/passdb/py_passdb.c | 2 | ||||
| -rw-r--r-- | source3/passdb/secrets.c | 7 |
3 files changed, 5 insertions, 6 deletions
diff --git a/source3/include/secrets.h b/source3/include/secrets.h index bd0da4bd732..350bdc6b5fa 100644 --- a/source3/include/secrets.h +++ b/source3/include/secrets.h @@ -82,7 +82,7 @@ struct afs_keyfile { /* The following definitions come from passdb/secrets.c */ -bool secrets_init_path(const char *private_dir, bool use_ntdb); +bool secrets_init_path(const char *private_dir); bool secrets_init(void); struct db_context *secrets_db_ctx(void); void secrets_shutdown(void); diff --git a/source3/passdb/py_passdb.c b/source3/passdb/py_passdb.c index cb0eb5f55b2..ca43f70cdb5 100644 --- a/source3/passdb/py_passdb.c +++ b/source3/passdb/py_passdb.c @@ -3647,7 +3647,7 @@ static PyObject *py_set_secrets_dir(PyObject *self, PyObject *args) } /* Initialize secrets database */ - if (!secrets_init_path(private_dir, false)) { + if (!secrets_init_path(private_dir)) { PyErr_Format(py_pdb_error, "Cannot open secrets file database in '%s'", private_dir); talloc_free(frame); diff --git a/source3/passdb/secrets.c b/source3/passdb/secrets.c index 50476f736d8..73935be1abc 100644 --- a/source3/passdb/secrets.c +++ b/source3/passdb/secrets.c @@ -55,7 +55,7 @@ static void get_rand_seed(void *userdata, int *new_seed) } /* open up the secrets database with specified private_dir path */ -bool secrets_init_path(const char *private_dir, bool use_ntdb) +bool secrets_init_path(const char *private_dir) { char *fname = NULL; unsigned char dummy; @@ -70,8 +70,7 @@ bool secrets_init_path(const char *private_dir, bool use_ntdb) } frame = talloc_stackframe(); - fname = talloc_asprintf(frame, "%s/secrets.%s", - private_dir, use_ntdb ? "ntdb" : "tdb"); + fname = talloc_asprintf(frame, "%s/secrets.tdb", private_dir); if (fname == NULL) { TALLOC_FREE(frame); return False; @@ -105,7 +104,7 @@ bool secrets_init_path(const char *private_dir, bool use_ntdb) /* open up the secrets database */ bool secrets_init(void) { - return secrets_init_path(lp_private_dir(), false); + return secrets_init_path(lp_private_dir()); } struct db_context *secrets_db_ctx(void) |