diff -ru dist/postfix-2.0.16-20031022/src/global/mail_proto.h postfix-2.0.16-20031022/src/global/mail_proto.h --- dist/postfix-2.0.16-20031022/src/global/mail_proto.h Thu Dec 18 12:37:23 2003 +++ postfix-2.0.16-20031022/src/global/mail_proto.h Thu Dec 18 12:40:43 2003 @@ -116,6 +116,9 @@ #define MAIL_ATTR_TABLE "table" #define MAIL_ATTR_KEY "key" #define MAIL_ATTR_VALUE "value" +#ifdef USE_SASL_AUTH +#define MAIL_ATTR_SASL_USERNAME "sasl_username" +#endif /* * Suffixes for sender_name, sender_domain etc. diff -ru dist/postfix-2.0.16-20031022/src/smtpd/smtpd_check.c postfix-2.0.16-20031022/src/smtpd/smtpd_check.c --- dist/postfix-2.0.16-20031022/src/smtpd/smtpd_check.c Thu Dec 18 12:37:23 2003 +++ postfix-2.0.16-20031022/src/smtpd/smtpd_check.c Thu Dec 18 15:39:47 2003 @@ -2955,6 +2955,10 @@ state->recipient ? state->recipient : "", ATTR_TYPE_STR, MAIL_ATTR_QUEUEID, state->queue_id ? state->queue_id : "", +#ifdef USE_SASL_AUTH + ATTR_TYPE_STR, MAIL_ATTR_SASL_USERNAME, + (var_smtpd_sasl_enable && state->sasl_username) ? state->sasl_username : "", +#endif ATTR_TYPE_END, ATTR_FLAG_MISSING, /* Reply attributes. */ ATTR_TYPE_STR, MAIL_ATTR_ACTION, action,