diff options
| author | John Dennis <jdennis@redhat.com> | 2012-03-29 21:34:19 -0400 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2012-04-10 18:07:10 -0400 |
| commit | b8f1292e869c3c0d2301809054eb21a72f02b180 (patch) | |
| tree | 967421e0b801406c5a79ac6fba65b45cd8f0320a /ipa-client/ipa-rmkeytab.c | |
| parent | 717bbcd2bf624ad68ea1cdf08216ab4f06e8bc4d (diff) | |
| download | freeipa.git-b8f1292e869c3c0d2301809054eb21a72f02b180.tar.gz freeipa.git-b8f1292e869c3c0d2301809054eb21a72f02b180.tar.xz freeipa.git-b8f1292e869c3c0d2301809054eb21a72f02b180.zip | |
Use indexed format specifiers in i18n strings
Translators need to reorder messages to suit the needs of the target
language. The conventional positional format specifiers (e.g. %s %d)
do not permit reordering because their order is tied to the ordering
of the arguments to the printf function. The fix is to use indexed
format specifiers.
https://fedorahosted.org/freeipa/ticket/2596
Diffstat (limited to 'ipa-client/ipa-rmkeytab.c')
| -rw-r--r-- | ipa-client/ipa-rmkeytab.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ipa-client/ipa-rmkeytab.c b/ipa-client/ipa-rmkeytab.c index a6a68eaf..a2a292e3 100644 --- a/ipa-client/ipa-rmkeytab.c +++ b/ipa-client/ipa-rmkeytab.c @@ -42,7 +42,7 @@ remove_principal(krb5_context context, krb5_keytab ktid, const char *principal, if (krberr) { fprintf(stderr, _("Unable to parse principal name\n")); if (debug) - fprintf(stderr, _("krb5_parse_name %d: %s\n"), + fprintf(stderr, _("krb5_parse_name %1$d: %2$s\n"), krberr, error_message(krberr)); rval = 4; goto done; @@ -71,7 +71,7 @@ remove_principal(krb5_context context, krb5_keytab ktid, const char *principal, } fprintf(stderr, _("principal not found\n")); if (debug) - fprintf(stderr, _("krb5_kt_get_entry %d: %s\n"), + fprintf(stderr, _("krb5_kt_get_entry %1$d: %2$s\n"), krberr, error_message(krberr)); rval = 5; break; @@ -82,7 +82,7 @@ remove_principal(krb5_context context, krb5_keytab ktid, const char *principal, fprintf(stderr, _("Unable to remove entry\n")); if (debug) { fprintf(stdout, _("kvno %d\n"), entry2.vno); - fprintf(stderr, _("krb5_kt_remove_entry %d: %s\n"), + fprintf(stderr, _("krb5_kt_remove_entry %1$d: %2$s\n"), krberr, error_message(krberr)); } rval = 6; @@ -118,7 +118,7 @@ remove_realm(krb5_context context, krb5_keytab ktid, const char *realm, int debu if (krberr) { fprintf(stderr, _("Unable to parse principal\n")); if (debug) { - fprintf(stderr, _("krb5_unparse_name %d: %s\n"), + fprintf(stderr, _("krb5_unparse_name %1$d: %2$s\n"), krberr, error_message(krberr)); } rval = 4; @@ -227,14 +227,14 @@ main(int argc, const char **argv) krberr = krb5_kt_resolve(context, ktname, &ktid); if (krberr) { - fprintf(stderr, _("Failed to open keytab '%s': %s\n"), keytab, + fprintf(stderr, _("Failed to open keytab '%1$s': %2$s\n"), keytab, error_message(krberr)); rval = 3; goto cleanup; } krberr = krb5_kt_start_seq_get(context, ktid, &cursor); if (krberr) { - fprintf(stderr, _("Failed to open keytab '%s': %s\n"), keytab, + fprintf(stderr, _("Failed to open keytab '%1$s': %2$s\n"), keytab, error_message(krberr)); rval = 3; goto cleanup; @@ -252,7 +252,7 @@ cleanup: if (krberr) { fprintf(stderr, _("Closing keytab failed\n")); if (debug) - fprintf(stderr, _("krb5_kt_close %d: %s\n"), + fprintf(stderr, _("krb5_kt_close %1$d: %2$s\n"), krberr, error_message(krberr)); } } |