projects
/
debian
/
amanda
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more details
[debian/amanda]
/
server-src
/
amcheck.c
diff --git
a/server-src/amcheck.c
b/server-src/amcheck.c
index 533a044013a072eb6efaf47b12e34cd6d3a67c53..5e9653e4a56277d17c2d291205dbfdceb363bd10 100644
(file)
--- a/
server-src/amcheck.c
+++ b/
server-src/amcheck.c
@@
-1744,6
+1744,7
@@
start_host(
hostp->hostname, qname);
g_fprintf(outf, _("Dumptype configuration is not GNUTAR or DUMP."
" It is case sensitive\n"));
hostp->hostname, qname);
g_fprintf(outf, _("Dumptype configuration is not GNUTAR or DUMP."
" It is case sensitive\n"));
+ l = stralloc("");
} else {
l = vstralloc("<dle>\n"
" <program>APPLICATION</program>\n", NULL);
} else {
l = vstralloc("<dle>\n"
" <program>APPLICATION</program>\n", NULL);
@@
-1931,13
+1932,20
@@
handle_result(
t = strstr(line, "features=");
if(t != NULL && (g_ascii_isspace((int)t[-1]) || t[-1] == ';')) {
t = strstr(line, "features=");
if(t != NULL && (g_ascii_isspace((int)t[-1]) || t[-1] == ';')) {
+ char *u = strchr(t, ';');
+ if (u)
+ *u = '\0';
t += SIZEOF("features=")-1;
am_release_feature_set(hostp->features);
if((hostp->features = am_string_to_feature(t)) == NULL) {
t += SIZEOF("features=")-1;
am_release_feature_set(hostp->features);
if((hostp->features = am_string_to_feature(t)) == NULL) {
- g_fprintf(outf, _("ERROR: %s: bad features value:
%s
\n"),
- hostp->hostname,
line
);
+ g_fprintf(outf, _("ERROR: %s: bad features value:
'%s'
\n"),
+ hostp->hostname,
t
);
g_fprintf(outf, _("The amfeature in the reply packet is invalid\n"));
g_fprintf(outf, _("The amfeature in the reply packet is invalid\n"));
+ remote_errors++;
+ hostp->up = HOST_DONE;
}
}
+ if (u)
+ *u = ';';
}
continue;
}
continue;