[Fedora-directory-commits] ldapserver/ldap/servers/slapd/back-ldbm ldbm_search.c, 1.13, 1.14

[Nathan Kinder (nkinder)]

Author: nkinder

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

Modified Files:
	ldbm_search.c 
Log Message:
Resolves: 458135
Summary: Don't log SORT control message for internal operations.



Index: ldbm_search.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/ldbm_search.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ldbm_search.c	30 Jun 2008 17:28:16 -0000	1.13
+++ ldbm_search.c	8 Aug 2008 15:53:10 -0000	1.14
@@ -478,9 +478,12 @@
                 char *sort_error_type = NULL;
                 int sort_return_value  = 0;
 
-                /* Log to the access log the particulars of this sort request */
-                /* Log message looks like this: SORT <key list useful for input to ldapsearch> <#candidates> | <unsortable> */
-                sort_log_access(pb,sort_control,candidates);
+                /* Don't log internal operations */
+                if (!operation_is_flag_set(operation, OP_FLAG_INTERNAL)) {
+                    /* Log to the access log the particulars of this sort request */
+                    /* Log message looks like this: SORT <key list useful for input to ldapsearch> <#candidates> | <unsortable> */
+                    sort_log_access(pb,sort_control,candidates);
+                }
                 sort_return_value = sort_candidates( be, lookthrough_limit, time_up, pb, candidates, sort_control, &sort_error_type );
                 /* Fix for bugid # 394184, SD, 20 Jul 00 */
                 /* replace the hard coded return value by the appropriate LDAP error code */