summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2001-09-05 08:11:17 +0000
committerAndrew Tridgell <tridge@samba.org>2001-09-05 08:11:17 +0000
commit7844aa868b02f99c013f336ee03ef05adbd11a7b (patch)
treeadd54a56c99250d44b5e7508f1f7a9469b1312f0
parent7deed93dd7c451b71d9b3cd801a265dbe8e664fc (diff)
downloadsamba-7844aa868b02f99c013f336ee03ef05adbd11a7b.tar.gz
samba-7844aa868b02f99c013f336ee03ef05adbd11a7b.tar.bz2
samba-7844aa868b02f99c013f336ee03ef05adbd11a7b.zip
more warning fixes on solaris
(This used to be commit c04c67fec85b1c81ef0b3cebacde304a1de0d854)
-rw-r--r--source3/libsmb/cli_netlogon.c4
-rw-r--r--source3/nsswitch/winbind_nss_config.h4
-rw-r--r--source3/nsswitch/winbindd_group.c2
-rw-r--r--source3/nsswitch/winbindd_pam.c4
-rw-r--r--source3/nsswitch/winbindd_proto.h2
-rw-r--r--source3/nsswitch/winbindd_util.c4
-rw-r--r--source3/passdb/passdb.c4
-rw-r--r--source3/utils/smbtree.c4
8 files changed, 17 insertions, 11 deletions
diff --git a/source3/libsmb/cli_netlogon.c b/source3/libsmb/cli_netlogon.c
index dc43ab935d..b330299721 100644
--- a/source3/libsmb/cli_netlogon.c
+++ b/source3/libsmb/cli_netlogon.c
@@ -288,7 +288,7 @@ NTSTATUS cli_netlogon_sam_sync(struct cli_state *cli, TALLOC_CTX *mem_ctx,
NET_R_SAM_SYNC r;
NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
DOM_CRED clnt_creds;
- char sess_key[16];
+ uchar sess_key[16];
ZERO_STRUCT(q);
ZERO_STRUCT(r);
@@ -347,7 +347,7 @@ NTSTATUS cli_netlogon_sam_deltas(struct cli_state *cli, TALLOC_CTX *mem_ctx,
NET_R_SAM_DELTAS r;
NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
DOM_CRED clnt_creds;
- char sess_key[16];
+ uchar sess_key[16];
ZERO_STRUCT(q);
ZERO_STRUCT(r);
diff --git a/source3/nsswitch/winbind_nss_config.h b/source3/nsswitch/winbind_nss_config.h
index de3c61e496..88561ee808 100644
--- a/source3/nsswitch/winbind_nss_config.h
+++ b/source3/nsswitch/winbind_nss_config.h
@@ -55,6 +55,10 @@
#include <grp.h>
#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
diff --git a/source3/nsswitch/winbindd_group.c b/source3/nsswitch/winbindd_group.c
index c4ec9b2ce4..55dd41afd4 100644
--- a/source3/nsswitch/winbindd_group.c
+++ b/source3/nsswitch/winbindd_group.c
@@ -48,7 +48,7 @@ static BOOL fill_grent_mem(struct winbindd_domain *domain,
int *num_gr_mem, char **gr_mem, int *gr_mem_len)
{
uint32 *rid_mem = NULL, num_names = 0;
- enum SID_NAME_USE *name_types = NULL;
+ uint32 *name_types = NULL;
int buf_len, buf_ndx, i;
char **names = NULL, *buf;
BOOL result = False;
diff --git a/source3/nsswitch/winbindd_pam.c b/source3/nsswitch/winbindd_pam.c
index b5c3a80422..0408c3a2fb 100644
--- a/source3/nsswitch/winbindd_pam.c
+++ b/source3/nsswitch/winbindd_pam.c
@@ -182,8 +182,8 @@ enum winbindd_result winbindd_pam_auth_crap(struct winbindd_cli_state *state)
memcpy(user_info.chal, state->request.data.auth_crap.chal, 8);
- user_info.lm_resp.buffer = state->request.data.auth_crap.lm_resp;
- user_info.nt_resp.buffer = state->request.data.auth_crap.nt_resp;
+ user_info.lm_resp.buffer = (uchar *)state->request.data.auth_crap.lm_resp;
+ user_info.nt_resp.buffer = (uchar *)state->request.data.auth_crap.nt_resp;
user_info.lm_resp.len = 24;
user_info.nt_resp.len = 24;
diff --git a/source3/nsswitch/winbindd_proto.h b/source3/nsswitch/winbindd_proto.h
index 96ce772bd3..e2de9cca6f 100644
--- a/source3/nsswitch/winbindd_proto.h
+++ b/source3/nsswitch/winbindd_proto.h
@@ -131,7 +131,7 @@ BOOL winbindd_lookup_groupinfo(struct winbindd_domain *domain,
BOOL winbindd_lookup_groupmem(struct winbindd_domain *domain,
uint32 group_rid, uint32 *num_names,
uint32 **rid_mem, char ***names,
- enum SID_NAME_USE **name_types);
+ uint32 **name_types);
struct winbindd_domain *find_domain_from_name(char *domain_name);
struct winbindd_domain *find_domain_from_sid(DOM_SID *sid);
void free_getent_state(struct getent_state *state);
diff --git a/source3/nsswitch/winbindd_util.c b/source3/nsswitch/winbindd_util.c
index 13f8e07c61..aca625fe66 100644
--- a/source3/nsswitch/winbindd_util.c
+++ b/source3/nsswitch/winbindd_util.c
@@ -621,7 +621,7 @@ BOOL winbindd_lookup_groupinfo(struct winbindd_domain *domain,
BOOL winbindd_lookup_groupmem(struct winbindd_domain *domain,
uint32 group_rid, uint32 *num_names,
uint32 **rid_mem, char ***names,
- enum SID_NAME_USE **name_types)
+ uint32 **name_types)
{
return wb_sam_query_groupmem(&domain->sam_dom_handle, group_rid,
num_names, rid_mem, names, name_types);
@@ -834,7 +834,7 @@ char *winbindd_cmd_to_string(enum winbindd_cmd cmd)
}
return result;
-};
+}
/* find the sequence number for a domain */
diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c
index 8144a8e3dd..c86e4c17a7 100644
--- a/source3/passdb/passdb.c
+++ b/source3/passdb/passdb.c
@@ -49,7 +49,8 @@ BOOL initialize_password_db(BOOL reload)
ignore the details and always return True. It is here
only as a placeholder --jerry */
return True;
-
+
+#if _NOT_YET_
/* load another module? */
if (reload && pdb_handle)
{
@@ -85,6 +86,7 @@ BOOL initialize_password_db(BOOL reload)
return (pdb_handle != NULL);
+#endif
}
/*************************************************************
diff --git a/source3/utils/smbtree.c b/source3/utils/smbtree.c
index 0f824f7ecf..41940d9a6c 100644
--- a/source3/utils/smbtree.c
+++ b/source3/utils/smbtree.c
@@ -183,10 +183,10 @@ static BOOL find_master_ip_bcast(pstring workgroup, struct in_addr *server_ip)
static fstring name;
if (!name_status_find(0x1d, ip_list[i], name))
- return False;
+ continue;
if (!find_master_ip(name, server_ip))
- return False;
+ continue;
pstrcpy(workgroup, name);