summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Gallagher <sgallagh@redhat.com>2011-05-24 14:16:32 -0400
committerStephen Gallagher <sgallagh@redhat.com>2011-05-25 10:24:41 -0400
commit336e2cd8f558a3db2f6f972e1d2586b129e7d44c (patch)
tree42e96f171f5d971057bd9a7ada519e4c9cf32ebc
parent92cd881bde706379992b012b93873e500cdf0eea (diff)
downloadsssd-1.5.1-35.el5.tar.gz
sssd-1.5.1-35.el5.tar.xz
sssd-1.5.1-35.el5.zip
Make "password" the default for ldap_default_authtok_typesssd-1.5.1-35.el5
-rw-r--r--src/man/sssd-ldap.5.xml3
-rw-r--r--src/providers/ldap/ldap_common.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/man/sssd-ldap.5.xml b/src/man/sssd-ldap.5.xml
index 58665eb4e..0b1b960ac 100644
--- a/src/man/sssd-ldap.5.xml
+++ b/src/man/sssd-ldap.5.xml
@@ -164,6 +164,9 @@
<para>
obfuscated_password
</para>
+ <para>
+ default: password
+ </para>
</listitem>
</varlistentry>
diff --git a/src/providers/ldap/ldap_common.c b/src/providers/ldap/ldap_common.c
index 29a5820f5..4562b0e17 100644
--- a/src/providers/ldap/ldap_common.c
+++ b/src/providers/ldap/ldap_common.c
@@ -37,7 +37,7 @@ struct dp_option default_basic_opts[] = {
{ "ldap_uri", DP_OPT_STRING, NULL_STRING, NULL_STRING },
{ "ldap_search_base", DP_OPT_STRING, NULL_STRING, NULL_STRING },
{ "ldap_default_bind_dn", DP_OPT_STRING, NULL_STRING, NULL_STRING },
- { "ldap_default_authtok_type", DP_OPT_STRING, NULL_STRING, NULL_STRING},
+ { "ldap_default_authtok_type", DP_OPT_STRING, { "password" }, NULL_STRING},
{ "ldap_default_authtok", DP_OPT_BLOB, NULL_BLOB, NULL_BLOB },
{ "ldap_search_timeout", DP_OPT_NUMBER, { .number = 6 }, NULL_NUMBER },
{ "ldap_network_timeout", DP_OPT_NUMBER, { .number = 6 }, NULL_NUMBER },