projects / packages / postfix.git / blame
| Commit | Line | Data |
|---|---|---|
| aef5dd42 TO |
1 | diff -Nur snapshot-20011114.orig/src/global/mail_params.h snapshot-20011114/src/global/mail_params.h |
| 2 | --- snapshot-20011114.orig/src/global/mail_params.h Thu Nov 15 15:13:42 2001 | |
| 3 | +++ snapshot-20011114/src/global/mail_params.h Thu Nov 15 15:15:21 2001 | |
| 4 | @@ -961,6 +961,10 @@ | |
| 5 | #define DEF_SMTPD_SASL_REALM "$myhostname" | |
| 6 | extern char *var_smtpd_sasl_realm; | |
| 7 | ||
| 8 | +#define VAR_PUBLISH_SASL_USERNAME "publish_sasl_username" | |
| 9 | +#define DEF_PUBLISH_SASL_USERNAME 0 | |
| 10 | +extern bool var_publish_sasl_username; | |
| 11 | + | |
| 12 | /* | |
| 13 | * SASL authentication support, SMTP client side. | |
| 14 | */ | |
| 15 | Binary files snapshot-20011114.orig/src/smtpd/.smtpd.c.rej.swp and snapshot-20011114/src/smtpd/.smtpd.c.rej.swp differ | |
| 16 | diff -Nur snapshot-20011114.orig/src/smtpd/smtpd.c snapshot-20011114/src/smtpd/smtpd.c | |
| 17 | --- snapshot-20011114.orig/src/smtpd/smtpd.c Thu Nov 15 15:13:42 2001 | |
| 18 | +++ snapshot-20011114/src/smtpd/smtpd.c Thu Nov 15 15:20:19 2001 | |
| 19 | @@ -359,6 +359,7 @@ | |
| 20 | bool var_smtpd_sasl_enable; | |
| 21 | char *var_smtpd_sasl_opts; | |
| 22 | char *var_smtpd_sasl_realm; | |
| 23 | +bool var_publish_sasl_username; | |
| 24 | char *var_filter_xport; | |
| 25 | bool var_broken_auth_clients; | |
| 26 | char *var_perm_mx_networks; | |
| 27 | @@ -1011,6 +1012,13 @@ | |
| 28 | "Received: from %s (%s [%s])", | |
| 29 | state->helo_name ? state->helo_name : state->name, | |
| 30 | state->name, state->addr); | |
| 31 | +#ifdef USE_SASL_AUTH | |
| 32 | + if (var_publish_sasl_username) | |
| 33 | + rec_fprintf(state->cleanup, REC_TYPE_NORM, | |
| 34 | + "\tsender authenticated as: \"%s\"", | |
| 35 | + state->sasl_username ? state->sasl_username : "<none>"); | |
| 36 | +#endif | |
| 37 | + | |
| 38 | if (var_smtpd_tls_received_header && state->tls_active) { | |
| 39 | rec_fprintf(state->cleanup, REC_TYPE_NORM, | |
| 40 | "\t(using %s with cipher %s (%d/%d bits))", | |
| 41 | @@ -1839,6 +1847,7 @@ | |
| 42 | VAR_DISABLE_VRFY_CMD, DEF_DISABLE_VRFY_CMD, &var_disable_vrfy_cmd, | |
| 43 | VAR_ALLOW_UNTRUST_ROUTE, DEF_ALLOW_UNTRUST_ROUTE, &var_allow_untrust_route, | |
| 44 | VAR_SMTPD_SASL_ENABLE, DEF_SMTPD_SASL_ENABLE, &var_smtpd_sasl_enable, | |
| 45 | + VAR_PUBLISH_SASL_USERNAME, DEF_PUBLISH_SASL_USERNAME, &var_publish_sasl_username, | |
| 46 | VAR_BROKEN_AUTH_CLNTS, DEF_BROKEN_AUTH_CLNTS, &var_broken_auth_clients, | |
| 47 | VAR_SMTPD_TLS_WRAPPER, DEF_SMTPD_TLS_WRAPPER, &var_smtpd_tls_wrappermode, | |
| 48 | VAR_SMTPD_USE_TLS, DEF_SMTPD_USE_TLS, &var_smtpd_use_tls, |