add bug closure to changelog

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

diff --git a/client-src/sendbackup.c b/client-src/sendbackup.c
index ffb260c6e6dad338657cc1ca078ce48163f8c008..5b9b7e9fbb0d60de18454774420945f45a6cf8e5 100644 (file)
--- a/client-src/sendbackup.c
+++ b/client-src/sendbackup.c
@@ -125,7 +125,12 @@ main(
     int ch;
     GSList *errlist;
     FILE   *mesgstream;
-    level_t *alevel;
+    am_level_t *alevel;
+
+    if (argc > 1 && argv && argv[1] && g_str_equal(argv[1], "--version")) {
+       printf("sendbackup-%s\n", VERSION);
+       return (0);
+    }
 
     /* initialize */
     /*
@@ -300,7 +305,7 @@ main(
            goto err;                           /* bad level */
        }
        skip_integer(s, ch);
-       alevel = g_new0(level_t, 1);
+       alevel = g_new0(am_level_t, 1);
        alevel->level = level;
        dle->levellist = g_slist_append(dle->levellist, alevel);
 
@@ -380,7 +385,7 @@ main(
        goto err;
     }
 
-    alevel = (level_t *)dle->levellist->data;
+    alevel = (am_level_t *)dle->levellist->data;
     level = alevel->level;
     dbprintf(_("  Parsed request as: program `%s'\n"), dle->program);
     dbprintf(_("                     disk `%s'\n"), qdisk);
@@ -468,6 +473,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);
@@ -592,7 +601,7 @@ main(
                int size;
                char *s, *s1;
 
-               indirect_tcp = stralloc(dle->directtcp_list->data);
+               indirect_tcp = g_strdup(dle->directtcp_list->data);
                g_slist_free(dle->directtcp_list);
                dle->directtcp_list = NULL;
                str_port = strchr(indirect_tcp, ':');
@@ -615,7 +624,7 @@ main(
                s1 = buffer;
                while ((s = strchr(s1, ' ')) != NULL) {
                    *s++ = '\0';
-                   dle->directtcp_list = g_slist_append(dle->directtcp_list, stralloc(s1));
+                   dle->directtcp_list = g_slist_append(dle->directtcp_list, g_strdup(s1));
                    s1 = s;
                }
                amfree(indirect_tcp);