svn commit: samba r16127 - in branches/SAMBA_3_0_RELEASE: .
source/rpc_parse
jerry at samba.org
jerry at samba.org
Fri Jun 9 17:53:01 GMT 2006
Author: jerry
Date: 2006-06-09 17:53:00 +0000 (Fri, 09 Jun 2006)
New Revision: 16127
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=16127
Log:
adding volker parse_net change
Modified:
branches/SAMBA_3_0_RELEASE/WHATSNEW.txt
branches/SAMBA_3_0_RELEASE/source/rpc_parse/parse_net.c
Changeset:
Modified: branches/SAMBA_3_0_RELEASE/WHATSNEW.txt
===================================================================
--- branches/SAMBA_3_0_RELEASE/WHATSNEW.txt 2006-06-09 17:19:59 UTC (rev 16126)
+++ branches/SAMBA_3_0_RELEASE/WHATSNEW.txt 2006-06-09 17:53:00 UTC (rev 16127)
@@ -21,6 +21,17 @@
o Winbind & AD trust failures.
+Group Mapping Changes
+=====================
+
+The default mapping entries for groups such as "Domain Admins"
+are no longer created when using an smbpasswd file or a tdbsam passdb
+backend. This means that it is necessary to use 'net groupmap add'
+rathe than 'net groupmap modify' to set these entries. This change
+has no effect on winbindd's IDmap functionality for domain groups.
+
+
+
######################################################################
Changes
#######
@@ -99,6 +110,8 @@
when mapped to a non-algorithmic rid.
* Fix regression which upper-cased machine names passed to the
'add machine script'.
+ * Correct parsing error in parse_net.c for user's with no group
+ membership.
o Jason Mader <jason at ncac.gwu.edu>
Modified: branches/SAMBA_3_0_RELEASE/source/rpc_parse/parse_net.c
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/rpc_parse/parse_net.c 2006-06-09 17:19:59 UTC (rev 16126)
+++ branches/SAMBA_3_0_RELEASE/source/rpc_parse/parse_net.c 2006-06-09 17:53:00 UTC (rev 16127)
@@ -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ç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 @@
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 */
- 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));
+ 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));
+ if (UNMARSHALLING(ps)) {
+ usr->gids = PRS_ALLOC_MEM(ps, DOM_GID, usr->num_groups);
+ if (usr->gids == NULL)
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;
- }
-
+ 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 */
More information about the samba-cvs
mailing list