[SCM] Samba Shared Repository - branch master updated -
release-4-0-0alpha7-1287-ge935d86
Michael Adam
obnox at samba.org
Mon Apr 27 09:24:55 GMT 2009
The branch, master has been updated
via e935d8616b3846695f4633ca0dbbc36ee54608e4 (commit)
via c9b1734419e795b1f57882de37758e7f1ee25b94 (commit)
via cec84287473fffa1aee833163bad9f0d337ffb49 (commit)
via 8797bb138263e8a87f141fe637db2f053f4dabfc (commit)
via 8185d31fb0a4ef0219fe15f825a9340083f4c277 (commit)
via 221151a2a2c30e5c82b100161b498fdbbc1d4382 (commit)
from 38d02c5d857ecea3405c3f48e64906764329f1a1 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit e935d8616b3846695f4633ca0dbbc36ee54608e4
Author: Michael Adam <obnox at samba.org>
Date: Mon Mar 23 23:14:45 2009 +0100
s3:registry: replace typedef REGISTRY_OPS by struct registry_ops
Michael
commit c9b1734419e795b1f57882de37758e7f1ee25b94
Author: Michael Adam <obnox at samba.org>
Date: Mon Mar 23 23:05:30 2009 +0100
s3:registry replace typedef REGISTRY_HOOK by struct registry_hook.
Michael
commit cec84287473fffa1aee833163bad9f0d337ffb49
Author: Michael Adam <obnox at samba.org>
Date: Mon Mar 23 23:02:57 2009 +0100
s3:registry: replace typedef REGISTRY_KEY by struct registry_key_handle
Michael
commit 8797bb138263e8a87f141fe637db2f053f4dabfc
Author: Michael Adam <obnox at samba.org>
Date: Mon Mar 23 23:18:26 2009 +0100
s3:registry: make a comment more precise.
Michael
commit 8185d31fb0a4ef0219fe15f825a9340083f4c277
Author: Michael Adam <obnox at samba.org>
Date: Mon Mar 23 22:27:59 2009 +0100
s3:registry: replace typedef REGISTRY_VALUE by struct regval_blob
Michael
commit 221151a2a2c30e5c82b100161b498fdbbc1d4382
Author: Michael Adam <obnox at samba.org>
Date: Mon Mar 23 18:14:17 2009 +0100
s3:registry: replace typedef REGVAL_CTR by struct regval_ctr.
This paves the way for hiding the typedef and the implementation
from the surface.
Michael
-----------------------------------------------------------------------
Summary of changes:
source3/include/nt_printing.h | 4 +-
source3/include/proto.h | 91 +++++++++++++-----------
source3/include/reg_objects.h | 38 +++++-----
source3/include/regfio.h | 2 +-
source3/lib/util_reg.c | 2 +-
source3/libads/ldap_printer.c | 18 +++---
source3/printing/nt_printing.c | 26 ++++----
source3/registry/reg_api.c | 37 +++++-----
source3/registry/reg_backend_current_version.c | 6 +-
source3/registry/reg_backend_db.c | 20 +++---
source3/registry/reg_backend_hkpt_params.c | 6 +-
source3/registry/reg_backend_netlogon_params.c | 6 +-
source3/registry/reg_backend_perflib.c | 10 ++--
source3/registry/reg_backend_printing.c | 30 ++++----
source3/registry/reg_backend_prod_options.c | 6 +-
source3/registry/reg_backend_shares.c | 6 +-
source3/registry/reg_backend_smbconf.c | 8 +-
source3/registry/reg_backend_tcpip_params.c | 6 +-
source3/registry/reg_cachehook.c | 10 ++--
source3/registry/reg_dispatcher.c | 29 +++++---
source3/registry/reg_eventlog.c | 14 ++--
source3/registry/reg_init_full.c | 28 ++++----
source3/registry/reg_init_smbconf.c | 2 +-
source3/registry/reg_objects.c | 63 +++++++++--------
source3/registry/reg_util_legacy.c | 9 ++-
source3/registry/regfio.c | 9 ++-
source3/rpc_server/srv_ntsvcs_nt.c | 4 +-
source3/rpc_server/srv_spoolss_nt.c | 10 ++--
source3/rpc_server/srv_svcctl_nt.c | 4 +-
source3/rpcclient/cmd_spoolss.c | 6 +-
source3/services/services_db.c | 55 +++++++-------
source3/utils/net_rpc_printer.c | 10 ++--
source3/utils/net_rpc_registry.c | 6 +-
source3/utils/profiles.c | 6 +-
34 files changed, 305 insertions(+), 282 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/nt_printing.h b/source3/include/nt_printing.h
index 7dc60a8..a25d984 100644
--- a/source3/include/nt_printing.h
+++ b/source3/include/nt_printing.h
@@ -243,8 +243,8 @@ typedef struct nt_printer_driver_info_level
/* container for a single registry key */
typedef struct {
- char *name;
- REGVAL_CTR *values;
+ char *name;
+ struct regval_ctr *values;
} NT_PRINTER_KEY;
/* container for all printer data */
diff --git a/source3/include/proto.h b/source3/include/proto.h
index aec249c..1018315 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -4628,7 +4628,7 @@ WERROR delete_all_printer_data( NT_PRINTER_INFO_LEVEL_2 *p2, const char *key );
WERROR delete_printer_data( NT_PRINTER_INFO_LEVEL_2 *p2, const char *key, const char *value );
WERROR add_printer_data( NT_PRINTER_INFO_LEVEL_2 *p2, const char *key, const char *value,
uint32 type, uint8 *data, int real_len );
-REGISTRY_VALUE* get_printer_data( NT_PRINTER_INFO_LEVEL_2 *p2, const char *key, const char *value );
+struct regval_blob* get_printer_data( NT_PRINTER_INFO_LEVEL_2 *p2, const char *key, const char *value );
WERROR mod_a_printer(NT_PRINTER_INFO_LEVEL *printer, uint32 level);
bool set_driver_init(NT_PRINTER_INFO_LEVEL *printer, uint32 level);
bool del_driver_init(const char *drivername);
@@ -4821,10 +4821,10 @@ WERROR regdb_transaction_cancel(void);
int regdb_get_seqnum(void);
bool regdb_store_keys(const char *key, struct regsubkey_ctr *ctr);
int regdb_fetch_keys(const char *key, struct regsubkey_ctr *ctr);
-int regdb_fetch_values( const char* key, REGVAL_CTR *values );
-bool regdb_store_values( const char *key, REGVAL_CTR *values );
+int regdb_fetch_values(const char* key, struct regval_ctr *values);
+bool regdb_store_values(const char *key, struct regval_ctr *values);
bool regdb_subkeys_need_update(struct regsubkey_ctr *subkeys);
-bool regdb_values_need_update(REGVAL_CTR *values);
+bool regdb_values_need_update(struct regval_ctr *values);
/* The following definitions come from registry/reg_backend_hkpt_params.c */
@@ -4853,26 +4853,31 @@ bool regdb_values_need_update(REGVAL_CTR *values);
/* The following definitions come from registry/reg_cachehook.c */
WERROR reghook_cache_init(void);
-WERROR reghook_cache_add(const char *keyname, REGISTRY_OPS *ops);
-REGISTRY_OPS *reghook_cache_find(const char *keyname);
+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 );
/* The following definitions come from registry/reg_dispatcher.c */
-bool store_reg_keys( REGISTRY_KEY *key, struct regsubkey_ctr *subkeys );
-bool store_reg_values( REGISTRY_KEY *key, REGVAL_CTR *val );
-WERROR create_reg_subkey(REGISTRY_KEY *key, const char *subkey);
-WERROR delete_reg_subkey(REGISTRY_KEY *key, const char *subkey);
-int fetch_reg_keys( REGISTRY_KEY *key, struct regsubkey_ctr *subkey_ctr );
-int fetch_reg_values( REGISTRY_KEY *key, REGVAL_CTR *val );
-bool regkey_access_check( REGISTRY_KEY *key, uint32 requested, uint32 *granted,
- const struct nt_user_token *token );
-WERROR regkey_get_secdesc(TALLOC_CTX *mem_ctx, REGISTRY_KEY *key,
+bool store_reg_keys(struct registry_key_handle *key,
+ struct regsubkey_ctr *subkeys);
+bool store_reg_values(struct registry_key_handle *key, struct regval_ctr *val);
+WERROR create_reg_subkey(struct registry_key_handle *key, const char *subkey);
+WERROR delete_reg_subkey(struct registry_key_handle *key, const char *subkey);
+int fetch_reg_keys(struct registry_key_handle *key,
+ struct regsubkey_ctr *subkey_ctr);
+int fetch_reg_values(struct registry_key_handle *key, struct regval_ctr *val);
+bool regkey_access_check(struct registry_key_handle *key, uint32 requested,
+ uint32 *granted,
+ const struct nt_user_token *token);
+WERROR regkey_get_secdesc(TALLOC_CTX *mem_ctx, struct registry_key_handle *key,
struct security_descriptor **psecdesc);
-WERROR regkey_set_secdesc(REGISTRY_KEY *key,
+WERROR regkey_set_secdesc(struct registry_key_handle *key,
struct security_descriptor *psecdesc);
-bool reg_subkeys_need_update(REGISTRY_KEY *key, struct regsubkey_ctr *subkeys);
-bool reg_values_need_update(REGISTRY_KEY *key, REGVAL_CTR *values);
+bool reg_subkeys_need_update(struct registry_key_handle *key,
+ struct regsubkey_ctr *subkeys);
+bool reg_values_need_update(struct registry_key_handle *key,
+ struct regval_ctr *values);
/* The following definitions come from registry/reg_eventlog.c */
@@ -4905,24 +4910,27 @@ WERROR regsubkey_ctr_delkey( struct regsubkey_ctr *ctr, const char *keyname );
bool regsubkey_ctr_key_exists( struct regsubkey_ctr *ctr, const char *keyname );
int regsubkey_ctr_numkeys( struct regsubkey_ctr *ctr );
char* regsubkey_ctr_specific_key( struct regsubkey_ctr *ctr, uint32 key_index );
-int regval_ctr_numvals( REGVAL_CTR *ctr );
-REGISTRY_VALUE* dup_registry_value( REGISTRY_VALUE *val );
-void free_registry_value( REGISTRY_VALUE *val );
-uint8* regval_data_p( REGISTRY_VALUE *val );
-uint32 regval_size( REGISTRY_VALUE *val );
-char* regval_name( REGISTRY_VALUE *val );
-uint32 regval_type( REGISTRY_VALUE *val );
-REGISTRY_VALUE* regval_ctr_specific_value( REGVAL_CTR *ctr, uint32 idx );
-bool regval_ctr_key_exists( REGVAL_CTR *ctr, const char *value );
-REGISTRY_VALUE *regval_compose(TALLOC_CTX *ctx, const char *name, uint16 type,
- const char *data_p, size_t size);
-int regval_ctr_addvalue( REGVAL_CTR *ctr, const char *name, uint16 type,
- const char *data_p, size_t size );
-int regval_ctr_copyvalue( REGVAL_CTR *ctr, REGISTRY_VALUE *val );
-int regval_ctr_delvalue( REGVAL_CTR *ctr, const char *name );
-REGISTRY_VALUE* regval_ctr_getvalue( REGVAL_CTR *ctr, const char *name );
-uint32 regval_dword( REGISTRY_VALUE *val );
-char *regval_sz(REGISTRY_VALUE *val);
+int regval_ctr_numvals(struct regval_ctr *ctr);
+struct regval_blob* dup_registry_value(struct regval_blob *val);
+void free_registry_value(struct regval_blob *val);
+uint8* regval_data_p(struct regval_blob *val);
+uint32 regval_size(struct regval_blob *val);
+char* regval_name(struct regval_blob *val);
+uint32 regval_type(struct regval_blob *val);
+struct regval_blob* regval_ctr_specific_value(struct regval_ctr *ctr,
+ uint32 idx);
+bool regval_ctr_key_exists(struct regval_ctr *ctr, const char *value);
+struct regval_blob *regval_compose(TALLOC_CTX *ctx, const char *name,
+ uint16 type,
+ const char *data_p, size_t size);
+int regval_ctr_addvalue(struct regval_ctr *ctr, const char *name, uint16 type,
+ const char *data_p, size_t size);
+int regval_ctr_copyvalue(struct regval_ctr *ctr, struct regval_blob *val);
+int regval_ctr_delvalue(struct regval_ctr *ctr, const char *name);
+struct regval_blob* regval_ctr_getvalue(struct regval_ctr *ctr,
+ const char *name);
+uint32 regval_dword(struct regval_blob *val);
+char *regval_sz(struct regval_blob *val);
/* The following definitions come from registry/reg_perfcount.c */
@@ -4960,10 +4968,11 @@ size_t regval_build_multi_sz( char **values, uint16 **buffer );
/* The following definitions come from registry/reg_util_legacy.c */
-WERROR regkey_open_internal( TALLOC_CTX *ctx, REGISTRY_KEY **regkey,
- const char *path,
- const struct nt_user_token *token,
- uint32 access_desired );
+WERROR regkey_open_internal(TALLOC_CTX *ctx,
+ struct registry_key_handle **regkey,
+ const char *path,
+ const struct nt_user_token *token,
+ uint32 access_desired );
/* The following definitions come from registry/regfio.c */
@@ -5881,7 +5890,7 @@ SEC_DESC *svcctl_get_secdesc( TALLOC_CTX *ctx, const char *name, NT_USER_TOKEN *
bool svcctl_set_secdesc( TALLOC_CTX *ctx, const char *name, SEC_DESC *sec_desc, NT_USER_TOKEN *token );
const char *svcctl_lookup_dispname(TALLOC_CTX *ctx, const char *name, NT_USER_TOKEN *token );
const char *svcctl_lookup_description(TALLOC_CTX *ctx, const char *name, NT_USER_TOKEN *token );
-REGVAL_CTR *svcctl_fetch_regvalues( const char *name, NT_USER_TOKEN *token );
+struct regval_ctr *svcctl_fetch_regvalues( const char *name, NT_USER_TOKEN *token );
/* The following definitions come from services/svc_netlogon.c */
diff --git a/source3/include/reg_objects.h b/source3/include/reg_objects.h
index a03ac1b..8d220eb 100644
--- a/source3/include/reg_objects.h
+++ b/source3/include/reg_objects.h
@@ -21,15 +21,15 @@
#ifndef _REG_OBJECTS_H /* _REG_OBJECTS_H */
#define _REG_OBJECTS_H
-/* structure to contain registry values */
+/* low level structure to contain registry values */
-typedef struct {
+struct regval_blob {
fstring valuename;
uint16 type;
/* this should be encapsulated in an RPC_DATA_BLOB */
uint32 size; /* in bytes */
uint8 *data_p;
-} REGISTRY_VALUE;
+};
/*
* A REG_SZ string is not necessarily NULL terminated. When retrieving it from
@@ -58,11 +58,11 @@ struct registry_value {
/* container for registry values */
-typedef struct {
+struct regval_ctr {
uint32 num_values;
- REGISTRY_VALUE **values;
+ struct regval_blob **values;
int seqnum;
-} REGVAL_CTR;
+};
/* container for registry subkey names */
@@ -126,14 +126,14 @@ struct regsubkey_ctr;
* for virtual registry view
*/
-typedef struct {
+struct registry_ops {
/* functions for enumerating subkeys and values */
int (*fetch_subkeys)( const char *key, struct regsubkey_ctr *subkeys);
- int (*fetch_values) ( const char *key, REGVAL_CTR *val );
+ int (*fetch_values) ( const char *key, struct regval_ctr *val );
bool (*store_subkeys)( const char *key, struct regsubkey_ctr *subkeys );
WERROR (*create_subkey)(const char *key, const char *subkey);
WERROR (*delete_subkey)(const char *key, const char *subkey);
- bool (*store_values)( const char *key, REGVAL_CTR *val );
+ bool (*store_values)( const char *key, struct regval_ctr *val );
bool (*reg_access_check)( const char *keyname, uint32 requested,
uint32 *granted,
const NT_USER_TOKEN *token );
@@ -142,28 +142,28 @@ typedef struct {
WERROR (*set_secdesc)(const char *key,
struct security_descriptor *sec_desc);
bool (*subkeys_need_update)(struct regsubkey_ctr *subkeys);
- bool (*values_need_update)(REGVAL_CTR *values);
-} REGISTRY_OPS;
+ bool (*values_need_update)(struct regval_ctr *values);
+};
-typedef struct {
+struct registry_hook {
const char *keyname; /* full path to name of key */
- REGISTRY_OPS *ops; /* registry function hooks */
-} REGISTRY_HOOK;
+ struct registry_ops *ops; /* registry function hooks */
+};
/* structure to store the registry handles */
-typedef struct _RegistryKey {
+struct registry_key_handle {
uint32 type;
char *name; /* full name of registry key */
uint32 access_granted;
- REGISTRY_OPS *ops;
-} REGISTRY_KEY;
+ struct registry_ops *ops;
+};
struct registry_key {
- REGISTRY_KEY *key;
+ struct registry_key_handle *key;
struct regsubkey_ctr *subkeys;
- REGVAL_CTR *values;
+ struct regval_ctr *values;
struct nt_user_token *token;
};
diff --git a/source3/include/regfio.h b/source3/include/regfio.h
index 0e957d5..58bfe80 100644
--- a/source3/include/regfio.h
+++ b/source3/include/regfio.h
@@ -214,7 +214,7 @@ int regfio_close( REGF_FILE *r );
REGF_NK_REC* regfio_rootkey( REGF_FILE *file );
REGF_NK_REC* regfio_fetch_subkey( REGF_FILE *file, REGF_NK_REC *nk );
REGF_NK_REC* regfio_write_key ( REGF_FILE *file, const char *name,
- REGVAL_CTR *values, struct regsubkey_ctr *subkeys,
+ struct regval_ctr *values, struct regsubkey_ctr *subkeys,
SEC_DESC *sec_desc, REGF_NK_REC *parent );
diff --git a/source3/lib/util_reg.c b/source3/lib/util_reg.c
index 96717e3..1e1bcfe 100644
--- a/source3/lib/util_reg.c
+++ b/source3/lib/util_reg.c
@@ -22,7 +22,7 @@
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_REGISTRY
-extern REGISTRY_OPS smbconf_reg_ops;
+extern struct registry_ops smbconf_reg_ops;
const char *reg_type_lookup(enum winreg_Type type)
{
diff --git a/source3/libads/ldap_printer.c b/source3/libads/ldap_printer.c
index 7fec58c..a529029 100644
--- a/source3/libads/ldap_printer.c
+++ b/source3/libads/ldap_printer.c
@@ -118,7 +118,7 @@ ADS_STATUS ads_add_printer_entry(ADS_STRUCT *ads, char *prt_dn,
map a REG_SZ to an ldap mod
*/
static bool map_sz(TALLOC_CTX *ctx, ADS_MODLIST *mods,
- const REGISTRY_VALUE *value)
+ const struct regval_blob *value)
{
char *str_value = NULL;
size_t converted_size;
@@ -145,7 +145,7 @@ static bool map_sz(TALLOC_CTX *ctx, ADS_MODLIST *mods,
map a REG_DWORD to an ldap mod
*/
static bool map_dword(TALLOC_CTX *ctx, ADS_MODLIST *mods,
- const REGISTRY_VALUE *value)
+ const struct regval_blob *value)
{
char *str_value = NULL;
ADS_STATUS status;
@@ -164,7 +164,7 @@ static bool map_dword(TALLOC_CTX *ctx, ADS_MODLIST *mods,
map a boolean REG_BINARY to an ldap mod
*/
static bool map_bool(TALLOC_CTX *ctx, ADS_MODLIST *mods,
- const REGISTRY_VALUE *value)
+ const struct regval_blob *value)
{
char *str_value;
ADS_STATUS status;
@@ -184,7 +184,7 @@ static bool map_bool(TALLOC_CTX *ctx, ADS_MODLIST *mods,
map a REG_MULTI_SZ to an ldap mod
*/
static bool map_multi_sz(TALLOC_CTX *ctx, ADS_MODLIST *mods,
- const REGISTRY_VALUE *value)
+ const struct regval_blob *value)
{
char **str_values = NULL;
size_t converted_size;
@@ -225,14 +225,14 @@ static bool map_multi_sz(TALLOC_CTX *ctx, ADS_MODLIST *mods,
struct valmap_to_ads {
const char *valname;
- bool (*fn)(TALLOC_CTX *, ADS_MODLIST *, const REGISTRY_VALUE *);
+ bool (*fn)(TALLOC_CTX *, ADS_MODLIST *, const struct regval_blob *);
};
/*
map a REG_SZ to an ldap mod
*/
static void map_regval_to_ads(TALLOC_CTX *ctx, ADS_MODLIST *mods,
- REGISTRY_VALUE *value)
+ struct regval_blob *value)
{
const struct valmap_to_ads map[] = {
{SPOOL_REG_ASSETNUMBER, map_sz},
@@ -344,7 +344,7 @@ WERROR get_remote_printer_publishing_data(struct rpc_pipe_client *cli,
} else {
/* Have the data we need now, so start building */
for (i=0; i < count; i++) {
- REGISTRY_VALUE v;
+ struct regval_blob v;
DATA_BLOB blob;
result = push_spoolss_PrinterData(mem_ctx, &blob,
@@ -371,7 +371,7 @@ WERROR get_remote_printer_publishing_data(struct rpc_pipe_client *cli,
printername, win_errstr(result)));
} else {
for (i=0; i < count; i++) {
- REGISTRY_VALUE v;
+ struct regval_blob v;
DATA_BLOB blob = data_blob_null;
result = push_spoolss_PrinterData(mem_ctx, &blob,
@@ -403,7 +403,7 @@ bool get_local_printer_publishing_data(TALLOC_CTX *mem_ctx,
uint32 key,val;
for (key=0; key < data->num_keys; key++) {
- REGVAL_CTR *ctr = data->keys[key].values;
+ struct regval_ctr *ctr = data->keys[key].values;
for (val=0; val < ctr->num_values; val++)
map_regval_to_ads(mem_ctx, mods, ctr->values[val]);
}
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index d6fead1..d6054f2 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -2473,8 +2473,8 @@ static int pack_values(NT_PRINTER_DATA *data, uint8 *buf, int buflen)
{
int len = 0;
int i, j;
- REGISTRY_VALUE *val;
- REGVAL_CTR *val_ctr;
+ struct regval_blob *val;
+ struct regval_ctr *val_ctr;
char *path = NULL;
int num_values;
@@ -2870,7 +2870,7 @@ int add_new_printer_key( NT_PRINTER_DATA *data, const char *name )
data->keys[key_index].name = talloc_strdup( data, name );
- if ( !(data->keys[key_index].values = TALLOC_ZERO_P( data, REGVAL_CTR )) )
+ if ( !(data->keys[key_index].values = TALLOC_ZERO_P( data, struct regval_ctr )) )
return -1;
data->num_keys++;
@@ -3041,7 +3041,7 @@ done:
}
#ifdef HAVE_ADS
-static void map_sz_into_ctr(REGVAL_CTR *ctr, const char *val_name,
+static void map_sz_into_ctr(struct regval_ctr *ctr, const char *val_name,
const char *sz)
{
smb_ucs2_t conv_str[1024];
@@ -3054,7 +3054,7 @@ static void map_sz_into_ctr(REGVAL_CTR *ctr, const char *val_name,
(char *) conv_str, str_size);
}
-static void map_dword_into_ctr(REGVAL_CTR *ctr, const char *val_name,
+static void map_dword_into_ctr(struct regval_ctr *ctr, const char *val_name,
uint32 dword)
{
regval_ctr_delvalue(ctr, val_name);
@@ -3062,7 +3062,7 @@ static void map_dword_into_ctr(REGVAL_CTR *ctr, const char *val_name,
(char *) &dword, sizeof(dword));
}
-static void map_bool_into_ctr(REGVAL_CTR *ctr, const char *val_name,
+static void map_bool_into_ctr(struct regval_ctr *ctr, const char *val_name,
bool b)
{
uint8 bin_bool = (b ? 1 : 0);
@@ -3071,7 +3071,7 @@ static void map_bool_into_ctr(REGVAL_CTR *ctr, const char *val_name,
(char *) &bin_bool, sizeof(bin_bool));
}
-static void map_single_multi_sz_into_ctr(REGVAL_CTR *ctr, const char *val_name,
+static void map_single_multi_sz_into_ctr(struct regval_ctr *ctr, const char *val_name,
const char *multi_sz)
{
smb_ucs2_t *conv_strs = NULL;
@@ -3105,7 +3105,7 @@ static void map_single_multi_sz_into_ctr(REGVAL_CTR *ctr, const char *val_name,
static bool map_nt_printer_info2_to_dsspooler(NT_PRINTER_INFO_LEVEL_2 *info2)
{
- REGVAL_CTR *ctr = NULL;
+ struct regval_ctr *ctr = NULL;
fstring longname;
const char *dnssuffix;
char *allocated_string = NULL;
@@ -3177,7 +3177,7 @@ static void store_printer_guid(NT_PRINTER_INFO_LEVEL_2 *info2,
struct GUID guid)
{
int i;
- REGVAL_CTR *ctr=NULL;
+ struct regval_ctr *ctr=NULL;
UNISTR2 unistr_guid;
/* find the DsSpooler key */
@@ -3469,8 +3469,8 @@ bool is_printer_published(Printer_entry *print_hnd, int snum,
struct GUID *guid)
{
NT_PRINTER_INFO_LEVEL *printer = NULL;
- REGVAL_CTR *ctr;
- REGISTRY_VALUE *guid_val;
+ struct regval_ctr *ctr;
+ struct regval_blob *guid_val;
WERROR win_rc;
int i;
bool ret = False;
@@ -3690,7 +3690,7 @@ WERROR add_printer_data( NT_PRINTER_INFO_LEVEL_2 *p2, const char *key, const cha
/****************************************************************************
***************************************************************************/
-REGISTRY_VALUE* get_printer_data( NT_PRINTER_INFO_LEVEL_2 *p2, const char *key, const char *value )
+struct regval_blob* get_printer_data( NT_PRINTER_INFO_LEVEL_2 *p2, const char *key, const char *value )
{
int key_index;
@@ -3717,7 +3717,7 @@ static int unpack_values(NT_PRINTER_DATA *printer_data, const uint8 *buf, int bu
char *str;
int size;
uint8 *data_p;
- REGISTRY_VALUE *regval_p;
+ struct regval_blob *regval_p;
int key_index;
/* add the "PrinterDriverData" key first for performance reasons */
diff --git a/source3/registry/reg_api.c b/source3/registry/reg_api.c
index 817d43b..9aff4b0 100644
--- a/source3/registry/reg_api.c
+++ b/source3/registry/reg_api.c
@@ -81,7 +81,7 @@ static WERROR fill_value_cache(struct registry_key *key)
}
}
- if (!(key->values = TALLOC_ZERO_P(key, REGVAL_CTR))) {
+ if (!(key->values = TALLOC_ZERO_P(key, struct regval_ctr))) {
return WERR_NOMEM;
}
if (fetch_reg_values(key->key, key->values) == -1) {
@@ -113,7 +113,7 @@ static WERROR fill_subkey_cache(struct registry_key *key)
return WERR_OK;
}
-static int regkey_destructor(REGISTRY_KEY *key)
+static int regkey_destructor(struct registry_key_handle *key)
{
return regdb_close();
}
@@ -127,7 +127,7 @@ static WERROR regkey_open_onelevel(TALLOC_CTX *mem_ctx,
{
WERROR result = WERR_OK;
struct registry_key *regkey;
- REGISTRY_KEY *key;
+ struct registry_key_handle *key;
struct regsubkey_ctr *subkeys = NULL;
--
Samba Shared Repository
More information about the samba-cvs
mailing list