mirror of
https://github.com/samba-team/samba.git
synced 2025-11-26 04:23:49 +03:00
r16126: Janitor for Volker..... This looks correct to me.
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:
committed by
Gerald (Jerry) Carter
parent
e018ea3d1d
commit
ee1b9207d3
@@ -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,8 +1711,6 @@ 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;
|
||||
|
||||
@@ -1722,7 +1720,6 @@ BOOL net_io_user_info3(const char *desc, NET_USER_INFO_3 *usr, prs_struct *ps,
|
||||
return False;
|
||||
}
|
||||
|
||||
|
||||
if (UNMARSHALLING(ps)) {
|
||||
usr->gids = PRS_ALLOC_MEM(ps, DOM_GID, usr->num_groups);
|
||||
if (usr->gids == NULL)
|
||||
@@ -1734,8 +1731,6 @@ BOOL net_io_user_info3(const char *desc, NET_USER_INFO_3 *usr, prs_struct *ps,
|
||||
return False;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if(!smb_io_unistr2("uni_logon_srv", &usr->uni_logon_srv, usr->hdr_logon_srv.buffer, ps, depth)) /* logon server unicode string */
|
||||
return False;
|
||||
if(!smb_io_unistr2("uni_logon_dom", &usr->uni_logon_dom, usr->hdr_logon_dom.buffer, ps, depth)) /* logon domain unicode string */
|
||||
|
||||
Reference in New Issue
Block a user