svn commit: samba r4216 - branches/SAMBA_3_0/source/sam trunk/source/sam

[gd at samba.org]

Author: gd
Date: 2004-12-15 10:12:10 +0000 (Wed, 15 Dec 2004)
New Revision: 4216

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=4216

Log:
fix segfault in idmap_rid 

(only ever shows up when the somewhat hidden
IDMAP_RID_SUPPORT_TRUSTED_DOMAINS - define is set).

Thanks to Stephan Martin <sm at suse.de> for reporting this bug.

Guenther

Modified:
   branches/SAMBA_3_0/source/sam/idmap_rid.c
   trunk/source/sam/idmap_rid.c


Changeset:
Modified: branches/SAMBA_3_0/source/sam/idmap_rid.c
===================================================================
--- branches/SAMBA_3_0/source/sam/idmap_rid.c	2004-12-15 07:59:58 UTC (rev 4215)
+++ branches/SAMBA_3_0/source/sam/idmap_rid.c	2004-12-15 10:12:10 UTC (rev 4216)
@@ -272,8 +272,8 @@
 
 	/* put the results together */
 	*num_domains = trusted_num_domains + 1;
-	*domain_names = (fstring *) realloc(domain_names, sizeof(fstring) * *num_domains);
-	*domain_sids = (DOM_SID *) realloc(domain_sids, sizeof(DOM_SID) * *num_domains); 
+	*domain_names = (fstring *) realloc(*domain_names, sizeof(fstring) * *num_domains);
+	*domain_sids = (DOM_SID *) realloc(*domain_sids, sizeof(DOM_SID) * *num_domains); 
 
 	/* first add myself at the end*/
 	fstrcpy((*domain_names)[0], domain_name);

Modified: trunk/source/sam/idmap_rid.c
===================================================================
--- trunk/source/sam/idmap_rid.c	2004-12-15 07:59:58 UTC (rev 4215)
+++ trunk/source/sam/idmap_rid.c	2004-12-15 10:12:10 UTC (rev 4216)
@@ -272,8 +272,8 @@
 
 	/* put the results together */
 	*num_domains = trusted_num_domains + 1;
-	*domain_names = (fstring *) realloc(domain_names, sizeof(fstring) * *num_domains);
-	*domain_sids = (DOM_SID *) realloc(domain_sids, sizeof(DOM_SID) * *num_domains); 
+	*domain_names = (fstring *) realloc(*domain_names, sizeof(fstring) * *num_domains);
+	*domain_sids = (DOM_SID *) realloc(*domain_sids, sizeof(DOM_SID) * *num_domains); 
 
 	/* first add myself at the end*/
 	fstrcpy((*domain_names)[0], domain_name);