#include "param/param.h"
#include "system/filesys.h"
#include "tdb_wrap.h"
-#include "ldb_wrap.h"
#include "lib/ldb/include/ldb.h"
-#include "lib/tdb/include/tdb.h"
-#include "lib/util/util_tdb.h"
-#include "lib/util/util_ldb.h"
-#include "dsdb/samdb/samdb.h"
-
-static struct tdb_wrap *tdb;
+#include "../tdb/include/tdb.h"
+#include "../lib/util/util_tdb.h"
+#include "../lib/util/util_ldb.h"
+#include "librpc/gen_ndr/ndr_security.h"
/**
* Use a TDB to store an incrementing random seed.
*
* @note Not called by systems with a working /dev/urandom.
*/
-static void get_rand_seed(int *new_seed)
+static void get_rand_seed(struct tdb_wrap *secretsdb, int *new_seed)
{
*new_seed = getpid();
- if (tdb != NULL) {
- tdb_change_int32_atomic(tdb->tdb, "INFO/random_seed", new_seed, 1);
+ if (secretsdb != NULL) {
+ tdb_change_int32_atomic(secretsdb->tdb, "INFO/random_seed", new_seed, 1);
}
}
-/**
- * close the secrets database
- */
-void secrets_shutdown(void)
-{
- talloc_free(tdb);
-}
-
/**
* open up the secrets database
*/
-bool secrets_init(void)
+struct tdb_wrap *secrets_init(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx)
{
char *fname;
uint8_t dummy;
+ struct tdb_wrap *tdb;
- if (tdb != NULL)
- return true;
-
- fname = private_path(NULL, global_loadparm,
- "secrets.tdb");
+ fname = private_path(mem_ctx, lp_ctx, "secrets.tdb");
- tdb = tdb_wrap_open(talloc_autofree_context(), fname, 0, TDB_DEFAULT,
- O_RDWR|O_CREAT, 0600);
+ tdb = tdb_wrap_open(mem_ctx, fname, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
if (!tdb) {
DEBUG(0,("Failed to open %s\n", fname));
talloc_free(fname);
- return false;
+ return NULL;
}
talloc_free(fname);
* This avoids a problem where systems without /dev/urandom
* could send the same challenge to multiple clients
*/
- set_rand_reseed_callback(get_rand_seed);
+ set_rand_reseed_callback((void (*) (void *, int *))get_rand_seed, tdb);
/* Ensure that the reseed is done now, while we are root, etc */
generate_random_buffer(&dummy, sizeof(dummy));
- return true;
+ return tdb;
}
/**
connect to the secrets ldb
*/
-struct ldb_context *secrets_db_connect(TALLOC_CTX *mem_ctx)
+struct ldb_context *secrets_db_connect(TALLOC_CTX *mem_ctx,
+ struct tevent_context *ev_ctx,
+ struct loadparm_context *lp_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);
+ url = lp_secrets_url(lp_ctx);
if (!url || !url[0]) {
return NULL;
}
- path = private_path(mem_ctx, global_loadparm, url);
+ path = private_path(mem_ctx, lp_ctx, url);
if (!path) {
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);
- talloc_free(path);
+ ldb = ldb_init(mem_ctx, ev_ctx);
if (!ldb) {
+ talloc_free(path);
return NULL;
}
-
- if (!existed) {
- gendb_add_ldif(ldb, init_ldif);
+
+ ldb_set_modules_dir(ldb,
+ talloc_asprintf(ldb, "%s/ldb", lp_modulesdir(lp_ctx)));
+
+ if (ldb_connect(ldb, path, 0, NULL) != 0) {
+ talloc_free(path);
+ return NULL;
}
+ /* the update_keytab module relies on this being setup */
+ if (ldb_set_opaque(ldb, "loadparm", lp_ctx) != LDB_SUCCESS) {
+ talloc_free(path);
+ talloc_free(ldb);
+ return NULL;
+ }
+
+ talloc_free(path);
+
return ldb;
}
* @return pointer to a SID object if the SID could be obtained, NULL otherwise
*/
struct dom_sid *secrets_get_domain_sid(TALLOC_CTX *mem_ctx,
+ struct tevent_context *ev_ctx,
+ struct loadparm_context *lp_ctx,
const char *domain)
{
struct ldb_context *ldb;
int ldb_ret;
const char *attrs[] = { "objectSid", NULL };
struct dom_sid *result = NULL;
+ const struct ldb_val *v;
+ enum ndr_err_code ndr_err;
- ldb = secrets_db_connect(mem_ctx);
+ ldb = secrets_db_connect(mem_ctx, ev_ctx, lp_ctx);
if (ldb == NULL) {
DEBUG(5, ("secrets_db_connect failed\n"));
return NULL;
return NULL;
}
- result = samdb_result_dom_sid(mem_ctx, msgs[0], "objectSid");
- if (result == NULL) {
+ v = ldb_msg_find_ldb_val(msgs[0], "objectSid");
+ if (v == NULL) {
DEBUG(0, ("Domain object for %s does not contain a SID!\n",
domain));
+ return NULL;
+ }
+ result = talloc(mem_ctx, struct dom_sid);
+ if (result == NULL) {
+ talloc_free(ldb);
+ return NULL;
+ }
+
+ ndr_err = ndr_pull_struct_blob(v, result, NULL, result,
+ (ndr_pull_flags_fn_t)ndr_pull_dom_sid);
+ if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+ talloc_free(result);
talloc_free(ldb);
return NULL;
}
git.samba.org / samba.git / blobdiff