[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  5049e3e s3:registry avoid pruning the sequencenumber while flushing the regsubkey_ctr
       via  7e3d750 s3:registry avoid leaking an old regsubkey_ctr on regsubkey_ctr_init
      from  1aae898 s3:clikrb5: fix the build with newer heimdal versions

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


- Log -----------------------------------------------------------------
commit 5049e3e142977a4c3d0f5a0fd9c06429f4d85bed
Author: Gregor Beck <gbeck at sernet.de>
Date:   Wed Jul 13 16:51:54 2011 +0200

    s3:registry avoid pruning the sequencenumber while flushing the regsubkey_ctr
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Fri Jul 15 08:34:47 CEST 2011 on sn-devel-104

commit 7e3d7505ddf2bdcf0d66273d9b96058969e2459b
Author: Gregor Beck <gbeck at sernet.de>
Date:   Thu Jul 14 12:19:01 2011 +0200

    s3:registry avoid leaking an old regsubkey_ctr on regsubkey_ctr_init
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>

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

Summary of changes:
 source3/registry/reg_api.c        |    1 +
 source3/registry/reg_backend_db.c |    6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/registry/reg_api.c b/source3/registry/reg_api.c
index 51bd98e..c66a95e 100644
--- a/source3/registry/reg_api.c
+++ b/source3/registry/reg_api.c
@@ -110,6 +110,7 @@ static WERROR fill_subkey_cache(struct registry_key *key)
 		}
 	}
 
+	TALLOC_FREE(key->subkeys);
 	werr = regsubkey_ctr_init(key, &(key->subkeys));
 	W_ERROR_NOT_OK_RETURN(werr);
 
diff --git a/source3/registry/reg_backend_db.c b/source3/registry/reg_backend_db.c
index 65ff0ae..e04374b 100644
--- a/source3/registry/reg_backend_db.c
+++ b/source3/registry/reg_backend_db.c
@@ -1438,6 +1438,9 @@ static WERROR regdb_fetch_keys_internal(struct db_context *db, const char *key,
 		goto done;
 	}
 
+	werr = regsubkey_ctr_reinit(ctr);
+	W_ERROR_NOT_OK_GOTO_DONE(werr);
+
 	werr = regsubkey_ctr_set_seqnum(ctr, db->get_seqnum(db));
 	W_ERROR_NOT_OK_GOTO_DONE(werr);
 
@@ -1457,9 +1460,6 @@ static WERROR regdb_fetch_keys_internal(struct db_context *db, const char *key,
 		goto done;
 	}
 
-	werr = regsubkey_ctr_reinit(ctr);
-	W_ERROR_NOT_OK_GOTO_DONE(werr);
-
 	for (i=0; i<num_items; i++) {
 		len += tdb_unpack(buf+len, buflen-len, "f", subkeyname);
 		werr = regsubkey_ctr_addkey(ctr, subkeyname);


-- 
Samba Shared Repository