a4a944c820
Fixes CVE-2010-3089: Mailman List Description Two Script Insertion Vulnerabilities ok sthen@
127 lines
3.4 KiB
Plaintext
127 lines
3.4 KiB
Plaintext
$OpenBSD: patch-configure,v 1.10 2010/09/21 07:21:00 jasper Exp $
|
|
--- configure.orig Mon Sep 20 23:33:13 2010
|
|
+++ configure Mon Sep 20 23:34:51 2010
|
|
@@ -3372,61 +3372,8 @@ fi
|
|
USERNAME=$with_username
|
|
{ $as_echo "$as_me:$LINENO: result: $USERNAME" >&5
|
|
$as_echo "$USERNAME" >&6; }
|
|
+MAILMAN_USER=$with_username
|
|
|
|
-# User `mailman' must exist
|
|
-
|
|
-{ $as_echo "$as_me:$LINENO: checking for user name \"$USERNAME\"" >&5
|
|
-$as_echo_n "checking for user name \"$USERNAME\"... " >&6; }
|
|
-
|
|
-# MAILMAN_USER == variable name
|
|
-# $USERNAME == user id to check for
|
|
-
|
|
-
|
|
-if test -z "$MAILMAN_USER"
|
|
-then
|
|
- cat > conftest.py <<EOF
|
|
-import pwd
|
|
-uid = ''
|
|
-for user in "$USERNAME".split():
|
|
- try:
|
|
- try:
|
|
- uname = pwd.getpwuid(int(user))[0]
|
|
- break
|
|
- except ValueError:
|
|
- uname = pwd.getpwnam(user)[0]
|
|
- break
|
|
- except KeyError:
|
|
- uname = ''
|
|
-fp = open("conftest.out", "w")
|
|
-fp.write("%s\n" % uname)
|
|
-fp.close()
|
|
-EOF
|
|
- $PYTHON conftest.py
|
|
- MAILMAN_USER=`cat conftest.out`
|
|
-fi
|
|
-
|
|
-rm -f conftest.out conftest.py
|
|
-if test -z "$MAILMAN_USER"
|
|
-then
|
|
- if test "$with_permcheck" = "yes"
|
|
- then
|
|
- { { $as_echo "$as_me:$LINENO: error:
|
|
-***** No \"$USERNAME\" user found!
|
|
-***** Your system must have a \"$USERNAME\" user defined
|
|
-***** (usually in your /etc/passwd file). Please see the INSTALL
|
|
-***** file for details." >&5
|
|
-$as_echo "$as_me: error:
|
|
-***** No \"$USERNAME\" user found!
|
|
-***** Your system must have a \"$USERNAME\" user defined
|
|
-***** (usually in your /etc/passwd file). Please see the INSTALL
|
|
-***** file for details." >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
- fi
|
|
-fi
|
|
-{ $as_echo "$as_me:$LINENO: result: okay" >&5
|
|
-$as_echo "okay" >&6; }
|
|
-
|
|
-
|
|
# Check for some other gid to use than `mailman'
|
|
{ $as_echo "$as_me:$LINENO: checking for --with-groupname" >&5
|
|
$as_echo_n "checking for --with-groupname... " >&6; }
|
|
@@ -3446,58 +3393,7 @@ GROUPNAME=$with_groupname
|
|
$as_echo "$GROUPNAME" >&6; }
|
|
|
|
|
|
-# Target group must exist
|
|
-
|
|
-{ $as_echo "$as_me:$LINENO: checking for group name \"$GROUPNAME\"" >&5
|
|
-$as_echo_n "checking for group name \"$GROUPNAME\"... " >&6; }
|
|
-
|
|
-# MAILMAN_GROUP == variable name
|
|
-# $GROUPNAME == user id to check for
|
|
-
|
|
-
|
|
-if test -z "$MAILMAN_GROUP"
|
|
-then
|
|
- cat > conftest.py <<EOF
|
|
-import grp
|
|
-gid = ''
|
|
-for group in "$GROUPNAME".split():
|
|
- try:
|
|
- try:
|
|
- gname = grp.getgrgid(int(group))[0]
|
|
- break
|
|
- except ValueError:
|
|
- gname = grp.getgrnam(group)[0]
|
|
- break
|
|
- except KeyError:
|
|
- gname = ''
|
|
-fp = open("conftest.out", "w")
|
|
-fp.write("%s\n" % gname)
|
|
-fp.close()
|
|
-EOF
|
|
- $PYTHON conftest.py
|
|
- MAILMAN_GROUP=`cat conftest.out`
|
|
-fi
|
|
-
|
|
-rm -f conftest.out conftest.py
|
|
-if test -z "$MAILMAN_GROUP"
|
|
-then
|
|
- if test "$with_permcheck" = "yes"
|
|
- then
|
|
- { { $as_echo "$as_me:$LINENO: error:
|
|
-***** No \"$GROUPNAME\" group found!
|
|
-***** Your system must have a \"$GROUPNAME\" group defined
|
|
-***** (usually in your /etc/group file). Please see the INSTALL
|
|
-***** file for details." >&5
|
|
-$as_echo "$as_me: error:
|
|
-***** No \"$GROUPNAME\" group found!
|
|
-***** Your system must have a \"$GROUPNAME\" group defined
|
|
-***** (usually in your /etc/group file). Please see the INSTALL
|
|
-***** file for details." >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
- fi
|
|
-fi
|
|
-{ $as_echo "$as_me:$LINENO: result: okay" >&5
|
|
-$as_echo "okay" >&6; }
|
|
+MAILMAN_GROUP=$with_groupname
|
|
|
|
|
|
{ $as_echo "$as_me:$LINENO: checking permissions on $prefixcheck" >&5
|