--------------------- PatchSet 12340 Date: 2008/08/03 22:11:37 Author: hno Branch: SQUID_2_7 Tag: (none) Log: Bug #2427: squid_ldap_group -h reports the old % codes for -f The help output still showed the old obsolete %v/%a codes in the -f description Updates to %u for user and %g for group some many years ago. Members: helpers/external_acl/ldap_group/squid_ldap_group.c:1.14.6.2->1.14.6.3 Index: squid/helpers/external_acl/ldap_group/squid_ldap_group.c =================================================================== RCS file: /cvsroot/squid/squid/helpers/external_acl/ldap_group/squid_ldap_group.c,v retrieving revision 1.14.6.2 retrieving revision 1.14.6.3 diff -u -r1.14.6.2 -r1.14.6.3 --- squid/helpers/external_acl/ldap_group/squid_ldap_group.c 18 Mar 2008 02:49:58 -0000 1.14.6.2 +++ squid/helpers/external_acl/ldap_group/squid_ldap_group.c 3 Aug 2008 22:11:37 -0000 1.14.6.3 @@ -404,7 +404,7 @@ fprintf(stderr, "\n" PROGRAM_NAME " version " PROGRAM_VERSION "\n\n"); fprintf(stderr, "Usage: " PROGRAM_NAME " -b basedn -f filter [options] ldap_server_name\n\n"); fprintf(stderr, "\t-b basedn (REQUIRED)\tbase dn under where to search for groups\n"); - fprintf(stderr, "\t-f filter (REQUIRED)\tgroup search filter pattern. %%v = user,\n\t\t\t\t%%a = group\n"); + fprintf(stderr, "\t-f filter (REQUIRED)\tgroup search filter pattern. %%u = user,\n\t\t\t\t%%g = group\n"); fprintf(stderr, "\t-B basedn (REQUIRED)\tbase dn under where to search for users\n"); fprintf(stderr, "\t-F filter (REQUIRED)\tuser search filter pattern. %%s = login\n"); fprintf(stderr, "\t-s base|one|sub\t\tsearch scope\n");