The branch, master has been updated
via 57941aa s3: utils: Convert all uses of uint32/16/8 to _t.
via bacd990 lib: Fix strv_next for the anchor NULL entry
from c49ad3f s3:selftest: run smb2.notify with --signing=required
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 57941aa044b8e0ddac5cb1004172ba06bb4298a3
Author: Richard Sharpe <rsha...@samba.org>
Date: Wed May 6 17:00:06 2015 -0700
s3: utils: Convert all uses of uint32/16/8 to _t.
Signed-off-by: Richard Sharpe <rsha...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
Autobuild-User(master): Jeremy Allison <j...@samba.org>
Autobuild-Date(master): Thu May 7 04:53:39 CEST 2015 on sn-devel-104
commit bacd990184e05738f80865dd363add57c59384c0
Author: Volker Lendecke <v...@samba.org>
Date: Tue Apr 28 10:28:52 2015 +0200
lib: Fix strv_next for the anchor NULL entry
I swear I have tested this somewhere....
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
lib/util/strv.c | 7 ++++
source3/utils/eventlogadm.c | 2 +-
source3/utils/log2pcaphex.c | 56 +++++++++++++-------------
source3/utils/net.c | 10 ++---
source3/utils/net.h | 2 +-
source3/utils/net_ads.c | 2 +-
source3/utils/net_ads_gpo.c | 14 +++----
source3/utils/net_groupmap.c | 4 +-
source3/utils/net_proto.h | 2 +-
source3/utils/net_rap.c | 40 +++++++++----------
source3/utils/net_registry.c | 4 +-
source3/utils/net_registry_util.c | 2 +-
source3/utils/net_rpc.c | 62 ++++++++++++++---------------
source3/utils/net_rpc_printer.c | 2 +-
source3/utils/net_rpc_registry.c | 74 +++++++++++++++++------------------
source3/utils/net_rpc_rights.c | 24 ++++++------
source3/utils/net_rpc_service.c | 22 +++++------
source3/utils/net_sam.c | 16 ++++----
source3/utils/ntlm_auth.c | 18 ++++-----
source3/utils/ntlm_auth_diagnostics.c | 18 ++++-----
source3/utils/ntlm_auth_proto.h | 8 ++--
source3/utils/pdbedit.c | 4 +-
source3/utils/regedit.h | 4 +-
source3/utils/regedit_wrap.c | 4 +-
source3/utils/sharesec.c | 6 +--
source3/utils/smbcacls.c | 14 +++----
source3/utils/smbtree.c | 6 +--
27 files changed, 217 insertions(+), 210 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/strv.c b/lib/util/strv.c
index 2acd145..f5879c7 100644
--- a/lib/util/strv.c
+++ b/lib/util/strv.c
@@ -84,6 +84,13 @@ char *strv_next(char *strv, const char *entry)
size_t len, entry_len;
char *result;
+ if (entry == NULL) {
+ if (strv_valid_entry(strv, strv, &len, &entry_len)) {
+ return strv;
+ }
+ return NULL;
+ }
+
if (!strv_valid_entry(strv, entry, &len, &entry_len)) {
return NULL;
}
diff --git a/source3/utils/eventlogadm.c b/source3/utils/eventlogadm.c
index 4c368b4..5ef091a 100644
--- a/source3/utils/eventlogadm.c
+++ b/source3/utils/eventlogadm.c
@@ -91,7 +91,7 @@ static bool eventlog_add_source( const char *eventlog, const
char *sourcename,
const char *hive_name, *relpath;
enum winreg_CreateAction action;
struct registry_value *value;
- static const uint32 ACCESS = REG_KEY_READ | REG_KEY_WRITE;
+ static const uint32_t ACCESS = REG_KEY_READ | REG_KEY_WRITE;
bool ret = false;
if (!elogs) {
diff --git a/source3/utils/log2pcaphex.c b/source3/utils/log2pcaphex.c
index 866abfd..d565a24 100644
--- a/source3/utils/log2pcaphex.c
+++ b/source3/utils/log2pcaphex.c
@@ -74,47 +74,47 @@ int hexformat = 0;
/* tcpdump file format */
struct tcpdump_file_header {
- uint32 magic;
- uint16 major;
- uint16 minor;
+ uint32_t magic;
+ uint16_t major;
+ uint16_t minor;
int32 zone;
- uint32 sigfigs;
- uint32 snaplen;
- uint32 linktype;
+ uint32_t sigfigs;
+ uint32_t snaplen;
+ uint32_t linktype;
};
struct tcpdump_packet {
struct timeval ts;
- uint32 caplen;
- uint32 len;
+ uint32_t caplen;
+ uint32_t len;
};
typedef struct {
- uint8 ver_hdrlen;
- uint8 dscp;
- uint16 packet_length;
- uint16 identification;
- uint8 flags;
- uint8 fragment;
- uint8 ttl;
- uint8 protocol;
- uint16 hdr_checksum;
- uint32 src_addr;
- uint32 dest_addr;
+ uint8_t ver_hdrlen;
+ uint8_t dscp;
+ uint16_t packet_length;
+ uint16_t identification;
+ uint8_t flags;
+ uint8_t fragment;
+ uint8_t ttl;
+ uint8_t protocol;
+ uint16_t hdr_checksum;
+ uint32_t src_addr;
+ uint32_t dest_addr;
} hdr_ip_t;
static hdr_ip_t HDR_IP = {0x45, 0, 0, 0x3412, 0, 0, 0xff, 6, 0, 0x01010101,
0x02020202};
typedef struct {
- uint16 source_port;
- uint16 dest_port;
- uint32 seq_num;
- uint32 ack_num;
- uint8 hdr_length;
- uint8 flags;
- uint16 window;
- uint16 checksum;
- uint16 urg;
+ uint16_t source_port;
+ uint16_t dest_port;
+ uint32_t seq_num;
+ uint32_t ack_num;
+ uint8_t hdr_length;
+ uint8_t flags;
+ uint16_t window;
+ uint16_t checksum;
+ uint16_t urg;
} hdr_tcp_t;
static hdr_tcp_t HDR_TCP = {139, 139, 0, 0, 0x50, 0, 0, 0, 0};
diff --git a/source3/utils/net.c b/source3/utils/net.c
index f53e627..ceaf5da 100644
--- a/source3/utils/net.c
+++ b/source3/utils/net.c
@@ -370,10 +370,10 @@ static int net_getdomainsid(struct net_context *c, int
argc, const char **argv)
}
static bool search_maxrid(struct pdb_search *search, const char *type,
- uint32 *max_rid)
+ uint32_t *max_rid)
{
struct samr_displayentry *entries;
- uint32 i, num_entries;
+ uint32_t i, num_entries;
if (search == NULL) {
d_fprintf(stderr, _("get_maxrid: Could not search %s\n"), type);
@@ -387,9 +387,9 @@ static bool search_maxrid(struct pdb_search *search, const
char *type,
return true;
}
-static uint32 get_maxrid(void)
+static uint32_t get_maxrid(void)
{
- uint32 max_rid = 0;
+ uint32_t max_rid = 0;
if (!search_maxrid(pdb_search_users(talloc_tos(), 0), "users",
&max_rid))
return 0;
@@ -407,7 +407,7 @@ static uint32 get_maxrid(void)
static int net_maxrid(struct net_context *c, int argc, const char **argv)
{
- uint32 rid;
+ uint32_t rid;
if (argc != 0) {
d_fprintf(stderr, "%s net maxrid\n", _("Usage:"));
diff --git a/source3/utils/net.h b/source3/utils/net.h
index ce19c57..cded8e1 100644
--- a/source3/utils/net.h
+++ b/source3/utils/net.h
@@ -133,7 +133,7 @@ typedef struct copy_clistate {
struct cli_state *cli_share_src;
struct cli_state *cli_share_dst;
char *cwd;
- uint16 attribute;
+ uint16_t attribute;
struct net_context *c;
}copy_clistate;
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index b0e7112..a8f3892 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -230,7 +230,7 @@ static void use_in_memory_ccache(void) {
}
static ADS_STATUS ads_startup_int(struct net_context *c, bool only_own_domain,
- uint32 auth_flags, ADS_STRUCT **ads_ret)
+ uint32_t auth_flags, ADS_STRUCT **ads_ret)
{
ADS_STRUCT *ads = NULL;
ADS_STATUS status;
diff --git a/source3/utils/net_ads_gpo.c b/source3/utils/net_ads_gpo.c
index 8b789e5..f2f65c8 100644
--- a/source3/utils/net_ads_gpo.c
+++ b/source3/utils/net_ads_gpo.c
@@ -34,8 +34,8 @@ static int net_ads_gpo_refresh(struct net_context *c, int
argc, const char **arg
const char *dn = NULL;
struct GROUP_POLICY_OBJECT *gpo_list = NULL;
struct GROUP_POLICY_OBJECT *read_list = NULL;
- uint32 uac = 0;
- uint32 flags = 0;
+ uint32_t uac = 0;
+ uint32_t flags = 0;
struct GROUP_POLICY_OBJECT *gpo;
NTSTATUS result;
struct security_token *token = NULL;
@@ -305,8 +305,8 @@ static int net_ads_gpo_list(struct net_context *c, int
argc, const char **argv)
LDAPMessage *res = NULL;
TALLOC_CTX *mem_ctx;
const char *dn = NULL;
- uint32 uac = 0;
- uint32 flags = 0;
+ uint32_t uac = 0;
+ uint32_t flags = 0;
struct GROUP_POLICY_OBJECT *gpo_list;
struct security_token *token = NULL;
@@ -376,8 +376,8 @@ static int net_ads_gpo_apply(struct net_context *c, int
argc, const char **argv)
ADS_STATUS status;
const char *dn = NULL;
struct GROUP_POLICY_OBJECT *gpo_list;
- uint32 uac = 0;
- uint32 flags = 0;
+ uint32_t uac = 0;
+ uint32_t flags = 0;
struct security_token *token = NULL;
const char *filter = NULL;
@@ -501,7 +501,7 @@ static int net_ads_gpo_link_add(struct net_context *c, int
argc, const char **ar
{
ADS_STRUCT *ads;
ADS_STATUS status;
- uint32 gpo_opt = 0;
+ uint32_t gpo_opt = 0;
TALLOC_CTX *mem_ctx;
if (argc < 2 || c->display_usage) {
diff --git a/source3/utils/net_groupmap.c b/source3/utils/net_groupmap.c
index 8c6aa2e..0f86df0 100644
--- a/source3/utils/net_groupmap.c
+++ b/source3/utils/net_groupmap.c
@@ -195,7 +195,7 @@ static int net_groupmap_add(struct net_context *c, int
argc, const char **argv)
fstring type = "";
fstring ntcomment = "";
enum lsa_SidType sid_type = SID_NAME_DOM_GRP;
- uint32 rid = 0;
+ uint32_t rid = 0;
gid_t gid;
int i;
GROUP_MAP *map;
@@ -860,7 +860,7 @@ static bool print_alias_memberships(TALLOC_CTX *mem_ctx,
const struct dom_sid *domain_sid,
const struct dom_sid *member)
{
- uint32 *alias_rids;
+ uint32_t *alias_rids;
size_t i, num_alias_rids;
alias_rids = NULL;
diff --git a/source3/utils/net_proto.h b/source3/utils/net_proto.h
index 25e9db2..27cdb8d 100644
--- a/source3/utils/net_proto.h
+++ b/source3/utils/net_proto.h
@@ -332,7 +332,7 @@ int rpc_vampire_keytab(struct net_context *c, int argc,
const char **argv);
/* The following definitions come from utils/net_rpc_service.c */
-const char *svc_status_string( uint32 state );
+const char *svc_status_string( uint32_t state );
int net_rpc_service(struct net_context *c, int argc, const char **argv);
/* The following definitions come from utils/net_rpc_sh_acct.c */
diff --git a/source3/utils/net_rap.c b/source3/utils/net_rap.c
index d5b78fc..4be7b5f 100644
--- a/source3/utils/net_rap.c
+++ b/source3/utils/net_rap.c
@@ -53,15 +53,15 @@ int net_rap_file_usage(struct net_context *c, int argc,
const char **argv)
/***************************************************************************
list info on an open file
***************************************************************************/
-static void file_fn(const char * pPath, const char * pUser, uint16 perms,
- uint16 locks, uint32 id)
+static void file_fn(const char * pPath, const char * pUser, uint16_t perms,
+ uint16_t locks, uint32_t id)
{
d_printf("%-7.1d %-20.20s 0x%-4.2x %-6.1d %s\n",
id, pUser, perms, locks, pPath);
}
-static void one_file_fn(const char *pPath, const char *pUser, uint16 perms,
- uint16 locks, uint32 id)
+static void one_file_fn(const char *pPath, const char *pUser, uint16_t perms,
+ uint16_t locks, uint32_t id)
{
d_printf(_("File ID %d\n"
"User name %s\n"
@@ -196,14 +196,14 @@ int net_rap_share_usage(struct net_context *c, int argc,
const char **argv)
return net_share_usage(c, argc, argv);
}
-static void long_share_fn(const char *share_name, uint32 type,
+static void long_share_fn(const char *share_name, uint32_t type,
const char *comment, void *state)
{
d_printf("%-12s %-8.8s %-50s\n",
share_name, net_share_type_str(type), comment);
}
-static void share_fn(const char *share_name, uint32 type,
+static void share_fn(const char *share_name, uint32_t type,
const char *comment, void *state)
{
d_printf("%s\n", share_name);
@@ -348,9 +348,9 @@ int net_rap_session_usage(struct net_context *c, int argc,
const char **argv)
return -1;
}
-static void list_sessions_func(char *wsname, char *username, uint16 conns,
- uint16 opens, uint16 users, uint32 sess_time,
- uint32 idle_time, uint32 user_flags, char *clitype)
+static void list_sessions_func(char *wsname, char *username, uint16_t conns,
+ uint16_t opens, uint16_t users, uint32_t sess_time,
+ uint32_t idle_time, uint32 user_flags, char *clitype)
{
int hrs = idle_time / 3600;
int min = (idle_time / 60) % 60;
@@ -361,9 +361,9 @@ static void list_sessions_func(char *wsname, char
*username, uint16 conns,
}
static void display_session_func(const char *wsname, const char *username,
- uint16 conns, uint16 opens, uint16 users,
- uint32 sess_time, uint32 idle_time,
- uint32 user_flags, const char *clitype)
+ uint16_t conns, uint16_t opens, uint16 users,
+ uint32_t sess_time, uint32 idle_time,
+ uint32_t user_flags, const char *clitype)
{
int ihrs = idle_time / 3600;
int imin = (idle_time / 60) % 60;
@@ -382,8 +382,8 @@ static void display_session_func(const char *wsname, const
char *username,
shrs, smin, ssec, ihrs, imin, isec);
}
-static void display_conns_func(uint16 conn_id, uint16 conn_type, uint16 opens,
- uint16 users, uint32 conn_time,
+static void display_conns_func(uint16_t conn_id, uint16_t conn_type, uint16
opens,
+ uint16_t users, uint32_t conn_time,
const char *username, const char *netname)
{
d_printf("%-14.14s %-8.8s %5d\n",
@@ -496,7 +496,7 @@ int net_rap_session(struct net_context *c, int argc, const
char **argv)
/****************************************************************************
list a server name
****************************************************************************/
-static void display_server_func(const char *name, uint32 m,
+static void display_server_func(const char *name, uint32_t m,
const char *comment, void * reserved)
{
d_printf("\t%-16.16s %s\n", name, comment);
@@ -634,10 +634,10 @@ int net_rap_printq_usage(struct net_context *c, int argc,
const char **argv)
return -1;
}
-static void enum_queue(const char *queuename, uint16 pri, uint16 start,
- uint16 until, const char *sep, const char *pproc,
+static void enum_queue(const char *queuename, uint16_t pri, uint16_t start,
+ uint16_t until, const char *sep, const char *pproc,
const char *dest, const char *qparms,
- const char *qcomment, uint16 status, uint16 jobcount)
+ const char *qcomment, uint16_t status, uint16_t jobcount)
{
d_printf(_("%-17.17s Queue %5d jobs "),
queuename, jobcount);
@@ -660,9 +660,9 @@ static void enum_queue(const char *queuename, uint16 pri,
uint16 start,
}
}
-static void enum_jobs(uint16 jobid, const char *ownername,
+static void enum_jobs(uint16_t jobid, const char *ownername,
const char *notifyname, const char *datatype,
- const char *jparms, uint16 pos, uint16 status,
+ const char *jparms, uint16_t pos, uint16_t status,
const char *jstatus, unsigned int submitted, unsigned int
jobsize,
const char *comment)
{
diff --git a/source3/utils/net_registry.c b/source3/utils/net_registry.c
index cdfb318..0ebb51b 100644
--- a/source3/utils/net_registry.c
+++ b/source3/utils/net_registry.c
@@ -48,7 +48,7 @@
* split given path into hive and remaining path and open the hive key
*/
static WERROR open_hive(TALLOC_CTX *ctx, const char *path,
- uint32 desired_access,
+ uint32_t desired_access,
struct registry_key **hive,
char **subkeyname)
{
@@ -91,7 +91,7 @@ done:
}
static WERROR open_key(TALLOC_CTX *ctx, const char *path,
- uint32 desired_access,
+ uint32_t desired_access,
struct registry_key **key)
{
WERROR werr;
diff --git a/source3/utils/net_registry_util.c
b/source3/utils/net_registry_util.c
index 2020a0a..3552a6a 100644
--- a/source3/utils/net_registry_util.c
+++ b/source3/utils/net_registry_util.c
@@ -79,7 +79,7 @@ void print_registry_value(const struct registry_value
*valvalue, bool raw)
break;
}
case REG_MULTI_SZ: {
- uint32 j;
+ uint32_t j;
const char **a;
if (!pull_reg_multi_sz(talloc_tos(), &valvalue->data, &a)) {
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index 2df009d..6eb27c9 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -1336,7 +1336,7 @@ static NTSTATUS rpc_sh_handle_user(struct net_context *c,
struct policy_handle connect_pol, domain_pol, user_pol;
NTSTATUS status, result;
struct dom_sid sid;
- uint32 rid;
+ uint32_t rid;
enum lsa_SidType type;
struct dcerpc_binding_handle *b = pipe_hnd->binding_handle;
@@ -1590,7 +1590,7 @@ static NTSTATUS rpc_sh_user_flag_edit_internals(struct
net_context *c,
NTSTATUS status, result;
const char *username;
const char *oldval = "unknown";
- uint32 oldflags, newflags;
+ uint32_t oldflags, newflags;
bool newval;
union samr_UserInfo *info = NULL;
struct dcerpc_binding_handle *b = pipe_hnd->binding_handle;
@@ -2196,7 +2196,7 @@ static NTSTATUS rpc_add_groupmem(struct rpc_pipe_client
*pipe_hnd,
{
struct policy_handle connect_pol, domain_pol;
NTSTATUS status, result;
- uint32 group_rid;
+ uint32_t group_rid;
struct policy_handle group_pol;
struct dcerpc_binding_handle *b = pipe_hnd->binding_handle;
@@ -2307,7 +2307,7 @@ static NTSTATUS rpc_add_aliasmem(struct rpc_pipe_client
*pipe_hnd,
{
struct policy_handle connect_pol, domain_pol;
NTSTATUS status, result;
- uint32 alias_rid;
+ uint32_t alias_rid;
struct policy_handle alias_pol;
struct dcerpc_binding_handle *b = pipe_hnd->binding_handle;
@@ -2460,7 +2460,7 @@ static NTSTATUS rpc_del_groupmem(struct net_context *c,
{
struct policy_handle connect_pol, domain_pol;
NTSTATUS status, result;
- uint32 group_rid;
+ uint32_t group_rid;
struct policy_handle group_pol;
struct dcerpc_binding_handle *b = pipe_hnd->binding_handle;
@@ -2568,7 +2568,7 @@ static NTSTATUS rpc_del_aliasmem(struct rpc_pipe_client
*pipe_hnd,
{
struct policy_handle connect_pol, domain_pol;
NTSTATUS status, result;
- uint32 alias_rid;
+ uint32_t alias_rid;
struct policy_handle alias_pol;
struct dcerpc_binding_handle *b = pipe_hnd->binding_handle;
@@ -2741,7 +2741,7 @@ static NTSTATUS rpc_group_list_internals(struct
net_context *c,
{
struct policy_handle connect_pol, domain_pol;
NTSTATUS status, result;
- uint32 start_idx=0, max_entries=250, num_entries, i, loop_count = 0;
+ uint32_t start_idx=0, max_entries=250, num_entries, i, loop_count = 0;
struct samr_SamArray *groups = NULL;
bool global = false;
bool local = false;
@@ -3019,11 +3019,11 @@ static NTSTATUS rpc_list_group_members(struct
net_context *c,
const char *domain_name,
const struct dom_sid *domain_sid,
struct policy_handle *domain_pol,
- uint32 rid)
+ uint32_t rid)
{
NTSTATUS result, status;
struct policy_handle group_pol;
- uint32 num_members, *group_rids;
+ uint32_t num_members, *group_rids;
int i;
struct samr_RidAttrArray *rids = NULL;
struct lsa_Strings names;
@@ -3113,12 +3113,12 @@ static NTSTATUS rpc_list_alias_members(struct
net_context *c,
struct cli_state *cli,
TALLOC_CTX *mem_ctx,
struct policy_handle *domain_pol,
- uint32 rid)
+ uint32_t rid)
{
NTSTATUS result, status;
struct rpc_pipe_client *lsa_pipe;
struct policy_handle alias_pol, lsa_pol;
- uint32 num_members;
+ uint32_t num_members;
struct dom_sid *alias_sids;
char **domains;
char **names;
--
Samba Shared Repository
