1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-25 21:07:40 +00:00

Teach mailman how to work both with MD5 and DES passwords.

This problem is already fixed in mailman CVS.
Bump PORTREVISION.

Submitted by:	Kresimir Kumericki <kkumer@phy.hr>
This commit is contained in:
Dmitry Sivachenko 2001-02-26 09:13:49 +00:00
parent 3b14d66efb
commit 3d13fb15fe
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=38780
2 changed files with 27 additions and 0 deletions

View File

@ -7,6 +7,7 @@
PORTNAME= mailman
PORTVERSION= 2.0.1
PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= mailman

View File

@ -0,0 +1,26 @@
*** Mailman/Utils.py.orig Thu Nov 16 22:43:11 2000
--- Mailman/Utils.py Thu Feb 15 19:42:10 2001
***************
*** 407,413 ****
f = open(mm_cfg.SITE_PW_FILE)
pw2 = f.read()
f.close()
! return Crypt.crypt(pw1, pw2[:2]) == pw2
# There probably is no site admin password if there was an exception
except IOError:
return 0
--- 407,420 ----
f = open(mm_cfg.SITE_PW_FILE)
pw2 = f.read()
f.close()
! # First we check for the Modular Crypt Format
! mcf = re.match(r'\$\d\$(\w+)\$', pw2)
! if mcf: # Is it MCF?
! salt=mcf.group(1)
! else: # No, it's traditional DES.
! salt=pw2[:2]
!
! return Crypt.crypt(pw1, salt) == pw2
# There probably is no site admin password if there was an exception
except IOError:
return 0