[SCM] Samba Shared Repository - branch master updated

[Michael Adam]

The branch, master has been updated
       via  855d23b s3: Use talloc_tos() in more places in dbwrap_util
      from  080c1ca s3: Make --pw-nt-hash useable in smbclient

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 855d23b742c701f2902a96a39caaad49d4d710a1
Author: Volker Lendecke <v...@samba.org>
Date:   Tue Jun 12 11:17:58 2012 +0200

    s3: Use talloc_tos() in more places in dbwrap_util
    
    Signed-off-by: Michael Adam <ob...@samba.org>
    
    Autobuild-User(master): Michael Adam <ob...@samba.org>
    Autobuild-Date(master): Tue Jun 12 15:37:16 CEST 2012 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 lib/dbwrap/dbwrap_util.c |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/dbwrap/dbwrap_util.c b/lib/dbwrap/dbwrap_util.c
index 9a65f7a..314a552 100644
--- a/lib/dbwrap/dbwrap_util.c
+++ b/lib/dbwrap/dbwrap_util.c
@@ -36,7 +36,7 @@ NTSTATUS dbwrap_fetch_int32(struct db_context *db, const char 
*keystr,
                return NT_STATUS_INVALID_PARAMETER;
        }
 
-       status = dbwrap_fetch_bystring(db, NULL, keystr, &dbuf);
+       status = dbwrap_fetch_bystring(db, talloc_tos(), keystr, &dbuf);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
@@ -58,7 +58,8 @@ NTSTATUS dbwrap_store_int32(struct db_context *db, const char 
*keystr,
        int32_t v_store;
        NTSTATUS status;
 
-       rec = dbwrap_fetch_locked(db, NULL, string_term_tdb_data(keystr));
+       rec = dbwrap_fetch_locked(db, talloc_tos(),
+                                 string_term_tdb_data(keystr));
        if (rec == NULL) {
                return NT_STATUS_UNSUCCESSFUL;
        }
@@ -83,7 +84,7 @@ NTSTATUS dbwrap_fetch_uint32(struct db_context *db, const 
char *keystr,
                return NT_STATUS_INVALID_PARAMETER;
        }
 
-       status = dbwrap_fetch_bystring(db, NULL, keystr, &dbuf);
+       status = dbwrap_fetch_bystring(db, talloc_tos(), keystr, &dbuf);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
@@ -105,7 +106,8 @@ NTSTATUS dbwrap_store_uint32(struct db_context *db, const 
char *keystr,
        uint32_t v_store;
        NTSTATUS status;
 
-       rec = dbwrap_fetch_locked(db, NULL, string_term_tdb_data(keystr));
+       rec = dbwrap_fetch_locked(db, talloc_tos(),
+                                 string_term_tdb_data(keystr));
        if (rec == NULL) {
                return NT_STATUS_INVALID_PARAMETER;
        }
@@ -146,7 +148,8 @@ static NTSTATUS dbwrap_change_uint32_atomic_action(struct 
db_context *db,
 
        state = (struct dbwrap_change_uint32_atomic_context *)private_data;
 
-       rec = dbwrap_fetch_locked(db, NULL, 
string_term_tdb_data(state->keystr));
+       rec = dbwrap_fetch_locked(db, talloc_tos(),
+                                 string_term_tdb_data(state->keystr));
        if (!rec) {
                return NT_STATUS_UNSUCCESSFUL;
        }
@@ -235,7 +238,8 @@ static NTSTATUS dbwrap_change_int32_atomic_action(struct 
db_context *db,
 
        state = (struct dbwrap_change_int32_atomic_context *)private_data;
 
-       rec = dbwrap_fetch_locked(db, NULL, 
string_term_tdb_data(state->keystr));
+       rec = dbwrap_fetch_locked(db, talloc_tos(),
+                                 string_term_tdb_data(state->keystr));
        if (!rec) {
                return NT_STATUS_UNSUCCESSFUL;
        }


-- 
Samba Shared Repository