From: Lukas Juhrich <lukas.juhrich@agdsn.de>
Date: Sat, 4 Nov 2017 01:50:44 +0000 (+0100)
Subject: Issue#8769 - Fix oid search extension syntax in documentation
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~12^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8ba729f846434cc87fd4e2df812d6aa628a9b98;p=thirdparty%2Fopenldap.git

Issue#8769 - Fix oid search extension syntax in documentation

The option string, e.g. '<oid>=:dn:' is parsed like a LDIF entry starting from
the '=' and replacing the '=' with a dummy variable 'x'.  In this case, said
string is 'x:dn:', so the resulting effective value is 'dn:'.  This also implies
that base64 values have to be passed in the form '<oid>=::<b64value>'.
---

diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c
index 55bf26432d..eb10c2e343 100644
--- a/clients/tools/ldapsearch.c
+++ b/clients/tools/ldapsearch.c
@@ -156,7 +156,7 @@ usage( void )
 #ifdef LDAP_CONTROL_X_SERVER_NOTIFICATION
 	fprintf( stderr, _("             [!]serverNotif              (MS AD Server Notification)\n"));
 #endif
-	fprintf( stderr, _("             [!]<oid>[=:<b64value>] (generic control; no response handling)\n"));
+	fprintf( stderr, _("             [!]<oid>[=:<value>|::<b64value>] (generic control; no response handling)\n"));
 	fprintf( stderr, _("  -f file    read operations from `file'\n"));
 	fprintf( stderr, _("  -F prefix  URL prefix for files (default: %s)\n"), def_urlpre);
 	fprintf( stderr, _("  -l limit   time limit (in seconds, or \"none\" or \"max\") for search\n"));
diff --git a/doc/man/man1/ldapsearch.1 b/doc/man/man1/ldapsearch.1
index c8fed5d15c..bb59cf7ef1 100644
--- a/doc/man/man1/ldapsearch.1
+++ b/doc/man/man1/ldapsearch.1
@@ -327,7 +327,7 @@ Search extensions:
           rp[/<cookie>][/<slimit>]     (LDAP Sync refreshAndPersist)
   [!]vlv=<before>/<after>(/<offset>/<count>|:<value>)  (virtual list view)
   [!]deref=derefAttr:attr[,attr[...]][;derefAttr:attr[,attr[...]]]
-  [!]<oid>[=<value>]
+  [!]<oid>[=:<value>|::<b64value>]
 .fi
 .TP
 .BI \-o \ opt \fR[= optparam \fR]