diff --git a/clients/tools/common.c b/clients/tools/common.c index 69ab796c3ea3284e5ba2151cc73aadf30f4773b8..86434283d8f21c40907cd1047d4140c4845b454e 100644 --- a/clients/tools/common.c +++ b/clients/tools/common.c @@ -247,8 +247,8 @@ N_(" -c continuous operation mode (do not stop on errors)\n"), N_(" -d level set LDAP debugging level to `level'\n"), N_(" -D binddn bind DN\n"), N_(" -e [!]<ext>[=<extparam>] general extensions (! indicates criticality)\n") -N_(" [!]assert=<filter> (a RFC 4515 Filter string)\n") -N_(" [!]authzid=<authzid> (\"dn:<dn>\" or \"u:<user>\")\n") +N_(" [!]assert=<filter> (RFC 4528; a RFC 4515 Filter string)\n") +N_(" [!]authzid=<authzid> (RFC 4370; \"dn:<dn>\" or \"u:<user>\")\n") #ifdef LDAP_CONTROL_OBSOLETE_PROXY_AUTHZ #if 0 /* non-advertized support for proxyDN */ @@ -260,13 +260,13 @@ N_(" [!]chaining[=<resolveBehavior>[/<continuationBehavior>]]\n") N_(" one of \"chainingPreferred\", \"chainingRequired\",\n") N_(" \"referralsPreferred\", \"referralsRequired\"\n") #endif /* LDAP_CONTROL_X_CHAINING_BEHAVIOR */ -N_(" [!]manageDSAit\n") +N_(" [!]manageDSAit (RFC 3296)\n") N_(" [!]noop\n") #ifdef LDAP_CONTROL_PASSWORDPOLICYREQUEST N_(" ppolicy\n") #endif -N_(" [!]postread[=<attrs>] (a comma-separated attribute list)\n") -N_(" [!]preread[=<attrs>] (a comma-separated attribute list)\n") +N_(" [!]postread[=<attrs>] (RFC 4527; comma-separated attr list)\n") +N_(" [!]preread[=<attrs>] (RFC 4527; comma-separated attr list)\n") N_(" [!]relax\n") #ifdef LDAP_CONTROL_X_SESSION_TRACKING N_(" [!]sessiontracking\n") diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c index aeb56d036ad20ea80e85d1d2d21b1fb0e6fc68eb..1bb7ec8db8b2c5289fbac43475a0df8575844c59 100644 --- a/clients/tools/ldapsearch.c +++ b/clients/tools/ldapsearch.c @@ -126,12 +126,13 @@ usage( void ) fprintf( stderr, _(" -E [!]<ext>[=<extparam>] search extensions (! indicates criticality)\n")); fprintf( stderr, _(" [!]domainScope (domain scope)\n")); fprintf( stderr, _(" !dontUseCopy (Don't Use Copy)\n")); - fprintf( stderr, _(" [!]mv=<filter> (matched values filter)\n")); - fprintf( stderr, _(" [!]pr=<size>[/prompt|noprompt] (paged results/prompt)\n")); - fprintf( stderr, _(" [!]sss=[-]<attr[:OID]>[/[-]<attr[:OID]>...] (server side sorting)\n")); - fprintf( stderr, _(" [!]subentries[=true|false] (subentries)\n")); - fprintf( stderr, _(" [!]sync=ro[/<cookie>] (LDAP Sync refreshOnly)\n")); - fprintf( stderr, _(" rp[/<cookie>][/<slimit>] (LDAP Sync refreshAndPersist)\n")); + fprintf( stderr, _(" [!]mv=<filter> (RFC 3876 matched values filter)\n")); + fprintf( stderr, _(" [!]pr=<size>[/prompt|noprompt] (RFC 2696 paged results/prompt)\n")); + fprintf( stderr, _(" [!]sss=[-]<attr[:OID]>[/[-]<attr[:OID]>...]\n")); + fprintf( stderr, _(" (RFC 2891 server side sorting)\n")); + fprintf( stderr, _(" [!]subentries[=true|false] (RFC 3672 subentries)\n")); + fprintf( stderr, _(" [!]sync=ro[/<cookie>] (RFC 4533 LDAP Sync refreshOnly)\n")); + fprintf( stderr, _(" rp[/<cookie>][/<slimit>] (refreshAndPersist)\n")); fprintf( stderr, _(" [!]<oid>=:<value> (generic control; no response handling)\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"));