[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  4b2e2f9 s3: Streamline regdb_normalize_keynames_fn a bit
       via  8b87603 s3: Fix the registry upgrade code
      from  a43261e s3: FILE_WRITE_DATA & friends have gone from includes.h

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


- Log -----------------------------------------------------------------
commit 4b2e2f94bb505f3de6411cfc8e01d05b010a2819
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Oct 28 15:41:30 2010 +0200

    s3: Streamline regdb_normalize_keynames_fn a bit
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Thu Oct 28 14:32:11 UTC 2010 on sn-devel-104

commit 8b87603de4f40c341d23262b4ffe357248ac4ff3
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Oct 28 15:30:21 2010 +0200

    s3: Fix the registry upgrade code
    
    The strings have the 0-terminator as part of the keys. The rest of the registry
    code would not cope well without.

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

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


Changeset truncated at 500 lines:

diff --git a/source3/registry/reg_backend_db.c b/source3/registry/reg_backend_db.c
index 43fe374..322cabf 100644
--- a/source3/registry/reg_backend_db.c
+++ b/source3/registry/reg_backend_db.c
@@ -417,10 +417,8 @@ static int regdb_normalize_keynames_fn(struct db_record *rec,
 			  (const char *) rec->key.dptr,
 			  keyname));
 
-		new_rec.value.dptr = rec->value.dptr;
-		new_rec.value.dsize = rec->value.dsize;
-		new_rec.key.dptr = (unsigned char *) keyname;
-		new_rec.key.dsize = strlen(keyname);
+		new_rec.value = rec->value;
+		new_rec.key = string_term_tdb_data(keyname);
 		new_rec.private_data = rec->private_data;
 
 		/* Delete the original record and store the normalized key */


-- 
Samba Shared Repository