diff options
| -rw-r--r-- | source3/include/registry.h | 10 | ||||
| -rw-r--r-- | source3/registry/reg_api.c | 1 | ||||
| -rw-r--r-- | source3/registry/reg_util_marshalling.c | 1 | ||||
| -rw-r--r-- | source3/registry/reg_util_marshalling.h | 32 | ||||
| -rw-r--r-- | source3/rpc_server/srv_winreg_nt.c | 1 | ||||
| -rw-r--r-- | source3/utils/net_rpc_registry.c | 1 |
6 files changed, 36 insertions, 10 deletions
diff --git a/source3/include/registry.h b/source3/include/registry.h index 33234037d7..81580f02a8 100644 --- a/source3/include/registry.h +++ b/source3/include/registry.h @@ -69,14 +69,4 @@ WERROR registry_init_full(void); WERROR registry_init_smbconf(const char *keyname); -/* The following definitions come from lib/util_reg_api.c */ - -WERROR registry_pull_value(TALLOC_CTX *mem_ctx, - struct registry_value **pvalue, - enum winreg_Type type, uint8 *data, - uint32 size, uint32 length); -WERROR registry_push_value(TALLOC_CTX *mem_ctx, - const struct registry_value *value, - DATA_BLOB *presult); - #endif /* _REGISTRY_H */ diff --git a/source3/registry/reg_api.c b/source3/registry/reg_api.c index 0eba8e0d01..b4f821ec1c 100644 --- a/source3/registry/reg_api.c +++ b/source3/registry/reg_api.c @@ -69,6 +69,7 @@ #include "reg_util_internal.h" #include "reg_backend_db.h" #include "reg_dispatcher.h" +#include "reg_util_marshalling.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_REGISTRY diff --git a/source3/registry/reg_util_marshalling.c b/source3/registry/reg_util_marshalling.c index 347c5d6d89..d65b1a8672 100644 --- a/source3/registry/reg_util_marshalling.c +++ b/source3/registry/reg_util_marshalling.c @@ -19,6 +19,7 @@ #include "includes.h" #include "registry.h" +#include "reg_util_marshalling.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_REGISTRY diff --git a/source3/registry/reg_util_marshalling.h b/source3/registry/reg_util_marshalling.h new file mode 100644 index 0000000000..289010a06d --- /dev/null +++ b/source3/registry/reg_util_marshalling.h @@ -0,0 +1,32 @@ +/* + * Unix SMB/CIFS implementation. + * Registry helper routines + * Copyright (C) Volker Lendecke 2006 + * + * 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_MARSHALLING_H +#define _REG_UTIL_MARSHALLING_H + +WERROR registry_pull_value(TALLOC_CTX *mem_ctx, + struct registry_value **pvalue, + enum winreg_Type type, uint8 *data, + uint32 size, uint32 length); + +WERROR registry_push_value(TALLOC_CTX *mem_ctx, + const struct registry_value *value, + DATA_BLOB *presult); + +#endif /* _REG_UTIL_MARSHALLING_H */ diff --git a/source3/rpc_server/srv_winreg_nt.c b/source3/rpc_server/srv_winreg_nt.c index b84740ba04..10ea8fef22 100644 --- a/source3/rpc_server/srv_winreg_nt.c +++ b/source3/rpc_server/srv_winreg_nt.c @@ -24,6 +24,7 @@ #include "../librpc/gen_ndr/srv_winreg.h" #include "registry.h" #include "registry/reg_perfcount.h" +#include "registry/reg_util_marshalling.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_RPC_SRV diff --git a/source3/utils/net_rpc_registry.c b/source3/utils/net_rpc_registry.c index 2b2ed96f91..c7224f7ecc 100644 --- a/source3/utils/net_rpc_registry.c +++ b/source3/utils/net_rpc_registry.c @@ -23,6 +23,7 @@ #include "utils/net_registry_util.h" #include "regfio.h" #include "../librpc/gen_ndr/cli_winreg.h" +#include "registry/reg_util_marshalling.h" /******************************************************************* connect to a registry hive root (open a registry policy) |