NetBSD Problem Report #35361
From jukka+moray@salmi.ch Fri Jan 5 08:38:38 2007
Return-Path: <jukka+moray@salmi.ch>
Received: from mail.netbsd.org (mail.netbsd.org [204.152.190.11])
by narn.NetBSD.org (Postfix) with ESMTP id 155FD63B880
for <gnats-bugs@gnats.NetBSD.org>; Fri, 5 Jan 2007 08:38:38 +0000 (UTC)
Message-Id: <20070105083835.829DA153D2@moray.salmi.ch>
Date: Fri, 5 Jan 2007 09:38:35 +0100 (CET)
From: j+nbsd@2007.salmi.ch
To: gnats-bugs@NetBSD.org
Subject: sysutils/amanda: prevent amverify from looping forever
X-Send-Pr-Version: 3.95
>Number: 35361
>Category: pkg
>Synopsis: sysutils/amanda: prevent amverify from looping forever
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: pkg-manager
>State: closed
>Class: sw-bug
>Submitter-Id: net
>Arrival-Date: Fri Jan 05 08:40:00 +0000 2007
>Closed-Date: Fri Jan 05 13:22:18 +0000 2007
>Last-Modified: Fri Jan 05 13:25:00 +0000 2007
>Originator: Jukka Salmi
>Release: pkgsrc HEAD
>Organization:
>Environment:
>Description:
As [1]reported on the amanda-users list amverify built from Amanda
2.4.4p4 (which is the version still used in pkgsrc) might loop forever.
This problem was fixed in a later Amanda version, and a patch for
2.4.4p4 was [2]provided.
>How-To-Repeat:
n/a
>Fix:
The following patch is available from [2] and [3]:
Amanda 2.4.4p4
Prevent amverify from looping forever. Patch provided by Jean-Louis
Martineau on amanda-users:
http://groups.yahoo.com/group/amanda-users/message/55099
--- restore-src/amrestore.c 2004-11-19 08:17:15.000000000 -0500
+++ restore-src/amrestore.c 2004-11-19 13:12:30.000000000 -0500
@@ -482,6 +482,7 @@
char *e;
char *err;
char *label = NULL;
+ int count_error;
for(fd = 3; fd < FD_SETSIZE; fd++) {
/*
@@ -667,24 +668,28 @@
get_pname());
}
- while(file.type == F_TAPESTART || file.type == F_DUMPFILE) {
- amfree(filename);
- filename = make_filename(&file);
+ count_error=0;
+ while(count_error < 10) {
+ if(file.type == F_TAPEEND) break;
found_match = 0;
- for(me = match_list; me; me = me->next) {
- if(disk_match(&file,me->datestamp,me->hostname,me->diskname) != 0) {
- found_match = 1;
- break;
+ if(file.type == F_DUMPFILE) {
+ amfree(filename);
+ filename = make_filename(&file);
+ for(me = match_list; me; me = me->next) {
+ if(disk_match(&file,me->datestamp,me->hostname,me->diskname) != 0) {
+ found_match = 1;
+ break;
+ }
+ }
+ fprintf(stderr, "%s: %3d: %s ",
+ get_pname(),
+ file_number,
+ found_match ? "restoring" : "skipping");
+ if(file.type != F_DUMPFILE) {
+ print_header(stderr, &file);
+ } else {
+ fprintf(stderr, "%s\n", filename);
}
- }
- fprintf(stderr, "%s: %3d: %s ",
- get_pname(),
- file_number,
- found_match ? "restoring" : "skipping");
- if(file.type != F_DUMPFILE) {
- print_header(stderr, &file);
- } else {
- fprintf(stderr, "%s\n", filename);
}
if(found_match) {
restore(&file, filename, isafile);
@@ -718,6 +723,7 @@
if((tapedev = tape_open(tapename, 0)) < 0) {
error("could not open %s: %s", tapename, strerror(errno));
}
+ count_error++;
} else {
/*
* If the last read got something (even an error), we can
@@ -726,6 +732,7 @@
if(tapefd_fsf(tapedev, 1) < 0) {
error("could not fsf %s: %s", tapename, strerror(errno));
}
+ count_error=0;
}
file_number++;
read_file_header(&file, isafile);
--- server-src/amverify.sh.in 2004-10-04 07:47:06.000000000 -0400
+++ server-src/amverify.sh.in 2004-11-19 13:12:30.000000000 -0500
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $Id: amverify.sh.in,v 1.7.2.13.4.5.2.7 2004/10/04 11:47:06 martinea Exp $
+# $Id: amverify.sh.in,v 1.7.2.13.4.5.2.6.2.2 2004/11/19 18:12:30 martinea Exp $
#
# (C) 1996 by ICEM Systems GmbH
# Author: Axel Zinser (fifi@icem.de)
@@ -428,6 +428,7 @@
FILE=`grep restoring $TEMP/amrestore.out \
| sed 's/^.*restoring //'`
EOF=`grep "reached end of tape" $TEMP/amrestore.out`
+ EOI=`grep "reached end of information" $TEMP/amrestore.out`
# amrestore: 0: restoring sundae._mnt_sol1_usr.19961127.1
if [ X"$FILE" != X"" -a X"$RESULT" = X"0" ]; then
report "Checked $FILE"
@@ -436,6 +437,9 @@
elif [ -n "$EOF" ]; then
report "End-of-Tape detected."
break
+ elif [ -n "$EOI" ]; then
+ report "End-of-Information detected."
+ break
else
report "** Error detected ($FILE)"
echo "$VOLUME ($FILE):" >>$DEFECTS
[1] http://tech.groups.yahoo.com/group/amanda-users/message/55087
[2] http://tech.groups.yahoo.com/group/amanda-users/message/55099
[3] http://salmi.ch/~jukka/patches/pkgsrc/localpatches/pkgsrc-2006Q4/sysutils/amanda-server/patch-1-verify
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed
State-Changed-By: obache@netbsd.org
State-Changed-When: Fri, 05 Jan 2007 13:22:18 +0000
State-Changed-Why:
Patch added. Thanks for your PR!
From: OBATA Akio <obache@netbsd.org>
To: gnats-bugs@NetBSD.org
Cc:
Subject: PR/35361 CVS commit: pkgsrc/sysutils/amanda-server
Date: Fri, 5 Jan 2007 13:20:54 +0000 (UTC)
Module Name: pkgsrc
Committed By: obache
Date: Fri Jan 5 13:20:54 UTC 2007
Modified Files:
pkgsrc/sysutils/amanda-server: Makefile distinfo
Added Files:
pkgsrc/sysutils/amanda-server/patches: patch-an patch-ao
Log Message:
Prevent amverify from looping forever. Patch provided by Jean-Louis
Martineau on amanda-users:
http://groups.yahoo.com/group/amanda-users/message/55099
Pointed out by Jukka Salmi in PR 35361.
To generate a diff of this commit:
cvs rdiff -r1.38 -r1.39 pkgsrc/sysutils/amanda-server/Makefile
cvs rdiff -r1.9 -r1.10 pkgsrc/sysutils/amanda-server/distinfo
cvs rdiff -r0 -r1.1 pkgsrc/sysutils/amanda-server/patches/patch-an \
pkgsrc/sysutils/amanda-server/patches/patch-ao
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
>Unformatted:
(Contact us)
$NetBSD: query-full-pr,v 1.51 2026/08/10 02:28:17 riastradh Exp $
$NetBSD: gnats_config.sh,v 1.10 2026/05/13 22:00:09 riastradh Exp $
Copyright © 1994-2026
The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.