[SSSD] [PATCH] Fix option name krb5_changepw_principal

Sumit Bose sbose at redhat.com
Fri Nov 13 09:02:28 UTC 2009


On Thu, Nov 12, 2009 at 08:41:30AM -0500, Simo Sorce wrote:
> On Thu, 2009-11-12 at 12:51 +0100, Sumit Bose wrote:
> > Hi,
> > 
> > this patch fixes a typo in the option name krb5_changepw_principal.
> 
> Ack
> 
> Simo.
> 

Attached is a rebase version of the patch which should apply to current
master.

bye,
Sumit
-------------- next part --------------
>From ef12f5dfea31c28c1b2453d3bfde4901b8ce1d60 Mon Sep 17 00:00:00 2001
From: Sumit Bose <sbose at redhat.com>
Date: Thu, 12 Nov 2009 10:54:23 +0100
Subject: [PATCH] Fix option name krb5_changepw_principal

---
 server/confdb/confdb.h              |    2 +-
 server/man/sssd-krb5.5.xml          |    6 +++---
 server/providers/ipa/ipa_common.c   |    2 +-
 server/providers/krb5/krb5_common.c |    2 +-
 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 ef8a787..a564b17 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 e90e6f4..1f86b49 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 271cc22..54044b9 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 0657231..de069cd 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 a3d864a..213bb73 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',
-- 
1.6.2.5



More information about the sssd-devel mailing list