Delete ud-emailmatcher. Looks broken and unused.

[mirror/userdir-ldap.git] / ud-mailgate

diff --git a/ud-mailgate b/ud-mailgate
index baaf08a..073ee4f 100755 (executable)
--- a/ud-mailgate
+++ b/ud-mailgate
@@ -331,10 +331,11 @@ def DoSSH(Str, Attrs, badkeys, uid):
             Subst["__ERROR__"] = "SSH key with fingerprint %s known as bad key" % (g[1])
             ErrReply = TemplateSubst(Subst, open(TemplatesDir + "admin-info", "r").read())
 
-            Child = os.popen("/usr/sbin/sendmail -t", "w")
-            Child.write(ErrReplyHead)
-            Child.write(ErrReply)
-            if Child.close() is not None:
+            Child = subprocess.Popen(['/usr/sbin/sendmail', '-t'], stdin=subprocess.PIPE)
+            Child.stdin.write(ErrReplyHead)
+            Child.stdin.write(ErrReply)
+            Child.stdin.close()
+            if Child.wait() != 0:
                 raise UDExecuteError("Sendmail gave a non-zero return code")
         except Exception:
             sys.exit(EX_TEMPFAIL)
@@ -372,7 +373,7 @@ def DoDNS(Str, Attrs, DnRecord):
         return None
 
     # Check for punycode.  We ought to validate it before we allow it in our zone.
-    if Str.lower().startswith('xn--') and Str.lower() != 'xn--mnchen-3ya':
+    if Str.lower().startswith('xn--'):
         return "Punycode not allowed: " + Str
 
     # Check if the name is already taken