Merge tag 'upstream/3.3.1'

[debian/amanda] / client-src / sendbackup.c

diff --git a/client-src/sendbackup.c b/client-src/sendbackup.c
index dacb961e143ab296e4c4e19e3de67a14994795cd..506d45babb9e9456fb89bec87cf96177fecea57e 100644 (file)
--- a/client-src/sendbackup.c
+++ b/client-src/sendbackup.c
@@ -126,6 +126,11 @@ main(
     FILE   *mesgstream;
     level_t *alevel;
 
+    if (argc > 1 && argv && argv[1] && g_str_equal(argv[1], "--version")) {
+       printf("sendbackup-%s\n", VERSION);
+       return (0);
+    }
+
     /* initialize */
     /*
      * Configure program for internationalization:
@@ -467,6 +472,10 @@ main(
       }
     }
 
+    if (merge_dles_properties(dle, 1) == 0) {
+       g_debug("merge_dles_properties failed");
+       exit(1);
+    }
     mesgstream = fdopen(mesgfd,"w");
     run_client_scripts(EXECUTE_ON_PRE_DLE_BACKUP, g_options, dle, mesgstream);
     fflush(mesgstream);