Mercurial > hg > webserver / file diff

--- a/src/server/safs/ldap.h	Sat Mar 11 17:14:51 2023 +0100
+++ b/src/server/safs/ldap.h	Sun Mar 12 11:29:02 2023 +0100
@@ -43,14 +43,14 @@
     
 #define WS_SAFS_LDAP_MAX_TIMEOUT 32767
     
-#define WS_SAFS_LDAP_EMPTY_QUERY_ERROR  404
+#define WS_SAFS_LDAP_EMPTY_FILTER_ERROR  404
 #define WS_SAFS_LDAP_EMPTY_RESULT_ERROR 404
     
 /*
- * ldap-query
+ * ldap-search
  * 
- * Sends an ldap query result as ldif to the client. If no query parameter is
- * specified, the SAFs tries to use the "ldap_query" parameter from rq->vars.
+ * Sends an ldap search result as ldif to the client. If no filter parameter is
+ * specified, the SAFs tries to use the "ldap_filter" parameter from rq->vars.
  * 
  * required parameters:
  *  resource    name of the ldap resource pool
@@ -59,17 +59,17 @@
  * optional parameters:
  *  binddn              bind ldap session to binddn
  *  bindpw              binddn password
- *  query               ldap search query
+ *  filter              ldap search filter
  *  scope               search scope: base, onelevel, subtree, children
  *  timeout             timeout in seconds                       default: 30
  *  sizelimit           maximum number of result entries         defazkt: 1000
- *  empty_query_error   status code if the query is empty/null   default: 404
+ *  empty_filter_error  status code if the filter is empty/null  default: 404
  *  empty_result_error  status code if the result is empty       default: 404  
  * 
  * If the query or result is empty and the status code is 2xx, an empty
  * response is sent to the client.
  */
-int ldap_query_saf(pblock *pb, Session *sn, Request *rq);
+int service_ldap_search(pblock *pb, Session *sn, Request *rq);
 
 
 #ifdef __cplusplus