2c2
< * Copyright (c) 1998-2004 Sendmail, Inc. and its suppliers.
---
> * Copyright (c) 1998-2005 Sendmail, Inc. and its suppliers.
20c20
< SM_RCSID("@(#)$Id: srvrsmtp.c,v 8.902 2004/11/18 21:46:01 ca Exp $")
---
> SM_RCSID("@(#)$Id: srvrsmtp.c,v 8.906 2005/03/16 00:36:09 ca Exp $")
83,89c83,89
< result = reset_saslconn(&conn, AuthRealm, remoteip, localip, auth_id, \
< &ext_ssf); \
< if (result != SASL_OK) \
< { \
< /* This is pretty fatal */ \
< goto doquit; \
< }
---
> do \
> { \
> result = reset_saslconn(&conn, AuthRealm, remoteip, \
> localip, auth_id, &ext_ssf); \
> if (result != SASL_OK) \
> sasl_ok = false; \
> } while (0)
97,102c97,103
< result = reset_saslconn(&conn, AuthRealm, &saddr_r, &saddr_l, &ext_ssf); \
< if (result != SASL_OK) \
< { \
< /* This is pretty fatal */ \
< goto doquit; \
< }
---
> do \
> { \
> result = reset_saslconn(&conn, AuthRealm, &saddr_r, \
> &saddr_l, &ext_ssf); \
> if (result != SASL_OK) \
> sasl_ok = false; \
> } while (0)
666a668
> localip[0] = remoteip[0] = '\0';
750,751d751
< # if STARTTLS
< # endif /* STARTTLS */
4621c4621
< reset_saslconn(sasl_conn_t ** conn, char *hostname,
---
> reset_saslconn(sasl_conn_t **conn, char *hostname,
4626c4626
< struct sockaddr_in * saddr_r, struct sockaddr_in * saddr_l,
---
> struct sockaddr_in *saddr_r, struct sockaddr_in *saddr_l,
4649c4649
< if (remoteip != NULL)
---
> if (remoteip != NULL && *remoteip != '\0')
4654c4654
< if (localip != NULL)
---
> if (localip != NULL && *localip != '\0')