[Fedora-directory-commits] ldapserver/ldap/servers/plugins/replication repl5_total.c, 1.5, 1.5.2.1 repl_controls.c, 1.5, 1.5.2.1 repl_extop.c, 1.7, 1.7.2.1 windows_protocol_util.c, 1.20.2.3, 1.20.2.4

Noriko Hosoi (nhosoi) fedora-directory-commits at redhat.com
Thu Mar 2 01:12:06 UTC 2006


Author: nhosoi

Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/replication
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11336/ldap/servers/plugins/replication

Modified Files:
      Tag: Directory71RtmBranch
	repl5_total.c repl_controls.c repl_extop.c 
	windows_protocol_util.c 
Log Message:
[159328] Tracking bug for Directory Server 7.1 Service Packs; Comment #50
ported internal diffs to the external CVS



Index: repl5_total.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl5_total.c,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- repl5_total.c	19 Apr 2005 22:07:32 -0000	1.5
+++ repl5_total.c	2 Mar 2006 01:11:55 -0000	1.5.2.1
@@ -585,7 +585,7 @@
     char *lasti;
     unsigned long len;
 	unsigned long tag;
-    char *str;
+    char *str = NULL;
     int rc;
     Slapi_Value *value;
 
@@ -685,6 +685,9 @@
     if (value)
         slapi_value_free (&value);
 
+    slapi_ch_free_string(&attrtype);
+    slapi_ch_free_string(&str);
+
     return -1;    
 }
 


Index: repl_controls.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl_controls.c,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- repl_controls.c	19 Apr 2005 22:07:32 -0000	1.5
+++ repl_controls.c	2 Mar 2006 01:11:55 -0000	1.5.2.1
@@ -349,15 +349,15 @@
         		      emtag != LBER_ERROR && emtag != LBER_END_OF_SEQORSET;
         		      emtag = ber_next_element( ember, &emlen, emlast ))
 			    {
-        		    struct berval **embvals;
-        		    if ( ber_scanf( ember, "{i{a[V]}}", &op, &type, &embvals ) == LBER_ERROR )
+        		    struct berval **embvals = NULL;
+        		    type = NULL;
+        		    if ( ber_scanf( ember, "{i{a[V]}}", &op, &type, &embvals ) != LBER_ERROR )
 					{
-            			continue;
+        				slapi_mods_add_modbvps( smods, op, type, embvals);
 					/* GGOODREPL I suspect this will cause two sets of lastmods attr values
 						to end up in the entry. We need to remove the old ones.
 					*/
         		    }
-                    slapi_mods_add_modbvps( smods, op, type, embvals);
         		    free( type );
         		    ber_bvecfree( embvals );
         		}


Index: repl_extop.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl_extop.c,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -r1.7 -r1.7.2.1
--- repl_extop.c	19 Apr 2005 22:07:32 -0000	1.7
+++ repl_extop.c	2 Mar 2006 01:11:55 -0000	1.7.2.1
@@ -384,7 +384,8 @@
 		/* slapi_ch_free accepts NULL pointer */
 		slapi_ch_free ((void**)protocol_oid);
 		slapi_ch_free ((void**)repl_root);
-		slapi_ch_free ((void **)extra_referrals);
+		slapi_ch_array_free (*extra_referrals);
+        *extra_referrals = NULL;
 		slapi_ch_free ((void**)csnstr);
 
 		if (*supplier_ruv)


Index: windows_protocol_util.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/windows_protocol_util.c,v
retrieving revision 1.20.2.3
retrieving revision 1.20.2.4
diff -u -r1.20.2.3 -r1.20.2.4
--- windows_protocol_util.c	20 Feb 2006 19:50:29 -0000	1.20.2.3
+++ windows_protocol_util.c	2 Mar 2006 01:11:55 -0000	1.20.2.4
@@ -1570,11 +1570,12 @@
 {
 	int retval = 0;
 
-	char *string_deleted = "(isdeleted=*)";
+	char *string_deleted = slapi_ch_strdup("(isdeleted=*)");
 
 	/* DBDB: we should allocate these filters once and keep them around for better performance */
 	Slapi_Filter *filter_deleted = slapi_str2filter( string_deleted );
 	
+    slapi_ch_free_string(&string_deleted);
 	/* DBDB: this should be one filter, the code originally tested separately and hasn't been fixed yet */
 	if ( (slapi_filter_test_simple( e, filter_deleted ) == 0) )
 	{
@@ -2251,9 +2252,10 @@
 		/* Next test for the correct kind of entry */
 		if (local_entry) {
 			/* DBDB: we should allocate these filters once and keep them around for better performance */
-			char *string_filter = "(&(|(objectclass=ntuser)(objectclass=ntgroup))(ntUserDomainId=*))";
+			char *string_filter = slapi_ch_strdup("(&(|(objectclass=ntuser)(objectclass=ntgroup))(ntUserDomainId=*))");
 			Slapi_Filter *filter = slapi_str2filter( string_filter );
 			
+            slapi_ch_free_string(&string_filter);
 			if (slapi_filter_test_simple( (Slapi_Entry*)local_entry, filter ) == 0)
 			{
 				retval = 1;




More information about the Fedora-directory-commits mailing list