1.1 --- a/INSTALL	Sun Sep 04 11:55:51 2011 +0200
     1.2 +++ b/INSTALL	Sun Sep 04 12:19:41 2011 +0200
     1.3 @@ -12,19 +12,18 @@
     1.4  You need a user and a group for masqmail to run. If
     1.5  
     1.6  	grep '^mail:' /etc/passwd
     1.7 -	grep '^trusted:' /etc/group
     1.8 +	grep '^mail:' /etc/group
     1.9  
    1.10 -shows that the user `mail' and the group `trusted' exist, it's
    1.11 -probably best to use these. If they don't exist, create them:
    1.12 +shows that the user `mail' and the group `mail' exist, it's probably
    1.13 +best to use these. If they don't exist, create them:
    1.14  
    1.15 -	groupadd -g 42 trusted
    1.16 -	useradd -u 23 -g trusted -d /nonexistent -s /bin/false -c "masqmail MTA" mail
    1.17 +	groupadd -g 12 mail
    1.18 +	useradd -u 8 -g mail -d /nonexistent -s /bin/false -c "masqmail MTA" mail
    1.19  
    1.20 -If you use other names than `mail' and `trusted' use the options
    1.21 -described below for configure. The 23 and 42 are just a suggestion,
    1.22 -you can use any (not yet used) number you like, but preferably one
    1.23 -lower than 100. It does not have to be the same for the user `mail'
    1.24 -and the group `trusted'.
    1.25 +The 8 and 12 are common uid/gid for the user and group `mail', but you can
    1.26 +use any (not yet used) number you like, preferably one lower than 100.
    1.27 +If you use other names than `mail' and `mail', you need to use the
    1.28 +configure options described below.
    1.29  
    1.30  
    1.31  Compiling is a matter of the usual procedure. In the source directory,
    1.32 @@ -50,7 +49,7 @@
    1.33  to exist before you 'make install'.
    1.34  
    1.35  --with-group=GROUP
    1.36 -sets the group as which masqmail will run. Default is 'trusted'. GROUP
    1.37 +sets the group as which masqmail will run. Default is 'mail'. GROUP
    1.38  has to exist before you 'make install'.
    1.39  
    1.40  
    1.41 @@ -107,11 +106,11 @@
    1.42  
    1.43  	-rwsr-xr-x 1 root root    399356 May 10 12:34 /usr/local/sbin/masqmail
    1.44  	drwxr-xr-x 2 root root      4096 May 10 12:34 /etc/masqmail
    1.45 -	drwxr-xr-x 2 mail trusted   4096 May 10 12:34 /var/log/masqmail
    1.46 -	drwxr-xr-x 2 mail trusted   4096 May 10 12:34 /var/run/masqmail
    1.47 -	drwxr-xr-x 5 mail trusted   4096 May 10 12:34 /var/spool/masqmail
    1.48 -	drwxr-xr-x 2 mail trusted   4096 May 10 12:34 /var/spool/masqmail/input
    1.49 -	drwxr-xr-x 2 mail trusted   4096 May 10 12:34 /var/spool/masqmail/lock
    1.50 +	drwxr-xr-x 2 mail mail      4096 May 10 12:34 /var/log/masqmail
    1.51 +	drwxr-xr-x 2 mail mail      4096 May 10 12:34 /var/run/masqmail
    1.52 +	drwxr-xr-x 5 mail mail      4096 May 10 12:34 /var/spool/masqmail
    1.53 +	drwxr-xr-x 2 mail mail      4096 May 10 12:34 /var/spool/masqmail/input
    1.54 +	drwxr-xr-x 2 mail mail      4096 May 10 12:34 /var/spool/masqmail/lock
    1.55  
    1.56  Important are the set-user-id bit for /usr/local/sbin/masqmail and
    1.57  the permissions of all files.

     2.1 --- a/configure	Sun Sep 04 11:55:51 2011 +0200
     2.2 +++ b/configure	Sun Sep 04 12:19:41 2011 +0200
     2.3 @@ -1361,7 +1361,7 @@
     2.4    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
     2.5    --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
     2.6    --with-user=USER        set user mail
     2.7 -  --with-group=GROUP      set group trusted
     2.8 +  --with-group=GROUP      set group mail
     2.9    --with-libcrypto        use libcrypto
    2.10    --with-liblockfile      use liblock (for Debian)
    2.11    --with-logdir=DIR       set log directory /var/log/masqmail
    2.12 @@ -5122,7 +5122,7 @@
    2.13  fi
    2.14  
    2.15  if test "x$with_group" = 'x'; then
    2.16 -	with_group='trusted'
    2.17 +	with_group='mail'
    2.18  fi
    2.19  
    2.20  # Check whether --enable-debug was given.

     3.1 --- a/configure.ac	Sun Sep 04 11:55:51 2011 +0200
     3.2 +++ b/configure.ac	Sun Sep 04 12:19:41 2011 +0200
     3.3 @@ -95,10 +95,10 @@
     3.4  fi
     3.5  
     3.6  AC_ARG_WITH(group,
     3.7 -	[  --with-group=GROUP      set group [trusted]],
     3.8 +	[  --with-group=GROUP      set group [mail]],
     3.9  	)
    3.10  if test "x$with_group" = 'x'; then
    3.11 -	with_group='trusted'
    3.12 +	with_group='mail'
    3.13  fi
    3.14  
    3.15  dnl debugging support (default is use it)

     4.1 --- a/docs/INSTALL.linux	Sun Sep 04 11:55:51 2011 +0200
     4.2 +++ b/docs/INSTALL.linux	Sun Sep 04 12:19:41 2011 +0200
     4.3 @@ -6,9 +6,9 @@
     4.4  
     4.5  If you compile for Debian, do the configure with at least these options:
     4.6  
     4.7 -	./configure --with-liblockfile --with-group=mail
     4.8 +	./configure --with-liblockfile
     4.9  
    4.10 -Use the group `mail' instead of the group `trusted'.
    4.11 +(You probably like to add `--enable-auth and --enable-ident'.)
    4.12  
    4.13  You can also build your own Debian package with
    4.14