char *server_mechs;
#else /* CYRUS_SASL */
NMH_UNUSED (sasl);
+ NMH_UNUSED (saslssf);
NMH_UNUSED (saslmech);
NMH_UNUSED (user);
#endif /* CYRUS_SASL */
}
int
-sm_winit (int mode, char *from)
+sm_winit (char *from)
{
- char *smtpcom = NULL;
-
- switch (mode) {
- case S_MAIL:
- smtpcom = "MAIL";
- break;
-
- case S_SEND:
- smtpcom = "SEND";
- break;
-
- case S_SOML:
- smtpcom = "SOML";
- break;
-
- case S_SAML:
- smtpcom = "SAML";
- break;
-
- default:
- /* Hopefully, we do not get here. */
- break;
- }
-
- switch (smtalk (SM_MAIL, "%s FROM:<%s>", smtpcom, from)) {
+ switch (smtalk (SM_MAIL, "MAIL FROM:<%s>", from)) {
case 250:
sm_addrs = 0;
return RP_OK;
memset(&secprops, 0, sizeof(secprops));
secprops.maxbufsize = SASL_MAXRECVBUF;
- secprops.max_ssf = tls_active ? 0 : (saslssf != -1 ? saslssf : UINT_MAX);
+ secprops.max_ssf =
+ tls_active ? 0 : (saslssf != -1 ? (unsigned int) saslssf : UINT_MAX);
result = sasl_setprop(conn, SASL_SEC_PROPS, &secprops);
buffer[*len = 0] = 0;
if ((retval = sm_fgets (buffer, BUFSIZ, sm_rfp)) != RP_OK)
- return retval;
+ return sm_rerror (retval);
*len = strlen (buffer);
/* *len should be >0 except on EOF, but check for safety's sake */
if (*len == 0)