From 316af8dc23e46d51b4ff0317f2388ca7b114d915 Mon Sep 17 00:00:00 2001 From: AdamD Date: Thu, 21 Sep 2017 01:45:06 -0400 Subject: [PATCH 1/2] Update misleading help text Commit d57725aac5145b4f17097d61e3b5a6ca72f1754e updated the help text to use LDAP search filter syntax. This is misleading, however, as the auth.inc file already sets the LDAP filter syntax for you based on the input string in this field. This field should be the bare qualified search string instead, and using the full syntax could be confusing to end users. --- src/usr/local/www/system_authservers.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/usr/local/www/system_authservers.php b/src/usr/local/www/system_authservers.php index 4133e4765d..693a1577be 100644 --- a/src/usr/local/www/system_authservers.php +++ b/src/usr/local/www/system_authservers.php @@ -626,7 +626,7 @@ $group->add(new Form_Input( 'Query', 'text', $pconfig['ldap_extended_query'] -))->setHelp('Example: &(objectClass=inetOrgPerson)(mail=*@example.com)'); +))->setHelp('Example: memberOf=CN=Groupname,OU=MyGroups,DC=example,DC=com;OU=OtherUsers,DC=example,DC=com'); $section->add($group); From 603be2479d1db7c1382ba3838ec0e84575b3e6a8 Mon Sep 17 00:00:00 2001 From: AdamD Date: Thu, 21 Sep 2017 15:45:43 -0400 Subject: [PATCH 2/2] Remove erroneous additional text. --- src/usr/local/www/system_authservers.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/usr/local/www/system_authservers.php b/src/usr/local/www/system_authservers.php index 693a1577be..c327d8ed4f 100644 --- a/src/usr/local/www/system_authservers.php +++ b/src/usr/local/www/system_authservers.php @@ -626,7 +626,7 @@ $group->add(new Form_Input( 'Query', 'text', $pconfig['ldap_extended_query'] -))->setHelp('Example: memberOf=CN=Groupname,OU=MyGroups,DC=example,DC=com;OU=OtherUsers,DC=example,DC=com'); +))->setHelp('Example: memberOf=CN=Groupname,OU=MyGroups,DC=example,DC=com'); $section->add($group);