diff options
| -rw-r--r-- | auth/credentials/credentials_secrets.c | 3 | ||||
| -rw-r--r-- | lib/dbwrap/dbwrap.h | 3 | ||||
| -rw-r--r-- | lib/dbwrap/dbwrap_local_open.c | 3 | ||||
| -rw-r--r-- | libcli/auth/netlogon_creds_cli.c | 3 | ||||
| -rw-r--r-- | libcli/auth/schannel_state_tdb.c | 2 | ||||
| -rw-r--r-- | source3/lib/dbwrap/dbwrap_open.c | 2 | ||||
| -rw-r--r-- | source4/cluster/local.c | 2 |
7 files changed, 11 insertions, 7 deletions
diff --git a/auth/credentials/credentials_secrets.c b/auth/credentials/credentials_secrets.c index 6c1cded4cbc..9fad104bdb8 100644 --- a/auth/credentials/credentials_secrets.c +++ b/auth/credentials/credentials_secrets.c @@ -255,7 +255,8 @@ _PUBLIC_ NTSTATUS cli_credentials_set_machine_account(struct cli_credentials *cr db_ctx = dbwrap_local_open(cred, lp_ctx, secrets_tdb, 0, TDB_DEFAULT, O_RDWR, 0600, - DBWRAP_LOCK_ORDER_1); + DBWRAP_LOCK_ORDER_1, + DBWRAP_FLAG_NONE); /* Bleh, nasty recursion issues: We are setting a machine * account here, so we don't want the 'pending' flag around * any more */ diff --git a/lib/dbwrap/dbwrap.h b/lib/dbwrap/dbwrap.h index 02b44052dd7..1949d5f8e5e 100644 --- a/lib/dbwrap/dbwrap.h +++ b/lib/dbwrap/dbwrap.h @@ -160,6 +160,7 @@ struct db_context *dbwrap_local_open(TALLOC_CTX *mem_ctx, const char *name, int hash_size, int tdb_flags, int open_flags, mode_t mode, - enum dbwrap_lock_order lock_order); + enum dbwrap_lock_order lock_order, + uint64_t dbwrap_flags); #endif /* __DBWRAP_H__ */ diff --git a/lib/dbwrap/dbwrap_local_open.c b/lib/dbwrap/dbwrap_local_open.c index e54ed979f35..a6f494e313d 100644 --- a/lib/dbwrap/dbwrap_local_open.c +++ b/lib/dbwrap/dbwrap_local_open.c @@ -160,7 +160,8 @@ struct db_context *dbwrap_local_open(TALLOC_CTX *mem_ctx, const char *name, int hash_size, int tdb_flags, int open_flags, mode_t mode, - enum dbwrap_lock_order lock_order) + enum dbwrap_lock_order lock_order, + uint64_t dbwrap_flags) { TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx); const char *ntdbname, *tdbname; diff --git a/libcli/auth/netlogon_creds_cli.c b/libcli/auth/netlogon_creds_cli.c index 88893ad7d3a..d73335da1d6 100644 --- a/libcli/auth/netlogon_creds_cli.c +++ b/libcli/auth/netlogon_creds_cli.c @@ -227,7 +227,8 @@ NTSTATUS netlogon_creds_cli_open_global_db(struct loadparm_context *lp_ctx) fname, 0, TDB_CLEAR_IF_FIRST|TDB_INCOMPATIBLE_HASH, O_RDWR|O_CREAT, - 0600, DBWRAP_LOCK_ORDER_2); + 0600, DBWRAP_LOCK_ORDER_2, + DBWRAP_FLAG_NONE); if (global_db == NULL) { DEBUG(0,("netlogon_creds_cli_open_global_db: Failed to open %s - %s\n", fname, strerror(errno))); diff --git a/libcli/auth/schannel_state_tdb.c b/libcli/auth/schannel_state_tdb.c index 6669b465b73..2219540b1c6 100644 --- a/libcli/auth/schannel_state_tdb.c +++ b/libcli/auth/schannel_state_tdb.c @@ -49,7 +49,7 @@ struct db_context *open_schannel_session_store(TALLOC_CTX *mem_ctx, db_sc = dbwrap_local_open(mem_ctx, lp_ctx, fname, 0, TDB_CLEAR_IF_FIRST|TDB_NOSYNC, O_RDWR|O_CREAT, - 0600, 0); + 0600, 0, DBWRAP_FLAG_NONE); if (!db_sc) { DEBUG(0,("open_schannel_session_store: Failed to open %s - %s\n", diff --git a/source3/lib/dbwrap/dbwrap_open.c b/source3/lib/dbwrap/dbwrap_open.c index 7f3cddf276f..ee5ec749831 100644 --- a/source3/lib/dbwrap/dbwrap_open.c +++ b/source3/lib/dbwrap/dbwrap_open.c @@ -147,7 +147,7 @@ struct db_context *db_open(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx = loadparm_init_s3(mem_ctx, loadparm_s3_helpers()); result = dbwrap_local_open(mem_ctx, lp_ctx, name, hash_size, tdb_flags, open_flags, mode, - lock_order); + lock_order, dbwrap_flags); talloc_unlink(mem_ctx, lp_ctx); } return result; diff --git a/source4/cluster/local.c b/source4/cluster/local.c index aa0fd7def4a..0a659509023 100644 --- a/source4/cluster/local.c +++ b/source4/cluster/local.c @@ -63,7 +63,7 @@ static struct db_context *local_db_tmp_open(struct cluster_ops *ops, path = smbd_tmp_path(tmp_ctx, lp_ctx, dbname); db = dbwrap_local_open(mem_ctx, lp_ctx, path, 0, flags, O_RDWR|O_CREAT, - 0600, 0); + 0600, 0, DBWRAP_FLAG_NONE); talloc_free(tmp_ctx); return db; } |