2 files changed, 155 insertions, 91 deletions

diff --git a/configure b/configure
index 278ef7c2e..1e8cddb68 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# From configure.in Revision: 1.45 
+# From configure.in Revision: 1.46 
 
 # Guess values for system-dependent variables and create Makefiles.
 # Generated automatically using autoconf version 2.13 
@@ -19,6 +19,10 @@ ac_help="$ac_help
 ac_help="$ac_help
   --without-gcc		never use gcc"
 ac_help="$ac_help
+  --with-ownername	specify a user name other than \"mailman\""
+ac_help="$ac_help
+  --with-ownergroup	specify a group name other than \"mailman\""
+ac_help="$ac_help
   --with-mail-gid  	specify GID mail programs run as"
 ac_help="$ac_help
   --with-cgi-gid  	specify GID CGI programs run as"
@@ -542,7 +546,7 @@ fi
 
 # Check for Python!  Better be found on $PATH
 echo $ac_n "checking for --with-python""... $ac_c" 1>&6
-echo "configure:546: checking for --with-python" >&5
+echo "configure:550: checking for --with-python" >&5
 # Check whether --with-python or --without-python was given.
 if test "${with_python+set}" = set; then
   withval="$with_python"
@@ -556,7 +560,7 @@ then
 	# Extract the first word of "python", so it can be a program name with args.
 set dummy python; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:560: checking for $ac_word" >&5
+echo "configure:564: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_with_python'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -592,7 +596,7 @@ fi
 fi
 
 echo $ac_n "checking Python interpreter""... $ac_c" 1>&6
-echo "configure:596: checking Python interpreter" >&5
+echo "configure:600: checking Python interpreter" >&5
 if test ! -x $with_python
 then
     { echo "configure: error: 
@@ -607,7 +611,7 @@ echo "$ac_t""$PYTHON" 1>&6
 
 # See if Python is new enough.  1.5.2 or better is required.
 echo $ac_n "checking Python version""... $ac_c" 1>&6
-echo "configure:611: checking Python version" >&5
+echo "configure:615: checking Python version" >&5
 
 cat > conftest.py <<EOF
 import sys
@@ -670,7 +674,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:674: checking for a BSD compatible install" >&5
+echo "configure:678: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -723,7 +727,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:727: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:731: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -752,7 +756,7 @@ fi
 # Extract the first word of "true", so it can be a program name with args.
 set dummy true; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:756: checking for $ac_word" >&5
+echo "configure:760: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_TRUE'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -788,7 +792,7 @@ fi
 
 # Find compiler, allow alternatives to gcc
 echo $ac_n "checking for --without-gcc""... $ac_c" 1>&6
-echo "configure:792: checking for --without-gcc" >&5
+echo "configure:796: checking for --without-gcc" >&5
 # Check whether --with-gcc or --without-gcc was given.
 if test "${with_gcc+set}" = set; then
   withval="$with_gcc"
@@ -817,7 +821,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:821: checking for $ac_word" >&5
+echo "configure:825: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -847,7 +851,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:851: checking for $ac_word" >&5
+echo "configure:855: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -898,7 +902,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:902: checking for $ac_word" >&5
+echo "configure:906: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -930,7 +934,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:934: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:938: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -941,12 +945,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 945 "configure"
+#line 949 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -972,12 +976,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:976: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:980: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:981: checking whether we are using GNU C" >&5
+echo "configure:985: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -986,7 +990,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:994: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1005,7 +1009,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1009: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1013: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1057,7 +1061,7 @@ fi
 # Pull the hash mark out of the macro call to avoid m4 problems.
 ac_msg="whether #! works in shell scripts"
 echo $ac_n "checking $ac_msg""... $ac_c" 1>&6
-echo "configure:1061: checking $ac_msg" >&5
+echo "configure:1065: checking $ac_msg" >&5
 if eval "test \"`echo '$''{'ac_cv_sys_interpreter'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1093,12 +1097,29 @@ fi
 # new macro for finding UIDs
 
 
+# Check for some other uid to use than `mailman'
+echo $ac_n "checking for --with-ownername""... $ac_c" 1>&6
+echo "configure:1103: checking for --with-ownername" >&5
+# Check whether --with-ownername or --without-ownername was given.
+if test "${with_ownername+set}" = set; then
+  withval="$with_ownername"
+  :
+fi
+
+
+if test -z "$with_ownername"
+then
+	with_ownername="mailman"
+fi
+OWNERNAME=$with_ownername
+echo "$ac_t""$OWNERNAME" 1>&6
+
 # User `mailman' must exist
-echo $ac_n "checking for mailman UID""... $ac_c" 1>&6
-echo "configure:1099: checking for mailman UID" >&5
+echo $ac_n "checking for $OWNERNAME UID""... $ac_c" 1>&6
+echo "configure:1120: checking for $OWNERNAME UID" >&5
 
 # MAILMAN_UID == variable name
-# mailman == user id to check for
+# $OWNERNAME == user id to check for
 
 
 if test -z "$MAILMAN_UID"
@@ -1106,13 +1127,13 @@ then
     cat > conftest.py <<EOF
 import pwd, string
 uid = ''
-for user in string.split("mailman"):
+for user in string.split("$OWNERNAME"):
     try:
         try:
-	    uid = pwd.getpwuid(int(user))[0]
+	    uid = pwd.getpwuid(int(user))[2]
 	    break
 	except ValueError:
-	    uid = pwd.getpwnam(user)[0]
+	    uid = pwd.getpwnam(user)[2]
 	    break
     except KeyError:
         uid = ''
@@ -1129,19 +1150,37 @@ rm -f conftest.out conftest.py
 if test -z "$MAILMAN_UID"
 then
     { echo "configure: error: 
-***** No \"mailman\" user found!
-***** Your system must have a \"mailman\" user defined (usually
-***** in your /etc/passwd file).  Please see the INSTALL file
-***** file details." 1>&2; exit 1; }
+***** No \"$OWNERNAME\" user found!
+***** Your system must have a \"$OWNERNAME\" user defined
+***** (usually in your /etc/passwd file).  Please see the INSTALL
+***** file for details." 1>&2; exit 1; }
 fi
 
 
+# Check for some other gid to use than `mailman'
+echo $ac_n "checking for --with-ownergroup""... $ac_c" 1>&6
+echo "configure:1163: checking for --with-ownergroup" >&5
+# Check whether --with-ownergroup or --without-ownergroup was given.
+if test "${with_ownergroup+set}" = set; then
+  withval="$with_ownergroup"
+  :
+fi
+
+
+if test -z "$with_ownergroup"
+then
+	with_ownergroup="mailman"
+fi
+OWNERGROUP=$with_ownergroup
+echo "$ac_t""$OWNERGROUP" 1>&6
+
+
 # Group `mailman' must exist
-echo $ac_n "checking for mailman GID""... $ac_c" 1>&6
-echo "configure:1142: checking for mailman GID" >&5
+echo $ac_n "checking for $OWNERGROUP GID""... $ac_c" 1>&6
+echo "configure:1181: checking for $OWNERGROUP GID" >&5
 
 # MAILMAN_GID == variable name
-# mailman == user id to check for
+# $OWNERGROUP == user id to check for
 
 
 if test -z "$MAILMAN_GID"
@@ -1149,7 +1188,7 @@ then
     cat > conftest.py <<EOF
 import grp, string
 gid = ''
-for group in string.split("mailman"):
+for group in string.split("$OWNERGROUP"):
     try:
         try:
 	    gid = grp.getgrgid(int(group))[2]
@@ -1172,10 +1211,10 @@ rm -f conftest.out conftest.py
 if test -z "$MAILMAN_GID"
 then
     { echo "configure: error: 
-***** No \"mailman\" group found!
-***** Your system must have a \"mailman\" group defined (usually
-***** in your /etc/group file).  Please see the INSTALL file
-***** file details." 1>&2; exit 1; }
+***** No \"$OWNERGROUP\" group found!
+***** Your system must have a \"$OWNERGROUP\" group defined
+***** (usually in your /etc/group file).  Please see the INSTALL
+***** file for details." 1>&2; exit 1; }
 fi
 
 
@@ -1190,7 +1229,7 @@ else
 fi
 
 echo $ac_n "checking permissions on $prefixcheck""... $ac_c" 1>&6
-echo "configure:1194: checking permissions on $prefixcheck" >&5
+echo "configure:1233: checking permissions on $prefixcheck" >&5
 
 cat > conftest.py <<EOF
 import os, grp, string
@@ -1236,7 +1275,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""... $ac_c" 1>&6
-echo "configure:1240: checking for mail wrapper GID" >&5
+echo "configure:1279: checking for mail wrapper 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"
@@ -1297,7 +1336,7 @@ fi
 
 
 echo $ac_n "checking for CGI wrapper GID""... $ac_c" 1>&6
-echo "configure:1301: checking for CGI wrapper GID" >&5
+echo "configure:1340: checking for CGI wrapper 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"
@@ -1363,7 +1402,7 @@ fi
 # Check for CGI extensions, required by some Web servers
 
 echo $ac_n "checking for CGI extensions""... $ac_c" 1>&6
-echo "configure:1367: checking for CGI extensions" >&5
+echo "configure:1406: 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"
@@ -1414,14 +1453,14 @@ EOF
 $PYTHON conftest.py
 
 echo $ac_n "checking for default fully qualified host name""... $ac_c" 1>&6
-echo "configure:1418: checking for default fully qualified host name" >&5
+echo "configure:1457: 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:1425: checking for default URL host component" >&5
+echo "configure:1464: checking for default URL host component" >&5
 if test -z "$URL"
 then
     URL=`tail -1 conftest.out`
@@ -1433,12 +1472,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:1437: checking for $ac_func" >&5
+echo "configure:1476: 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 1442 "configure"
+#line 1481 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1461,7 +1500,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1504: \"$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
@@ -1492,17 +1531,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:1496: checking for syslog in -l$lib" >&5
+echo "configure:1535: checking for syslog in -l$lib" >&5
     Mailman_LIBS_save="$LIBS"; LIBS="$LIBS -l$lib"
     cat > conftest.$ac_ext <<EOF
-#line 1499 "configure"
+#line 1538 "configure"
 #include "confdefs.h"
 #include <syslog.h>
 int main() {
 syslog(LOG_DEBUG, "Just a test...");
 ; return 0; }
 EOF
-if { (eval echo configure:1506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1545: \"$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
@@ -1524,7 +1563,7 @@ fi
 
 # Checks for header files.
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1528: checking how to run the C preprocessor" >&5
+echo "configure:1567: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -1539,13 +1578,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 1543 "configure"
+#line 1582 "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:1549: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1588: \"$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
   :
@@ -1556,13 +1595,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1560 "configure"
+#line 1599 "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:1566: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1605: \"$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
   :
@@ -1573,13 +1612,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 1577 "configure"
+#line 1616 "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:1583: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1622: \"$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
   :
@@ -1604,12 +1643,12 @@ fi
 echo "$ac_t""$CPP" 1>&6
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1608: checking for ANSI C header files" >&5
+echo "configure:1647: 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 1613 "configure"
+#line 1652 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -1617,7 +1656,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1621: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1660: \"$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*
@@ -1634,7 +1673,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 1638 "configure"
+#line 1677 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -1652,7 +1691,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 1656 "configure"
+#line 1695 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -1673,7 +1712,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 1677 "configure"
+#line 1716 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1684,7 +1723,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:1688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -1711,17 +1750,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:1715: checking for $ac_hdr" >&5
+echo "configure:1754: 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 1720 "configure"
+#line 1759 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1725: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1764: \"$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*
@@ -1750,12 +1789,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:1754: checking for uid_t in sys/types.h" >&5
+echo "configure:1793: 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 1759 "configure"
+#line 1798 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -1784,7 +1823,7 @@ EOF
 fi
 
 echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6
-echo "configure:1788: checking type of array argument to getgroups" >&5
+echo "configure:1827: 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
@@ -1792,7 +1831,7 @@ else
   ac_cv_type_getgroups=cross
 else
   cat > conftest.$ac_ext <<EOF
-#line 1796 "configure"
+#line 1835 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Rendell for this test.  */
@@ -1817,7 +1856,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:1821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1860: \"$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
@@ -1831,7 +1870,7 @@ fi
 
 if test $ac_cv_type_getgroups = cross; then
         cat > conftest.$ac_ext <<EOF
-#line 1835 "configure"
+#line 1874 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 EOF
@@ -1859,12 +1898,12 @@ EOF
 for ac_func in vsnprintf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1863: checking for $ac_func" >&5
+echo "configure:1902: 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 1868 "configure"
+#line 1907 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1887,7 +1926,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1930: \"$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 454fee1d8..d70af366e 100644
--- a/configure.in
+++ b/configure.in
@@ -15,7 +15,7 @@
 # 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: 2479 $)
+AC_REVISION($Revision: 2684 $)
 AC_PREREQ(2.0)
 AC_INIT(src/alias-wrapper.c)
 
@@ -181,10 +181,10 @@ uid = ''
 for user in string.split("$2"):
     try:
         try:
-	    uid = pwd.getpwuid(int(user))[0]
+	    uid = pwd.getpwuid(int(user))[2]
 	    break
 	except ValueError:
-	    uid = pwd.getpwnam(user)[0]
+	    uid = pwd.getpwnam(user)[2]
 	    break
     except KeyError:
         uid = ''
@@ -199,29 +199,54 @@ changequote([, ])
 AC_MSG_RESULT($$1)
 rm -f conftest.out conftest.py])
 
+# Check for some other uid to use than `mailman'
+AC_MSG_CHECKING(for --with-ownername)
+AC_ARG_WITH(ownername, dnl
+[  --with-ownername	specify a user name other than \"mailman\"])
+
+if test -z "$with_ownername"
+then
+	with_ownername="mailman"
+fi
+OWNERNAME=$with_ownername
+AC_MSG_RESULT($OWNERNAME)
+
 # User `mailman' must exist
-AC_MSG_CHECKING(for mailman UID)
-MM_FIND_USER_ID(MAILMAN_UID, mailman)
+AC_MSG_CHECKING(for $OWNERNAME UID)
+MM_FIND_USER_ID(MAILMAN_UID, $OWNERNAME)
 if test -z "$MAILMAN_UID"
 then
     AC_MSG_ERROR([
-***** No \"mailman\" user found!
-***** Your system must have a \"mailman\" user defined (usually
-***** in your /etc/passwd file).  Please see the INSTALL file
-***** file details.])
+***** No \"$OWNERNAME\" user found!
+***** Your system must have a \"$OWNERNAME\" user defined
+***** (usually in your /etc/passwd file).  Please see the INSTALL
+***** file for details.])
+fi
+
+
+# Check for some other gid to use than `mailman'
+AC_MSG_CHECKING(for --with-ownergroup)
+AC_ARG_WITH(ownergroup, dnl
+[  --with-ownergroup	specify a group name other than \"mailman\"])
+
+if test -z "$with_ownergroup"
+then
+	with_ownergroup="mailman"
 fi
+OWNERGROUP=$with_ownergroup
+AC_MSG_RESULT($OWNERGROUP)
 
 
 # Group `mailman' must exist
-AC_MSG_CHECKING(for mailman GID)
-MM_FIND_GROUP_ID(MAILMAN_GID, mailman)
+AC_MSG_CHECKING(for $OWNERGROUP GID)
+MM_FIND_GROUP_ID(MAILMAN_GID, $OWNERGROUP)
 if test -z "$MAILMAN_GID"
 then
     AC_MSG_ERROR([
-***** No \"mailman\" group found!
-***** Your system must have a \"mailman\" group defined (usually
-***** in your /etc/group file).  Please see the INSTALL file
-***** file details.])
+***** No \"$OWNERGROUP\" group found!
+***** Your system must have a \"$OWNERGROUP\" group defined
+***** (usually in your /etc/group file).  Please see the INSTALL
+***** file for details.])
 fi