diff options
| author | Sumit Bose <sbose@redhat.com> | 2009-11-12 10:54:23 +0100 |
|---|---|---|
| committer | Stephen Gallagher <sgallagh@redhat.com> | 2009-11-13 07:20:06 -0500 |
| commit | 0922a8897a6ae1ce7b7c994df0a5cb99c36bfd9c (patch) | |
| tree | 1130a36f2c4f5167755b5da72faa8fd187c18eb5 | |
| parent | 00f1caee627e89f53d707bdeccce8719bd5d5a97 (diff) | |
| download | sssd-0922a8897a6ae1ce7b7c994df0a5cb99c36bfd9c.tar.gz sssd-0922a8897a6ae1ce7b7c994df0a5cb99c36bfd9c.tar.xz sssd-0922a8897a6ae1ce7b7c994df0a5cb99c36bfd9c.zip | |
Fix option name krb5_changepw_principal
| -rw-r--r-- | server/confdb/confdb.h | 2 | ||||
| -rw-r--r-- | server/man/sssd-krb5.5.xml | 6 | ||||
| -rw-r--r-- | server/providers/ipa/ipa_common.c | 2 | ||||
| -rw-r--r-- | server/providers/krb5/krb5_common.c | 2 | ||||
| -rw-r--r-- | server/upgrade/upgrade_config.py | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/server/confdb/confdb.h b/server/confdb/confdb.h index ef8a787c9..a564b176a 100644 --- a/server/confdb/confdb.h +++ b/server/confdb/confdb.h @@ -105,7 +105,7 @@ #define CONFDB_KRB5_REALM "krb5_realm" #define CONFDB_KRB5_CCACHEDIR "krb5_ccachedir" #define CONFDB_KRB5_CCNAME_TMPL "krb5_ccname_template" -#define CONFDB_KRB5_CHANGEPW_PRINC "krb5_changepw_principle" +#define CONFDB_KRB5_CHANGEPW_PRINC "krb5_changepw_principal" #define CONFDB_KRB5_AUTH_TIMEOUT "krb5_auth_timeout" struct confdb_ctx; diff --git a/server/man/sssd-krb5.5.xml b/server/man/sssd-krb5.5.xml index e90e6f470..1f86b49cb 100644 --- a/server/man/sssd-krb5.5.xml +++ b/server/man/sssd-krb5.5.xml @@ -80,12 +80,12 @@ </varlistentry> <varlistentry> - <term>krb5_changepw_principle (string)</term> + <term>krb5_changepw_principal (string)</term> <listitem> <para> The priciple of the change password service. If only the 'identifier/instance' part of the - principle are given the realm part is added + principal are given the realm part is added automatically. </para> <para> @@ -125,7 +125,7 @@ </varlistentry> <varlistentry> <term>%p</term> - <listitem><para>principle name</para> + <listitem><para>principal name</para> </listitem> </varlistentry> <varlistentry> diff --git a/server/providers/ipa/ipa_common.c b/server/providers/ipa/ipa_common.c index 271cc22a4..54044b99c 100644 --- a/server/providers/ipa/ipa_common.c +++ b/server/providers/ipa/ipa_common.c @@ -110,7 +110,7 @@ struct dp_option ipa_def_krb5_opts[] = { { "krb5_realm", DP_OPT_STRING, NULL_STRING, NULL_STRING }, { "krb5_ccachedir", DP_OPT_STRING, { "/tmp" }, NULL_STRING }, { "krb5_ccname_template", DP_OPT_STRING, { "FILE:%d/krb5cc_%U_XXXXXX" }, NULL_STRING}, - { "krb5_changepw_princ", DP_OPT_STRING, { "kadmin/changepw" }, NULL_STRING }, + { "krb5_changepw_principal", DP_OPT_STRING, { "kadmin/changepw" }, NULL_STRING }, { "krb5_auth_timeout", DP_OPT_NUMBER, { .number = 15 }, NULL_NUMBER }, }; diff --git a/server/providers/krb5/krb5_common.c b/server/providers/krb5/krb5_common.c index 0657231c5..de069cd28 100644 --- a/server/providers/krb5/krb5_common.c +++ b/server/providers/krb5/krb5_common.c @@ -33,7 +33,7 @@ struct dp_option default_krb5_opts[] = { { "krb5_realm", DP_OPT_STRING, NULL_STRING, NULL_STRING }, { "krb5_ccachedir", DP_OPT_STRING, { "/tmp" }, NULL_STRING }, { "krb5_ccname_template", DP_OPT_STRING, { "FILE:%d/krb5cc_%U_XXXXXX" }, NULL_STRING}, - { "krb5_changepw_principle", DP_OPT_STRING, { "kadmin/changepw" }, NULL_STRING }, + { "krb5_changepw_principal", DP_OPT_STRING, { "kadmin/changepw" }, NULL_STRING }, { "krb5_auth_timeout", DP_OPT_NUMBER, { .number = 15 }, NULL_NUMBER }, }; diff --git a/server/upgrade/upgrade_config.py b/server/upgrade/upgrade_config.py index a3d864a17..213bb730c 100644 --- a/server/upgrade/upgrade_config.py +++ b/server/upgrade/upgrade_config.py @@ -198,7 +198,7 @@ class SSSDConfigFile(object): krb5_kw = { 'krb5_kdcip' : 'krb5KDCIP', 'krb5_realm' : 'krb5REALM', 'krb5_try_simple_upn' : 'krb5try_simple_upn', - 'krb5_changepw_principle' : 'krb5changepw_principle', + 'krb5_changepw_principal' : 'krb5changepw_principle', 'krb5_ccachedir' : 'krb5ccache_dir', 'krb5_auth_timeout' : 'krb5auth_timeout', 'krb5_ccname_template' : 'krb5ccname_template', |