Sync some fixes from Amanda.

bareos · May 5, 2013 · 20ccfb1 · 20ccfb1
1 parent e82b5ed
commit 20ccfb1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/ndmp/ndma_noti_calls.c b/src/ndmp/ndma_noti_calls.c
@@ -136,6 +136,8 @@ ndma_send_logmsg (struct ndm_session *sess, ndmp9_log_type ltype,
 	vsnprintf (buf, sizeof(buf), fmt, ap);
 	va_end (ap);
 
+	if (!from_conn) return;
+
 	switch (from_conn->protocol_version) {
 #ifndef NDMOS_OPTION_NO_NDMP2
 	case NDMP2VER:

diff --git a/src/ndmp/ndmjob_job.c b/src/ndmp/ndmjob_job.c
@@ -106,14 +106,17 @@ args_to_job (void)
 	case NDM_JOB_OP_TOC:
 		args_to_job_recover_env();
 		args_to_job_recover_nlist();
-		if (J_index_file)
+		if (J_index_file) {
 			jndex_doit();
+			jndex_merge_environment();
+		}
 		break;
 
 	case NDM_JOB_OP_EXTRACT:
 		args_to_job_recover_env();
 		args_to_job_recover_nlist();
 		jndex_doit();
+		jndex_merge_environment();
 		break;
 
 	case 'D':		/* -o daemon */
@@ -530,7 +533,12 @@ jndex_merge_environment (void)
 	struct ndm_env_entry *	entry;
 
 	for (entry = ji_environment.head; entry; entry = entry->next) {
-		ndma_store_env_list (&E_environment, &entry->pval);
+		if (strcmp(entry->pval.name, "FILESYSTEM") != 0 &&
+		    strcmp(entry->pval.name, "PREFIX") != 0 &&
+		    strcmp(entry->pval.name, "HIST") != 0 &&
+		    strcmp(entry->pval.name, "TYPE") != 0) {
+			ndma_store_env_list (&E_environment, &entry->pval);
+		}
 	}
 
 	return 0;