Merge commit 'upstream/2.6.1p2'

Conflicts:
	server-src/diskfile.c

diff --combined client-src/selfcheck.c
index fd814f783912208ccf8fdb022557b91373e736cf,ac47d90e4843957fcdb5b0d48d87bded05264702..763ac323c535d8eb83c58d8a301122e5cc6b7b3e
--- 1/client-src/selfcheck.c
--- 2/client-src/selfcheck.c
+++ b/client-src/selfcheck.c
@@@ -447,7 -447,7 +447,7 @@@ check_options
  #endif
        {
            need_vxdump=1;
-           if (dle->create-index)
+           if (dle->create_index)
                need_vxrestore=1;
        }
        else
@@@ -841,6 -841,7 +841,7 @@@ check_disk
                    }
                    amfree(line);
                }
+               fclose(app_stderr);
                if (waitpid(application_api_pid, &status, 0) < 0) {
                    err = vstrallocf(_("waitpid failed: %s"),
                                         strerror(errno));
@@@ -1077,8 -1078,8 +1078,8 @@@ check_overall(void
        check_file(COMPRESS_PATH, X_OK);
  
      if (need_dump || need_xfsdump ) {
 -      if (check_file_exist("/etc/dumpdates")) {
 -          check_file("/etc/dumpdates",
 +      if (check_file_exist("/var/lib/dumpdates")) {
 +          check_file("/var/lib/dumpdates",
  #ifdef USE_RUNDUMP
                       F_OK
  #else
@@@ -1088,15 -1089,15 +1089,15 @@@
        } else {
  #ifndef USE_RUNDUMP
            if (access("/etc", R_OK|W_OK) == -1) {
 -              g_printf(_("ERROR [dump will not be able to create the /etc/dumpdates file: %s]\n"), strerror(errno));
 +              g_printf(_("ERROR [dump will not be able to create the /var/lib/dumpdates file: %s]\n"), strerror(errno));
            }
  #endif
        }
      }
  
      if (need_vdump) {
 -      if (check_file_exist("/etc/vdumpdates")) {
 -            check_file("/etc/vdumpdates", F_OK);
 +      if (check_file_exist("/var/lib/vdumpdates")) {
 +            check_file("/var/lib/vdumpdates", F_OK);
        }
      }
  
@@@ -1107,7 -1108,7 +1108,7 @@@
      check_space(AMANDA_DBGDIR, (off_t)64);    /* for amandad i/o */
  #endif
  
 -    check_space("/etc", (off_t)64);           /* for /etc/dumpdates writing */
 +    check_space("/var/lib", (off_t)64);               /* for /var/lib/dumpdates writing */
  }
  
  static void

diff --combined man/amanda.conf.5
index 67d0849c32c0967c50dedd0cdb4f3e3b558fadd0,8cdc321337e05597346f2b1632a68088f558c3e3..fcbb39e505b5644619d4a8cb949a7f85cb949f1d
--- 1/man/amanda.conf.5
--- 2/man/amanda.conf.5
+++ b/man/amanda.conf.5
@@@ -2,12 -2,12 +2,12 @@@
  .\"     Title: amanda.conf
  .\"    Author: James da Silva <jds@amanda.org>
  .\" Generator: DocBook XSL Stylesheets vsnapshot_8273 <http://docbook.sf.net/>
- .\"      Date: 04/10/2009
+ .\"      Date: 11/05/2009
  .\"    Manual: File formats and conventions
- .\"    Source: Amanda 2.6.1p1
+ .\"    Source: Amanda 2.6.1p2
  .\"  Language: English
  .\"
- .TH "AMANDA\&.CONF" "5" "04/10/2009" "Amanda 2\&.6\&.1p1" "File formats and conventions"
+ .TH "AMANDA\&.CONF" "5" "11/05/2009" "Amanda 2\&.6\&.1p2" "File formats and conventions"
  .\" -----------------------------------------------------------------
  .\" * set default formatting
  .\" -----------------------------------------------------------------
@@@ -1557,7 -1557,7 +1557,7 @@@ keyword append the values to the list o
  .RS 4
  Default:
  \fIyes\fR\&. Whether to ask the backup program to update its database (e\&.g\&.
 -/etc/dumpdates
 +/var/lib/dumpdates
  for DUMP or
  /usr/local/var/amanda/gnutar\-lists
  for GNUTAR) of time stamps\&. This is normally enabled for daily backups and turned off for periodic archival runs\&.
@@@ -1585,6 -1585,12 +1585,12 @@@ an
  has scheduled an incremental backup, these disks will be skipped\&.
  .RE
  .PP
+ \fBssh_keys\fR \fI string\fR
+ .RS 4
+ Default:
+ \fINo default\fR\&. The key file the ssh auth will use, it must be the private key\&. If this parameter is not specified, then the default ssh key will be used\&.
+ .RE
+ .PP
  \fBstarttime\fR \fI int\fR
  .RS 4
  Default:

diff --combined man/disklist.5
index 0cbd48308138a907bcdc55fa05e0aadfaa9fa94f,c87dbf8f207eea5b0b69897e1b2bc127ab6a7ee7..fde5de9cba5ffd3f90198ddf6a05cfabbabbaa91
--- 1/man/disklist.5
--- 2/man/disklist.5
+++ b/man/disklist.5
@@@ -2,12 -2,12 +2,12 @@@
  .\"     Title: disklist
  .\"    Author: James da Silva <jds@amanda.org>
  .\" Generator: DocBook XSL Stylesheets vsnapshot_8273 <http://docbook.sf.net/>
- .\"      Date: 04/10/2009
+ .\"      Date: 11/05/2009
  .\"    Manual: File formats and conventions
- .\"    Source: Amanda 2.6.1p1
+ .\"    Source: Amanda 2.6.1p2
  .\"  Language: English
  .\"
- .TH "DISKLIST" "5" "04/10/2009" "Amanda 2\&.6\&.1p1" "File formats and conventions"
+ .TH "DISKLIST" "5" "11/05/2009" "Amanda 2\&.6\&.1p2" "File formats and conventions"
  .\" -----------------------------------------------------------------
  .\" * set default formatting
  .\" -----------------------------------------------------------------
@@@ -94,7 -94,7 +94,7 @@@ defined in th
  \fBamanda\&.conf\fR
  file\&.
  \fIDumptype\fRs specify backup related parameters, such as whether to compress the backups, whether to record backup results in
 -/etc/dumpdates, the disk\'s relative priority, etc\&.
 +/var/lib/dumpdates, the disk\'s relative priority, etc\&.
  .RE
  .PP
  \fIspindle\fR

diff --combined man/xml-source/amanda.conf.5.xml
index 02916c482bc3fc27a2d402c73e7adabddfcb78c9,f55ea3d87c0562e436a55adf3b5a979d72f7ec5b..f082edacd66c442c7d4fcbf0e61ecb635f1a5694
--- 1/man/xml-source/amanda.conf.5.xml
--- 2/man/xml-source/amanda.conf.5.xml
+++ b/man/xml-source/amanda.conf.5.xml
@@@ -1872,7 -1872,7 +1872,7 @@@ the property to set, and the others con
    <listitem>
  <para>Default:
  <emphasis remap='I'>yes</emphasis>.
 -Whether to ask the backup program to update its database (e.g. <filename>/etc/dumpdates</filename>
 +Whether to ask the backup program to update its database (e.g. <filename>/var/lib/dumpdates</filename>
  for DUMP or <filename>/usr/local/var/amanda/gnutar-lists</filename> for GNUTAR) of time stamps.
  This is normally enabled for daily backups and turned off for periodic archival runs.</para>
    </listitem>
@@@ -1893,6 -1893,14 +1893,14 @@@ level 1 incrementals in this configurat
  <para>Default:
  <emphasis remap='I'>no</emphasis>. If <emphasis remap='I'>true</emphasis> and
  <emphasis remap='B'>planner</emphasis> has scheduled an incremental backup, these disks will be skipped.</para>
+   </listitem>
+   </varlistentry>
+   <varlistentry>
+   <term><emphasis remap='B'>ssh_keys</emphasis> <emphasis remap='I'> string</emphasis></term>
+   <listitem>
+ <para>Default:
+ <emphasis remap='I'>No default</emphasis>.
+ The key file the ssh auth will use, it must be the private key. If this parameter is not specified, then the default ssh key will be used.</para>
    </listitem>
    </varlistentry>
    <varlistentry>