fix for #693333, hard-coding of amandabackup as user in many scripts and docs

[debian/amanda] / installcheck / Amanda_Config.pl

diff --git a/installcheck/Amanda_Config.pl b/installcheck/Amanda_Config.pl
index 4a00337a70bfbfd24187b56b8ade3b1abab4e589..27c1ace8e5a2a5f8ef8782c59ffcd6ac3e6d93cf 100644 (file)
--- a/installcheck/Amanda_Config.pl
+++ b/installcheck/Amanda_Config.pl
@@ -1,4 +1,4 @@
-# Copyright (c) 2007, 2008, 2009, 2010 Zmanda, Inc.  All Rights Reserved.
+# Copyright (c) 2007-2012 Zmanda, Inc.  All Rights Reserved.
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 as published
@@ -212,7 +212,7 @@ $testconf->add_script('my_script', [
   'plugin' => '"script-email"',
   'execute-on' => 'pre-host-backup, post-host-backup',
   'execute-where' => 'client',
-  'property' => '"mailto" "amandabackup" "amanda"',
+  'property' => '"mailto" "backup" "amanda"',
 ]);
 $testconf->add_device('my_device', [
   'comment' => '"my device is mine, not yours"',
@@ -602,7 +602,7 @@ is($error_level, $CFGERR_ERRORS, "bogus config overwrite flagged as an error");
 my $pid = open(my $kid, "-|");
 die "Can't fork: $!" unless defined($pid);
 if (!$pid) {
-    Amanda::Config::dump_configuration();
+    Amanda::Config::dump_configuration(1, 0);
     exit 1;
 }
 my $dump_first_line = <$kid>;