bacula/contribs8/bacula-5.0.3-clientrunbeforejob.patch

--- bacula/src/dird/backup.c    2007-02-20 14:28:55.000000000 +0100
+++ bacula.org/src/dird/backup.c        2007-02-20 14:27:54.000000000 +0100
@@ -384,18 +384,6 @@
    jcr->setJobStatus(JS_Running);
    fd = jcr->file_bsock;
 
-   if (!send_include_list(jcr)) {
-      goto bail_out;
-   }
-
-   if (!send_exclude_list(jcr)) {
-      goto bail_out;
-   }
-
-   if (!send_level_command(jcr)) {
-      goto bail_out;
-   }
-
    /*
     * send Storage daemon address to the File daemon
     */
@@ -418,10 +406,24 @@
       goto bail_out;
    }
 
+   /* setup job */
+
+   if (!send_level_command(jcr)) {
+      goto bail_out;
+   }
+
    if (!send_runscripts_commands(jcr)) {
       goto bail_out;
    }
 
+   if (!send_include_list(jcr)) {
+      goto bail_out;
+   }
+
+   if (!send_exclude_list(jcr)) {
+      goto bail_out;
+   }
+
    /*    
     * We re-update the job start record so that the start
     *  time is set after the run before job.  This avoids 
1	--- bacula/src/dird/backup.c 2007-02-20 14:28:55.000000000 +0100
2	+++ bacula.org/src/dird/backup.c 2007-02-20 14:27:54.000000000 +0100
3	@@ -384,18 +384,6 @@
4	jcr->setJobStatus(JS_Running);
5	fd = jcr->file_bsock;
6
7	- if (!send_include_list(jcr)) {
8	- goto bail_out;
9	- }
10	-
11	- if (!send_exclude_list(jcr)) {
12	- goto bail_out;
13	- }
14	-
15	- if (!send_level_command(jcr)) {
16	- goto bail_out;
17	- }
18	-
19	/*
20	* send Storage daemon address to the File daemon
21	*/
22	@@ -418,10 +406,24 @@
23	goto bail_out;
24	}
25
26	+ /* setup job */
27	+
28	+ if (!send_level_command(jcr)) {
29	+ goto bail_out;
30	+ }
31	+
32	if (!send_runscripts_commands(jcr)) {
33	goto bail_out;
34	}
35
36	+ if (!send_include_list(jcr)) {
37	+ goto bail_out;
38	+ }
39	+
40	+ if (!send_exclude_list(jcr)) {
41	+ goto bail_out;
42	+ }
43	+
44	/*
45	* We re-update the job start record so that the start
46	* time is set after the run before job. This avoids