Imported Upstream version 3.2.0

[debian/amanda] / amandad-src / amandad_util.c

diff --git a/amandad-src/amandad_util.c b/amandad-src/amandad_util.c
index 7444c5ea3e051dd5553900d2abfbbaa5f5416ae6..1721a3220f78ac363240c8e3b4525a84d487415a 100644 (file)
--- a/amandad-src/amandad_util.c
+++ b/amandad-src/amandad_util.c
@@ -28,6 +28,7 @@
  *
  */
 
+#include "amanda.h"
 #include "amandad.h"
 #include "util.h"
 
@@ -64,18 +65,24 @@ parse_g_options(
 
     while (tok != NULL) {
        if(strncmp(tok,"features=", 9) == 0) {
+           char *t = tok+9;
+           char *u = strchr(t, ';');
+           if (u)
+              *u = '\0';
            if(g_options->features != NULL) {
                dbprintf(_("multiple features option\n"));
                if(verbose) {
                    g_printf(_("ERROR [multiple features option]\n"));
                }
            }
-           if((g_options->features = am_string_to_feature(tok+9)) == NULL) {
-               dbprintf(_("bad features value \"%s\"\n"), tok+10);
+           if((g_options->features = am_string_to_feature(t)) == NULL) {
+               dbprintf(_("bad features value \"%s\"\n"), t);
                if(verbose) {
-                   g_printf(_("ERROR [bad features value \"%s\"]\n"), tok+10);
+                   g_printf(_("ERROR [bad features value \"%s\"]\n"), t);
                }
            }
+           if (u)
+              *u = ';';
        }
        else if(strncmp(tok,"hostname=", 9) == 0) {
            if(g_options->hostname != NULL) {