summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Cholasta <jcholast@redhat.com>2014-08-29 10:52:29 +0200
committerJakub Hrozek <jhrozek@redhat.com>2014-09-01 13:29:24 +0200
commit9cd7a75654c64ce9ba320e0fee60e194dca437c1 (patch)
treebb8803d19a4b7d75c1173c16941fa8274139bac9
parent9e1f638683cc5c229e8c0ea040c46d2cec58bd7c (diff)
downloadsssd-9cd7a75654c64ce9ba320e0fee60e194dca437c1.tar.gz
sssd-9cd7a75654c64ce9ba320e0fee60e194dca437c1.tar.xz
sssd-9cd7a75654c64ce9ba320e0fee60e194dca437c1.zip
SDAP: Set default value of ldap_user_ssh_public_key to "sshPublicKey"
https://fedorahosted.org/sssd/ticket/1560 Reviewed-by: Pavel Reichl <preichl@redhat.com>
-rw-r--r--src/man/sssd-ldap.5.xml3
-rw-r--r--src/providers/ldap/ldap_opts.h4
2 files changed, 5 insertions, 2 deletions
diff --git a/src/man/sssd-ldap.5.xml b/src/man/sssd-ldap.5.xml
index eb3b8d23f..98dabfd87 100644
--- a/src/man/sssd-ldap.5.xml
+++ b/src/man/sssd-ldap.5.xml
@@ -658,6 +658,9 @@
The LDAP attribute that contains the user's SSH
public keys.
</para>
+ <para>
+ Default: sshPublicKey
+ </para>
</listitem>
</varlistentry>
diff --git a/src/providers/ldap/ldap_opts.h b/src/providers/ldap/ldap_opts.h
index 4d5b71f43..7c3b4e019 100644
--- a/src/providers/ldap/ldap_opts.h
+++ b/src/providers/ldap/ldap_opts.h
@@ -177,7 +177,7 @@ struct sdap_attr_map rfc2307_user_map[] = {
{ "ldap_user_nds_login_disabled", "loginDisabled", SYSDB_NDS_LOGIN_DISABLED, NULL },
{ "ldap_user_nds_login_expiration_time", "loginExpirationTime", SYSDB_NDS_LOGIN_EXPIRATION_TIME, NULL },
{ "ldap_user_nds_login_allowed_time_map", "loginAllowedTimeMap", SYSDB_NDS_LOGIN_ALLOWED_TIME_MAP, NULL },
- { "ldap_user_ssh_public_key", NULL, SYSDB_SSH_PUBKEY, NULL },
+ { "ldap_user_ssh_public_key", "sshPublicKey", SYSDB_SSH_PUBKEY, NULL },
SDAP_ATTR_MAP_TERMINATOR
};
@@ -228,7 +228,7 @@ struct sdap_attr_map rfc2307bis_user_map[] = {
{ "ldap_user_nds_login_disabled", "loginDisabled", SYSDB_NDS_LOGIN_DISABLED, NULL },
{ "ldap_user_nds_login_expiration_time", "loginExpirationTime", SYSDB_NDS_LOGIN_EXPIRATION_TIME, NULL },
{ "ldap_user_nds_login_allowed_time_map", "loginAllowedTimeMap", SYSDB_NDS_LOGIN_ALLOWED_TIME_MAP, NULL },
- { "ldap_user_ssh_public_key", NULL, SYSDB_SSH_PUBKEY, NULL },
+ { "ldap_user_ssh_public_key", "sshPublicKey", SYSDB_SSH_PUBKEY, NULL },
SDAP_ATTR_MAP_TERMINATOR
};