From cbdc12bcc4bf0d62001d8d633d50bc48fe10c083 Mon Sep 17 00:00:00 2001 From: Eric Bollengier Date: Thu, 20 May 2010 12:05:43 +0200 Subject: [PATCH] Fix problem with BaseJob and Accurate FileSet options on client side --- bacula/src/findlib/find.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/bacula/src/findlib/find.c b/bacula/src/findlib/find.c index f818bae13d..45f2a67cef 100644 --- a/bacula/src/findlib/find.c +++ b/bacula/src/findlib/find.c @@ -193,9 +193,14 @@ find_files(JCR *jcr, FF_PKT *ff, int file_save(JCR *jcr, FF_PKT *ff_pkt, bool to ff->fstypes = fo->fstype; ff->drivetypes = fo->drivetype; bstrncat(ff->VerifyOpts, fo->VerifyOpts, sizeof(ff->VerifyOpts)); - bstrncat(ff->AccurateOpts, fo->AccurateOpts, sizeof(ff->AccurateOpts)); - bstrncat(ff->BaseJobOpts, fo->BaseJobOpts, sizeof(ff->BaseJobOpts)); + if (fo->AccurateOpts[0]) { + bstrncpy(ff->AccurateOpts, fo->AccurateOpts, sizeof(ff->AccurateOpts)); + } + if (fo->BaseJobOpts[0]) { + bstrncpy(ff->BaseJobOpts, fo->BaseJobOpts, sizeof(ff->BaseJobOpts)); + } } + Dmsg3(50, "Verify=<%s> Accurate=<%s> BaseJob=<%s>\n", ff->VerifyOpts, ff->AccurateOpts, ff->BaseJobOpts); dlistString *node; foreach_dlist(node, &incexe->name_list) { char *fname = node->c_str(); -- 2.39.5