fedora-accounts export-aliases.py,1.8,1.9

[Michael Patrick McGrath (mmcgrath)]

Author: mmcgrath

Update of /cvs/fedora/fedora-accounts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26375

Modified Files:
	export-aliases.py 
Log Message:
Changes made by Ahmed Kamal



Index: export-aliases.py
===================================================================
RCS file: /cvs/fedora/fedora-accounts/export-aliases.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- export-aliases.py	8 Oct 2006 20:19:15 -0000	1.8
+++ export-aliases.py	8 Oct 2006 20:26:39 -0000	1.9
@@ -36,8 +36,7 @@
 while 1:
     arow = dbc.fetchone()
     if not arow: break
-    x = arow[1].find('@')
-    if x >= 0 and arow[1][x:] != ('@' + local_domain):
+    if re.compile("^[A-Z0-9._-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$", re.IGNORECASE).match(arow[1]):
 	fh_aliases_new.write('%s: %s\n' % (arow[0], arow[1]))
 	fh_aliases_new.write('%s: %s\n' % (arow[2].replace(' ', '.').lower(), arow[0]))