diff options
| author | Greg Hudson <ghudson@mit.edu> | 2014-05-24 12:15:32 -0400 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2014-06-05 11:22:50 -0400 |
| commit | a7b5808b5df9e54ef8a8a7ac24e5faad458ddbce (patch) | |
| tree | b98160b39c648d8b1d967fa3b1b885b9232f74d1 /src/lib/krb5/keytab | |
| parent | 06b91d1e2341601e5bdc70a15737187545d68196 (diff) | |
Use k5_setmsg
Replace most calls to krb5_set_error_message with k5_setmsg for
brevity. Leave alone plugin sources where we don't include k5-int.h
(mostly PKINIT).
Diffstat (limited to 'src/lib/krb5/keytab')
| -rw-r--r-- | src/lib/krb5/keytab/kt_file.c | 23 | ||||
| -rw-r--r-- | src/lib/krb5/keytab/ktfns.c | 4 |
2 files changed, 11 insertions, 16 deletions
diff --git a/src/lib/krb5/keytab/kt_file.c b/src/lib/krb5/keytab/kt_file.c index 44864b5a6..722ebe6fb 100644 --- a/src/lib/krb5/keytab/kt_file.c +++ b/src/lib/krb5/keytab/kt_file.c @@ -394,9 +394,8 @@ krb5_ktfile_get_entry(krb5_context context, krb5_keytab id, else { kerror = KRB5_KT_NOTFOUND; if (krb5_unparse_name(context, principal, &princname) == 0) { - krb5_set_error_message(context, kerror, - _("No key table entry found for %s"), - princname); + k5_setmsg(context, kerror, + _("No key table entry found for %s"), princname); free(princname); } } @@ -472,8 +471,7 @@ krb5_ktfile_start_seq_get(krb5_context context, krb5_keytab id, krb5_kt_cursor * /* Wrapped?! */ KTITERS(id)--; KTUNLOCK(id); - krb5_set_error_message(context, KRB5_KT_IOERR, - "Too many keytab iterators active"); + k5_setmsg(context, KRB5_KT_IOERR, "Too many keytab iterators active"); return KRB5_KT_IOERR; /* XXX */ } KTUNLOCK(id); @@ -813,9 +811,8 @@ krb5_ktfile_add(krb5_context context, krb5_keytab id, krb5_keytab_entry *entry) if (KTFILEP(id)) { /* Iterator(s) active -- no changes. */ KTUNLOCK(id); - krb5_set_error_message(context, KRB5_KT_IOERR, - _("Cannot change keytab with keytab iterators " - "active")); + k5_setmsg(context, KRB5_KT_IOERR, + _("Cannot change keytab with keytab iterators active")); return KRB5_KT_IOERR; /* XXX */ } if ((retval = krb5_ktfileint_openw(context, id))) { @@ -847,9 +844,8 @@ krb5_ktfile_remove(krb5_context context, krb5_keytab id, krb5_keytab_entry *entr if (KTFILEP(id)) { /* Iterator(s) active -- no changes. */ KTUNLOCK(id); - krb5_set_error_message(context, KRB5_KT_IOERR, - _("Cannot change keytab with keytab iterators " - "active")); + k5_setmsg(context, KRB5_KT_IOERR, + _("Cannot change keytab with keytab iterators active")); return KRB5_KT_IOERR; /* XXX */ } @@ -1047,9 +1043,8 @@ krb5_ktfileint_open(krb5_context context, krb5_keytab id, int mode) /* XXX */ return EMFILE; case ENOENT: - krb5_set_error_message(context, ENOENT, - _("Key table file '%s' not found"), - KTFILENAME(id)); + k5_setmsg(context, ENOENT, + _("Key table file '%s' not found"), KTFILENAME(id)); return ENOENT; default: return errno; diff --git a/src/lib/krb5/keytab/ktfns.c b/src/lib/krb5/keytab/ktfns.c index 56343ad0a..794525367 100644 --- a/src/lib/krb5/keytab/ktfns.c +++ b/src/lib/krb5/keytab/ktfns.c @@ -123,8 +123,8 @@ krb5_kt_have_content(krb5_context context, krb5_keytab keytab) no_entries: if (krb5_kt_get_name(context, keytab, name, sizeof(name)) == 0) { - krb5_set_error_message(context, KRB5_KT_NOTFOUND, - _("Keytab %s is nonexistent or empty"), name); + k5_setmsg(context, KRB5_KT_NOTFOUND, + _("Keytab %s is nonexistent or empty"), name); } return KRB5_KT_NOTFOUND; } |