# HG changeset patch
# User markus schnalke <meillo@marmaro.de>
# Date 1315131581 -7200
# Node ID 92340177150dc403ce140947804a509cf9df4538
# Parent  04744e3e8b18ddb0b0c3a9df5dfde98f16b7b943
Eventually switched the default group from `trusted' to `mail'
All systems I run have a group `mail' but no group `trusted'.
Also changed the uid/gid to the common values 8/12.

diff -r 04744e3e8b18 -r 92340177150d INSTALL
--- a/INSTALL	Sun Sep 04 11:55:51 2011 +0200
+++ b/INSTALL	Sun Sep 04 12:19:41 2011 +0200
@@ -12,19 +12,18 @@
 You need a user and a group for masqmail to run. If
 
 	grep '^mail:' /etc/passwd
-	grep '^trusted:' /etc/group
+	grep '^mail:' /etc/group
 
-shows that the user `mail' and the group `trusted' exist, it's
-probably best to use these. If they don't exist, create them:
+shows that the user `mail' and the group `mail' exist, it's probably
+best to use these. If they don't exist, create them:
 
-	groupadd -g 42 trusted
-	useradd -u 23 -g trusted -d /nonexistent -s /bin/false -c "masqmail MTA" mail
+	groupadd -g 12 mail
+	useradd -u 8 -g mail -d /nonexistent -s /bin/false -c "masqmail MTA" mail
 
-If you use other names than `mail' and `trusted' use the options
-described below for configure. The 23 and 42 are just a suggestion,
-you can use any (not yet used) number you like, but preferably one
-lower than 100. It does not have to be the same for the user `mail'
-and the group `trusted'.
+The 8 and 12 are common uid/gid for the user and group `mail', but you can
+use any (not yet used) number you like, preferably one lower than 100.
+If you use other names than `mail' and `mail', you need to use the
+configure options described below.
 
 
 Compiling is a matter of the usual procedure. In the source directory,
@@ -50,7 +49,7 @@
 to exist before you 'make install'.
 
 --with-group=GROUP
-sets the group as which masqmail will run. Default is 'trusted'. GROUP
+sets the group as which masqmail will run. Default is 'mail'. GROUP
 has to exist before you 'make install'.
 
 
@@ -107,11 +106,11 @@
 
 	-rwsr-xr-x 1 root root    399356 May 10 12:34 /usr/local/sbin/masqmail
 	drwxr-xr-x 2 root root      4096 May 10 12:34 /etc/masqmail
-	drwxr-xr-x 2 mail trusted   4096 May 10 12:34 /var/log/masqmail
-	drwxr-xr-x 2 mail trusted   4096 May 10 12:34 /var/run/masqmail
-	drwxr-xr-x 5 mail trusted   4096 May 10 12:34 /var/spool/masqmail
-	drwxr-xr-x 2 mail trusted   4096 May 10 12:34 /var/spool/masqmail/input
-	drwxr-xr-x 2 mail trusted   4096 May 10 12:34 /var/spool/masqmail/lock
+	drwxr-xr-x 2 mail mail      4096 May 10 12:34 /var/log/masqmail
+	drwxr-xr-x 2 mail mail      4096 May 10 12:34 /var/run/masqmail
+	drwxr-xr-x 5 mail mail      4096 May 10 12:34 /var/spool/masqmail
+	drwxr-xr-x 2 mail mail      4096 May 10 12:34 /var/spool/masqmail/input
+	drwxr-xr-x 2 mail mail      4096 May 10 12:34 /var/spool/masqmail/lock
 
 Important are the set-user-id bit for /usr/local/sbin/masqmail and
 the permissions of all files.
diff -r 04744e3e8b18 -r 92340177150d configure
--- a/configure	Sun Sep 04 11:55:51 2011 +0200
+++ b/configure	Sun Sep 04 12:19:41 2011 +0200
@@ -1361,7 +1361,7 @@
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-user=USER        set user mail
-  --with-group=GROUP      set group trusted
+  --with-group=GROUP      set group mail
   --with-libcrypto        use libcrypto
   --with-liblockfile      use liblock (for Debian)
   --with-logdir=DIR       set log directory /var/log/masqmail
@@ -5122,7 +5122,7 @@
 fi
 
 if test "x$with_group" = 'x'; then
-	with_group='trusted'
+	with_group='mail'
 fi
 
 # Check whether --enable-debug was given.
diff -r 04744e3e8b18 -r 92340177150d configure.ac
--- a/configure.ac	Sun Sep 04 11:55:51 2011 +0200
+++ b/configure.ac	Sun Sep 04 12:19:41 2011 +0200
@@ -95,10 +95,10 @@
 fi
 
 AC_ARG_WITH(group,
-	[  --with-group=GROUP      set group [trusted]],
+	[  --with-group=GROUP      set group [mail]],
 	)
 if test "x$with_group" = 'x'; then
-	with_group='trusted'
+	with_group='mail'
 fi
 
 dnl debugging support (default is use it)
diff -r 04744e3e8b18 -r 92340177150d docs/INSTALL.linux
--- a/docs/INSTALL.linux	Sun Sep 04 11:55:51 2011 +0200
+++ b/docs/INSTALL.linux	Sun Sep 04 12:19:41 2011 +0200
@@ -6,9 +6,9 @@
 
 If you compile for Debian, do the configure with at least these options:
 
-	./configure --with-liblockfile --with-group=mail
+	./configure --with-liblockfile
 
-Use the group `mail' instead of the group `trusted'.
+(You probably like to add `--enable-auth and --enable-ident'.)
 
 You can also build your own Debian package with