sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

more bug updates from head

Browse Source
This commit is contained in:
Andrew Tridgell 0001-01-01 00:00:00 +00:00
parent 03ac082dcb
commit 8b769bf5bb
7 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/libsmb/cli_wkssvc.c
View File

@ -40,7 +40,6 @@ NTSTATUS cli_wks_query_info(struct cli_state *cli, TALLOC_CTX *mem_ctx,
prs_struct rbuf;
WKS_Q_QUERY_INFO q_o;
WKS_R_QUERY_INFO r_o;
NTSTATUS nt_status;
if (cli == NULL || wks100 == NULL)
return NT_STATUS_UNSUCCESSFUL;
@ -89,6 +88,6 @@ NTSTATUS cli_wks_query_info(struct cli_state *cli, TALLOC_CTX *mem_ctx,
/* do clean up */
prs_mem_free(&rbuf);
return nt_status;
return NT_STATUS_OK;
}

5
source/libsmb/cliconnect.c
View File

@ -1119,11 +1119,6 @@ NTSTATUS cli_full_connection(struct cli_state **output_cli,
struct in_addr ip;
extern pstring global_myname;
if (!output_cli) {
DEBUG(0, ("output_cli is NULL!?!"));
SMB_ASSERT("output_cli for cli_full_connection was NULL.\n");
}
if (!my_name)
my_name = global_myname;

8
source/nsswitch/winbind_nss.c
View File

@ -593,7 +593,7 @@ BOOL next_token(char **ptr,char *buff,char *sep, size_t bufsize)
static NSS_STATUS fill_pwent(struct passwd *result,
struct winbindd_pw *pw,
char **buffer, int *buflen)
char **buffer, size_t *buflen)
{
/* User name */
@ -678,8 +678,8 @@ static NSS_STATUS fill_pwent(struct passwd *result,
the static data passed to us by libc to put strings and stuff in.
Return NSS_STATUS_TRYAGAIN if we run out of memory. */
static int fill_grent(struct group *result, struct winbindd_gr *gr,
char *gr_mem, char **buffer, int *buflen)
static NSS_STATUS fill_grent(struct group *result, struct winbindd_gr *gr,
char *gr_mem, char **buffer, size_t *buflen)
{
fstring name;
int i;
@ -722,7 +722,7 @@ static int fill_grent(struct group *result, struct winbindd_gr *gr,
/* this next value is a pointer to a pointer so let's align it */
/* Calculate number of extra bytes needed to align on pointer size boundry */
if ((i = (int)*buffer % sizeof(char*)) != 0)
if ((i = (unsigned long)(*buffer) % sizeof(char*)) != 0)
i = sizeof(char*) - i;
if ((tst = get_static(buffer, buflen, ((gr->num_gr_mem + 1) *

4
source/rpc_parse/parse_sec.c
View File

@ -157,7 +157,7 @@ BOOL sec_io_ace(char *desc, SEC_ACE *psa, prs_struct *ps, int depth)
adds new SID with its permissions to ACE list
********************************************************************/
NTSTATUS sec_ace_add_sid(TALLOC_CTX *ctx, SEC_ACE **new, SEC_ACE *old, size_t *num, DOM_SID *sid, uint32 mask)
NTSTATUS sec_ace_add_sid(TALLOC_CTX *ctx, SEC_ACE **new, SEC_ACE *old, unsigned *num, DOM_SID *sid, uint32 mask)
{
int i = 0;
@ -165,7 +165,7 @@ NTSTATUS sec_ace_add_sid(TALLOC_CTX *ctx, SEC_ACE **new, SEC_ACE *old, size_t *n
*num += 1;
if((new[0] = (SEC_ACE *) talloc_zero(ctx, *num * sizeof(SEC_ACE))) == 0)
if((new[0] = (SEC_ACE *) talloc_zero(ctx, (*num) * sizeof(SEC_ACE))) == 0)
return NT_STATUS_NO_MEMORY;
for (i = 0; i < *num - 1; i ++)

2
source/rpc_server/srv_srvsvc_nt.c
View File

@ -964,8 +964,6 @@ static WERROR init_srv_file_info_ctr(pipes_struct *p, SRV_FILE_INFO_CTR *ctr,
ctr->switch_value = switch_value;
ctr->num_entries = *total_entries - *resume_hnd;
if (ctr->num_entries < 0)
ctr->num_entries = 0;
ctr->num_entries2 = ctr->num_entries;
switch (switch_value) {

2
source/smbd/lanman.c
View File

@ -1778,7 +1778,7 @@ static BOOL api_RNetGroupEnum(connection_struct *conn,uint16 vuid, char *param,c
return False;
/* get list of domain groups SID_DOMAIN_GRP=2 */
if(!enum_group_mapping(2 , &group_list, &num_entries, False, False)) {
if(!enum_group_mapping(SID_NAME_DOM_GRP , &group_list, &num_entries, False, False)) {
DEBUG(3,("api_RNetGroupEnum:failed to get group list"));
return False;
}

2
source/wrepld/parser.c
View File

@ -96,7 +96,7 @@ static void decode_wins_name(struct BUFFER *outbuf, WINS_NAME *wins_name)
wins_name->name_len=RIVAL(outbuf->buffer, outbuf->offset);
outbuf->offset+=4;
memcpy(wins_name->name,outbuf->buffer+outbuf->offset, 15);
wins_name->name[16]='\0';
wins_name->name[15]='\0';
if((p = strchr(wins_name->name,' ')) != NULL)
*p = 0;