Imported Upstream version 2.5.2p1

[debian/amanda] / server-src / amcleanupdisk.c

diff --git a/server-src/amcleanupdisk.c b/server-src/amcleanupdisk.c
index 9092313c304a6070de14251d43b186903d8f7914..924e3cdee93ef245970cd81edb8c8d303788fa35 100644 (file)
--- a/server-src/amcleanupdisk.c
+++ b/server-src/amcleanupdisk.c
@@ -66,8 +66,8 @@ main(
     /* Don't die when child closes pipe */
     signal(SIGPIPE, SIG_IGN);
 
-    if(main_argc != 2) {
-       error("Usage: amcleanupdisk%s <confdir>", versionsuffix());
+    if(main_argc < 2) {
+       error("Usage: amcleanupdisk%s <config>", versionsuffix());
        /*NOTREACHED*/
     }
 
@@ -182,7 +182,7 @@ check_holdingdisk(
 
        amfree(hostname);
        amfree(diskname);
-       filetype = get_amanda_names(tmpname, &hostname, &diskname, &level);
+       filetype = holding_file_read_header(tmpname, &hostname, &diskname, &level, NULL);
        amfree(tmpname);
        if(filetype != F_DUMPFILE) {
            continue;