Merge branch 'bareos-15.2'

bareos · Jul 15, 2016 · c6ab2ea · c6ab2ea
2 parents 0a161b0 + 15e0d2f
commit c6ab2ea
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/dird/ndmp_dma_backup.c b/src/dird/ndmp_dma_backup.c
@@ -580,6 +580,14 @@ bool do_ndmp_backup(JCR *jcr)
           * Copy the actual job to perform.
           */
          memcpy(&ndmp_sess.control_acb->job, &ndmp_job, sizeof(struct ndm_job_param));
+
+         /*
+          * We can use the same private pointer used in the logging with the JCR in
+          * the file index generation. We don't setup a index_log.deliver
+          * function as we catch the index information via callbacks.
+          */
+         ndmp_sess.control_acb->job.index_log.ctx = ndmp_sess.param->log.ctx;
+
          if (!fill_backup_environment(jcr,
                                       ie,
                                       nis->filesystem,
@@ -625,12 +633,6 @@ bool do_ndmp_backup(JCR *jcr)
          ndmp_sess.conn_open = 1;
          ndmp_sess.conn_authorized = 1;
 
-         /*
-          * We can use the same private pointer used in the logging with the JCR in
-          * the file index generation. We don't setup a index_log.deliver
-          * function as we catch the index information via callbacks.
-          */
-         ndmp_sess.control_acb->job.index_log.ctx = ndmp_sess.param->log.ctx;
          register_callback_hooks(&ndmp_sess.control_acb->job.index_log);
 
          /*