AuthRealm.p0 revision 285303
1Patch from John Marshall (slightly modified). 2 3diff --git a/sendmail/srvrsmtp.c b/sendmail/srvrsmtp.c 4index 7dba983..bf804ab 100644 5--- a/sendmail/srvrsmtp.c 6+++ b/sendmail/srvrsmtp.c 7@@ -84,7 +84,7 @@ static int reset_saslconn __P((sasl_conn_t **_conn, char *_hostname, 8 # define RESET_SASLCONN \ 9 do \ 10 { \ 11- result = reset_saslconn(&conn, AuthRealm, remoteip, \ 12+ result = reset_saslconn(&conn, hostname, remoteip, \ 13 localip, auth_id, &ext_ssf); \ 14 if (result != SASL_OK) \ 15 sasl_ok = false; \ 16@@ -938,8 +938,6 @@ smtp(nullserver, d_flags, e) 17 e->e_features = features; 18 hostname = macvalue('j', e); 19 #if SASL 20- if (AuthRealm == NULL) 21- AuthRealm = hostname; 22 sasl_ok = bitset(SRV_OFFER_AUTH, features); 23 n_mechs = 0; 24 authenticating = SASL_NOT_AUTH; 25@@ -948,8 +946,8 @@ smtp(nullserver, d_flags, e) 26 if (sasl_ok) 27 { 28 # if SASL >= 20000 29- result = sasl_server_new("smtp", AuthRealm, NULL, NULL, NULL, 30- NULL, 0, &conn); 31+ result = sasl_server_new("smtp", hostname, AuthRealm, NULL, 32+ NULL, NULL, 0, &conn); 33 # elif SASL > 10505 34 /* use empty realm: only works in SASL > 1.5.5 */ 35 result = sasl_server_new("smtp", AuthRealm, "", NULL, 0, &conn); 36@@ -5392,7 +5390,7 @@ reset_saslconn(sasl_conn_t **conn, char *hostname, 37 38 sasl_dispose(conn); 39 # if SASL >= 20000 40- result = sasl_server_new("smtp", hostname, NULL, NULL, NULL, 41+ result = sasl_server_new("smtp", hostname, AuthRealm, NULL, NULL, 42 NULL, 0, conn); 43 # elif SASL > 10505 44 /* use empty realm: only works in SASL > 1.5.5 */ 45