[Fedora-directory-commits] ldapserver/ldap/servers/slapd index_subsystem.c, 1.5, 1.5.2.1 plugin_internal_op.c, 1.5, 1.5.2.1

[Noriko Hosoi (nhosoi)]

Author: nhosoi

Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24843/slapd

Modified Files:
      Tag: Directory71RtmBranch
	index_subsystem.c plugin_internal_op.c 
Log Message:
Resolves: #297221
Summary: rhds71 Malformed Dynamic Authorization Group makes Directory Server Crash
Note: applying the fixes in HEAD to Directory71RtmBranch



Index: index_subsystem.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/index_subsystem.c,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- index_subsystem.c	19 Apr 2005 22:07:36 -0000	1.5
+++ index_subsystem.c	21 Dec 2007 00:03:46 -0000	1.5.2.1
@@ -1029,7 +1029,7 @@
 	Slapi_Filter *tmp_f = slapi_str2filter(registration_item->index_filter);
 	Slapi_Backend *be;
 	
-	if(!theCache)
+	if(!theCache || !tmp_f)
 		return -1;
 
 	index_subsys_write_lock();


Index: plugin_internal_op.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/plugin_internal_op.c,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- plugin_internal_op.c	19 Apr 2005 22:07:36 -0000	1.5
+++ plugin_internal_op.c	21 Dec 2007 00:03:46 -0000	1.5.2.1
@@ -717,7 +717,7 @@
     op->o_search_entry_handler    = internal_srch_entry_callback;
     op->o_search_referral_handler = internal_ref_entry_callback;
 	
-    filter = slapi_str2filter(ifstr ? (fstr = slapi_ch_strdup(ifstr)) : "");
+    filter = slapi_str2filter(ifstr ? (fstr = slapi_ch_strdup(ifstr)) : NULL);
     if(scope == LDAP_SCOPE_BASE) filter->f_flags |= (SLAPI_FILTER_LDAPSUBENTRY | SLAPI_FILTER_TOMBSTONE);
     if (NULL == filter) 
 	{