The branch, master has been updated
via 07d3ba4 Change the registry subsystem to use uint32_t from uint32.
Also change session.h.
from a65e22c spoolss: cache_key handle allocation failures early
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 07d3ba435a3a8012da0107b6ff12a7d8951c9650
Author: Richard Sharpe <[email protected]>
Date: Tue Apr 14 07:50:28 2015 -0700
Change the registry subsystem to use uint32_t from uint32. Also change
session.h.
Signed-off-by: Richard Sharpe <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
Autobuild-User(master): Jeremy Allison <[email protected]>
Autobuild-Date(master): Thu Apr 16 00:37:28 CEST 2015 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
source3/include/registry.h | 8 +-
source3/include/session.h | 2 +-
source3/registry/reg_api.c | 20 ++--
source3/registry/reg_api.h | 10 +-
source3/registry/reg_api_util.c | 4 +-
source3/registry/reg_api_util.h | 4 +-
source3/registry/reg_backend_db.c | 18 ++--
source3/registry/reg_backend_hkpt_params.c | 4 +-
source3/registry/reg_backend_netlogon_params.c | 2 +-
source3/registry/reg_backend_smbconf.c | 4 +-
source3/registry/reg_dispatcher.c | 4 +-
source3/registry/reg_dispatcher.h | 4 +-
source3/registry/reg_parse_prs.c | 30 +++---
source3/registry/reg_parse_prs.h | 22 ++--
source3/registry/reg_perfcount.c | 66 ++++++------
source3/registry/reg_perfcount.h | 12 +--
source3/registry/regfio.c | 144 ++++++++++++-------------
source3/registry/regfio.h | 92 ++++++++--------
18 files changed, 225 insertions(+), 225 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/registry.h b/source3/include/registry.h
index f7a537e..0de392f 100644
--- a/source3/include/registry.h
+++ b/source3/include/registry.h
@@ -47,8 +47,8 @@ struct registry_ops {
WERROR (*create_subkey)(const char *key, const char *subkey);
WERROR (*delete_subkey)(const char *key, const char *subkey, bool
lazy);
bool (*store_values)( const char *key, struct regval_ctr *val );
- bool (*reg_access_check)( const char *keyname, uint32 requested,
- uint32 *granted,
+ bool (*reg_access_check)( const char *keyname, uint32_t requested,
+ uint32_t *granted,
const struct security_token *token );
WERROR (*get_secdesc)(TALLOC_CTX *mem_ctx, const char *key,
struct security_descriptor **psecdesc);
@@ -61,9 +61,9 @@ struct registry_ops {
/* structure to store the registry handles */
struct registry_key_handle {
- uint32 type;
+ uint32_t type;
char *name; /* full name of registry key */
- uint32 access_granted;
+ uint32_t access_granted;
struct registry_ops *ops;
};
diff --git a/source3/include/session.h b/source3/include/session.h
index ba96ae3..fe41954 100644
--- a/source3/include/session.h
+++ b/source3/include/session.h
@@ -34,7 +34,7 @@ struct sessionid {
fstring netbios_name;
fstring remote_machine;
fstring id_str;
- uint32 id_num;
+ uint32_t id_num;
struct server_id pid;
fstring ip_addr_str;
time_t connect_start;
diff --git a/source3/registry/reg_api.c b/source3/registry/reg_api.c
index d1c70ec..586bf03 100644
--- a/source3/registry/reg_api.c
+++ b/source3/registry/reg_api.c
@@ -133,7 +133,7 @@ static WERROR regkey_open_onelevel(TALLOC_CTX *mem_ctx,
struct registry_key *parent,
const char *name,
const struct security_token *token,
- uint32 access_desired,
+ uint32_t access_desired,
struct registry_key **pregkey)
{
WERROR result = WERR_OK;
@@ -229,7 +229,7 @@ done:
}
WERROR reg_openhive(TALLOC_CTX *mem_ctx, const char *hive,
- uint32 desired_access,
+ uint32_t desired_access,
const struct security_token *token,
struct registry_key **pkey)
{
@@ -252,7 +252,7 @@ WERROR reg_openhive(TALLOC_CTX *mem_ctx, const char *hive,
**********************************************************************/
WERROR reg_openkey(TALLOC_CTX *mem_ctx, struct registry_key *parent,
- const char *name, uint32 desired_access,
+ const char *name, uint32_t desired_access,
struct registry_key **pkey)
{
struct registry_key *direct_parent = parent;
@@ -304,7 +304,7 @@ error:
}
WERROR reg_enumkey(TALLOC_CTX *mem_ctx, struct registry_key *key,
- uint32 idx, char **name, NTTIME *last_write_time)
+ uint32_t idx, char **name, NTTIME *last_write_time)
{
WERROR err;
@@ -335,7 +335,7 @@ WERROR reg_enumkey(TALLOC_CTX *mem_ctx, struct registry_key
*key,
}
WERROR reg_enumvalue(TALLOC_CTX *mem_ctx, struct registry_key *key,
- uint32 idx, char **pname, struct registry_value **pval)
+ uint32_t idx, char **pname, struct registry_value **pval)
{
struct registry_value *val;
struct regval_blob *blob;
@@ -377,7 +377,7 @@ WERROR reg_enumvalue(TALLOC_CTX *mem_ctx, struct
registry_key *key,
static WERROR reg_enumvalue_nocachefill(TALLOC_CTX *mem_ctx,
struct registry_key *key,
- uint32 idx, char **pname,
+ uint32_t idx, char **pname,
struct registry_value **pval)
{
struct registry_value *val;
@@ -416,7 +416,7 @@ WERROR reg_queryvalue(TALLOC_CTX *mem_ctx, struct
registry_key *key,
const char *name, struct registry_value **pval)
{
WERROR err;
- uint32 i;
+ uint32_t i;
if (!(key->key->access_granted & KEY_QUERY_VALUE)) {
return WERR_ACCESS_DENIED;
@@ -500,7 +500,7 @@ WERROR reg_queryinfokey(struct registry_key *key, uint32_t
*num_subkeys,
uint32_t *max_valbufsize, uint32_t *secdescsize,
NTTIME *last_changed_time)
{
- uint32 i, max_size;
+ uint32_t i, max_size;
size_t max_len;
TALLOC_CTX *mem_ctx;
WERROR err;
@@ -557,7 +557,7 @@ WERROR reg_queryinfokey(struct registry_key *key, uint32_t
*num_subkeys,
}
WERROR reg_createkey(TALLOC_CTX *ctx, struct registry_key *parent,
- const char *subkeypath, uint32 desired_access,
+ const char *subkeypath, uint32_t desired_access,
struct registry_key **pkey,
enum winreg_CreateAction *paction)
{
@@ -958,7 +958,7 @@ static WERROR reg_deletekey_recursive_internal(struct
registry_key *parent,
WERROR werr = WERR_OK;
struct registry_key *key;
char *subkey_name = NULL;
- uint32 i;
+ uint32_t i;
TALLOC_CTX *mem_ctx = talloc_stackframe();
DEBUG(5, ("reg_deletekey_recursive_internal: deleting '%s' from '%s'\n",
diff --git a/source3/registry/reg_api.h b/source3/registry/reg_api.h
index 41c4792..535e4ff 100644
--- a/source3/registry/reg_api.h
+++ b/source3/registry/reg_api.h
@@ -24,16 +24,16 @@
#define _REG_API_H
WERROR reg_openhive(TALLOC_CTX *mem_ctx, const char *hive,
- uint32 desired_access,
+ uint32_t 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,
+ const char *name, uint32_t 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);
+ uint32_t 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);
+ uint32_t 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,
@@ -48,7 +48,7 @@ WERROR reg_queryinfokey(struct registry_key *key, uint32_t
*num_subkeys,
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,
+ const char *subkeypath, uint32_t desired_access,
struct registry_key **pkey,
enum winreg_CreateAction *paction);
WERROR reg_deletekey(struct registry_key *parent, const char *path);
diff --git a/source3/registry/reg_api_util.c b/source3/registry/reg_api_util.c
index e86e3e3..b206e7d 100644
--- a/source3/registry/reg_api_util.c
+++ b/source3/registry/reg_api_util.c
@@ -32,7 +32,7 @@
* Utility function to open a complete registry path including the hive prefix.
*/
WERROR reg_open_path(TALLOC_CTX *mem_ctx, const char *orig_path,
- uint32 desired_access, const struct security_token *token,
+ uint32_t desired_access, const struct security_token
*token,
struct registry_key **pkey)
{
struct registry_key *hive, *key;
@@ -89,7 +89,7 @@ WERROR reg_open_path(TALLOC_CTX *mem_ctx, const char
*orig_path,
*/
WERROR reg_create_path(TALLOC_CTX *mem_ctx, const char *orig_path,
- uint32 desired_access,
+ uint32_t desired_access,
const struct security_token *token,
enum winreg_CreateAction *paction,
struct registry_key **pkey)
diff --git a/source3/registry/reg_api_util.h b/source3/registry/reg_api_util.h
index b5ce0fd..692d077 100644
--- a/source3/registry/reg_api_util.h
+++ b/source3/registry/reg_api_util.h
@@ -29,11 +29,11 @@
* Utility function to open a complete registry path including the hive prefix.
*/
WERROR reg_open_path(TALLOC_CTX *mem_ctx, const char *orig_path,
- uint32 desired_access, const struct security_token *token,
+ uint32_t desired_access, const struct security_token
*token,
struct registry_key **pkey);
WERROR reg_create_path(TALLOC_CTX *mem_ctx, const char *orig_path,
- uint32 desired_access,
+ uint32_t desired_access,
const struct security_token *token,
enum winreg_CreateAction *paction,
struct registry_key **pkey);
diff --git a/source3/registry/reg_backend_db.c
b/source3/registry/reg_backend_db.c
index 44a3d9f..0cb43d5 100644
--- a/source3/registry/reg_backend_db.c
+++ b/source3/registry/reg_backend_db.c
@@ -153,10 +153,10 @@ static const char *builtin_registry_paths[] = {
struct builtin_regkey_value {
const char *path;
const char *valuename;
- uint32 type;
+ uint32_t type;
union {
const char *string;
- uint32 dw_value;
+ uint32_t dw_value;
} data;
};
@@ -286,7 +286,7 @@ static void regdb_ctr_add_value(struct regval_ctr *ctr,
case REG_DWORD:
regval_ctr_addvalue(ctr, value->valuename, REG_DWORD,
(uint8_t *)&value->data.dw_value,
- sizeof(uint32));
+ sizeof(uint32_t));
break;
case REG_SZ:
@@ -1037,8 +1037,8 @@ static WERROR regdb_store_keys_internal2(struct
db_context *db,
TDB_DATA dbuf;
uint8 *buffer = NULL;
int i = 0;
- uint32 len, buflen;
- uint32 num_subkeys = regsubkey_ctr_numkeys(ctr);
+ uint32_t len, buflen;
+ uint32_t num_subkeys = regsubkey_ctr_numkeys(ctr);
char *keyname = NULL;
TALLOC_CTX *ctx = talloc_stackframe();
WERROR werr;
@@ -1731,7 +1731,7 @@ static WERROR regdb_fetch_keys_internal(struct db_context
*db, const char *key,
WERROR werr;
uint32_t num_items;
uint8 *buf;
- uint32 buflen, len;
+ uint32_t buflen, len;
int i;
fstring subkeyname;
TALLOC_CTX *frame = talloc_stackframe();
@@ -1823,11 +1823,11 @@ static int regdb_fetch_keys(const char *key, struct
regsubkey_ctr *ctr)
static int regdb_unpack_values(struct regval_ctr *values, uint8 *buf, int
buflen)
{
int len = 0;
- uint32 type;
+ uint32_t type;
fstring valuename;
- uint32 size;
+ uint32_t size;
uint8 *data_p;
- uint32 num_values = 0;
+ uint32_t num_values = 0;
int i;
/* loop and unpack the rest of the registry values */
diff --git a/source3/registry/reg_backend_hkpt_params.c
b/source3/registry/reg_backend_hkpt_params.c
index d34d1ac..2ecfecd 100644
--- a/source3/registry/reg_backend_hkpt_params.c
+++ b/source3/registry/reg_backend_hkpt_params.c
@@ -36,8 +36,8 @@ extern struct registry_ops regdb_ops;
static int hkpt_params_fetch_values(const char *key, struct regval_ctr
*regvals)
{
- uint32 base_index;
- uint32 buffer_size;
+ uint32_t base_index;
+ uint32_t buffer_size;
char *buffer = NULL;
/* This is ALMOST the same as perflib_009_params, but HKPT has
diff --git a/source3/registry/reg_backend_netlogon_params.c
b/source3/registry/reg_backend_netlogon_params.c
index a98c92e..d7cf3c6 100644
--- a/source3/registry/reg_backend_netlogon_params.c
+++ b/source3/registry/reg_backend_netlogon_params.c
@@ -36,7 +36,7 @@ extern struct registry_ops regdb_ops;
static int netlogon_params_fetch_values(const char *key, struct regval_ctr
*regvals)
{
- uint32 dwValue;
+ uint32_t dwValue;
if (!pdb_get_account_policy(PDB_POLICY_REFUSE_MACHINE_PW_CHANGE,
&dwValue)) {
dwValue = 0;
diff --git a/source3/registry/reg_backend_smbconf.c
b/source3/registry/reg_backend_smbconf.c
index a056654..001a5f7 100644
--- a/source3/registry/reg_backend_smbconf.c
+++ b/source3/registry/reg_backend_smbconf.c
@@ -57,8 +57,8 @@ static bool smbconf_store_values(const char *key, struct
regval_ctr *val)
return regdb_ops.store_values(key, val);
}
-static bool smbconf_reg_access_check(const char *keyname, uint32 requested,
- uint32 *granted,
+static bool smbconf_reg_access_check(const char *keyname, uint32_t requested,
+ uint32_t *granted,
const struct security_token *token)
{
if (!security_token_has_privilege(token, SEC_PRIV_DISK_OPERATOR)) {
diff --git a/source3/registry/reg_dispatcher.c
b/source3/registry/reg_dispatcher.c
index 0f87b27..8c94413 100644
--- a/source3/registry/reg_dispatcher.c
+++ b/source3/registry/reg_dispatcher.c
@@ -161,8 +161,8 @@ int fetch_reg_values(struct registry_key_handle *key,
struct regval_ctr *val)
underlying registry backend
***********************************************************************/
-bool regkey_access_check(struct registry_key_handle *key, uint32 requested,
- uint32 *granted,
+bool regkey_access_check(struct registry_key_handle *key, uint32_t requested,
+ uint32_t *granted,
const struct security_token *token )
{
struct security_descriptor *sec_desc;
diff --git a/source3/registry/reg_dispatcher.h
b/source3/registry/reg_dispatcher.h
index ec44746..76485b3 100644
--- a/source3/registry/reg_dispatcher.h
+++ b/source3/registry/reg_dispatcher.h
@@ -29,8 +29,8 @@ WERROR delete_reg_subkey(struct registry_key_handle *key,
const char *subkey, bo
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,
+bool regkey_access_check(struct registry_key_handle *key, uint32_t requested,
+ uint32_t *granted,
const struct security_token *token);
WERROR regkey_get_secdesc(TALLOC_CTX *mem_ctx, struct registry_key_handle *key,
struct security_descriptor **psecdesc);
diff --git a/source3/registry/reg_parse_prs.c b/source3/registry/reg_parse_prs.c
index 14aa3fa..41580f4 100644
--- a/source3/registry/reg_parse_prs.c
+++ b/source3/registry/reg_parse_prs.c
@@ -48,7 +48,7 @@ void prs_debug(prs_struct *ps, int depth, const char *desc,
const char *fn_name)
* @return False if allocation fails, otherwise True.
**/
-bool prs_init(prs_struct *ps, uint32 size, TALLOC_CTX *ctx, bool io)
+bool prs_init(prs_struct *ps, uint32_t size, TALLOC_CTX *ctx, bool io)
{
ZERO_STRUCTP(ps);
ps->io = io;
@@ -131,9 +131,9 @@ TALLOC_CTX *prs_get_mem_context(prs_struct *ps)
Also depends on the data stream mode (io).
********************************************************************/
-bool prs_grow(prs_struct *ps, uint32 extra_space)
+bool prs_grow(prs_struct *ps, uint32_t extra_space)
{
- uint32 new_size;
+ uint32_t new_size;
ps->grow_size = MAX(ps->grow_size, ps->data_offset + extra_space);
@@ -209,7 +209,7 @@ char *prs_data_p(prs_struct *ps)
Get the current data size (external interface).
********************************************************************/
-uint32 prs_data_size(prs_struct *ps)
+uint32_t prs_data_size(prs_struct *ps)
{
return ps->buffer_size;
}
@@ -218,7 +218,7 @@ uint32 prs_data_size(prs_struct *ps)
Fetch the current offset (external interface).
********************************************************************/
-uint32 prs_offset(prs_struct *ps)
+uint32_t prs_offset(prs_struct *ps)
{
return ps->data_offset;
}
@@ -227,7 +227,7 @@ uint32 prs_offset(prs_struct *ps)
Set the current offset (external interface).
********************************************************************/
-bool prs_set_offset(prs_struct *ps, uint32 offset)
+bool prs_set_offset(prs_struct *ps, uint32_t offset)
{
if ((offset > ps->data_offset)
&& !prs_grow(ps, offset - ps->data_offset)) {
@@ -242,7 +242,7 @@ bool prs_set_offset(prs_struct *ps, uint32 offset)
Append the data from a buffer into a parse_struct.
********************************************************************/
-bool prs_copy_data_in(prs_struct *dst, const char *src, uint32 len)
+bool prs_copy_data_in(prs_struct *dst, const char *src, uint32_t len)
{
if (len == 0)
return True;
@@ -263,10 +263,10 @@ bool prs_copy_data_in(prs_struct *dst, const char *src,
uint32 len)
bool prs_align(prs_struct *ps)
{
- uint32 mod = ps->data_offset & (ps->align-1);
+ uint32_t mod = ps->data_offset & (ps->align-1);
if (ps->align != 0 && mod != 0) {
- uint32 extra_space = (ps->align - mod);
+ uint32_t extra_space = (ps->align - mod);
if(!prs_grow(ps, extra_space))
return False;
memset(&ps->data_p[ps->data_offset], '\0', (size_t)extra_space);
@@ -296,7 +296,7 @@ bool prs_align_uint64(prs_struct *ps)
Ensure we can read/write to a given offset.
********************************************************************/
-char *prs_mem_get(prs_struct *ps, uint32 extra_size)
+char *prs_mem_get(prs_struct *ps, uint32_t extra_size)
{
if(UNMARSHALLING(ps)) {
/*
@@ -362,9 +362,9 @@ bool prs_uint16(const char *name, prs_struct *ps, int
depth, uint16 *data16)
Stream a uint32.
********************************************************************/
-bool prs_uint32(const char *name, prs_struct *ps, int depth, uint32 *data32)
+bool prs_uint32(const char *name, prs_struct *ps, int depth, uint32_t *data32)
{
- char *q = prs_mem_get(ps, sizeof(uint32));
+ char *q = prs_mem_get(ps, sizeof(uint32_t));
if (q == NULL)
return False;
@@ -382,7 +382,7 @@ bool prs_uint32(const char *name, prs_struct *ps, int
depth, uint32 *data32)
DEBUGADD(5,("%s%04x %s: %08x\n", tab_depth(5,depth), ps->data_offset,
name, *data32));
- ps->data_offset += sizeof(uint32);
+ ps->data_offset += sizeof(uint32_t);
return True;
}
@@ -393,7 +393,7 @@ bool prs_uint32(const char *name, prs_struct *ps, int
depth, uint32 *data32)
bool prs_uint64(const char *name, prs_struct *ps, int depth, uint64 *data64)
{
if (UNMARSHALLING(ps)) {
- uint32 high, low;
+ uint32_t high, low;
if (!prs_uint32(name, ps, depth+1, &low))
return False;
@@ -405,7 +405,7 @@ bool prs_uint64(const char *name, prs_struct *ps, int
depth, uint64 *data64)
return True;
} else {
- uint32 high = (*data64) >> 32, low = (*data64) & 0xFFFFFFFF;
+ uint32_t high = (*data64) >> 32, low = (*data64) & 0xFFFFFFFF;
return prs_uint32(name, ps, depth+1, &low) &&
prs_uint32(name, ps, depth+1, &high);
}
diff --git a/source3/registry/reg_parse_prs.h b/source3/registry/reg_parse_prs.h
index 2994015..de69a68 100644
--- a/source3/registry/reg_parse_prs.h
+++ b/source3/registry/reg_parse_prs.h
@@ -35,9 +35,9 @@ typedef struct _prs_struct {
bool bigendian_data;
uint8 align; /* data alignment */
bool is_dynamic; /* Do we own this memory or not ? */
- uint32 data_offset; /* Current working offset into data. */
- uint32 buffer_size; /* Current allocated size of the buffer. */
- uint32 grow_size; /* size requested via prs_grow() calls */
+ uint32_t data_offset; /* Current working offset into data. */
+ uint32_t buffer_size; /* Current allocated size of the buffer. */
+ uint32_t grow_size; /* size requested via prs_grow() calls */
/* The buffer itself. If "is_dynamic" is true this
* MUST BE TALLOC'ed off mem_ctx. */
char *data_p;
@@ -57,23 +57,23 @@ typedef struct _prs_struct {
#define RPC_PARSE_ALIGN 4
void prs_debug(prs_struct *ps, int depth, const char *desc, const char
*fn_name);
-bool prs_init(prs_struct *ps, uint32 size, TALLOC_CTX *ctx, bool io);
+bool prs_init(prs_struct *ps, uint32_t size, TALLOC_CTX *ctx, bool io);
void prs_mem_free(prs_struct *ps);
char *prs_alloc_mem_(prs_struct *ps, size_t size, unsigned int count);
char *prs_alloc_mem(prs_struct *ps, size_t size, unsigned int count);
TALLOC_CTX *prs_get_mem_context(prs_struct *ps);
-bool prs_grow(prs_struct *ps, uint32 extra_space);
+bool prs_grow(prs_struct *ps, uint32_t extra_space);
char *prs_data_p(prs_struct *ps);
-uint32 prs_data_size(prs_struct *ps);
-uint32 prs_offset(prs_struct *ps);
-bool prs_set_offset(prs_struct *ps, uint32 offset);
-bool prs_copy_data_in(prs_struct *dst, const char *src, uint32 len);
+uint32_t prs_data_size(prs_struct *ps);
+uint32_t prs_offset(prs_struct *ps);
--
Samba Shared Repository
