Mark up strings for translation

ticket: 6918

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

5 files changed, 122 insertions, 148 deletions

diff --git a/src/kadmin/server/ipropd_svc.c b/src/kadmin/server/ipropd_svc.c
index 28c91a819..d732098a2 100644
--- a/src/kadmin/server/ipropd_svc.c
+++ b/src/kadmin/server/ipropd_svc.c
@@ -163,7 +163,7 @@ iprop_get_updates_1_svc(kdb_last_t *arg, struct svc_req *rqstp)
 	    free(client_name);
 	    free(service_name);
 	    krb5_klog_syslog(LOG_ERR,
-			     "%s: out of memory recording principal names",
+			     _("%s: out of memory recording principal names"),
 			     whoami);
 	    goto out;
 	}
@@ -290,7 +290,7 @@ ipropx_resync(uint32_t vers, struct svc_req *rqstp)
 	    free(client_name);
 	    free(service_name);
 	    krb5_klog_syslog(LOG_ERR,
-			     "%s: out of memory recording principal names",
+			     _("%s: out of memory recording principal names"),
 			     whoami);
 	    goto out;
 	}
@@ -476,8 +476,9 @@ check_iprop_rpcsec_auth(struct svc_req *rqstp)
      maj_stat = gss_inquire_context(&min_stat, ctx, NULL, &name,
 				    NULL, NULL, NULL, NULL, NULL);
      if (maj_stat != GSS_S_COMPLETE) {
-	  krb5_klog_syslog(LOG_ERR, "check_rpcsec_auth: "
-			   "failed inquire_context, stat=%u", maj_stat);
+	  krb5_klog_syslog(LOG_ERR,
+			   _("check_rpcsec_auth: failed inquire_context, "
+			     "stat=%u"), maj_stat);
 	  log_badauth(maj_stat, min_stat,
 		      &rqstp->rq_xprt->xp_raddr, NULL);
 	  goto fail_name;
@@ -508,8 +509,8 @@ check_iprop_rpcsec_auth(struct svc_req *rqstp)
 
 fail_princ:
      if (!success) {
-	 krb5_klog_syslog(LOG_ERR, "bad service principal %.*s%s",
-			  (int) slen, (char *) gss_str.value, sdots);
+	  krb5_klog_syslog(LOG_ERR, _("bad service principal %.*s%s"),
+			   (int) slen, (char *) gss_str.value, sdots);
      }
      gss_release_buffer(&min_stat, &gss_str);
      krb5_free_principal(kctx, princ);
@@ -531,8 +532,8 @@ krb5_iprop_prog_1(struct svc_req *rqstp,
     char *whoami = "krb5_iprop_prog_1";
 
     if (!check_iprop_rpcsec_auth(rqstp)) {
-	krb5_klog_syslog(LOG_ERR,
-			 "authentication attempt failed: %s, RPC authentication flavor %d",
+	krb5_klog_syslog(LOG_ERR, _("authentication attempt failed: %s, RPC "
+				    "authentication flavor %d"),
 			 inet_ntoa(rqstp->rq_xprt->xp_raddr.sin_addr),
 			 rqstp->rq_cred.oa_flavor);
 	svcerr_weakauth(transp);
diff --git a/src/kadmin/server/kadm_rpc_svc.c b/src/kadmin/server/kadm_rpc_svc.c
index a231d0b1f..a9bccf599 100644
--- a/src/kadmin/server/kadm_rpc_svc.c
+++ b/src/kadmin/server/kadm_rpc_svc.c
@@ -4,15 +4,10 @@
  *
  */
 
-#include <stdio.h>
+#include <k5-platform.h>
 #include <gssrpc/rpc.h>
 #include <gssapi/gssapi_krb5.h> /* for gss_nt_krb5_name */
 #include <syslog.h>
-#include <string.h>
-#include "autoconf.h"
-#ifdef HAVE_MEMORY_H
-#include <memory.h>
-#endif
 #include <kadm5/kadm_rpc.h>
 #include <krb5.h>
 #include <kadm5/admin.h>
@@ -269,8 +264,8 @@ check_rpcsec_auth(struct svc_req *rqstp)
      maj_stat = gss_inquire_context(&min_stat, ctx, NULL, &name,
 				    NULL, NULL, NULL, NULL, NULL);
      if (maj_stat != GSS_S_COMPLETE) {
-	  krb5_klog_syslog(LOG_ERR, "check_rpcsec_auth: "
-			   "failed inquire_context, stat=%u", maj_stat);
+	  krb5_klog_syslog(LOG_ERR, _("check_rpcsec_auth: failed "
+				      "inquire_context, stat=%u"), maj_stat);
 	  log_badauth(maj_stat, min_stat,
 		      &rqstp->rq_xprt->xp_raddr, NULL);
 	  goto fail_name;
@@ -305,7 +300,7 @@ check_rpcsec_auth(struct svc_req *rqstp)
 
 fail_princ:
      if (!success) {
-	 krb5_klog_syslog(LOG_ERR, "bad service principal %.*s%s",
+	 krb5_klog_syslog(LOG_ERR, _("bad service principal %.*s%s"),
 			  (int) slen, (char *) gss_str.value, sdots);
      }
      gss_release_buffer(&min_stat, &gss_str);
@@ -326,9 +321,8 @@ gss_to_krb5_name_1(struct svc_req *rqstp, krb5_context ctx, gss_name_t gss_name,
 
      status = gss_display_name(&minor_stat, gss_name, gss_str, &gss_type);
      if ((status != GSS_S_COMPLETE) || (gss_type != gss_nt_krb5_name)) {
-	  krb5_klog_syslog(LOG_ERR,
-			   "gss_to_krb5_name: "
-			   "failed display_name status %d", status);
+	  krb5_klog_syslog(LOG_ERR, _("gss_to_krb5_name: failed display_name "
+				      "status %d"), status);
 	  log_badauth(status, minor_stat,
 		      &rqstp->rq_xprt->xp_raddr, NULL);
 	  return 0;
diff --git a/src/kadmin/server/ovsec_kadmd.c b/src/kadmin/server/ovsec_kadmd.c
index 4d7a26191..8c11480e8 100644
--- a/src/kadmin/server/ovsec_kadmd.c
+++ b/src/kadmin/server/ovsec_kadmd.c
@@ -127,15 +127,13 @@ void kadm5_set_use_password_server (void);
 
 static void usage()
 {
-    fprintf(stderr, "Usage: kadmind [-x db_args]* [-r realm] [-m] [-nofork] "
-#ifdef USE_PASSWORD_SERVER
-            "[-passwordserver] "
-#endif
-            "[-port port-number]\n"
-            "\t\t[-P pid_file]\n"
-            "\nwhere,\n\t[-x db_args]* - any number of database specific arguments.\n"
-            "\t\t\tLook at each database documentation for supported arguments\n"
-    );
+    fprintf(stderr, _("Usage: kadmind [-x db_args]* [-r realm] [-m] [-nofork] "
+                      "[-port port-number]\n"
+                      "\t\t[-P pid_file]\n"
+                      "\nwhere,\n\t[-x db_args]* - any number of database "
+                      "specific arguments.\n"
+                      "\t\t\tLook at each database documentation for "
+                      "supported arguments\n"));
     exit(1);
 }
 
@@ -181,8 +179,7 @@ static void display_status_1(m, code, type)
         maj_stat = gss_display_status(&min_stat, code,
                                       type, GSS_C_NULL_OID,
                                       &msg_ctx, &msg);
-        fprintf(stderr, "GSS-API error %s: %s\n", m,
-                (char *)msg.value);
+        fprintf(stderr, _("GSS-API error %s: %s\n"), m, (char *)msg.value);
         (void) gss_release_buffer(&min_stat, &msg);
 
         if (!msg_ctx)
@@ -256,7 +253,7 @@ int main(int argc, char *argv[])
     gssbuf.length = strlen(gssbuf.value);
     major_status = gss_str_to_oid(&minor_status, &gssbuf, &nt_krb5_name_oid);
     if (major_status != GSS_S_COMPLETE) {
-        fprintf(stderr, "Couldn't create KRB5 Name NameType OID\n");
+        fprintf(stderr, _("Couldn't create KRB5 Name NameType OID\n"));
         display_status("str_to_oid", major_status, minor_status);
         exit(1);
     }
@@ -285,8 +282,8 @@ int main(int argc, char *argv[])
                 char **temp = realloc( db_args, sizeof(char*) * (db_args_size+1)); /* one for NULL */
                 if( temp == NULL )
                 {
-                    fprintf(stderr,"%s: cannot initialize. Not enough memory\n",
-                            whoami);
+                    fprintf(stderr, _("%s: cannot initialize. Not enough "
+                                      "memory\n"), whoami);
                     exit(1);
                 }
                 db_args = temp;
@@ -332,7 +329,7 @@ int main(int argc, char *argv[])
         usage();
 
     if ((ret = kadm5_init_krb5_context(&context))) {
-        fprintf(stderr, "%s: %s while initializing context, aborting\n",
+        fprintf(stderr, _("%s: %s while initializing context, aborting\n"),
                 whoami, error_message(ret));
         exit(1);
     }
@@ -346,9 +343,8 @@ int main(int argc, char *argv[])
                          db_args,
                          &global_server_handle)) != KADM5_OK) {
         const char *e_txt = krb5_get_error_message (context, ret);
-        krb5_klog_syslog(LOG_ERR, "%s while initializing, aborting",
-                         e_txt);
-        fprintf(stderr, "%s: %s while initializing, aborting\n",
+        krb5_klog_syslog(LOG_ERR, _("%s while initializing, aborting"), e_txt);
+        fprintf(stderr, _("%s: %s while initializing, aborting\n"),
                 whoami, e_txt);
         krb5_klog_close(context);
         exit(1);
@@ -357,9 +353,9 @@ int main(int argc, char *argv[])
     if ((ret = kadm5_get_config_params(context, 1, &params,
                                        &params))) {
         const char *e_txt = krb5_get_error_message (context, ret);
-        krb5_klog_syslog(LOG_ERR, "%s: %s while initializing, aborting",
+        krb5_klog_syslog(LOG_ERR, _("%s: %s while initializing, aborting"),
                          whoami, e_txt);
-        fprintf(stderr, "%s: %s while initializing, aborting\n",
+        fprintf(stderr, _("%s: %s while initializing, aborting\n"),
                 whoami, e_txt);
         kadm5_destroy(global_server_handle);
         krb5_klog_close(context);
@@ -369,11 +365,12 @@ int main(int argc, char *argv[])
 #define REQUIRED_PARAMS (KADM5_CONFIG_REALM | KADM5_CONFIG_ACL_FILE)
 
     if ((params.mask & REQUIRED_PARAMS) != REQUIRED_PARAMS) {
-        krb5_klog_syslog(LOG_ERR, "%s: Missing required configuration values "
-                         "(%lx) while initializing, aborting", whoami,
+        krb5_klog_syslog(LOG_ERR,
+                         _("%s: Missing required configuration values "
+                           "(%lx) while initializing, aborting"), whoami,
                          (params.mask & REQUIRED_PARAMS) ^ REQUIRED_PARAMS);
-        fprintf(stderr, "%s: Missing required configuration values "
-                "(%lx) while initializing, aborting\n", whoami,
+        fprintf(stderr, _("%s: Missing required configuration values "
+                          "(%lx) while initializing, aborting\n"), whoami,
                 (params.mask & REQUIRED_PARAMS) ^ REQUIRED_PARAMS);
         krb5_klog_close(context);
         kadm5_destroy(global_server_handle);
@@ -395,9 +392,9 @@ int main(int argc, char *argv[])
 #undef server_handle
         || (ret = setup_network(global_server_handle, whoami, 0))) {
         const char *e_txt = krb5_get_error_message (context, ret);
-        krb5_klog_syslog(LOG_ERR, "%s: %s while initializing network, aborting",
-                         whoami, e_txt);
-        fprintf(stderr, "%s: %s while initializing network, aborting\n",
+        krb5_klog_syslog(LOG_ERR, _("%s: %s while initializing network, "
+                                    "aborting"), whoami, e_txt);
+        fprintf(stderr, _("%s: %s while initializing network, aborting\n"),
                 whoami, e_txt);
         kadm5_destroy(global_server_handle);
         krb5_klog_close(context);
@@ -407,10 +404,9 @@ int main(int argc, char *argv[])
     names[0].name = build_princ_name(KADM5_ADMIN_SERVICE, params.realm);
     names[1].name = build_princ_name(KADM5_CHANGEPW_SERVICE, params.realm);
     if (names[0].name == NULL || names[1].name == NULL) {
-        krb5_klog_syslog(LOG_ERR,
-                         "Cannot build GSS-API authentication names, "
-                         "failing.");
-        fprintf(stderr, "%s: Cannot build GSS-API authentication names.\n",
+        krb5_klog_syslog(LOG_ERR, _("Cannot build GSS-API authentication "
+                                    "names, failing."));
+        fprintf(stderr, _("%s: Cannot build GSS-API authentication names.\n"),
                 whoami);
         kadm5_destroy(global_server_handle);
         krb5_klog_close(context);
@@ -427,34 +423,34 @@ int main(int argc, char *argv[])
     /* Set ktkdb's internal krb5_context. */
     ret = krb5_ktkdb_set_context(hctx);
     if (ret) {
-        krb5_klog_syslog(LOG_ERR, "Can't set kdb keytab's internal context.");
+        krb5_klog_syslog(LOG_ERR,
+                         _("Can't set kdb keytab's internal context."));
         goto kterr;
     }
     ret = krb5_kt_register(context, &krb5_kt_kdb_ops);
     if (ret) {
-        krb5_klog_syslog(LOG_ERR, "Can't register kdb keytab.");
+        krb5_klog_syslog(LOG_ERR, _("Can't register kdb keytab."));
         goto kterr;
     }
     /* Tell gssapi about the kdb keytab. */
     ret = krb5_gss_register_acceptor_identity("KDB:");
     if (ret) {
-        krb5_klog_syslog(LOG_ERR, "Can't register acceptor keytab.");
+        krb5_klog_syslog(LOG_ERR, _("Can't register acceptor keytab."));
         goto kterr;
     }
 kterr:
     if (ret) {
         krb5_klog_syslog(LOG_ERR, "%s", krb5_get_error_message (context, ret));
-        fprintf(stderr, "%s: Can't set up keytab for RPC.\n", whoami);
+        fprintf(stderr, _("%s: Can't set up keytab for RPC.\n"), whoami);
         kadm5_destroy(global_server_handle);
         krb5_klog_close(context);
         exit(1);
     }
 
     if (svcauth_gssapi_set_names(names, 2) == FALSE) {
-        krb5_klog_syslog(LOG_ERR,
-                         "Cannot set GSS-API authentication names (keytab not present?), "
-                         "failing.");
-        fprintf(stderr, "%s: Cannot set GSS-API authentication names.\n",
+        krb5_klog_syslog(LOG_ERR, _("Cannot set GSS-API authentication names "
+                                    "(keytab not present?), failing."));
+        fprintf(stderr, _("%s: Cannot set GSS-API authentication names.\n"),
                 whoami);
         svcauth_gssapi_unset_names();
         kadm5_destroy(global_server_handle);
@@ -477,16 +473,15 @@ kterr:
     svcauth_gss_set_log_miscerr_func(log_miscerr, NULL);
 
     if (svcauth_gss_set_svc_name(GSS_C_NO_NAME) != TRUE) {
-        fprintf(stderr, "%s: Cannot initialize RPCSEC_GSS service name.\n",
+        fprintf(stderr, _("%s: Cannot initialize RPCSEC_GSS service name.\n"),
                 whoami);
         exit(1);
     }
 
     if ((ret = kadm5int_acl_init(context, 0, params.acl_file))) {
         errmsg = krb5_get_error_message (context, ret);
-        krb5_klog_syslog(LOG_ERR, "Cannot initialize acl file: %s",
-                         errmsg);
-        fprintf(stderr, "%s: Cannot initialize acl file: %s\n",
+        krb5_klog_syslog(LOG_ERR, _("Cannot initialize acl file: %s"), errmsg);
+        fprintf(stderr, _("%s: Cannot initialize acl file: %s\n"),
                 whoami, errmsg);
         svcauth_gssapi_unset_names();
         kadm5_destroy(global_server_handle);
@@ -497,9 +492,8 @@ kterr:
     if (!nofork && (ret = daemon(0, 0))) {
         ret = errno;
         errmsg = krb5_get_error_message (context, ret);
-        krb5_klog_syslog(LOG_ERR, "Cannot detach from tty: %s", errmsg);
-        fprintf(stderr, "%s: Cannot detach from tty: %s\n",
-                whoami, errmsg);
+        krb5_klog_syslog(LOG_ERR, _("Cannot detach from tty: %s"), errmsg);
+        fprintf(stderr, _("%s: Cannot detach from tty: %s\n"), whoami, errmsg);
         svcauth_gssapi_unset_names();
         kadm5_destroy(global_server_handle);
         krb5_klog_close(context);
@@ -509,7 +503,7 @@ kterr:
         ret = write_pid_file(pid_file);
         if (ret) {
             errmsg = krb5_get_error_message(context, ret);
-            krb5_klog_syslog(LOG_ERR, "Cannot create PID file %s: %s",
+            krb5_klog_syslog(LOG_ERR, _("Cannot create PID file %s: %s"),
                              pid_file, errmsg);
             svcauth_gssapi_unset_names();
             kadm5_destroy(global_server_handle);
@@ -518,10 +512,10 @@ kterr:
         }
     }
 
-    krb5_klog_syslog(LOG_INFO, "Seeding random number generator");
+    krb5_klog_syslog(LOG_INFO, _("Seeding random number generator"));
     ret = krb5_c_random_os_entropy(context, strong_random, NULL);
     if (ret) {
-        krb5_klog_syslog(LOG_ERR, "Error getting random seed: %s, aborting",
+        krb5_klog_syslog(LOG_ERR, _("Error getting random seed: %s, aborting"),
                          krb5_get_error_message(context, ret));
         svcauth_gssapi_unset_names();
         kadm5_destroy(global_server_handle);
@@ -556,7 +550,7 @@ kterr:
 
         if (nofork)
             fprintf(stderr,
-                    "%s: create IPROP svc (PROG=%d, VERS=%d)\n",
+                    _("%s: create IPROP svc (PROG=%d, VERS=%d)\n"),
                     whoami, KRB5_IPROP_PROG, KRB5_IPROP_VERS);
 
 #if 0
@@ -629,10 +623,10 @@ kterr:
     setup_signal_handlers(log_ctx->iproprole);
     krb5_klog_syslog(LOG_INFO, _("starting"));
     if (nofork)
-        fprintf(stderr, "%s: starting...\n", whoami);
+        fprintf(stderr, _("%s: starting...\n"), whoami);
 
     listen_and_process(global_server_handle, whoami, reset_db);
-    krb5_klog_syslog(LOG_INFO, "finished, exiting");
+    krb5_klog_syslog(LOG_INFO, _("finished, exiting"));
 
     /* Clean up memory, etc */
     svcauth_gssapi_unset_names();
@@ -823,7 +817,7 @@ void reset_db(void)
 
 void request_exit(int signum)
 {
-    krb5_klog_syslog(LOG_DEBUG, "Got signal to request exit");
+    krb5_klog_syslog(LOG_DEBUG, _("Got signal to request exit"));
     signal_requests_exit = 1;
     return;
 }
@@ -839,8 +833,8 @@ void request_exit(int signum)
  */
 void sig_pipe(int unused)
 {
-    krb5_klog_syslog(LOG_NOTICE, "Warning: Received a SIGPIPE; probably a "
-                     "client aborted.  Continuing.");
+    krb5_klog_syslog(LOG_NOTICE, _("Warning: Received a SIGPIPE; probably a "
+                                   "client aborted.  Continuing."));
     return;
 }
 
@@ -968,13 +962,15 @@ void log_badverf(gss_name_t client_name, gss_name_t server_name,
         }
     }
     if (procname != NULL)
-        krb5_klog_syslog(LOG_NOTICE, "WARNING! Forged/garbled request: %s, "
-                         "claimed client = %.*s%s, server = %.*s%s, addr = %s",
+        krb5_klog_syslog(LOG_NOTICE,
+                         _("WARNING! Forged/garbled request: %s, claimed "
+                           "client = %.*s%s, server = %.*s%s, addr = %s"),
                          procname, (int) clen, (char *) client.value, cdots,
                          (int) slen, (char *) server.value, sdots, a);
     else
-        krb5_klog_syslog(LOG_NOTICE, "WARNING! Forged/garbled request: %d, "
-                         "claimed client = %.*s%s, server = %.*s%s, addr = %s",
+        krb5_klog_syslog(LOG_NOTICE,
+                         _("WARNING! Forged/garbled request: %d, claimed "
+                           "client = %.*s%s, server = %.*s%s, addr = %s"),
                          proc, (int) clen, (char *) client.value, cdots,
                          (int) slen, (char *) server.value, sdots, a);
 
@@ -1004,7 +1000,8 @@ void log_miscerr(struct svc_req *rqst, struct rpc_msg *msg,
     char *a;
 
     a = inet_ntoa(rqst->rq_xprt->xp_raddr.sin_addr);
-    krb5_klog_syslog(LOG_NOTICE, "Miscellaneous RPC error: %s, %s", a, error);
+    krb5_klog_syslog(LOG_NOTICE, _("Miscellaneous RPC error: %s, %s"), a,
+                     error);
 }
 
 
@@ -1036,10 +1033,10 @@ void log_badauth(OM_uint32 major, OM_uint32 minor,
 
     a = inet_ntoa(addr->sin_addr);
 
-    krb5_klog_syslog(LOG_NOTICE, "Authentication attempt failed: %s, GSS-API "
-                     "error strings are:", a);
+    krb5_klog_syslog(LOG_NOTICE, _("Authentication attempt failed: %s, "
+                                   "GSS-API error strings are:"), a);
     log_badauth_display_status("   ", major, minor);
-    krb5_klog_syslog(LOG_NOTICE, "   GSS-API error strings complete.");
+    krb5_klog_syslog(LOG_NOTICE, _("   GSS-API error strings complete."));
 }
 
 void log_badauth_display_status(char *msg, OM_uint32 major, OM_uint32 minor)
@@ -1066,8 +1063,9 @@ void log_badauth_display_status_1(char *m, OM_uint32 code, int type,
                 log_badauth_display_status_1(m, minor_stat,
                                              GSS_C_MECH_CODE, 1);
             } else
-                krb5_klog_syslog(LOG_ERR, "GSS-API authentication error %.*s: "
-                                 "recursive failure!", (int) msg.length,
+                krb5_klog_syslog(LOG_ERR,
+                                 _("GSS-API authentication error %.*s: "
+                                   "recursive failure!"), (int) msg.length,
                                  (char *) msg.value);
             return;
         }
diff --git a/src/kadmin/server/schpw.c b/src/kadmin/server/schpw.c
index aef30d16a..4f7f1104e 100644
--- a/src/kadmin/server/schpw.c
+++ b/src/kadmin/server/schpw.c
@@ -299,15 +299,13 @@ process_chpw_request(krb5_context context, void *server_handle, char *realm,
             targetp = clientstr;
         }
 
-        krb5_klog_syslog(LOG_NOTICE, "setpw request from %s by %.*s%s for %.*s%s: %s",
-                         addrbuf,
-                         (int) clen, clientstr, cdots,
-                         (int) tlen, targetp, tdots,
+        krb5_klog_syslog(LOG_NOTICE, _("setpw request from %s by %.*s%s for "
+                                       "%.*s%s: %s"), addrbuf, (int) clen,
+                         clientstr, cdots, (int) tlen, targetp, tdots,
                          errmsg ? errmsg : "success");
     } else {
-        krb5_klog_syslog(LOG_NOTICE, "chpw request from %s for %.*s%s: %s",
-                         addrbuf,
-                         (int) clen, clientstr, cdots,
+        krb5_klog_syslog(LOG_NOTICE, _("chpw request from %s for %.*s%s: %s"),
+                         addrbuf, (int) clen, clientstr, cdots,
                          errmsg ? errmsg : "success");
     }
     switch (ret) {
@@ -484,7 +482,7 @@ dispatch(void *handle,
 
     ret = krb5_kt_resolve(server_handle->context, "KDB:", &kt);
     if (ret != 0) {
-        krb5_klog_syslog(LOG_ERR, "chpw: Couldn't open admin keytab %s",
+        krb5_klog_syslog(LOG_ERR, _("chpw: Couldn't open admin keytab %s"),
                          krb5_get_error_message(server_handle->context, ret));
         goto cleanup;
     }
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),