[SCM] Samba Shared Repository - branch master updated
Christian Ambach
ambi at samba.org
Wed Mar 20 10:09:01 MDT 2013
The branch, master has been updated
via f7564ca s3:registry accept windows like long hivenames
via 4490e72 s3:include bump profile memory area version number
from 05a7a10 wkssvc: Fix bug 9727, NULL pointer dereference
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit f7564cae4cdd1e2629404c5a1229978451584257
Author: Gregor Beck <gbeck at sernet.de>
Date: Wed Mar 20 13:00:26 2013 +0100
s3:registry accept windows like long hivenames
Signed-off-by: Gregor Beck <gbeck at sernet.de>
Reviewed-by: Christian Ambach <ambi at samba.org>
Autobuild-User(master): Christian Ambach <ambi at samba.org>
Autobuild-Date(master): Wed Mar 20 17:08:52 CET 2013 on sn-devel-104
commit 4490e72426bc55a5680df84fce344aa509219219
Author: Christian Ambach <ambi at samba.org>
Date: Thu Mar 14 23:19:25 2013 +0100
s3:include bump profile memory area version number
forgot to bump this earlier when removing the counters for setdir
Signed-off-by: Christian Ambach <ambi at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
-----------------------------------------------------------------------
Summary of changes:
source3/include/smbprofile.h | 2 +-
source3/registry/reg_api.c | 12 +++++++++---
2 files changed, 10 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/smbprofile.h b/source3/include/smbprofile.h
index 9bcee42..69df2ca 100644
--- a/source3/include/smbprofile.h
+++ b/source3/include/smbprofile.h
@@ -26,7 +26,7 @@
#define PROF_SHMEM_KEY ((key_t)0x07021999)
#define PROF_SHM_MAGIC 0x6349985
-#define PROF_SHM_VERSION 12
+#define PROF_SHM_VERSION 13
/* time values in the following structure are in microseconds */
diff --git a/source3/registry/reg_api.c b/source3/registry/reg_api.c
index c263174..ca990e2 100644
--- a/source3/registry/reg_api.c
+++ b/source3/registry/reg_api.c
@@ -70,6 +70,7 @@
#include "reg_dispatcher.h"
#include "reg_objects.h"
#include "../librpc/gen_ndr/ndr_security.h"
+#include "reg_parse_internal.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_REGISTRY
@@ -232,12 +233,17 @@ WERROR reg_openhive(TALLOC_CTX *mem_ctx, const char *hive,
const struct security_token *token,
struct registry_key **pkey)
{
+ const struct hive_info *hi;
SMB_ASSERT(hive != NULL);
- SMB_ASSERT(hive[0] != '\0');
SMB_ASSERT(strchr(hive, '\\') == NULL);
- return regkey_open_onelevel(mem_ctx, NULL, hive, token, desired_access,
- pkey);
+ hi = hive_info(hive);
+ if (hi == NULL) {
+ return WERR_BADFILE;
+ }
+
+ return regkey_open_onelevel(mem_ctx, NULL, hi->short_name, token,
+ desired_access, pkey);
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list