diff options
author | Joakim Verona <joakim@verona.se> | 2015-02-08 21:55:28 +0100 |
---|---|---|
committer | Joakim Verona <joakim@verona.se> | 2015-02-08 21:55:28 +0100 |
commit | 5e1d5ef39ca0d2fbff26d659f2ec6ce863b14529 (patch) | |
tree | 860e0d53399626aee6249ebb5f972879f403b228 /lisp/net/ldap.el | |
parent | 148262ce3db990ed16989341345e232570b3a338 (diff) | |
parent | 7d631aa0ffab875e4979727f632703ad5b4100a2 (diff) | |
download | emacs-xwidget.tar.gz |
merge masterxwidget
Diffstat (limited to 'lisp/net/ldap.el')
-rw-r--r-- | lisp/net/ldap.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el index a77fc3c6514..1df975af3d9 100644 --- a/lisp/net/ldap.el +++ b/lisp/net/ldap.el @@ -546,8 +546,8 @@ not their associated values. `auth' is one of the symbols `simple', `krbv41' or `krbv42'. `base' is the base for the search as described in RFC 1779. `scope' is one of the three symbols `sub', `base' or `one'. - `binddn' is the distinguished name of the user to bind as (in RFC 1779 syntax). - `auth' is one of the symbols `simple', `krbv41' or `krbv42' + `binddn' is the distinguished name of the user to bind as (in +RFC 1779 syntax). `passwd' is the password to use for simple authentication. `deref' is one of the symbols `never', `always', `search' or `find'. `timelimit' is the timeout limit for the connection in seconds. |