wrong patch for domain-aware-getpwnam?

[Eugene Crosser <crosser@rol.ru>]

Matti,

Either I sent it wrong, or you applied it wrong, or I do not understand
anything ;-)

This is what I think is needed:

RCS file: /cvsroot/zmailer/proto/cf/aliases.cf,v
retrieving revision 1.54
diff -u -r1.54 aliases.cf
--- proto/cf/aliases.cf 11 Mar 2004 22:54:01 -0000      1.54
+++ proto/cf/aliases.cf 16 Mar 2004 13:18:05 -0000
@@ -228,7 +228,7 @@
        user=$(user $quad)
                                                                                
        if [ "$DOMAIN_AWARE_GETPWNAM" = "1" ] ; then
-               sysuser="$host@domain"
+               sysuser="$user$domain"
        else
                sysuser="$user"
        fi

And by the way despite the comment in changelog, the "always_accept"
patch did not find its way into CVS?  Or am I missing something again?..

RCS file: /cvsroot/zmailer/smtpserver/policytest.c,v
retrieving revision 1.82
diff -u -r1.82 policytest.c
--- smtpserver/policytest.c     11 Mar 2004 22:54:01 -0000      1.82
+++ smtpserver/policytest.c     16 Mar 2004 13:18:09 -0000
@@ -1536,7 +1536,9 @@
     if (state->always_freeze)
        return 1;
     if (state->full_trust || state->authuser)
-      return 0;
+       return 0;
+    if (state->always_accept)
+       return 0;
                                                                                
     if (len == 0) /* MAIL FROM:<> -- error message ? */
       return 0;   /* We accept it, sigh.. */

Eugene

This is a digitally signed message part