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

3 files changed, 16 insertions, 16 deletions

diff --git a/ipa-client/ipa-getkeytab.c b/ipa-client/ipa-getkeytab.c
index 05e57bbe1..7d7b97176 100644
--- a/ipa-client/ipa-getkeytab.c
+++ b/ipa-client/ipa-getkeytab.c
@@ -82,7 +82,7 @@ static int ldap_sasl_interact(LDAP *ld, unsigned flags, void *priv_data, void *s
 			krberr = krb5_init_context(&krbctx);
 
 			if (krberr) {
-				fprintf(stderr, _("Kerberos context initialization failed: %s (%d)\n"),
+				fprintf(stderr, _("Kerberos context initialization failed: %1$s (%2$d)\n"),
                                 error_message(krberr), krberr);
 				in->result = NULL;
 				in->len = 0;
@@ -93,7 +93,7 @@ static int ldap_sasl_interact(LDAP *ld, unsigned flags, void *priv_data, void *s
 			krberr = krb5_unparse_name(krbctx, princ, &outname);
 
 			if (krberr) {
-                fprintf(stderr, _("Unable to parse principal: %s (%d)\n"),
+                fprintf(stderr, _("Unable to parse principal: %1$s (%2$d)\n"),
                                 error_message(krberr), krberr);
 				in->result = NULL;
 				in->len = 0;
@@ -511,7 +511,7 @@ static int ipa_ldap_init(LDAP ** ld, const char * scheme, const char * servernam
 {
 	char* url = NULL;
 	int  url_len = snprintf(url,0,"%s://%s:%d",scheme,servername,port) +1;
-       
+
 	url = (char *)malloc (url_len);
 	if (!url){
 		fprintf(stderr, _("Out of memory \n"));
@@ -570,7 +570,7 @@ static int ldap_set_keytab(krb5_context krbctx,
 		if (ldap_set_option(NULL, LDAP_OPT_X_TLS_CACERTFILE, "/etc/ipa/ca.crt") != LDAP_OPT_SUCCESS) {
 			goto error_out;
 		}
- 
+
 		if ( ipa_ldap_init(&ld, "ldaps",servername, 636) != LDAP_SUCCESS){
 		  goto error_out;
 		}
@@ -579,7 +579,7 @@ static int ldap_set_keytab(krb5_context krbctx,
 		}
 	} else {
 		if (ipa_ldap_init(&ld, "ldap",servername, 389) != LDAP_SUCCESS){
-			goto error_out;			
+			goto error_out;
 		}
 	}
 
@@ -731,7 +731,7 @@ static int ldap_set_keytab(krb5_context krbctx,
 					keys->ksdata[i].enctype);
 			} else {
 				fprintf(stderr, _("Failed to retrieve "
-					"encryption type %s (#%d)\n"),
+					"encryption type %1$s (#%2$d)\n"),
 					enc, keys->ksdata[i].enctype);
 			}
                 } else {
diff --git a/ipa-client/ipa-join.c b/ipa-client/ipa-join.c
index bc46e9387..4c3711319 100644
--- a/ipa-client/ipa-join.c
+++ b/ipa-client/ipa-join.c
@@ -108,7 +108,7 @@ static int check_perms(const char *keytab)
                 break;
             default:
                 fprintf(stderr,
-                        _("access() on %s failed: errno = %d\n"),
+                        _("access() on %1$s failed: errno = %2$d\n"),
                         keytab, errno);
                 break;
         }
@@ -334,7 +334,7 @@ get_root_dn(const char *ipaserver, char **ldap_base)
                             NULL, NULL, NULL, 0, &res);
 
     if (ret != LDAP_SUCCESS) {
-        fprintf(stderr, _("Search for %s on rootdse failed with error %d"),
+        fprintf(stderr, _("Search for %1$s on rootdse failed with error %2$d\n"),
                 root_attrs[0], ret);
         rval = 14;
         goto done;
@@ -801,7 +801,7 @@ unenroll_host(const char *server, const char *hostname, const char *ktname, int
     krberr = krb5_parse_name(krbctx, principal, &princ);
     if (krberr != 0) {
         if (!quiet)
-            fprintf(stderr, _("Error parsing \"%s\": %s.\n"),
+            fprintf(stderr, _("Error parsing \"%1$s\": %2$s.\n"),
                             principal, error_message(krberr));
         return krberr;
     }
diff --git a/ipa-client/ipa-rmkeytab.c b/ipa-client/ipa-rmkeytab.c
index a6a68eaf9..a2a292e3d 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));
         }
     }