summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source3/auth/auth_util.c6
-rw-r--r--source3/lib/account_pol.c4
-rw-r--r--source3/rpc_server/srv_lsa_nt.c1
-rw-r--r--source3/rpc_server/srv_srvsvc_nt.c2
-rw-r--r--source3/rpc_server/srv_util.c6
-rw-r--r--source3/smbd/sesssetup.c2
6 files changed, 10 insertions, 11 deletions
diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
index 6f7ec8c0d7..4265e77093 100644
--- a/source3/auth/auth_util.c
+++ b/source3/auth/auth_util.c
@@ -279,7 +279,7 @@ BOOL make_user_info_netlogon_interactive(auth_usersupplied_info **user_info,
char *smb_name,
char *client_domain,
char *wksta_name,
- char chal[8],
+ uchar chal[8],
uchar lm_interactive_pwd[16],
uchar nt_interactive_pwd[16],
uchar *dc_sess_key)
@@ -360,7 +360,7 @@ BOOL make_user_info_winbind(auth_usersupplied_info **user_info,
const char *username,
const char *domain,
const char *password,
- char chal[8] /* Give winbind back the challenge we used */
+ uchar chal[8] /* Give winbind back the challenge we used */
)
{
unsigned char local_lm_response[24];
@@ -468,7 +468,7 @@ BOOL make_user_info_winbind_crap(auth_usersupplied_info **user_info,
BOOL make_user_info_for_reply(auth_usersupplied_info **user_info,
char *smb_name,
char *client_domain,
- char chal[8],
+ unsigned char chal[8],
DATA_BLOB plaintext_password)
{
diff --git a/source3/lib/account_pol.c b/source3/lib/account_pol.c
index 74c8883ed1..1b70d0ceb0 100644
--- a/source3/lib/account_pol.c
+++ b/source3/lib/account_pol.c
@@ -105,7 +105,7 @@ static char *decode_account_policy_name(int field)
/****************************************************************************
****************************************************************************/
-BOOL account_policy_get(int field, int *value)
+BOOL account_policy_get(int field, uint32 *value)
{
fstring name;
@@ -120,7 +120,7 @@ BOOL account_policy_get(int field, int *value)
/****************************************************************************
****************************************************************************/
-BOOL account_policy_set(int field, int value)
+BOOL account_policy_set(int field, uint32 value)
{
fstring name;
diff --git a/source3/rpc_server/srv_lsa_nt.c b/source3/rpc_server/srv_lsa_nt.c
index 432f20a40c..9916b99c8a 100644
--- a/source3/rpc_server/srv_lsa_nt.c
+++ b/source3/rpc_server/srv_lsa_nt.c
@@ -1116,7 +1116,6 @@ NTSTATUS _lsa_query_secobj(pipes_struct *p, LSA_Q_QUERY_SEC_OBJ *q_u, LSA_R_QUER
break;
default:
return NT_STATUS_INVALID_LEVEL;
- break;
}
r_u->ptr=1;
diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c
index 06cbbaa2dc..57757e28b5 100644
--- a/source3/rpc_server/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srv_srvsvc_nt.c
@@ -1827,7 +1827,7 @@ NTSTATUS _srv_net_disk_enum(pipes_struct *p, SRV_Q_NET_DISK_ENUM *q_u, SRV_R_NET
r_u->disk_enum_ctr.unknown = 0;
- r_u->disk_enum_ctr.disk_info_ptr = (uint32) r_u->disk_enum_ctr.disk_info;
+ r_u->disk_enum_ctr.disk_info_ptr = r_u->disk_enum_ctr.disk_info? 1 : 0;
/*allow one DISK_INFO for null terminator*/
diff --git a/source3/rpc_server/srv_util.c b/source3/rpc_server/srv_util.c
index 5c781c20ae..14caf89e2f 100644
--- a/source3/rpc_server/srv_util.c
+++ b/source3/rpc_server/srv_util.c
@@ -86,7 +86,7 @@ NTSTATUS get_alias_user_groups(TALLOC_CTX *ctx, DOM_SID *sid, int *numgroups, ui
struct sys_grent *glist;
struct sys_grent *grp;
int i, num, cur_rid=0;
- gid_t *gid;
+ gid_t gid;
GROUP_MAP map;
DOM_SID tmp_sid;
fstring user_name;
@@ -204,9 +204,9 @@ NTSTATUS get_alias_user_groups(TALLOC_CTX *ctx, DOM_SID *sid, int *numgroups, ui
goto done;
}
- DEBUG(10,("get_alias_user_groups: looking for gid %d of user %s\n", (int)*gid, user_name));
+ DEBUG(10,("get_alias_user_groups: looking for gid %d of user %s\n", (int)gid, user_name));
- if(!get_group_from_gid(*gid, &map, MAPPING_WITHOUT_PRIV)) {
+ if(!get_group_from_gid(gid, &map, MAPPING_WITHOUT_PRIV)) {
DEBUG(0,("get_alias_user_groups: gid of user %s doesn't exist. Check your /etc/passwd and /etc/group files\n", user_name));
goto done;
}
diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index 7791637606..57e0ee2f3a 100644
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -77,7 +77,7 @@ static NTSTATUS check_guest_password(auth_serversupplied_info **server_info)
auth_usersupplied_info *user_info = NULL;
NTSTATUS nt_status;
- char chal[8];
+ unsigned char chal[8];
ZERO_STRUCT(chal);