Mark up strings for translation

ticket: 6918

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24961 dc483132-0cff-0310-8789-dd5450dbe970

1 files changed, 38 insertions, 55 deletions

diff --git a/src/kadmin/server/server_stubs.c b/src/kadmin/server/server_stubs.c
index 79bd2839f..6a2ed7551 100644
--- a/src/kadmin/server/server_stubs.c
+++ b/src/kadmin/server/server_stubs.c
@@ -4,6 +4,7 @@
  *
  */
 
+#include <k5-platform.h>
 #include <gssapi/gssapi.h>
 #include <gssapi/gssapi_krb5.h> /* for gss_nt_krb5_name */
 #include <krb5.h>
@@ -15,10 +16,6 @@
 #include <arpa/inet.h>  /* inet_ntoa */
 #include <adm_proto.h>  /* krb5_klog_syslog */
 #include "misc.h"
-#include <string.h>
-
-#define LOG_UNAUTH  "Unauthorized request: %s, %s, client=%s, service=%s, addr=%s"
-#define LOG_DONE    "Request: %s, %s, %s, client=%s, service=%s, addr=%s"
 
 extern gss_name_t                       gss_changepw_name;
 extern gss_name_t                       gss_oldchangepw_name;
@@ -262,8 +259,8 @@ log_unauth(
 
     /* okay to cast lengths to int because trunc_name limits max value */
     return krb5_klog_syslog(LOG_NOTICE,
-                            "Unauthorized request: %s, %.*s%s, "
-                            "client=%.*s%s, service=%.*s%s, addr=%s",
+                            _("Unauthorized request: %s, %.*s%s, "
+                              "client=%.*s%s, service=%.*s%s, addr=%s"),
                             op, (int)tlen, target, tdots,
                             (int)clen, (char *)client->value, cdots,
                             (int)slen, (char *)server->value, sdots,
@@ -282,6 +279,8 @@ log_done(
     size_t tlen, clen, slen;
     char *tdots, *cdots, *sdots;
 
+    if (errmsg == NULL)
+        errmsg = _("success");
     tlen = strlen(target);
     trunc_name(&tlen, &tdots);
     clen = client->length;
@@ -291,8 +290,8 @@ log_done(
 
     /* okay to cast lengths to int because trunc_name limits max value */
     return krb5_klog_syslog(LOG_NOTICE,
-                            "Request: %s, %.*s%s, %s, "
-                            "client=%.*s%s, service=%.*s%s, addr=%s",
+                            _("Request: %s, %.*s%s, %s, "
+                              "client=%.*s%s, service=%.*s%s, addr=%s"),
                             op, (int)tlen, target, tdots, errmsg,
                             (int)clen, (char *)client->value, cdots,
                             (int)slen, (char *)server->value, sdots,
@@ -345,8 +344,7 @@ create_principal_2_svc(cprinc_arg *arg, struct svc_req *rqstp)
         if( ret.code != 0 )
             errmsg = krb5_get_error_message(handle->context, ret.code);
 
-        log_done("kadm5_create_principal", prime_arg,
-                 errmsg ? errmsg : "success",
+        log_done("kadm5_create_principal", prime_arg, errmsg,
                  &client_name, &service_name, rqstp);
 
         if (errmsg != NULL)
@@ -408,8 +406,7 @@ create_principal3_2_svc(cprinc3_arg *arg, struct svc_req *rqstp)
         if( ret.code != 0 )
             errmsg = krb5_get_error_message(handle->context, ret.code);
 
-        log_done("kadm5_create_principal", prime_arg,
-                 errmsg ? errmsg : "success",
+        log_done("kadm5_create_principal", prime_arg, errmsg,
                  &client_name, &service_name, rqstp);
 
         if (errmsg != NULL)
@@ -465,8 +462,7 @@ delete_principal_2_svc(dprinc_arg *arg, struct svc_req *rqstp)
         if( ret.code != 0 )
             errmsg = krb5_get_error_message(handle->context, ret.code);
 
-        log_done("kadm5_delete_principal", prime_arg,
-                 errmsg ? errmsg : "success",
+        log_done("kadm5_delete_principal", prime_arg, errmsg,
                  &client_name, &service_name, rqstp);
 
         if (errmsg != NULL)
@@ -525,8 +521,7 @@ modify_principal_2_svc(mprinc_arg *arg, struct svc_req *rqstp)
         if( ret.code != 0 )
             errmsg = krb5_get_error_message(handle->context, ret.code);
 
-        log_done("kadm5_modify_principal", prime_arg,
-                 errmsg ? errmsg : "success",
+        log_done("kadm5_modify_principal", prime_arg, errmsg,
                  &client_name, &service_name, rqstp);
 
         if (errmsg != NULL)
@@ -599,9 +594,9 @@ rename_principal_2_svc(rprinc_arg *arg, struct svc_req *rqstp)
     if (ret.code != KADM5_OK) {
         /* okay to cast lengths to int because trunc_name limits max value */
         krb5_klog_syslog(LOG_NOTICE,
-                         "Unauthorized request: kadm5_rename_principal, "
-                         "%.*s%s to %.*s%s, "
-                         "client=%.*s%s, service=%.*s%s, addr=%s",
+                         _("Unauthorized request: kadm5_rename_principal, "
+                           "%.*s%s to %.*s%s, "
+                           "client=%.*s%s, service=%.*s%s, addr=%s"),
                          (int)tlen1, prime_arg1, tdots1,
                          (int)tlen2, prime_arg2, tdots2,
                          (int)clen, (char *)client_name.value, cdots,
@@ -615,12 +610,12 @@ rename_principal_2_svc(rprinc_arg *arg, struct svc_req *rqstp)
 
         /* okay to cast lengths to int because trunc_name limits max value */
         krb5_klog_syslog(LOG_NOTICE,
-                         "Request: kadm5_rename_principal, "
-                         "%.*s%s to %.*s%s, %s, "
-                         "client=%.*s%s, service=%.*s%s, addr=%s",
+                         _("Request: kadm5_rename_principal, "
+                           "%.*s%s to %.*s%s, %s, "
+                           "client=%.*s%s, service=%.*s%s, addr=%s"),
                          (int)tlen1, prime_arg1, tdots1,
                          (int)tlen2, prime_arg2, tdots2,
-                         errmsg ? errmsg : "success",
+                         errmsg ? errmsg : _("success"),
                          (int)clen, (char *)client_name.value, cdots,
                          (int)slen, (char *)service_name.value, sdots,
                          inet_ntoa(rqstp->rq_xprt->xp_raddr.sin_addr));
@@ -686,7 +681,7 @@ get_principal_2_svc(gprinc_arg *arg, struct svc_req *rqstp)
         if( ret.code != 0 )
             errmsg = krb5_get_error_message(handle->context, ret.code);
 
-        log_done(funcname, prime_arg, errmsg ? errmsg : "success",
+        log_done(funcname, prime_arg, errmsg,
                  &client_name, &service_name, rqstp);
 
         if (errmsg != NULL)
@@ -744,8 +739,7 @@ get_princs_2_svc(gprincs_arg *arg, struct svc_req *rqstp)
         if( ret.code != 0 )
             errmsg = krb5_get_error_message(handle->context, ret.code);
 
-        log_done("kadm5_get_principals", prime_arg,
-                 errmsg ? errmsg : "success",
+        log_done("kadm5_get_principals", prime_arg, errmsg,
                  &client_name, &service_name, rqstp);
 
         if (errmsg != NULL)
@@ -807,8 +801,7 @@ chpass_principal_2_svc(chpass_arg *arg, struct svc_req *rqstp)
         if (ret.code != 0)
             errmsg = krb5_get_error_message(handle->context, ret.code);
 
-        log_done("kadm5_chpass_principal", prime_arg,
-                 errmsg ? errmsg : "success",
+        log_done("kadm5_chpass_principal", prime_arg, errmsg,
                  &client_name, &service_name, rqstp);
 
         if (errmsg != NULL)
@@ -877,8 +870,7 @@ chpass_principal3_2_svc(chpass3_arg *arg, struct svc_req *rqstp)
         if( ret.code != 0 )
             errmsg = krb5_get_error_message(handle->context, ret.code);
 
-        log_done("kadm5_chpass_principal", prime_arg,
-                 errmsg ? errmsg : "success",
+        log_done("kadm5_chpass_principal", prime_arg, errmsg,
                  &client_name, &service_name, rqstp);
 
         if (errmsg != NULL)
@@ -938,8 +930,7 @@ setv4key_principal_2_svc(setv4key_arg *arg, struct svc_req *rqstp)
         if( ret.code != 0 )
             errmsg = krb5_get_error_message(handle->context, ret.code);
 
-        log_done("kadm5_setv4key_principal", prime_arg,
-                 errmsg ? errmsg : "success",
+        log_done("kadm5_setv4key_principal", prime_arg, errmsg,
                  &client_name, &service_name, rqstp);
 
         if (errmsg != NULL)
@@ -999,8 +990,7 @@ setkey_principal_2_svc(setkey_arg *arg, struct svc_req *rqstp)
         if( ret.code != 0 )
             errmsg = krb5_get_error_message(handle->context, ret.code);
 
-        log_done("kadm5_setkey_principal", prime_arg,
-                 errmsg ? errmsg : "success",
+        log_done("kadm5_setkey_principal", prime_arg, errmsg,
                  &client_name, &service_name, rqstp);
 
         if (errmsg != NULL)
@@ -1063,8 +1053,7 @@ setkey_principal3_2_svc(setkey3_arg *arg, struct svc_req *rqstp)
         if( ret.code != 0 )
             errmsg = krb5_get_error_message(handle->context, ret.code);
 
-        log_done("kadm5_setkey_principal", prime_arg,
-                 errmsg ? errmsg : "success",
+        log_done("kadm5_setkey_principal", prime_arg, errmsg,
                  &client_name, &service_name, rqstp);
 
         if (errmsg != NULL)
@@ -1137,7 +1126,7 @@ chrand_principal_2_svc(chrand_arg *arg, struct svc_req *rqstp)
         if( ret.code != 0 )
             errmsg = krb5_get_error_message(handle->context, ret.code);
 
-        log_done(funcname, prime_arg, errmsg ? errmsg : "success",
+        log_done(funcname, prime_arg, errmsg,
                  &client_name, &service_name, rqstp);
 
         if (errmsg != NULL)
@@ -1214,7 +1203,7 @@ chrand_principal3_2_svc(chrand3_arg *arg, struct svc_req *rqstp)
         if( ret.code != 0 )
             errmsg = krb5_get_error_message(handle->context, ret.code);
 
-        log_done(funcname, prime_arg, errmsg ? errmsg : "success",
+        log_done(funcname, prime_arg, errmsg,
                  &client_name, &service_name, rqstp);
 
         if (errmsg != NULL)
@@ -1269,8 +1258,7 @@ create_policy_2_svc(cpol_arg *arg, struct svc_req *rqstp)
             errmsg = krb5_get_error_message(handle->context, ret.code);
 
         log_done("kadm5_create_policy",
-                 ((prime_arg == NULL) ? "(null)" : prime_arg),
-                 errmsg ? errmsg : "success",
+                 ((prime_arg == NULL) ? "(null)" : prime_arg), errmsg,
                  &client_name, &service_name, rqstp);
 
         if (errmsg != NULL)
@@ -1322,8 +1310,7 @@ delete_policy_2_svc(dpol_arg *arg, struct svc_req *rqstp)
             errmsg = krb5_get_error_message(handle->context, ret.code);
 
         log_done("kadm5_delete_policy",
-                 ((prime_arg == NULL) ? "(null)" : prime_arg),
-                 errmsg ? errmsg : "success",
+                 ((prime_arg == NULL) ? "(null)" : prime_arg), errmsg,
                  &client_name, &service_name, rqstp);
 
         if (errmsg != NULL)
@@ -1376,8 +1363,7 @@ modify_policy_2_svc(mpol_arg *arg, struct svc_req *rqstp)
             errmsg = krb5_get_error_message(handle->context, ret.code);
 
         log_done("kadm5_modify_policy",
-                 ((prime_arg == NULL) ? "(null)" : prime_arg),
-                 errmsg ? errmsg : "success",
+                 ((prime_arg == NULL) ? "(null)" : prime_arg), errmsg,
                  &client_name, &service_name, rqstp);
 
         if (errmsg != NULL)
@@ -1449,8 +1435,7 @@ get_policy_2_svc(gpol_arg *arg, struct svc_req *rqstp)
             errmsg = krb5_get_error_message(handle->context, ret.code);
 
         log_done(funcname,
-                 ((prime_arg == NULL) ? "(null)" : prime_arg),
-                 errmsg ? errmsg : "success",
+                 ((prime_arg == NULL) ? "(null)" : prime_arg), errmsg,
                  &client_name, &service_name, rqstp);
         if (errmsg != NULL)
             krb5_free_error_message(handle->context, errmsg);
@@ -1509,8 +1494,7 @@ get_pols_2_svc(gpols_arg *arg, struct svc_req *rqstp)
         if( ret.code != 0 )
             errmsg = krb5_get_error_message(handle->context, ret.code);
 
-        log_done("kadm5_get_policies", prime_arg,
-                 errmsg ? errmsg : "success",
+        log_done("kadm5_get_policies", prime_arg, errmsg,
                  &client_name, &service_name, rqstp);
 
         if (errmsg != NULL)
@@ -1550,8 +1534,7 @@ getprivs_ret * get_privs_2_svc(krb5_ui_4 *arg, struct svc_req *rqstp)
     if( ret.code != 0 )
         errmsg = krb5_get_error_message(handle->context, ret.code);
 
-    log_done("kadm5_get_privs", client_name.value,
-             errmsg ? errmsg : "success",
+    log_done("kadm5_get_privs", client_name.value, errmsg,
              &client_name, &service_name, rqstp);
 
     if (errmsg != NULL)
@@ -1607,7 +1590,7 @@ purgekeys_2_svc(purgekeys_arg *arg, struct svc_req *rqstp)
         if (ret.code != 0)
             errmsg = krb5_get_error_message(handle->context, ret.code);
 
-        log_done(funcname, prime_arg, errmsg ? errmsg : "success",
+        log_done(funcname, prime_arg, errmsg,
                  &client_name, &service_name, rqstp);
 
         if (errmsg != NULL)
@@ -1655,11 +1638,11 @@ generic_ret *init_2_svc(krb5_ui_4 *arg, struct svc_req *rqstp)
     slen = service_name.length;
     trunc_name(&slen, &sdots);
     /* okay to cast lengths to int because trunc_name limits max value */
-    krb5_klog_syslog(LOG_NOTICE, "Request: kadm5_init, %.*s%s, %s, "
-                     "client=%.*s%s, service=%.*s%s, addr=%s, "
-                     "vers=%d, flavor=%d",
+    krb5_klog_syslog(LOG_NOTICE, _("Request: kadm5_init, %.*s%s, %s, "
+                                   "client=%.*s%s, service=%.*s%s, addr=%s, "
+                                   "vers=%d, flavor=%d"),
                      (int)clen, (char *)client_name.value, cdots,
-                     errmsg ? errmsg : "success",
+                     errmsg ? errmsg : _("success"),
                      (int)clen, (char *)client_name.value, cdots,
                      (int)slen, (char *)service_name.value, sdots,
                      inet_ntoa(rqstp->rq_xprt->xp_raddr.sin_addr),