From c2193cda1082c1acca1e738a85cc82e311d63a8a Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sat, 17 Jun 2017 15:10:55 +0200 Subject: [PATCH] Fix bug #2289 version 7.9 not compatible with old FDs -- comm compression --- bacula/src/dird/authenticate.c | 2 +- bacula/src/filed/job.c | 2 +- bacula/src/stored/hello.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bacula/src/dird/authenticate.c b/bacula/src/dird/authenticate.c index 023887cd5d..19ecba6bda 100644 --- a/bacula/src/dird/authenticate.c +++ b/bacula/src/dird/authenticate.c @@ -299,7 +299,7 @@ int authenticate_file_daemon(JCR *jcr) return 0; } /* For newer FD turn on comm line compression */ - if (jcr->FDVersion >= 9 && director->comm_compression) { + if (jcr->FDVersion >= 214 && director->comm_compression) { fd->set_compress(); } else { fd->clear_compress(); diff --git a/bacula/src/filed/job.c b/bacula/src/filed/job.c index 81cef24486..305dfa7eb9 100644 --- a/bacula/src/filed/job.c +++ b/bacula/src/filed/job.c @@ -326,7 +326,7 @@ static void *handle_director_request(BSOCK *dir) quit = true; break; } - Dmsg1(100, "Executing Dir %s command.\n", dir->msg); + Dmsg2(100, "Executing %s Dir %s command.\n", cmds[i].cmd, dir->msg); if (!cmds[i].func(jcr)) { /* do command */ quit = true; /* error or fully terminated, get out */ Dmsg1(100, "Quit command loop. Canceled=%d\n", job_canceled(jcr)); diff --git a/bacula/src/stored/hello.c b/bacula/src/stored/hello.c index 49c3130825..14d0f9d0a4 100644 --- a/bacula/src/stored/hello.c +++ b/bacula/src/stored/hello.c @@ -282,7 +282,7 @@ bool read_client_hello(JCR *jcr) jcr->SDVersion = sd_version; Dmsg1(050, "FDVersion=%d\n", fd_version); /* Turn on compression for newer FDs, except for Community version */ - if (jcr->FDVersion >= 9 && jcr->FDVersion != 213 && me->comm_compression) { + if (jcr->FDVersion >= 214 && me->comm_compression) { cl->set_compress(); /* set compression allowed */ } else { cl->clear_compress(); -- 2.39.5