restore cmd + misc -- see kes04Aug02

[bacula/bacula] / bacula / src / dird / ua_server.c

diff --git a/bacula/src/dird/ua_server.c b/bacula/src/dird/ua_server.c
index 861b92024d703ba7a290e818e48fcb804b70cac8..6884ae4ff55eaa12294840de7f293258413fda64 100644 (file)
--- a/bacula/src/dird/ua_server.c
+++ b/bacula/src/dird/ua_server.c
@@ -117,10 +117,8 @@ static void handle_UA_client_request(void *arg)
 
    while (!ua.quit) {
       stat = bnet_recv(ua.UA_sock);
-      Dmsg1(500, "stat=%d\n", stat);
       if (stat > 0) {
-        strncpy(cmd, ua.UA_sock->msg, sizeof(cmd));
-        cmd[sizeof(cmd)-1] = 0;       /* ensure it is terminated/trucated */
+        bstrncpy(cmd, ua.UA_sock->msg, sizeof(cmd));
         parse_command_args(&ua);
          if (ua.argc > 0 && ua.argk[0][0] == '.') {
            do_a_dot_command(&ua, cmd);
@@ -139,12 +137,10 @@ static void handle_UA_client_request(void *arg)
            bnet_sig(ua.UA_sock, BNET_EOD); /* send end of command */
         }
       } else if (stat == 0) {
-        if (ua.UA_sock->msglen == BNET_TERMINATE || 
-            ua.UA_sock->msglen == BNET_EOF) {
+        if (ua.UA_sock->msglen == BNET_TERMINATE) {
            ua.quit = TRUE;
            break;
         }
-         Dmsg1(000, "stat=0 msglen=%d\n", ua.UA_sock->msglen);
         bnet_sig(ua.UA_sock, BNET_POLL);
       } else {
         break;                    /* error, exit */