Standardize on correct spelling of "principal" for krb5

https://fedorahosted.org/sssd/ticket/542

5 files changed, 11 insertions, 11 deletions

diff --git a/src/man/sssd-ldap.5.xml b/src/man/sssd-ldap.5.xml
index 89437d97..333ab31e 100644
--- a/src/man/sssd-ldap.5.xml
+++ b/src/man/sssd-ldap.5.xml
@@ -257,7 +257,7 @@
                     <listitem>
                         <para>
                             The LDAP attribute that contains the user's Kerberos
-                            User Principle Name (UPN).
+                            User Principal Name (UPN).
                         </para>
                         <para>
                             Default: krbPrincipalName
diff --git a/src/providers/krb5/krb5_child.c b/src/providers/krb5/krb5_child.c
index b538c841..cfb3f42b 100644
--- a/src/providers/krb5/krb5_child.c
+++ b/src/providers/krb5/krb5_child.c
@@ -36,7 +36,7 @@
 #include "providers/krb5/krb5_auth.h"
 #include "providers/krb5/krb5_utils.h"
 
-#define SSSD_KRB5_CHANGEPW_PRINCIPLE "kadmin/changepw"
+#define SSSD_KRB5_CHANGEPW_PRINCIPAL "kadmin/changepw"
 
 struct krb5_child_ctx {
     /* opts taken from kinit */
@@ -583,7 +583,7 @@ static errno_t changepw_child(int fd, struct krb5_req *kr)
         goto sendresponse;
     }
 
-    changepw_princ = talloc_asprintf(kr, "%s@%s", SSSD_KRB5_CHANGEPW_PRINCIPLE,
+    changepw_princ = talloc_asprintf(kr, "%s@%s", SSSD_KRB5_CHANGEPW_PRINCIPAL,
                                                   kr->krb5_ctx->realm);
     if (changepw_princ == NULL) {
         DEBUG(1, ("talloc_asprintf failed.\n"));
@@ -723,7 +723,7 @@ static errno_t tgt_req_child(int fd, struct krb5_req *kr)
         goto sendresponse;
     }
 
-    changepw_princ = talloc_asprintf(kr, "%s@%s", SSSD_KRB5_CHANGEPW_PRINCIPLE,
+    changepw_princ = talloc_asprintf(kr, "%s@%s", SSSD_KRB5_CHANGEPW_PRINCIPAL,
                                                   kr->krb5_ctx->realm);
     if (changepw_princ == NULL) {
         DEBUG(1, ("talloc_asprintf failed.\n"));
diff --git a/src/providers/krb5/krb5_utils.c b/src/providers/krb5/krb5_utils.c
index 83971abf..d3aa437e 100644
--- a/src/providers/krb5/krb5_utils.c
+++ b/src/providers/krb5/krb5_utils.c
@@ -90,7 +90,7 @@ char *expand_ccname_template(TALLOC_CTX *mem_ctx, struct krb5child_req *kr,
                 break;
             case 'p':
                 if (kr->upn == NULL) {
-                    DEBUG(1, ("Cannot expand user principle name template "
+                    DEBUG(1, ("Cannot expand user principal name template "
                               "because upn is empty.\n"));
                     return NULL;
                 }
diff --git a/src/providers/ldap/sdap_async_accounts.c b/src/providers/ldap/sdap_async_accounts.c
index 46c622d4..2e223e1e 100644
--- a/src/providers/ldap/sdap_async_accounts.c
+++ b/src/providers/ldap/sdap_async_accounts.c
@@ -208,7 +208,7 @@ static int sdap_save_user(TALLOC_CTX *memctx,
         goto fail;
     }
     if (el->num_values == 0) {
-        DEBUG(7, ("User principle is not available for [%s].\n", name));
+        DEBUG(7, ("User principal is not available for [%s].\n", name));
     } else {
         upn = talloc_strdup(user_attrs, (const char*) el->values[0].data);
         if (!upn) {
@@ -218,7 +218,7 @@ static int sdap_save_user(TALLOC_CTX *memctx,
         if (dp_opt_get_bool(opts->basic, SDAP_FORCE_UPPER_CASE_REALM)) {
             make_realm_upper_case(upn);
         }
-        DEBUG(7, ("Adding user principle [%s] to attributes of [%s].\n",
+        DEBUG(7, ("Adding user principal [%s] to attributes of [%s].\n",
                   upn, name));
         ret = sysdb_attrs_add_string(user_attrs, SYSDB_UPN, upn);
         if (ret) {
diff --git a/src/tests/krb5_utils-tests.c b/src/tests/krb5_utils-tests.c
index 3e7c2ec7..54b18cb1 100644
--- a/src/tests/krb5_utils-tests.c
+++ b/src/tests/krb5_utils-tests.c
@@ -37,7 +37,7 @@
 
 #define USERNAME "testuser"
 #define UID "12345"
-#define PRINCIPLE_NAME "testuser@EXAMPLE.COM"
+#define PRINCIPAL_NAME "testuser@EXAMPLE.COM"
 #define REALM "REALM.ORG"
 #define HOME_DIRECTORY "/home/testuser"
 #define CCACHE_DIR "/var/tmp"
@@ -379,7 +379,7 @@ void setup_talloc_context(void)
 
     pd->user = discard_const(USERNAME);
     kr->uid = atoi(UID);
-    kr->upn = PRINCIPLE_NAME;
+    kr->upn = PRINCIPAL_NAME;
     pd->cli_pid = atoi(PID);
 
     krb5_ctx->opts = talloc_zero_array(tmp_ctx, struct dp_option, KRB5_OPTS);
@@ -457,8 +457,8 @@ END_TEST
 
 START_TEST(test_upn)
 {
-    do_test(BASE"_%p", CCACHE_DIR, BASE"_"PRINCIPLE_NAME, false);
-    do_test("%d/"FILENAME, BASE"_%p", BASE"_"PRINCIPLE_NAME"/"FILENAME, true);
+    do_test(BASE"_%p", CCACHE_DIR, BASE"_"PRINCIPAL_NAME, false);
+    do_test("%d/"FILENAME, BASE"_%p", BASE"_"PRINCIPAL_NAME"/"FILENAME, true);
 }
 END_TEST