Fix hardcoded 'mailman' groupname in error message and some comments. It

cost me ten minutes to figure out I wasn't calling configure with the wrong
argument to change groupname :)

2 files changed, 74 insertions, 70 deletions

diff --git a/configure b/configure
index 1a8ecfd55..a9e46e48f 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# From configure.in Revision: 2.6 
+# From configure.in Revision: 2.8 
 
 # Guess values for system-dependent variables and create Makefiles.
 # Generated automatically using autoconf version 2.13 
@@ -542,7 +542,7 @@ fi
 
 
 
-# /home/mailman is the default installation directory
+# /usr/local/mailman is the default installation directory
 
 
 
@@ -1155,11 +1155,11 @@ uid = ''
 for user in string.split("$USERNAME"):
     try:
         try:
-	    uid = pwd.getpwuid(int(user))[2]
-	    break
+            uid = pwd.getpwuid(int(user))[2]
+            break
 	except ValueError:
-	    uid = pwd.getpwnam(user)[2]
-	    break
+            uid = pwd.getpwnam(user)[2]
+            break
     except KeyError:
         uid = ''
 fp = open("conftest.out", "w")
@@ -1200,7 +1200,7 @@ GROUPNAME=$with_groupname
 echo "$ac_t""$GROUPNAME" 1>&6
 
 
-# Group `mailman' must exist
+# Target group must exist
 
 echo $ac_n "checking for $GROUPNAME GID""... $ac_c" 1>&6
 echo "configure:1207: checking for $GROUPNAME GID" >&5
@@ -1217,11 +1217,11 @@ gid = ''
 for group in string.split("$GROUPNAME"):
     try:
         try:
-	    gid = grp.getgrgid(int(group))[2]
-	    break
-	except ValueError:
-	    gid = grp.getgrnam(group)[2]
-	    break
+            gid = grp.getgrgid(int(group))[2]
+            break
+        except ValueError:
+            gid = grp.getgrnam(group)[2]
+            break
     except KeyError:
         gid = ''
 fp = open("conftest.out", "w")
@@ -1245,8 +1245,8 @@ fi
 
 
 # Now make sure that $prefix is set up correctly.  It must be group
-# owned by `mailman', it must have the group sticky bit set, and it
-# must be a+rx
+# owned by the target group, it must have the group sticky bit set, and
+# it must be a+rx
 if test "$VAR_PREFIX" = "NONE"
 then
     VAR_PREFIX=$ac_default_prefix
@@ -1262,6 +1262,7 @@ cat > conftest.py <<EOF
 import os, grp, string
 from stat import *
 prefix = "$prefixcheck"
+groupname = "$GROUPNAME"
 mailmangid = $MAILMAN_GID
 problems = []
 try: statdata = os.stat(prefix)
@@ -1271,12 +1272,13 @@ else:
     mode = statdata[ST_MODE]
     gid = statdata[ST_GID]
     if mailmangid <> gid:
-	problems.append("Directory must be owned by group mailman: " + prefix)
+        problems.append("Directory must be owned by group " +
+                        groupname + ": " + prefix)
     if (mode & S_ISGID) <> S_ISGID:
-	problems.append("Set-gid bit must be set for directory: " +prefix)
+        problems.append("Set-gid bit must be set for directory: " +prefix)
     perms = S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH
     if (mode & perms) <> perms:
-	problems.append("Permissions should be at least 02775: " + prefix)
+        problems.append("Permissions should be at least 02775: " + prefix)
 if not problems:
     msg = "okay\n"
 else:
@@ -1302,7 +1304,7 @@ echo "$ac_t""okay" 1>&6
 # Now find the UIDs and GIDs
 # Support --with-mail-gid and --with-cgi-gid
 echo $ac_n "checking for mail wrapper GID; i.e. --with-mail-gid""... $ac_c" 1>&6
-echo "configure:1306: checking for mail wrapper GID; i.e. --with-mail-gid" >&5
+echo "configure:1308: checking for mail wrapper GID; i.e. --with-mail-gid" >&5
 # Check whether --with-mail-gid or --without-mail-gid was given.
 if test "${with_mail_gid+set}" = set; then
   withval="$with_mail_gid"
@@ -1333,11 +1335,11 @@ gid = ''
 for group in string.split("$ac_cv_group_mail"):
     try:
         try:
-	    gid = grp.getgrgid(int(group))[2]
-	    break
-	except ValueError:
-	    gid = grp.getgrnam(group)[2]
-	    break
+            gid = grp.getgrgid(int(group))[2]
+            break
+        except ValueError:
+            gid = grp.getgrnam(group)[2]
+            break
     except KeyError:
         gid = ''
 fp = open("conftest.out", "w")
@@ -1363,7 +1365,7 @@ fi
 
 
 echo $ac_n "checking for CGI wrapper GID; i.e. --with-cgi-gid""... $ac_c" 1>&6
-echo "configure:1367: checking for CGI wrapper GID; i.e. --with-cgi-gid" >&5
+echo "configure:1369: checking for CGI wrapper GID; i.e. --with-cgi-gid" >&5
 # Check whether --with-cgi-gid or --without-cgi-gid was given.
 if test "${with_cgi_gid+set}" = set; then
   withval="$with_cgi_gid"
@@ -1395,11 +1397,11 @@ gid = ''
 for group in string.split("$ac_cv_group_cgi"):
     try:
         try:
-	    gid = grp.getgrgid(int(group))[2]
-	    break
-	except ValueError:
-	    gid = grp.getgrnam(group)[2]
-	    break
+            gid = grp.getgrgid(int(group))[2]
+            break
+        except ValueError:
+            gid = grp.getgrnam(group)[2]
+            break
     except KeyError:
         gid = ''
 fp = open("conftest.out", "w")
@@ -1429,7 +1431,7 @@ fi
 # Check for CGI extensions, required by some Web servers
 
 echo $ac_n "checking for CGI extensions""... $ac_c" 1>&6
-echo "configure:1433: checking for CGI extensions" >&5
+echo "configure:1435: checking for CGI extensions" >&5
 # Check whether --with-cgi-ext or --without-cgi-ext was given.
 if test "${with_cgi_ext+set}" = set; then
   withval="$with_cgi_ext"
@@ -1480,14 +1482,14 @@ EOF
 $PYTHON conftest.py
 
 echo $ac_n "checking for default fully qualified host name""... $ac_c" 1>&6
-echo "configure:1484: checking for default fully qualified host name" >&5
+echo "configure:1486: checking for default fully qualified host name" >&5
 if test -z "$FQDN"
 then
     FQDN=`head -1 conftest.out`
 fi
 echo "$ac_t""$FQDN" 1>&6
 echo $ac_n "checking for default URL host component""... $ac_c" 1>&6
-echo "configure:1491: checking for default URL host component" >&5
+echo "configure:1493: checking for default URL host component" >&5
 if test -z "$URL"
 then
     URL=`tail -1 conftest.out`
@@ -1499,12 +1501,12 @@ rm -f conftest.out conftest.py
 for ac_func in strerror setregid syslog
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1503: checking for $ac_func" >&5
+echo "configure:1505: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1508 "configure"
+#line 1510 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1527,7 +1529,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -1558,17 +1560,17 @@ if test $ac_cv_func_syslog = no; then
   # with the appropriate include.
   for lib in bsd socket inet; do
     echo $ac_n "checking for syslog in -l$lib""... $ac_c" 1>&6
-echo "configure:1562: checking for syslog in -l$lib" >&5
+echo "configure:1564: checking for syslog in -l$lib" >&5
     Mailman_LIBS_save="$LIBS"; LIBS="$LIBS -l$lib"
     cat > conftest.$ac_ext <<EOF
-#line 1565 "configure"
+#line 1567 "configure"
 #include "confdefs.h"
 #include <syslog.h>
 int main() {
 syslog(LOG_DEBUG, "Just a test...");
 ; return 0; }
 EOF
-if { (eval echo configure:1572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
       cat >> confdefs.h <<\EOF
@@ -1590,7 +1592,7 @@ fi
 
 # Checks for header files.
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1594: checking how to run the C preprocessor" >&5
+echo "configure:1596: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -1605,13 +1607,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1609 "configure"
+#line 1611 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1615: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1617: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1622,13 +1624,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1626 "configure"
+#line 1628 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1632: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1634: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1639,13 +1641,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 1643 "configure"
+#line 1645 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1649: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1651: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1670,12 +1672,12 @@ fi
 echo "$ac_t""$CPP" 1>&6
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1674: checking for ANSI C header files" >&5
+echo "configure:1676: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1679 "configure"
+#line 1681 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -1683,7 +1685,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1687: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1689: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1700,7 +1702,7 @@ rm -f conftest*
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1704 "configure"
+#line 1706 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -1718,7 +1720,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1722 "configure"
+#line 1724 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -1739,7 +1741,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 1743 "configure"
+#line 1745 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1750,7 +1752,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:1754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -1777,17 +1779,17 @@ for ac_hdr in syslog.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1781: checking for $ac_hdr" >&5
+echo "configure:1783: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1786 "configure"
+#line 1788 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1791: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1793: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1816,12 +1818,12 @@ done
 
 # Checks for typedefs, structures, and compiler characteristics.
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:1820: checking for uid_t in sys/types.h" >&5
+echo "configure:1822: checking for uid_t in sys/types.h" >&5
 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1825 "configure"
+#line 1827 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -1850,7 +1852,7 @@ EOF
 fi
 
 echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6
-echo "configure:1854: checking type of array argument to getgroups" >&5
+echo "configure:1856: checking type of array argument to getgroups" >&5
 if eval "test \"`echo '$''{'ac_cv_type_getgroups'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1858,7 +1860,7 @@ else
   ac_cv_type_getgroups=cross
 else
   cat > conftest.$ac_ext <<EOF
-#line 1862 "configure"
+#line 1864 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Rendell for this test.  */
@@ -1883,7 +1885,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:1887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
     ac_cv_type_getgroups=gid_t
 else
@@ -1897,7 +1899,7 @@ fi
 
 if test $ac_cv_type_getgroups = cross; then
         cat > conftest.$ac_ext <<EOF
-#line 1901 "configure"
+#line 1903 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 EOF
@@ -1925,12 +1927,12 @@ EOF
 for ac_func in vsnprintf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1929: checking for $ac_func" >&5
+echo "configure:1931: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1934 "configure"
+#line 1936 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1953,7 +1955,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
diff --git a/configure.in b/configure.in
index 4a92cdb64..9c7332881 100644
--- a/configure.in
+++ b/configure.in
@@ -15,12 +15,12 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 dnl Process this file with autoconf to produce a configure script.
-AC_REVISION($Revision: 3729 $)
+AC_REVISION($Revision: 3730 $)
 AC_PREREQ(2.0)
 AC_INIT(src/alias-wrapper.c)
 
 
-# /home/mailman is the default installation directory
+# /usr/local/mailman is the default installation directory
 AC_PREFIX_DEFAULT(/usr/local/mailman)
 
 
@@ -255,7 +255,7 @@ GROUPNAME=$with_groupname
 AC_MSG_RESULT($GROUPNAME)
 
 
-# Group `mailman' must exist
+# Target group must exist
 AC_SUBST(MAILMAN_GID)
 AC_MSG_CHECKING(for $GROUPNAME GID)
 MM_FIND_GROUP_ID(MAILMAN_GID, $GROUPNAME)
@@ -270,8 +270,8 @@ fi
 
 
 # Now make sure that $prefix is set up correctly.  It must be group
-# owned by `mailman', it must have the group sticky bit set, and it
-# must be a+rx
+# owned by the target group, it must have the group sticky bit set, and
+# it must be a+rx
 if test "$VAR_PREFIX" = "NONE"
 then
     VAR_PREFIX=$ac_default_prefix
@@ -286,6 +286,7 @@ cat > conftest.py <<EOF
 import os, grp, string
 from stat import *
 prefix = "$prefixcheck"
+groupname = "$GROUPNAME"
 mailmangid = $MAILMAN_GID
 problems = []
 try: statdata = os.stat(prefix)
@@ -295,7 +296,8 @@ else:
     mode = statdata[ST_MODE]
     gid = statdata[ST_GID]
     if mailmangid <> gid:
-        problems.append("Directory must be owned by group mailman: " + prefix)
+        problems.append("Directory must be owned by group " +
+                        groupname + ": " + prefix)
     if (mode & S_ISGID) <> S_ISGID:
         problems.append("Set-gid bit must be set for directory: " +prefix)
     perms = S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH