Imported Upstream version 3.1.0

[debian/amanda] / client-src / noop.c

diff --git a/client-src/noop.c b/client-src/noop.c
index a0c4105abcf3e41c958f029a075e50078dc36123..e9b62706fd152b5a3cec98a22e0f0b40075369cc 100644 (file)
--- a/client-src/noop.c
+++ b/client-src/noop.c
@@ -52,10 +52,23 @@ main(
     (void)argc;        /* Quiet unused parameter warning */
     (void)argv;        /* Quiet unused parameter warning */
 
+    /*
+     * Configure program for internationalization:
+     *   1) Only set the message locale for now.
+     *   2) Set textdomain for all amanda related programs to "amanda"
+     *      We don't want to be forced to support dozens of message catalogs.
+     */  
+    setlocale(LC_MESSAGES, "C");
+    textdomain("amanda"); 
+
     /* Don't die when child closes pipe */
     signal(SIGPIPE, SIG_IGN);
 
     safe_fd(-1, 0);
+    openbsd_fd_inform();
+
+    check_running_as(RUNNING_AS_CLIENT_LOGIN);
+
     do {
        /* soak up any stdin */
        n = read(0, &ch, 1);
@@ -69,8 +82,8 @@ main(
     amfree(our_feature_string);
     am_release_feature_set(our_features);
     our_features = NULL;
-    if (fullwrite(1, options, strlen(options)) < 0) {
-       error("error sending noop response: %s", strerror(errno));
+    if (full_write(1, options, strlen(options)) < strlen(options)) {
+       error(_("error sending noop response: %s"), strerror(errno));
        /*NOTREACHED*/
     }
     amfree(options);