mirror of
https://github.com/samba-team/samba.git
synced 2024-12-23 17:34:34 +03:00
- portablitity fixes for cc -64 on irix
- fixed gid* bug in rpc_server
(This used to be commit 48aa90c48c
)
This commit is contained in:
parent
af7bd393da
commit
eb4e101153
@ -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)
|
||||
{
|
||||
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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;
|
||||
|
@ -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*/
|
||||
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user