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

diff --git a/debian/patches/series b/debian/patches/series
index 8a8ba3f8c254aac7957231d12fdc882dd3ebc6af..25366ac14631808b42eb27d4d257a2654fd83424 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 dumpdates-path
 fix-amserverconfig-path
+amandabackup-hard-coded

diff --git a/example/amanda-client-postgresql.conf.in b/example/amanda-client-postgresql.conf.in
index f917a5bd5c3831c2548a141f085220cec3eaf37d..bd32b3db9344fdf1eb6e192f92a480f4aac83428 100644 (file)
--- a/example/amanda-client-postgresql.conf.in
+++ b/example/amanda-client-postgresql.conf.in
@@ -25,7 +25,7 @@ ssh_keys "/var/lib/amanda/.ssh/id_rsa_amrecover"
 # Use /etc/amanda/pgpassfile for authentication credentials
 # (Note: for PostgreSQL 8.0.x, you must use PG-PASSWORD instead)
 # Should contain an appropriate line for foo (below).Example:
-#   localhost:*:*:amandabackup:my_backup_password
+#   localhost:*:*:backup:my_backup_password
 # The file must be owned by the Amanda user with permissions 0600
 property "PG-PASSFILE" "/etc/amanda/pgpassfile"
 
@@ -34,8 +34,8 @@ property "PG-PASSFILE" "/etc/amanda/pgpassfile"
 property "foo-PG-HOST" "localhost"
 #   Connect to port 5432 (PostgreSQL's default)
 property "foo-PG-PORT" "5432"
-#   Connect as user amandabackup (Note: must be a superuser)
-property "foo-PG-USER" "amandabackup"
+#   Connect as user backup (Note: must be a superuser)
+property "foo-PG-USER" "backup"
 #   Connect to database template1 (exists by default)
 property "foo-PG-DB" "template1"
 #   Database's data directory

diff --git a/example/inetd.conf.amandaclient.in b/example/inetd.conf.amandaclient.in
index 9d60e06489f82ae57c82f9406e0f297859617939..9b8f8a00f2645343f290aec714a87326277ec339 100644 (file)
--- a/example/inetd.conf.amandaclient.in
+++ b/example/inetd.conf.amandaclient.in
@@ -1,2 +1,2 @@
-#amanda stream tcp nowait amandabackup @amlibexecdir@/amandad -auth=bsdtcp amdump
-amanda stream tcp nowait amandabackup @amlibexecdir@/amandad amandad -auth=bsdtcp amdump
+#amanda stream tcp nowait backup @amlibexecdir@/amandad -auth=bsdtcp amdump
+amanda stream tcp nowait backup @amlibexecdir@/amandad amandad -auth=bsdtcp amdump

diff --git a/example/inetd.conf.amandaserver.in b/example/inetd.conf.amandaserver.in
index 3228c79e07866ea45abe0fd7cee9d67db32581c4..f964b430bd5e17af5577ae84045aa8b9fe8cae81 100644 (file)
--- a/example/inetd.conf.amandaserver.in
+++ b/example/inetd.conf.amandaserver.in
@@ -1 +1 @@
-amanda stream tcp nowait amandabackup @amlibexecdir@/amandad amandad -auth=bsdtcp amdump amindexd amidxtaped
+amanda stream tcp nowait backup @amlibexecdir@/amandad amandad -auth=bsdtcp amdump amindexd amidxtaped

diff --git a/example/xinetd.amandaclient.in b/example/xinetd.amandaclient.in
index a97c8e1c0b85edcfc08c38f93ec8551995268884..5cfc8e078e5fa7144374e282cd01bcf62b100cde 100644 (file)
--- a/example/xinetd.amandaclient.in
+++ b/example/xinetd.amandaclient.in
@@ -10,7 +10,7 @@ service amanda
        socket_type     = stream
        protocol        = tcp
        wait            = no
-       user            = amandabackup
+       user            = backup
        group           = disk
        groups          = yes
        server          = @amlibexecdir@/amandad

diff --git a/example/xinetd.amandaserver.in b/example/xinetd.amandaserver.in
index a665efefe6a2f729eed7b7b64c87b6481332ccce..cc33c18f9619b8f6d593e406022170ed02782938 100644 (file)
--- a/example/xinetd.amandaserver.in
+++ b/example/xinetd.amandaserver.in
@@ -10,7 +10,7 @@ service amanda
         socket_type     = stream
         protocol        = tcp
         wait            = no
-        user            = amandabackup
+        user            = backup
         group           = disk
         groups          = yes
         server          = @amlibexecdir@/amandad

diff --git a/installcheck/Amanda_Config.pl b/installcheck/Amanda_Config.pl
index 362dcb5cdbe7e42b222a2c9eabc59e2c6eecde48..27c1ace8e5a2a5f8ef8782c59ffcd6ac3e6d93cf 100644 (file)
--- a/installcheck/Amanda_Config.pl
+++ b/installcheck/Amanda_Config.pl
@@ -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"',

diff --git a/installcheck/catalogs/chunker-partial.cat b/installcheck/catalogs/chunker-partial.cat
index 621b73f19622640208d46ec224ad2b8f3b9e0ec2..25b0be2b2fb9a37f814726edb280a841109e82e1 100644 (file)
--- a/installcheck/catalogs/chunker-partial.cat
+++ b/installcheck/catalogs/chunker-partial.cat
@@ -28,7 +28,7 @@ planner:        DEFAULT_TAPE_SERVER="localhost" DEFAULT_TAPE_DEVICE=""
 planner:        HAVE_MMAP NEED_STRSTR HAVE_SYSVSHM AMFLOCK_POSIX AMFLOCK_LOCKF
 planner:        AMFLOCK_LNLOCK SETPGRP_VOID ASSERTIONS AMANDA_DEBUG_DAYS=4
 planner:        BSD_SECURITY RSH_SECURITY USE_AMANDAHOSTS
-planner:        CLIENT_LOGIN="amandabackup" CHECK_USERID HAVE_GZIP
+planner:        CLIENT_LOGIN="backup" CHECK_USERID HAVE_GZIP
 planner:        COMPRESS_SUFFIX=".gz" COMPRESS_FAST_OPT="--fast"
 planner:        COMPRESS_BEST_OPT="--best" UNCOMPRESS_OPT="-dc"
 READING CONF INFO...

diff --git a/man/amaddclient.8 b/man/amaddclient.8
index 775c21cdd67b5e7a9b3856d7a4adadad2008ce84..8a892bd24decfcf1ffb0c3b562e0289990b47714 100644 (file)
--- a/man/amaddclient.8
+++ b/man/amaddclient.8
@@ -56,7 +56,7 @@ for detail\&.)
 .PP
 
 \fBamaddclient\fR
-must be run by user amandabackup\&.
+must be run by user backup\&.
 .PP
 \-\-config, \-\-client and \-\-diskdev must be specified\&.
 .SH "OPTIONS"
@@ -172,7 +172,7 @@ Amanda configuration template files install location
 .PP
 \fB/var/lib/amanda\fR
 .RS 4
-amandabackup home directory
+backup home directory
 .RE
 .PP
 \fB/var/lib/amanda/\&.amandahosts\fR

diff --git a/man/amanda-auth.7 b/man/amanda-auth.7
index c4d9db13f5763f85eeb682b577d6651c4b52f7a0..d44f5b0456abc7ab1675a0cbc3fbb9761d257283 100644 (file)
--- a/man/amanda-auth.7
+++ b/man/amanda-auth.7
@@ -124,7 +124,7 @@ parameter selects a communication/authentication method to use between the clien
 .PP
 When Amanda is built, a username is specified with the
 \fB\-\-with\-user\fR
-option\&. Most Amanda processes run under this user\*(Aqs identity, to minimize security risks\&. In binary distributions, this username is usually one of \*(Aqamanda\*(Aq, \*(Aqamandabackup\*(Aq, or \*(Aqbackup\*(Aq\&. The examples below use \*(Aqamandabackup\*(Aq since it is unambiguous\&. You may need to adjust accordingly for your system\&.
+option\&. Most Amanda processes run under this user\*(Aqs identity, to minimize security risks\&. In binary distributions, this username is usually one of \*(Aqamanda\*(Aq, \*(Aqbackup\*(Aq, or \*(Aqbackup\*(Aq\&. The examples below use \*(Aqbackup\*(Aq since it is unambiguous\&. You may need to adjust accordingly for your system\&.
 .SS "Authenticated Peer Hostnames"
 .PP
 Amanda\*(Aqs authentication mechanisms provide an authenticated hostname of the system on the other end of the connection, which is used to restrict access to only particular hosts\&. The degree of "authentication" performed on this hostname varies with the authentication mechanism, and is discussed below\&.
@@ -192,10 +192,10 @@ If service is omitted, it defaults to
 (which is equivalent to
 \fBamdump\fR)\&.
 .PP
-Example of the \&.amandahosts file on an Amanda client, where \*(Aqamandabackup\*(Aq is the Amanda dumpuser\&.
+Example of the \&.amandahosts file on an Amanda client, where \*(Aqbackup\*(Aq is the Amanda dumpuser\&.
 .sp
 .nf
-    \fBamandaserver\&.example\&.com   amandabackup   amdump\fR
+    \fBamandaserver\&.example\&.com   backup   amdump\fR
 .fi
 .PP
 Example of the \&.amandahosts file on an Amanda server
@@ -211,7 +211,7 @@ The authentication is done using \&.amandahosts file in the Amanda user\*(Aqs ho
 The authentication is done using \&.amandahosts files in the Amanda user\*(Aqs home directory\&. It uses UDP protocol between Amanda server and client for data and hence the number of DLEs is limited by the UDP packet size\&. It uses one TCP port to establish the connection and multiplexes all data streams using one port on the server (see PORT USAGE below)\&.
 .SS "bsdtcp communication and authentication"
 .PP
-The authentication is done using \&.amandahosts files in the backup user\*(Aqs (for example: amandabackup) home directory\&. It uses TCP protocol between Amanda server and client\&. On the client, two reserved ports are used\&. On the server, all data streams are multiplexed to one port (see PORT USAGE below)\&.
+The authentication is done using \&.amandahosts files in the backup user\*(Aqs (for example: backup) home directory\&. It uses TCP protocol between Amanda server and client\&. On the client, two reserved ports are used\&. On the server, all data streams are multiplexed to one port (see PORT USAGE below)\&.
 .SS "USING INETD SERVER"
 .PP
 Template for Amanda client inetd service entry
@@ -222,10 +222,10 @@ Template for Amanda client inetd service entry
 .PP
 Client example of using
 \fBbsd\fR
-authorization for inetd server given Amanda user is "amandabackup":
+authorization for inetd server given Amanda user is "backup":
 .sp
 .nf
-\fB   amanda dgram udp wait amandabackup /path/to/amandad amandad \-auth=bsd amdump\fR
+\fB   amanda dgram udp wait backup /path/to/amandad amandad \-auth=bsd amdump\fR
 .fi
 .PP
 The same could be used for
@@ -234,10 +234,10 @@ if specifying \-auth=bsdudp instead of \-auth=bsd\&.
 .PP
 Client example of using
 \fBbsdtcp\fR
-authorization for inetd server given Amanda user is "amandabackup":
+authorization for inetd server given Amanda user is "backup":
 .sp
 .nf
-\fB   amanda stream tcp nowait amandabackup /path/to/amandad amandad \-auth=bsdtcp amdump\fR
+\fB   amanda stream tcp nowait backup /path/to/amandad amandad \-auth=bsdtcp amdump\fR
 .fi
 .PP
 \fBamindexd\fR
@@ -249,10 +249,10 @@ server arguments for an Amanda server\&.
 .PP
 Server example of using
 \fBbsdtcp\fR
-authorization for inetd server given Amanda user is "amandabackup":
+authorization for inetd server given Amanda user is "backup":
 .sp
 .nf
-\fB   amanda stream tcp nowait amandabackup /path/to/amandad amandad \-auth=bsdtcp amdump amindexd amidxtaped\fR
+\fB   amanda stream tcp nowait backup /path/to/amandad amandad \-auth=bsdtcp amdump amindexd amidxtaped\fR
 .fi
 .PP
 For Amanda version 2\&.5\&.0 and earlier, remember that neither
@@ -286,8 +286,8 @@ instead and, again, the server must be running the amandaidx and amidxtape netwo
 Example of amindexd and amidxtaped Amanda daemon services configured as their own network services for a 2\&.5\&.0 or earlier server or a newer server having 2\&.5\&.0 or earlier clients
 .sp
 .nf
-\fB   amandaidx stream tcp nowait amandabackup /usr/local/libexec/amanda/current/amindexd   amindexd\fR
-\fB   amidxtape stream tcp nowait amandabackup /usr/local/libexec/amanda/current/amidxtaped amidxtaped\fR
+\fB   amandaidx stream tcp nowait backup /usr/local/libexec/amanda/current/amindexd   amindexd\fR
+\fB   amidxtape stream tcp nowait backup /usr/local/libexec/amanda/current/amidxtaped amidxtaped\fR
 .fi
 .SS "USING XINETD SERVER"
 .PP
@@ -315,7 +315,7 @@ parameter can be used with xinetd but is usually in addition to the primary form
 .PP
 Client example of using
 \fBbsd\fR
-authorization for xinetd server and for Amanda user "amandabackup":
+authorization for xinetd server and for Amanda user "backup":
 .sp
 .nf
 service amanda
@@ -324,7 +324,7 @@ service amanda
        socket_type     = dgram
        protocol        = udp
        wait            = yes
-       user            = amandabackup
+       user            = backup
        group           = disk
        groups          = yes
        server          = /path/to/amandad
@@ -339,7 +339,7 @@ if specifying \-auth=bsdudp instead of \-auth=bsd\&.
 .PP
 Client example of using
 \fBbsdtcp\fR
-authorization for xinetd server and for Amanda user "amandabackup":
+authorization for xinetd server and for Amanda user "backup":
 .sp
 .nf
 service amanda
@@ -348,7 +348,7 @@ service amanda
        socket_type     = stream
        protocol        = tcp
        wait            = no
-       user            = amandabackup
+       user            = backup
        group           = disk
        groups          = yes
        server          = /path/to/amandad
@@ -589,7 +589,7 @@ For example:
 define dumptype rsh_example {
          \&.\&.\&.
          auth "rsh"
-         client\-username "amandabackup"
+         client\-username "backup"
          amandad\-path "/usr/lib/exec/amandad"
          \&.\&.\&.
 }
@@ -616,7 +616,7 @@ When you use a public key on the client to do data encryption (see http://wiki\&
 Enable SSH authentication and set the \fBssh\-keys\fR option in all DLEs for that host by adding the following to the DLE itself or to the corresponding dumptype in amanda\&.conf:
 
   auth "ssh"
-  ssh\-keys "/home/amandabackup/\&.ssh/id_rsa_amdump"
+  ssh\-keys "/home/backup/\&.ssh/id_rsa_amdump"
 
 \fBssh\-keys\fR is the path to the private key on the client\&. If the username to which Amanda should connect is different from the default, then you should also add
 

diff --git a/man/amgpgcrypt.8 b/man/amgpgcrypt.8
index 6489a6d0508460ea491dff9bd6ab4393376bcd5e..3ea03b2670375716b7b7e012dc0bfd8cc547f8cf 100644 (file)
--- a/man/amgpgcrypt.8
+++ b/man/amgpgcrypt.8
@@ -98,11 +98,11 @@ You need a User\-ID to identify your key; the software constructs the user id
 from Real Name, Comment and Email Address in this form:
     "Heinrich Heine (Der Dichter) (heinrichh@duesseldorf\&.de)"
 
-Real name: amandabackup
+Real name: backup
 Email address:
-Comment: gpg keys for amandabackup
+Comment: gpg keys for backup
 You selected this USER\-ID:
-    "amandabackup (gpg keys for amandabackup)"
+    "backup (gpg keys for backup)"
 
 Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? o
 You need a Passphrase to protect your secret key\&.
@@ -120,7 +120,7 @@ generator a better chance to gain enough entropy\&.
 public and secret key created and signed\&.
 key marked as ultimately trusted\&.
 
-pub  1024D/4417A8CB 2006\-02\-07 amandabackup (gpg keys for amandabackup)
+pub  1024D/4417A8CB 2006\-02\-07 backup (gpg keys for backup)
      Key fingerprint = 139C 6369 44FC 7F1A 655C  E5E9 7EAA 515A 4417 A8CB
 sub  1024g/8C3A6A78 2006\-02\-07 [expires: 2006\-08\-06]
 .fi

diff --git a/man/amserverconfig.8 b/man/amserverconfig.8
index fb5607d367a16bf9cca4e5f073303914b97f3173..b6d433effdd40a6a6fbfb4a6135f369b81745faf 100644 (file)
--- a/man/amserverconfig.8
+++ b/man/amserverconfig.8
@@ -40,7 +40,7 @@ will setup initial Amanda configuration files\&. It will create /var/lib/amanda/
 \fBamserverconfig\fR
 does not change existing Amanda configurations\&.
 \fBamserverconfig\fR
-must be run by user amandabackup\&.
+must be run by user backup\&.
 .SH "OPTIONS"
 .PP
 Options may be abbreviated, as long as the abbreviation is not ambiguous\&. Option argument can either separated by \*(Aq=\*(Aq or a space\&. Example: \-\-templ=harddisk \-\-tapedev /dev/nst0
@@ -61,7 +61,7 @@ are the valid inputs for this option\&. Pre\-configured template files can be fo
 .sp
 If tape\-changer is chosen for this option, program mtx is required\&.
 \fBamserverconfig\fR
-will search for mtx in the following directory: "/usr/sbin", "/usr/local/sbin", "/usr/local/bin", "/usr/bin", "/bin" and amandabackup\*(Aqs PATH\&.
+will search for mtx in the following directory: "/usr/sbin", "/usr/local/sbin", "/usr/local/bin", "/usr/bin", "/bin" and backup\*(Aqs PATH\&.
 .sp
 If harddisk is chosen and \-\-no\-vtape is not specified,
 \fBamserverconfig\fR
@@ -107,7 +107,7 @@ The type of tape drive associated with tapedev or tpchanger\&. default [HARDDISK
 .PP
 \fB\-\-mailto mailto\fR
 .RS 4
-A space separated list of recipients for mail reports\&. default [amandabackup]
+A space separated list of recipients for mail reports\&. default [backup]
 .RE
 .PP
 \fB\-\-dumpcycle dumpcycle\fR
@@ -143,7 +143,7 @@ Amanda configuration template files install location
 .PP
 \fB/var/lib/amanda\fR
 .RS 4
-amandabackup home directory
+backup home directory
 .RE
 .PP
 \fB/var/lib/amanda/gnutar\-lists\fR

diff --git a/man/amsuntar.8 b/man/amsuntar.8
index 6e10904beb752cc78636b2d235cd6f1f8456d9e2..54da0f06b2f216ff51d5f3150b610dd4f549dc92 100644 (file)
--- a/man/amsuntar.8
+++ b/man/amsuntar.8
@@ -37,7 +37,7 @@ The
 \fBdiskdevice\fR
 in the disklist (DLE) must be the directory to backup\&.
 .PP
-Solaris 10 supports Role Based Access Control(RBAC) which is enabled by default\&. To run backup operations using sun tar utility by under privileged user like amandabackup, amandabackup user need to have proper roles and profiles, specially "Media Backup" profile/role\&. This can be done using \*(Aqusermod \-P "Media Backup" amandabackup\*(Aq command\&.
+Solaris 10 supports Role Based Access Control(RBAC) which is enabled by default\&. To run backup operations using sun tar utility by under privileged user like backup, backup user need to have proper roles and profiles, specially "Media Backup" profile/role\&. This can be done using \*(Aqusermod \-P "Media Backup" backup\*(Aq command\&.
 .SH "PROPERTIES"
 .PP
 This section lists the properties that control amsuntar\*(Aqs functionality\&. See

diff --git a/man/xml-source/amaddclient.8.xml b/man/xml-source/amaddclient.8.xml
index f0bbbbfca76f1cc4724bccd8daf922cc5d38475b..6966d538458073e36616870d44fa3251d9ac55f9 100644 (file)
--- a/man/xml-source/amaddclient.8.xml
+++ b/man/xml-source/amaddclient.8.xml
@@ -61,7 +61,7 @@ the client.
 (See <refentrytitle>ssh-keygen</refentrytitle><manvolnum>1</manvolnum> and
 <refentrytitle>ssh-add</refentrytitle><manvolnum>1</manvolnum> for detail.)</para>
 <para>
-&amaddclient; must be run by user amandabackup.</para>
+&amaddclient; must be run by user backup.</para>
 <para> --config, --client and --diskdev must be specified.
 </para> 
 </refsect1>
@@ -218,7 +218,7 @@ Specify either --excludefile or --excludelist. </para>
  <varlistentry>
  <term><option>/var/lib/amanda</option></term>
   <listitem>
-<para>amandabackup home directory</para>
+<para>backup home directory</para>
   </listitem>
   </varlistentry>
 

diff --git a/man/xml-source/amaespipe.8.xml b/man/xml-source/amaespipe.8.xml
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/man/xml-source/amanda-auth.7.xml b/man/xml-source/amanda-auth.7.xml
index 3d27fbbeaeb9a5e4dd7aa0560e9978c9e6273a46..04e3eb05d8c5531c30f729844c28f607b4545012 100644 (file)
--- a/man/xml-source/amanda-auth.7.xml
+++ b/man/xml-source/amanda-auth.7.xml
@@ -85,7 +85,7 @@ Authentication          Configure option(s)
 <option>--with-user</option> option.  Most Amanda processes run under
 this user's identity, to minimize security risks.  In binary
 distributions, this username is usually one of 'amanda',
-'amandabackup', or 'backup'.  The examples below use 'amandabackup'
+'backup', or 'backup'.  The examples below use 'backup'
 since it is unambiguous. You may need to adjust accordingly for your
 system.</para>
 
@@ -147,10 +147,10 @@ configuration file.</para>
 
 <para>If service is omitted, it defaults to <emphasis remap='B'>noop selfcheck sendsize sendbackup</emphasis> (which is equivalent to <emphasis remap='B'>amdump</emphasis>).</para>
 
-    <para>Example of the .amandahosts file on an Amanda client, where 'amandabackup' is the Amanda dumpuser.
+    <para>Example of the .amandahosts file on an Amanda client, where 'backup' is the Amanda dumpuser.
 
 <programlisting>
-    <emphasis remap='B'>amandaserver.example.com   amandabackup   amdump</emphasis>
+    <emphasis remap='B'>amandaserver.example.com   backup   amdump</emphasis>
 </programlisting>
     </para>
 
@@ -171,7 +171,7 @@ configuration file.</para>
   </refsect2>
 
   <refsect2><title>bsdtcp communication and authentication</title>
-    <para>The authentication is done using .amandahosts files in the backup user's (for example: amandabackup) home directory. It uses TCP protocol between Amanda server and client. On the client, two reserved ports are used. On the server, all data streams are multiplexed to one port (see PORT USAGE below).</para>
+    <para>The authentication is done using .amandahosts files in the backup user's (for example: backup) home directory. It uses TCP protocol between Amanda server and client. On the client, two reserved ports are used. On the server, all data streams are multiplexed to one port (see PORT USAGE below).</para>
   </refsect2>
 
   <refsect2><title>USING INETD SERVER</title>
@@ -181,24 +181,24 @@ configuration file.</para>
 <emphasis remap='I'>   service_name</emphasis> <emphasis remap='I'>socket_type</emphasis> <emphasis remap='I'>protocol</emphasis> <emphasis remap='I'>wait/nowait</emphasis> <emphasis remap='I'>amanda_backup_user</emphasis> <emphasis remap='I'>absolute_path_to_amandad</emphasis> amandad <emphasis remap='I'>server_args</emphasis>
 </programlisting>
     </para>
-    <para>Client example of using <emphasis remap='B'>bsd</emphasis> authorization for inetd server given Amanda user is "amandabackup":
+    <para>Client example of using <emphasis remap='B'>bsd</emphasis> authorization for inetd server given Amanda user is "backup":
 
 <programlisting>
-<emphasis remap='B'>   amanda dgram udp wait amandabackup /path/to/amandad amandad -auth=bsd amdump</emphasis>
+<emphasis remap='B'>   amanda dgram udp wait backup /path/to/amandad amandad -auth=bsd amdump</emphasis>
 </programlisting>
     </para>
     <para>The same could be used for <emphasis remap='B'>bsdudp</emphasis> if specifying -auth=bsdudp instead of -auth=bsd.</para>
-    <para>Client example of using <emphasis remap='B'>bsdtcp</emphasis> authorization for inetd server given Amanda user is "amandabackup":
+    <para>Client example of using <emphasis remap='B'>bsdtcp</emphasis> authorization for inetd server given Amanda user is "backup":
 
 <programlisting>
-<emphasis remap='B'>   amanda stream tcp nowait amandabackup /path/to/amandad amandad -auth=bsdtcp amdump</emphasis>
+<emphasis remap='B'>   amanda stream tcp nowait backup /path/to/amandad amandad -auth=bsdtcp amdump</emphasis>
 </programlisting>
     </para>
     <para><emphasis remap='B'>amindexd</emphasis> and <emphasis remap='B'>amidxtaped</emphasis> would typically be added at the end of the line as &amandad; server arguments for an Amanda server.</para>
-    <para>Server example of using <emphasis remap='B'>bsdtcp</emphasis> authorization for inetd server given Amanda user is "amandabackup":
+    <para>Server example of using <emphasis remap='B'>bsdtcp</emphasis> authorization for inetd server given Amanda user is "backup":
 
 <programlisting>
-<emphasis remap='B'>   amanda stream tcp nowait amandabackup /path/to/amandad amandad -auth=bsdtcp amdump amindexd amidxtaped</emphasis>
+<emphasis remap='B'>   amanda stream tcp nowait backup /path/to/amandad amandad -auth=bsdtcp amdump amindexd amidxtaped</emphasis>
 </programlisting>
     </para>
     <para>For Amanda version 2.5.0 and earlier, remember that neither <emphasis remap='B'>bsdudp</emphasis> nor <emphasis remap='B'>bsdtcp</emphasis> are supported and the Amanda daemon &amandad; accepts no arguments.  Because of the latter, &amrecover; as of Amanda version 2.5.1  is not compatible with 2.5.0 and earlier servers.  Thus, servers that are 2.5.0 or earlier must, in addition to the <emphasis remap='I'>amanda</emphasis> service, run <emphasis remap='I'>amindexd</emphasis> and <emphasis remap='I'>amidxtaped</emphasis> Amanda services as their own network services, amandaidx and amidxtape, respectively (see below).</para>
@@ -208,8 +208,8 @@ configuration file.</para>
 <para>Example of amindexd and amidxtaped Amanda daemon services configured as their own network services for a 2.5.0 or earlier server or a newer server having 2.5.0 or earlier clients
 
 <programlisting>
-<emphasis remap='B'>   amandaidx stream tcp nowait amandabackup /usr/local/libexec/amanda/current/amindexd   amindexd</emphasis>
-<emphasis remap='B'>   amidxtape stream tcp nowait amandabackup /usr/local/libexec/amanda/current/amidxtaped amidxtaped</emphasis>
+<emphasis remap='B'>   amandaidx stream tcp nowait backup /usr/local/libexec/amanda/current/amindexd   amindexd</emphasis>
+<emphasis remap='B'>   amidxtape stream tcp nowait backup /usr/local/libexec/amanda/current/amidxtaped amidxtaped</emphasis>
 </programlisting>
 </para>
   </refsect2>
@@ -234,7 +234,7 @@ service amanda
 </programlisting>
     </para>
     <para>The <emphasis remap='I'>only_from</emphasis> parameter can be used with xinetd but is usually in addition to the primary form of access control via the .amandahosts file.</para>
-    <para>Client example of using <emphasis remap='B'>bsd</emphasis> authorization for xinetd server and for Amanda user "amandabackup":
+    <para>Client example of using <emphasis remap='B'>bsd</emphasis> authorization for xinetd server and for Amanda user "backup":
 
 <programlisting>
 service amanda
@@ -243,7 +243,7 @@ service amanda
        socket_type     = dgram
        protocol        = udp
        wait            = yes
-       user            = amandabackup
+       user            = backup
        group           = disk
        groups          = yes
        server          = /path/to/amandad
@@ -253,7 +253,7 @@ service amanda
 </programlisting>
     </para>
     <para>The same could be used for <emphasis remap='B'>bsdudp</emphasis> if specifying -auth=bsdudp instead of -auth=bsd.</para>
-    <para>Client example of using <emphasis remap='B'>bsdtcp</emphasis> authorization for xinetd server and for Amanda user "amandabackup":
+    <para>Client example of using <emphasis remap='B'>bsdtcp</emphasis> authorization for xinetd server and for Amanda user "backup":
 
 <programlisting>
 service amanda
@@ -262,7 +262,7 @@ service amanda
        socket_type     = stream
        protocol        = tcp
        wait            = no
-       user            = amandabackup
+       user            = backup
        group           = disk
        groups          = yes
        server          = /path/to/amandad
@@ -473,7 +473,7 @@ For example:
 define dumptype rsh_example {
          ...
          auth "rsh"
-         client-username "amandabackup"
+         client-username "backup"
          amandad-path "/usr/lib/exec/amandad"
          ...
 }
@@ -506,7 +506,7 @@ When you use a public key on the client to do data encryption (see http://wiki.z
 Enable SSH authentication and set the <amkeyword>ssh-keys</amkeyword> option in all DLEs for that host by adding the following to the DLE itself or to the corresponding dumptype in amanda.conf:
 
   auth "ssh"
-  ssh-keys "/home/amandabackup/.ssh/id_rsa_amdump"
+  ssh-keys "/home/backup/.ssh/id_rsa_amdump"
 
 <amkeyword>ssh-keys</amkeyword> is the path to the private key on the client. If the username to which Amanda should connect is different from the default, then you should also add
 

diff --git a/man/xml-source/amcrypt.8.xml b/man/xml-source/amcrypt.8.xml
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/man/xml-source/amgpgcrypt.8.xml b/man/xml-source/amgpgcrypt.8.xml
index 3dd714069d9f67c6bef3c6e9fb12d92dbd4f9262..d6b9db149d8aaa2a1e01a5056d5e264dc47632b9 100644 (file)
--- a/man/xml-source/amgpgcrypt.8.xml
+++ b/man/xml-source/amgpgcrypt.8.xml
@@ -92,11 +92,11 @@ You need a User-ID to identify your key; the software constructs the user id
 from Real Name, Comment and Email Address in this form:
     "Heinrich Heine (Der Dichter) (heinrichh@duesseldorf.de)"
 
-Real name: amandabackup
+Real name: backup
 Email address:
-Comment: gpg keys for amandabackup
+Comment: gpg keys for backup
 You selected this USER-ID:
-    "amandabackup (gpg keys for amandabackup)"
+    "backup (gpg keys for backup)"
 
 Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? o
 You need a Passphrase to protect your secret key.
@@ -114,7 +114,7 @@ generator a better chance to gain enough entropy.
 public and secret key created and signed.
 key marked as ultimately trusted.
 
-pub  1024D/4417A8CB 2006-02-07 amandabackup (gpg keys for amandabackup)
+pub  1024D/4417A8CB 2006-02-07 backup (gpg keys for backup)
      Key fingerprint = 139C 6369 44FC 7F1A 655C  E5E9 7EAA 515A 4417 A8CB
 sub  1024g/8C3A6A78 2006-02-07 [expires: 2006-08-06]
 

diff --git a/man/xml-source/amserverconfig.8.xml b/man/xml-source/amserverconfig.8.xml
index 2871fcf1d6bd31e205124d3de719d3f1a1cff000..99875a38f045dd9243954c43558eeef55db47b86 100644 (file)
--- a/man/xml-source/amserverconfig.8.xml
+++ b/man/xml-source/amserverconfig.8.xml
@@ -50,7 +50,7 @@
 It will create /var/lib/amanda/guntar-lists directory if one does
          not exist.
 &amserverconfig; does not change existing Amanda configurations.
-&amserverconfig; must be run by user amandabackup.
+&amserverconfig; must be run by user backup.
 </para> 
 </refsect1>
 
@@ -73,7 +73,7 @@ Example:  --templ=harddisk --tapedev /dev/nst0</para>
                </para>
 <para>If tape-changer is chosen for this option, program mtx is required. &amserverconfig; will
 search for mtx in the following directory: "/usr/sbin", "/usr/local/sbin",
-"/usr/local/bin", "/usr/bin", "/bin" and amandabackup's PATH.
+"/usr/local/bin", "/usr/bin", "/bin" and backup's PATH.
 </para>
 <para>
 If harddisk is chosen and --no-vtape is not specified, &amserverconfig; will create and label virtual tape
@@ -138,7 +138,7 @@ is supported.</para>
   <varlistentry>
   <term><option>--mailto mailto</option></term>
   <listitem>
-<para> A space separated list of recipients for mail reports. default [amandabackup]  </para>
+<para> A space separated list of recipients for mail reports. default [backup]  </para>
   </listitem>
   </varlistentry>
 
@@ -193,7 +193,7 @@ is supported.</para>
  <varlistentry>
  <term><option>/var/lib/amanda</option></term>
   <listitem>
-<para>amandabackup home directory</para>
+<para>backup home directory</para>
   </listitem>
   </varlistentry>
 

diff --git a/man/xml-source/amsuntar.8.xml b/man/xml-source/amsuntar.8.xml
index 47ff3d5d7af5bb6cb80c8f105f48dcf521ea4e49..f11afc52dec531467ec2c62d4b740c112a4988dc 100644 (file)
--- a/man/xml-source/amsuntar.8.xml
+++ b/man/xml-source/amsuntar.8.xml
@@ -39,9 +39,9 @@ must be the directory to backup.</para>
 
 <para>Solaris 10 supports Role Based Access Control(RBAC) which is enabled
 by default. To run backup operations using  sun tar utility by under 
-privileged user like amandabackup, amandabackup user need to have proper 
+privileged user like backup, backup user need to have proper 
 roles and profiles, specially "Media Backup" profile/role. This can be done 
-using 'usermod -P "Media Backup" amandabackup' command.</para>
+using 'usermod -P "Media Backup" backup' command.</para>
 
 
 </refsect1>