sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-11-26 04:23:49 +03:00
Code Activity

r16126: Janitor for Volker..... This looks correct to me.

Browse Source 
Jeremy.

Fix a parsing error that became apparent in 'make test': If we have no
group
rids in the info3 we set the array buffer pointer to "1" but fail to
actually
ship the array.

Volker.
This commit is contained in:
Jeremy Allison
2006-06-09 17:19:59 +00:00
committed by Gerald (Jerry) Carter
parent e018ea3d1d
commit ee1b9207d3
1 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
source/rpc_parse/parse_net.c
View File

@@ -4,7 +4,7 @@
* Copyright (C) Andrew Tridgell 1992-1997,
* Copyright (C) Luke Kenneth Casson Leighton 1996-1997,
* Copyright (C) Paul Ashton 1997.
* Copyright (C) Jean Fran<EFBFBD>ois Micouleau 2002.
* Copyright (C) Jean Francois Micouleau 2002.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -1711,29 +1711,24 @@ BOOL net_io_user_info3(const char *desc, NET_USER_INFO_3 *usr, prs_struct *ps,
if(!prs_align(ps))
return False;
if (usr->num_groups > 0) {
if(!prs_uint32("num_groups2 ", ps, depth, &usr->num_groups2)) /* num groups2 */
return False;
if(!prs_uint32("num_groups2 ", ps, depth, &usr->num_groups2)) /* num groups2 */
if (usr->num_groups != usr->num_groups2) {
DEBUG(3,("net_io_user_info3: num_groups mismatch! (%d != %d)\n",
usr->num_groups, usr->num_groups2));
return False;
}
if (UNMARSHALLING(ps)) {
usr->gids = PRS_ALLOC_MEM(ps, DOM_GID, usr->num_groups);
if (usr->gids == NULL)
return False;
}
if (usr->num_groups != usr->num_groups2) {
DEBUG(3,("net_io_user_info3: num_groups mismatch! (%d != %d)\n",
usr->num_groups, usr->num_groups2));
for (i = 0; i < usr->num_groups; i++) {
if(!smb_io_gid("", &usr->gids[i], ps, depth)) /* group info */
return False;
}
if (UNMARSHALLING(ps)) {
usr->gids = PRS_ALLOC_MEM(ps, DOM_GID, usr->num_groups);
if (usr->gids == NULL)
return False;
}
for (i = 0; i < usr->num_groups; i++) {
if(!smb_io_gid("", &usr->gids[i], ps, depth)) /* group info */
return False;
}
}
if(!smb_io_unistr2("uni_logon_srv", &usr->uni_logon_srv, usr->hdr_logon_srv.buffer, ps, depth)) /* logon server unicode string */