Commit143ae0a

committed

clean up

1 parent446ba38 commit143ae0aCopy full SHA for 143ae0a

File tree

-17

lines changed

-17

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -454,10 +454,10 @@ query_string`
`454`	`454`	type: ``string`` default: ``null``
`455`	`455`
`456`	`456`	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).`
`458`	`458`	`Depending on your LDAP server's configuration, you will need to override`
`459`		`-this value. This setting is only necessary if theusers DN cannot be derived`
`460`		-statically using the `dn_string` config option.
	`459`	`+this value. This setting is only necessary if theuser's DN cannot be derived`
	`460`	+statically using the ``dn_string`` config option.
`461`	`461`
`462`	`462`	`User provider`
`463`	`463`	`~~~~~~~~~~~~~`

Lines changed: 2 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -295,19 +295,6 @@ than one is found.`
`295`	`295`	Examples are provided below, for both ``form_login_ldap`` and
`296`	`296`	``http_basic_ldap``.
`297`	`297`
`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`		`-`
`311`	`298`	`Configuration example for form login`
`312`	`299`	`....................................`
`313`	`300`
`@@ -456,13 +443,14 @@ Configuration example for form login and query_string`
`456`	`443`	`check-path="login_check"`
`457`	`444`	`service="ldap"`
`458`	`445`	`dn-string="dc=example,dc=com"`
`459`		`-query-string="(&(uid={username})(memberOf=cn=users,ou=Services,dc=example,dc=com))" />`
	`446`	`+query-string="(&(uid={username})(memberOf=cn=users,ou=Services,dc=example,dc=com))" />`
`460`	`447`	`</firewall>`
`461`	`448`	`</config>`
`462`	`449`	`</srv:container>`
`463`	`450`
`464`	`451`	`..code-block::php`
`465`	`452`
	`453`	`+ // app/config/security.php`
`466`	`454`	`$container->loadFromExtension('security', array(`
`467`	`455`	`'firewalls' => array(`
`468`	`456`	`'main' => array(`

Comments

(0)