Fix bconsole bug with new BNET signals

diff --git a/bacula/src/console/console.c b/bacula/src/console/console.c
index 0b7eeb9c35ac66875b1b6531c39f656d2e0a60d5..203cee38a1a0b2d7fac214eab816a4d23871a0f5 100644 (file)
--- a/bacula/src/console/console.c
+++ b/bacula/src/console/console.c
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2009 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2010 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -31,7 +31,6 @@
  *
  *     Kern Sibbald, September MM
  *
- *     Version $Id$
  */
 
 #include "bacula.h"

diff --git a/bacula/src/dird/ua_cmds.c b/bacula/src/dird/ua_cmds.c
index 7d637659c51616b54b2395c8918ca86901498c7e..8f99ee8b934b92342e3ef93fb087387f16e0aa6b 100644 (file)
--- a/bacula/src/dird/ua_cmds.c
+++ b/bacula/src/dird/ua_cmds.c
@@ -1342,8 +1342,8 @@ static int estimate_cmd(UAContext *ua, const char *cmd)
 
 bail_out:
    if (jcr->file_bsock) {
-      bnet_sig(jcr->file_bsock, BNET_TERMINATE);
-      bnet_close(jcr->file_bsock);
+      jcr->file_bsock->signal(BNET_TERMINATE);
+      jcr->file_bsock->close();
       jcr->file_bsock = NULL;
    }
    return 1;

diff --git a/bacula/src/dird/ua_input.c b/bacula/src/dird/ua_input.c
index 2b16f507433fc1e260febb4346fe5e8ae18faa66..d264d10272051881ff187334b691500965a9ebed 100644 (file)
--- a/bacula/src/dird/ua_input.c
+++ b/bacula/src/dird/ua_input.c
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2001-2008 Free Software Foundation Europe e.V.
+   Copyright (C) 2001-2010 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -31,7 +31,6 @@
  *
  *     Kern Sibbald, October MMI
  *
- *   Version $Id$
  */
 
 #include "bacula.h"
@@ -56,11 +55,11 @@ int get_cmd(UAContext *ua, const char *prompt, bool subprompt)
    if (!sock || ua->batch) {          /* No UA or batch mode */
       return 0;
    }
-   if (!subprompt) {
+   if (!subprompt && ua->api) {
       sock->signal(BNET_TEXT_INPUT);
    }
    sock->fsend("%s", prompt);
-   if (subprompt) {
+   if (!ua->api || subprompt) {
       sock->signal(BNET_SUB_PROMPT);
    }
    for ( ;; ) {