Update of /cvsroot/mailman/mailman/Mailman/Cgi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28254

Modified Files:
      Tag: Release_2_1-maint
        options.py 
Log Message:
main(): It's possible that if you're logged in as the list admin, you can get
to the end of the function trying to present the options page for a
non-existant user, causing a traceback.  At the last second, do one more
isMember() check and return the loginpage if the address isn't a member of the
list.


Index: options.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/Cgi/options.py,v
retrieving revision 2.40.2.3
retrieving revision 2.40.2.4
diff -u -d -r2.40.2.3 -r2.40.2.4
--- options.py  3 Nov 2003 13:49:05 -0000       2.40.2.3
+++ options.py  17 Feb 2004 19:18:06 -0000      2.40.2.4
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2003 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2004 by the Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -219,7 +219,6 @@
 
     # Authenticate, possibly using the password supplied in the login page
     password = cgidata.getvalue('password', '').strip()
-
     if not mlist.WebAuthenticate((mm_cfg.AuthUser,
                                   mm_cfg.AuthListAdmin,
                                   mm_cfg.AuthSiteAdmin),
@@ -629,7 +628,10 @@
         print doc.Format()
         return
 
-    options_page(mlist, doc, user, cpuser, userlang)
+    if mlist.isMember(user):
+        options_page(mlist, doc, user, cpuser, userlang)
+    else:
+        loginpage(mlist, doc, user, userlang)
     print doc.Format()
 
 


_______________________________________________
Mailman-checkins mailing list
[EMAIL PROTECTED]
Unsubscribe: http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org

Reply via email to