CVS: tmda-cgi/stubs vpopmail1.py,1.1,1.2

Update of /cvsroot/tmda/tmda-cgi/stubs
In directory sc8-pr-cvs1:/tmp/cvs-serv18334/stubs

Modified Files:
	vpopmail1.py 
Log Message:
Added %(Name)s as a substitution variable during auto-install.

Added login cookie to TODO list.

Tweaked pending list code so it won't complain if it can't find a batch
message.


Index: vpopmail1.py
===================================================================
RCS file: /cvsroot/tmda/tmda-cgi/stubs/vpopmail1.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vpopmail1.py	19 Apr 2003 14:45:16 -0000	1.1
+++ vpopmail1.py	11 Jun 2003 22:17:22 -0000	1.2
@@ -24,15 +24,15 @@
 import re
 
 # Constants
-Matcher = re.compile("^([^:]+):\s*(\S+)")
+Matcher = re.compile("^([^:]+):\s*(\S.+)\s*$")
 
 def getuserparams(List):
   # Convert a list returned by vuserinfo into a dictionary
-  Dict = {}
+  Dict = {"uid": "0", "gid": "0", "gecos": None}
   for Line in List:
     Match = Matcher.search(Line)
     if Match:
       Dict[Match.group(1)] = Match.group(2)
 
   # Return the home directory, UID, and GID
-  return Dict["dir"], Dict["uid"], Dict["gid"]
+  return Dict["dir"], Dict["uid"], Dict["gid"], Dict["gecos"]

_______________________________________
tmda-cvs mailing list
http://tmda.net/lists/listinfo/tmda-cvs