8000 clean up · symfony/symfony-docs@b82cafd · GitHub
[go: up one dir, main page]
Skip to content

Commit b82cafd

Browse files
lsmith77lsmith77
committed
clean up
1 parent 446ba38 commit b82cafd

File tree

2 files changed

+5
-29
lines changed

2 files changed

+5
-29
lines changed

‎reference/configuration/security.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -454,10 +454,10 @@ query_string
454454
**type**: ``string`` **default**: ``null``
455455

456456
This is the string which will be used to query for the DN. The ``{username}``
457-
placeholder will be replaced with the user-provided value (his login).
457+
placeholder will be replaced with the user-provided value (their login).
458458
Depending on your LDAP server's configuration, you will need to override
459-
this value. This setting is only necessary if the users DN cannot be derived
460-
statically using the `dn_string` config option.
459+
this value. This setting is only necessary if the user's DN cannot be derived
460+
statically using the ``dn_string`` config option.
461461

462462
User provider
463463
~~~~~~~~~~~~~

‎security/ldap.rst

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -295,19 +295,6 @@ than one is found.
295295
Examples are provided below, for both ``form_login_ldap`` and
296296
``http_basic_ldap``.
297297

298-
query_string
299-
............
300-
301-
**type**: ``string`` **default**: ``null``
302-
303-
This optional key defines the form of the query used in order to search the
304-
DN of the user, from the username. The ``{username}`` string is replaced by
305-
the actual username of the person trying to authenticate.
306-
307-
This setting is only necessary if the users DN cannot be derived statically
308-
using the `dn_string` config option.
309-
310-
311298
Configuration example for form login
312299
....................................
313300

@@ -323,8 +310,6 @@ Configuration example for form login
323310
main:
324311
# ...
325312
form_login_ldap:
326-
login_path: login
327-
check_path: login_check
328313
# ...
329314
service: ldap
330315
dn_string: 'uid={username},dc=example,dc=com'
@@ -342,8 +327,6 @@ Configuration example for form login
342327
<config>
343328
<firewall name="main">
344329
<form-login-ldap
345-
login-path="login"
346-
check-path="login_check"
347330
service="ldap"
348331
dn-string="uid={username},dc=example,dc=com" />
349332
</firewall>
@@ -356,8 +339,6 @@ Configuration example for form login
356339
'firewalls' => array(
357340
'main' => array(
358341
'form_login_ldap' => array(
359-
'login_path' => 'login',
360-
'check_path' => 'login_check',
361342
'service' => 'ldap',
362343
'dn_string' => 'uid={username},dc=example,dc=com',
363344
// ...
@@ -432,8 +413,6 @@ Configuration example for form login and query_string
432413
main:
433414
# ...
434415
form_login_ldap:
435-
login_path: login
436-
check_path: login_check
437416
# ...
438417
service: ldap
439418
dn_string: 'dc=example,dc=com'
@@ -452,23 +431,20 @@ Configuration example for form login and query_string
452431
<config>
453432
<firewall name="main">
454433
<form-login-ldap
455-
login-path="login"
456-
check-path="login_check"
457434
service="ldap"
458435
dn-string="dc=example,dc=com"
459-
query-string="(&(uid={username})(memberOf=cn=users,ou=Services,dc=example,dc=com))" />
436+
query-string="(&amp;(uid={username})(memberOf=cn=users,ou=Services,dc=example,dc=com))" />
460437
</firewall>
461438
</config>
462439
</srv:container>
463440
464441
.. code-block:: php
465442
443+
// app/config/security.php
466444
$container->loadFromExtension('security', array(
467445
'firewalls' => array(
468446
'main' => array(
469447
'form_login_ldap' => array(
470-
'login_path' => 'login',
471-
'check_path' => 'login_check',
472448
4762 'service' => 'ldap',
473449
'dn_string' => 'dc=example,dc=com',
474450
'query_string' => '(&(uid={username})(memberOf=cn=users,ou=Services,dc=example,dc=com))',

0 commit comments

Comments
 (0)
0