[Fedora-directory-commits] ldapserver/ldap/servers/plugins/views views.c, 1.5.2.1, 1.5.2.2

[Noriko Hosoi (nhosoi)]

Author: nhosoi

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

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



Index: views.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/views/views.c,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- views.c	25 Aug 2005 22:38:40 -0000	1.5.2.1
+++ views.c	2 Mar 2006 01:12:04 -0000	1.5.2.2
@@ -735,6 +735,7 @@
 	Slapi_Filter *pCurrentFilter = 0;
 	Slapi_Filter *pBuiltFilter = 0;
 	Slapi_Filter *pViewEntryExcludeFilter = 0;
+    char *excludeFilter;
 
 	if(pView->includeAncestorFiltersFilter)
 	{
@@ -769,7 +770,11 @@
 	}
 
 	/* filter for removing view entries from search */
-	pViewEntryExcludeFilter = slapi_str2filter( "(!(objectclass=" VIEW_OBJECTCLASS "))" );
+    /* richm - slapi_str2filter _writes_ to it's argument, so we have to pass in 
+       some writeable memory, or core dump, do not pass go */
+    excludeFilter = slapi_ch_strdup("(!(objectclass=" VIEW_OBJECTCLASS "))");
+	pViewEntryExcludeFilter = slapi_str2filter( excludeFilter );
+    slapi_ch_free_string(&excludeFilter);
 
 	if(pBuiltFilter)
 		pView->includeAncestorFiltersFilter = slapi_filter_join_ex( LDAP_FILTER_AND, pBuiltFilter, pViewEntryExcludeFilter, 0 );