[SCM] Samba Shared Repository - branch master updated
Michael Adam
obnox at samba.org
Tue Sep 21 00:52:20 MDT 2010
The branch, master has been updated
via a35daeb s3:registry: move prototype from reg_init_smbconf.c to its own header.
via d25b2ad s3:registry: move prototype from reg_init_full.c to its own header.
via 0bd2756 s3:registry: move prototypes from reg_init_basic.c to their own header.
via 4696cd6 s3:registry: move reg_api_regf prototypes to their own header file.
via b11cc30 s3:registry: move the reg_api prototypes to their own header.
via e4eda5f s3:registry:reg_api: update (C)
from 6a3c687 pidl/python: Allow passing in UTF8 string objects as well as unicode objects for IDL strings.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit a35daebaf1d0201077fe57f78350804c2e4fde50
Author: Michael Adam <obnox at samba.org>
Date: Tue Sep 21 08:50:54 2010 +0200
s3:registry: move prototype from reg_init_smbconf.c to its own header.
commit d25b2adf34a86c8abd0129304143f72dd6a9807c
Author: Michael Adam <obnox at samba.org>
Date: Tue Sep 21 08:45:06 2010 +0200
s3:registry: move prototype from reg_init_full.c to its own header.
commit 0bd2756b974f171eb837d30309e2a46915edd861
Author: Michael Adam <obnox at samba.org>
Date: Tue Sep 21 08:37:14 2010 +0200
s3:registry: move prototypes from reg_init_basic.c to their own header.
commit 4696cd6cbe02d93039240f82917582f4e7a91aa9
Author: Michael Adam <obnox at samba.org>
Date: Tue Sep 21 08:23:20 2010 +0200
s3:registry: move reg_api_regf prototypes to their own header file.
These two calls are currently only used in the WINREG rpc server.
And this reqires linking in the regfio code.
commit b11cc305083844052d0b82560e3a7006b3520f14
Author: Michael Adam <obnox at samba.org>
Date: Tue Sep 21 08:11:18 2010 +0200
s3:registry: move the reg_api prototypes to their own header.
commit e4eda5f9bcabbdb82aa4a65e5cd8558a36944270
Author: Michael Adam <obnox at samba.org>
Date: Tue Sep 21 07:44:56 2010 +0200
s3:registry:reg_api: update (C)
-----------------------------------------------------------------------
Summary of changes:
libgpo/gpext/gpext.c | 1 +
source3/include/registry.h | 66 ------------------
source3/lib/smbconf/smbconf_reg.c | 2 +
source3/libgpo/gpo_reg.c | 2 +
source3/registry/reg_api.c | 3 +-
source3/registry/reg_api.h | 72 ++++++++++++++++++++
source3/registry/reg_api_regf.c | 1 +
.../registry/{reg_cachehook.h => reg_api_regf.h} | 30 +++++---
source3/registry/reg_api_util.c | 1 +
source3/registry/reg_init_basic.c | 1 +
.../{reg_util_token.h => reg_init_basic.h} | 18 +++---
source3/registry/reg_init_full.c | 2 +
.../registry/{reg_util_token.h => reg_init_full.h} | 11 ++--
source3/registry/reg_init_smbconf.c | 2 +
.../{reg_util_token.h => reg_init_smbconf.h} | 11 ++--
source3/rpc_server/srv_eventlog_nt.c | 1 +
source3/rpc_server/srv_winreg_nt.c | 2 +
source3/services/services_db.c | 1 +
source3/smbd/server.c | 1 +
source3/utils/net_registry.c | 2 +
20 files changed, 132 insertions(+), 98 deletions(-)
create mode 100644 source3/registry/reg_api.h
copy source3/registry/{reg_cachehook.h => reg_api_regf.h} (60%)
copy source3/registry/{reg_util_token.h => reg_init_basic.h} (75%)
copy source3/registry/{reg_util_token.h => reg_init_full.h} (80%)
copy source3/registry/{reg_util_token.h => reg_init_smbconf.h} (80%)
Changeset truncated at 500 lines:
diff --git a/libgpo/gpext/gpext.c b/libgpo/gpext/gpext.c
index 6b81575..8c70f65 100644
--- a/libgpo/gpext/gpext.c
+++ b/libgpo/gpext/gpext.c
@@ -25,6 +25,7 @@
#if _SAMBA_BUILD_ == 3
#include "libgpo/gpo_proto.h"
#include "registry.h"
+#include "registry/reg_api.h"
#endif
static struct gp_extension *extensions = NULL;
diff --git a/source3/include/registry.h b/source3/include/registry.h
index 600fffe..c87b89a 100644
--- a/source3/include/registry.h
+++ b/source3/include/registry.h
@@ -129,70 +129,4 @@ struct registry_key {
#define REG_KEY_HKPD 1
#define REG_KEY_HKPT 2
-
-/* The following definitions come from registry/reg_api.c */
-
-WERROR reg_openhive(TALLOC_CTX *mem_ctx, const char *hive,
- uint32 desired_access,
- const struct security_token *token,
- struct registry_key **pkey);
-WERROR reg_openkey(TALLOC_CTX *mem_ctx, struct registry_key *parent,
- const char *name, uint32 desired_access,
- struct registry_key **pkey);
-WERROR reg_enumkey(TALLOC_CTX *mem_ctx, struct registry_key *key,
- uint32 idx, char **name, NTTIME *last_write_time);
-WERROR reg_enumvalue(TALLOC_CTX *mem_ctx, struct registry_key *key,
- uint32 idx, char **pname, struct registry_value **pval);
-WERROR reg_queryvalue(TALLOC_CTX *mem_ctx, struct registry_key *key,
- const char *name, struct registry_value **pval);
-WERROR reg_querymultiplevalues(TALLOC_CTX *mem_ctx,
- struct registry_key *key,
- uint32_t num_names,
- const char **names,
- uint32_t *pnum_vals,
- struct registry_value **pvals);
-WERROR reg_queryinfokey(struct registry_key *key, uint32_t *num_subkeys,
- uint32_t *max_subkeylen, uint32_t *max_subkeysize,
- uint32_t *num_values, uint32_t *max_valnamelen,
- uint32_t *max_valbufsize, uint32_t *secdescsize,
- NTTIME *last_changed_time);
-WERROR reg_createkey(TALLOC_CTX *ctx, struct registry_key *parent,
- const char *subkeypath, uint32 desired_access,
- struct registry_key **pkey,
- enum winreg_CreateAction *paction);
-WERROR reg_deletekey(struct registry_key *parent, const char *path);
-WERROR reg_setvalue(struct registry_key *key, const char *name,
- const struct registry_value *val);
-WERROR reg_deletevalue(struct registry_key *key, const char *name);
-WERROR reg_getkeysecurity(TALLOC_CTX *mem_ctx, struct registry_key *key,
- struct security_descriptor **psecdesc);
-WERROR reg_setkeysecurity(struct registry_key *key,
- struct security_descriptor *psecdesc);
-WERROR reg_getversion(uint32_t *version);
-WERROR reg_deleteallvalues(struct registry_key *key);
-WERROR reg_deletekey_recursive(TALLOC_CTX *ctx,
- struct registry_key *parent,
- const char *path);
-WERROR reg_deletesubkeys_recursive(TALLOC_CTX *ctx,
- struct registry_key *parent,
- const char *path);
-
-/* The following definitions come from registry/reg_api_regf.c */
-
-WERROR reg_restorekey(struct registry_key *key, const char *fname);
-WERROR reg_savekey(struct registry_key *key, const char *fname);
-
-/* The following definitions come from registry/reg_init_basic.c */
-
-WERROR registry_init_common(void);
-WERROR registry_init_basic(void);
-
-/* The following definitions come from registry/reg_init_full.c */
-
-WERROR registry_init_full(void);
-
-/* The following definitions come from registry/reg_init_smbconf.c */
-
-WERROR registry_init_smbconf(const char *keyname);
-
#endif /* _REGISTRY_H */
diff --git a/source3/lib/smbconf/smbconf_reg.c b/source3/lib/smbconf/smbconf_reg.c
index cafa3bf..11affd9 100644
--- a/source3/lib/smbconf/smbconf_reg.c
+++ b/source3/lib/smbconf/smbconf_reg.c
@@ -20,9 +20,11 @@
#include "includes.h"
#include "lib/smbconf/smbconf_private.h"
#include "registry.h"
+#include "registry/reg_api.h"
#include "registry/reg_backend_db.h"
#include "registry/reg_util_token.h"
#include "registry/reg_api_util.h"
+#include "registry/reg_init_smbconf.h"
#include "lib/smbconf/smbconf_init.h"
#include "lib/smbconf/smbconf_reg.h"
diff --git a/source3/libgpo/gpo_reg.c b/source3/libgpo/gpo_reg.c
index 8c05b2f..83f7e8d 100644
--- a/source3/libgpo/gpo_reg.c
+++ b/source3/libgpo/gpo_reg.c
@@ -21,8 +21,10 @@
#include "../libgpo/gpo.h"
#include "libgpo/gpo_proto.h"
#include "registry.h"
+#include "registry/reg_api.h"
#include "registry/reg_backend_db.h"
#include "registry/reg_api_util.h"
+#include "registry/reg_init_basic.h"
/****************************************************************
diff --git a/source3/registry/reg_api.c b/source3/registry/reg_api.c
index 1cbe466..31950f7 100644
--- a/source3/registry/reg_api.c
+++ b/source3/registry/reg_api.c
@@ -2,7 +2,7 @@
* Unix SMB/CIFS implementation.
* Virtual Windows Registry Layer
* Copyright (C) Volker Lendecke 2006
- * Copyright (C) Michael Adam 2007-2008
+ * Copyright (C) Michael Adam 2007-2010
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -64,6 +64,7 @@
#include "includes.h"
#include "registry.h"
+#include "reg_api.h"
#include "reg_cachehook.h"
#include "reg_util_internal.h"
#include "reg_backend_db.h"
diff --git a/source3/registry/reg_api.h b/source3/registry/reg_api.h
new file mode 100644
index 0000000..2a4f6db
--- /dev/null
+++ b/source3/registry/reg_api.h
@@ -0,0 +1,72 @@
+/*
+ * Unix SMB/CIFS implementation.
+ *
+ * Virtual Windows Registry Layer
+ *
+ * Copyright (C) Volker Lendecke 2006
+ * Copyright (C) Michael Adam 2007-2010
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _REG_API_H
+#define _REG_API_H
+
+WERROR reg_openhive(TALLOC_CTX *mem_ctx, const char *hive,
+ uint32 desired_access,
+ const struct security_token *token,
+ struct registry_key **pkey);
+WERROR reg_openkey(TALLOC_CTX *mem_ctx, struct registry_key *parent,
+ const char *name, uint32 desired_access,
+ struct registry_key **pkey);
+WERROR reg_enumkey(TALLOC_CTX *mem_ctx, struct registry_key *key,
+ uint32 idx, char **name, NTTIME *last_write_time);
+WERROR reg_enumvalue(TALLOC_CTX *mem_ctx, struct registry_key *key,
+ uint32 idx, char **pname, struct registry_value **pval);
+WERROR reg_queryvalue(TALLOC_CTX *mem_ctx, struct registry_key *key,
+ const char *name, struct registry_value **pval);
+WERROR reg_querymultiplevalues(TALLOC_CTX *mem_ctx,
+ struct registry_key *key,
+ uint32_t num_names,
+ const char **names,
+ uint32_t *pnum_vals,
+ struct registry_value **pvals);
+WERROR reg_queryinfokey(struct registry_key *key, uint32_t *num_subkeys,
+ uint32_t *max_subkeylen, uint32_t *max_subkeysize,
+ uint32_t *num_values, uint32_t *max_valnamelen,
+ uint32_t *max_valbufsize, uint32_t *secdescsize,
+ NTTIME *last_changed_time);
+WERROR reg_createkey(TALLOC_CTX *ctx, struct registry_key *parent,
+ const char *subkeypath, uint32 desired_access,
+ struct registry_key **pkey,
+ enum winreg_CreateAction *paction);
+WERROR reg_deletekey(struct registry_key *parent, const char *path);
+WERROR reg_setvalue(struct registry_key *key, const char *name,
+ const struct registry_value *val);
+WERROR reg_deletevalue(struct registry_key *key, const char *name);
+WERROR reg_getkeysecurity(TALLOC_CTX *mem_ctx, struct registry_key *key,
+ struct security_descriptor **psecdesc);
+WERROR reg_setkeysecurity(struct registry_key *key,
+ struct security_descriptor *psecdesc);
+WERROR reg_getversion(uint32_t *version);
+WERROR reg_deleteallvalues(struct registry_key *key);
+WERROR reg_deletekey_recursive(TALLOC_CTX *ctx,
+ struct registry_key *parent,
+ const char *path);
+WERROR reg_deletesubkeys_recursive(TALLOC_CTX *ctx,
+ struct registry_key *parent,
+ const char *path);
+
+
+#endif /* _REG_API_H */
diff --git a/source3/registry/reg_api_regf.c b/source3/registry/reg_api_regf.c
index 8f249b5..394e31a 100644
--- a/source3/registry/reg_api_regf.c
+++ b/source3/registry/reg_api_regf.c
@@ -20,6 +20,7 @@
#include "includes.h"
#include "registry.h"
+#include "reg_api_regf.h"
#include "reg_cachehook.h"
#include "regfio.h"
#include "reg_util_internal.h"
diff --git a/source3/registry/reg_cachehook.h b/source3/registry/reg_api_regf.h
similarity index 60%
copy from source3/registry/reg_cachehook.h
copy to source3/registry/reg_api_regf.h
index 7c901c0..c68261f 100644
--- a/source3/registry/reg_cachehook.h
+++ b/source3/registry/reg_api_regf.h
@@ -1,29 +1,35 @@
-/*
+/*
* Unix SMB/CIFS implementation.
+ *
* Virtual Windows Registry Layer
- * Copyright (C) Gerald Carter 2002.
- * Copyright (C) Michael Adam 2008
+ *
+ * Copyright (C) Volker Lendecke 2006
+ * Copyright (C) Michael Adam 2007-2008
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _REG_CACHEHOOK_H
-#define _REG_CACHEHOOK_H
+/*
+ * Portion of reg_api that references regfio.c code.
+ * These are the savekey and restorekey calls.
+ * These calls are currently only used in the WINREG rpc server.
+ */
+
+#ifndef _REG_API_REGF_H
+#define _REG_API_REGF_H
-WERROR reghook_cache_init(void);
-WERROR reghook_cache_add(const char *keyname, struct registry_ops *ops);
-struct registry_ops *reghook_cache_find(const char *keyname);
-void reghook_dump_cache( int debuglevel );
+WERROR reg_restorekey(struct registry_key *key, const char *fname);
+WERROR reg_savekey(struct registry_key *key, const char *fname);
-#endif /* _REG_CACHEHOOK_H */
+#endif /* _REG_API_REGF_H */
diff --git a/source3/registry/reg_api_util.c b/source3/registry/reg_api_util.c
index 592b370..045ad21 100644
--- a/source3/registry/reg_api_util.c
+++ b/source3/registry/reg_api_util.c
@@ -24,6 +24,7 @@
#include "includes.h"
#include "registry.h"
+#include "reg_api.h"
#include "reg_api_util.h"
/**
diff --git a/source3/registry/reg_init_basic.c b/source3/registry/reg_init_basic.c
index 097be39..ea8077f 100644
--- a/source3/registry/reg_init_basic.c
+++ b/source3/registry/reg_init_basic.c
@@ -19,6 +19,7 @@
#include "includes.h"
#include "registry.h"
+#include "reg_init_basic.h"
#include "reg_cachehook.h"
#include "reg_backend_db.h"
diff --git a/source3/registry/reg_util_token.h b/source3/registry/reg_init_basic.h
similarity index 75%
copy from source3/registry/reg_util_token.h
copy to source3/registry/reg_init_basic.h
index 558c787..4149b5d 100644
--- a/source3/registry/reg_util_token.h
+++ b/source3/registry/reg_init_basic.h
@@ -1,26 +1,26 @@
/*
* Unix SMB/CIFS implementation.
* Registry helper routines
- * Copyright (C) Michael Adam 2007
- *
+ * Copyright (C) Michael Adam 2008
+ *
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option)
* any later version.
- *
+ *
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
- *
+ *
* You should have received a copy of the GNU General Public License along with
* this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _REG_UTIL_TOKEN_H
-#define _REG_UTIL_TOKEN_H
+#ifndef _REG_INIT_BASIC_H
+#define _REG_INIT_BASIC_H
-NTSTATUS registry_create_admin_token(TALLOC_CTX *mem_ctx,
- struct security_token **ptoken);
+WERROR registry_init_common(void);
+WERROR registry_init_basic(void);
-#endif /* _REG_UTIL_TOKEN_H */
+#endif /* _REG_INIT_BASIC_H */
diff --git a/source3/registry/reg_init_full.c b/source3/registry/reg_init_full.c
index c99d974..fca07b1 100644
--- a/source3/registry/reg_init_full.c
+++ b/source3/registry/reg_init_full.c
@@ -26,6 +26,8 @@
#include "reg_backend_db.h"
#include "reg_perfcount.h"
#include "reg_eventlog.h"
+#include "reg_init_basic.h"
+#include "reg_init_full.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_REGISTRY
diff --git a/source3/registry/reg_util_token.h b/source3/registry/reg_init_full.h
similarity index 80%
copy from source3/registry/reg_util_token.h
copy to source3/registry/reg_init_full.h
index 558c787..8ba327e 100644
--- a/source3/registry/reg_util_token.h
+++ b/source3/registry/reg_init_full.h
@@ -1,6 +1,8 @@
/*
* Unix SMB/CIFS implementation.
+ *
* Registry helper routines
+ *
* Copyright (C) Michael Adam 2007
*
* This program is free software; you can redistribute it and/or modify it
@@ -17,10 +19,9 @@
* this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _REG_UTIL_TOKEN_H
-#define _REG_UTIL_TOKEN_H
+#ifndef _REG_INIT_FULL_H
+#define _REG_INIT_FULL_H
-NTSTATUS registry_create_admin_token(TALLOC_CTX *mem_ctx,
- struct security_token **ptoken);
+WERROR registry_init_full(void);
-#endif /* _REG_UTIL_TOKEN_H */
+#endif /* _REG_INIT_FULL_H */
diff --git a/source3/registry/reg_init_smbconf.c b/source3/registry/reg_init_smbconf.c
index f811049..18ee455 100644
--- a/source3/registry/reg_init_smbconf.c
+++ b/source3/registry/reg_init_smbconf.c
@@ -21,6 +21,8 @@
#include "registry.h"
#include "reg_cachehook.h"
#include "reg_backend_db.h"
+#include "reg_init_basic.h"
+#include "reg_init_smbconf.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_REGISTRY
diff --git a/source3/registry/reg_util_token.h b/source3/registry/reg_init_smbconf.h
similarity index 80%
copy from source3/registry/reg_util_token.h
copy to source3/registry/reg_init_smbconf.h
index 558c787..480d7af 100644
--- a/source3/registry/reg_util_token.h
+++ b/source3/registry/reg_init_smbconf.h
@@ -1,6 +1,8 @@
/*
* Unix SMB/CIFS implementation.
+ *
* Registry helper routines
+ *
* Copyright (C) Michael Adam 2007
*
* This program is free software; you can redistribute it and/or modify it
@@ -17,10 +19,9 @@
* this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _REG_UTIL_TOKEN_H
-#define _REG_UTIL_TOKEN_H
+#ifndef _REG_INIT_SMBCONF_H
+#define _REG_INIT_SMBCONF_H
-NTSTATUS registry_create_admin_token(TALLOC_CTX *mem_ctx,
- struct security_token **ptoken);
+WERROR registry_init_smbconf(const char *keyname);
-#endif /* _REG_UTIL_TOKEN_H */
+#endif /* _REG_INIT_SMBCONF_H */
diff --git a/source3/rpc_server/srv_eventlog_nt.c b/source3/rpc_server/srv_eventlog_nt.c
index de3439e..7c2cc1c 100644
--- a/source3/rpc_server/srv_eventlog_nt.c
+++ b/source3/rpc_server/srv_eventlog_nt.c
@@ -24,6 +24,7 @@
#include "../librpc/gen_ndr/srv_eventlog.h"
#include "lib/eventlog/eventlog.h"
#include "registry.h"
+#include "registry/reg_api.h"
#include "registry/reg_api_util.h"
#undef DBGC_CLASS
diff --git a/source3/rpc_server/srv_winreg_nt.c b/source3/rpc_server/srv_winreg_nt.c
index ab43f65..298f33a 100644
--- a/source3/rpc_server/srv_winreg_nt.c
+++ b/source3/rpc_server/srv_winreg_nt.c
@@ -24,6 +24,8 @@
#include "../librpc/gen_ndr/srv_winreg.h"
#include "registry/reg_parse_prs.h"
#include "registry.h"
+#include "registry/reg_api.h"
+#include "registry/reg_api_regf.h"
#include "registry/reg_perfcount.h"
#include "rpc_misc.h"
diff --git a/source3/services/services_db.c b/source3/services/services_db.c
index 7de613e..a224ab2 100644
--- a/source3/services/services_db.c
+++ b/source3/services/services_db.c
@@ -23,6 +23,7 @@
#include "includes.h"
#include "services/services.h"
#include "registry.h"
+#include "registry/reg_api.h"
#include "registry/reg_api_util.h"
struct rcinit_file_information {
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index e2edaf3..8a55f93 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -26,6 +26,7 @@
#include "smbd/globals.h"
#include "librpc/gen_ndr/messaging.h"
#include "registry.h"
+#include "registry/reg_init_full.h"
#include "libcli/auth/schannel.h"
#include "secrets.h"
#include "memcache.h"
diff --git a/source3/utils/net_registry.c b/source3/utils/net_registry.c
index 3170322..9b3f561 100644
--- a/source3/utils/net_registry.c
+++ b/source3/utils/net_registry.c
@@ -21,7 +21,9 @@
#include "includes.h"
#include "registry.h"
+#include "registry/reg_api.h"
#include "registry/reg_util_token.h"
+#include "registry/reg_init_basic.h"
#include "utils/net.h"
--
Samba Shared Repository
More information about the samba-cvs
mailing list