From fea0d9b7536f0c3c93440b4f3841419811b29988 Mon Sep 17 00:00:00 2001 From: Nicolas Boichat Date: Sun, 22 Aug 2004 20:21:14 +0000 Subject: [PATCH] Fix .status return codes. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1550 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/dird/ua_status.c | 6 +++--- bacula/src/stored/status.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bacula/src/dird/ua_status.c b/bacula/src/dird/ua_status.c index 0383a8c3fd..70f0bc8054 100644 --- a/bacula/src/dird/ua_status.c +++ b/bacula/src/dird/ua_status.c @@ -42,7 +42,7 @@ static void do_client_status(UAContext *ua, CLIENT *client); static void do_director_status(UAContext *ua); static void do_all_status(UAContext *ua); -static char OKqstatus[] = "2000 OK .status\n"; +static char OKqstatus[] = "1000 OK .status\n"; static char DotStatusJob[] = "JobId=%d JobStatus=%c JobErrors=%d\n"; /* @@ -59,7 +59,7 @@ int qstatus_cmd(UAContext *ua, const char *cmd) Dmsg1(20, "status:%s:\n", cmd); if ((ua->argc != 3) || (strcasecmp(ua->argk[1], "dir"))) { - bsendmsg(ua, "2900 Bad .status command, missing arguments.\n"); + bsendmsg(ua, "1900 Bad .status command, missing arguments.\n"); return 1; } @@ -82,7 +82,7 @@ int qstatus_cmd(UAContext *ua, const char *cmd) } } else { - bsendmsg(ua, "2900 Bad .status command, wrong argument.\n"); + bsendmsg(ua, "1900 Bad .status command, wrong argument.\n"); return 1; } diff --git a/bacula/src/stored/status.c b/bacula/src/stored/status.c index 5ae33f1dc0..06ffdf991d 100644 --- a/bacula/src/stored/status.c +++ b/bacula/src/stored/status.c @@ -43,7 +43,7 @@ extern int num_jobs_run; /* Static variables */ static char qstatus[] = ".status %s\n"; -static char OKqstatus[] = "2000 OK .status\n"; +static char OKqstatus[] = "3000 OK .status\n"; static char DotStatusJob[] = "JobId=%d JobStatus=%c JobErrors=%d\n"; @@ -432,7 +432,7 @@ int qstatus_cmd(JCR *jcr) if (sscanf(dir->msg, qstatus, time) != 1) { pm_strcpy(&jcr->errmsg, dir->msg); Jmsg1(jcr, M_FATAL, 0, _("Bad .status command: %s\n"), jcr->errmsg); - bnet_fsend(dir, "2900 Bad .status command, missing argument.\n"); + bnet_fsend(dir, "3900 Bad .status command, missing argument.\n"); bnet_sig(dir, BNET_EOD); return 0; } @@ -459,7 +459,7 @@ int qstatus_cmd(JCR *jcr) else { pm_strcpy(&jcr->errmsg, dir->msg); Jmsg1(jcr, M_FATAL, 0, _("Bad .status command: %s\n"), jcr->errmsg); - bnet_fsend(dir, "2900 Bad .status command, wrong argument.\n"); + bnet_fsend(dir, "3900 Bad .status command, wrong argument.\n"); bnet_sig(dir, BNET_EOD); return 0; } -- 2.39.5