[SCM] Samba Shared Repository - branch v3-6-test updated
Volker Lendecke
vlendec at samba.org
Thu Oct 28 08:23:36 MDT 2010
The branch, v3-6-test has been updated
via 0e8b6f2 s3: Streamline regdb_normalize_keynames_fn a bit
via 26ae187 s3: Fix the registry upgrade code
from 7543ee4 s3: Add a vfs_time_audit module
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 0e8b6f251efcc7d899e06f0d1708d5113d042840
Author: Volker Lendecke <vl at samba.org>
Date: Thu Oct 28 15:41:30 2010 +0200
s3: Streamline regdb_normalize_keynames_fn a bit
commit 26ae187915556b66b1a112187400043f05c11135
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 3fdea10..195f513 100644
--- a/source3/registry/reg_backend_db.c
+++ b/source3/registry/reg_backend_db.c
@@ -416,10 +416,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
More information about the samba-cvs
mailing list