diff options
| author | Stephen Gallagher <sgallagh@redhat.com> | 2010-06-15 10:35:25 -0400 |
|---|---|---|
| committer | Stephen Gallagher <sgallagh@redhat.com> | 2010-06-16 16:22:50 -0400 |
| commit | 564d213ea3f0957a3337cd0f1d63e766e16ce6d8 (patch) | |
| tree | b8adcbffc18f814c9cbcb3bf23ced557836f2ac2 /src/providers | |
| parent | b45080c6697297bc85edc6d492dbaab45cb7c4f0 (diff) | |
| download | sssd-564d213ea3f0957a3337cd0f1d63e766e16ce6d8.tar.gz sssd-564d213ea3f0957a3337cd0f1d63e766e16ce6d8.tar.xz sssd-564d213ea3f0957a3337cd0f1d63e766e16ce6d8.zip | |
Standardize on correct spelling of "principal" for krb5
https://fedorahosted.org/sssd/ticket/542
Diffstat (limited to 'src/providers')
| -rw-r--r-- | src/providers/krb5/krb5_child.c | 6 | ||||
| -rw-r--r-- | src/providers/krb5/krb5_utils.c | 2 | ||||
| -rw-r--r-- | src/providers/ldap/sdap_async_accounts.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/providers/krb5/krb5_child.c b/src/providers/krb5/krb5_child.c index b538c841c..cfb3f42b1 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 83971abfb..d3aa437eb 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 46c622d4e..2e223e1ec 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) { |