From af73e17fcc2e80be3b2b1af11b9a417fdec9fec7 Mon Sep 17 00:00:00 2001 From: Eduardo Chappa Date: Wed, 19 Feb 2020 01:13:58 -0700 Subject: * Correct the NTLM authenticator to make sure Alpine compiles when support for the NTLM authenticator is compiled into Alpine. --- imap/src/c-client/auth_ntl.c | 8 ++++---- pith/pine.hlp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/imap/src/c-client/auth_ntl.c b/imap/src/c-client/auth_ntl.c index 481ca0f8..7579b8fb 100644 --- a/imap/src/c-client/auth_ntl.c +++ b/imap/src/c-client/auth_ntl.c @@ -24,7 +24,7 @@ #include -long auth_ntlm_client (authchallenge_t challenger,authrespond_t responder, +long auth_ntlm_client (authchallenge_t challenger,authrespond_t responder,char *base, char *service,NETMBX *mb,void *stream, unsigned long port, unsigned long *trial,char *user); @@ -48,7 +48,7 @@ AUTHENTICATOR auth_ntl = { /* secure, has full auth, hidden */ * Returns: T if success, NIL otherwise, number of trials incremented if retry */ -long auth_ntlm_client (authchallenge_t challenger, authrespond_t responder, +long auth_ntlm_client (authchallenge_t challenger, authrespond_t responder,char *base, char *service, NETMBX *mb, void *stream, unsigned long port, unsigned long *trial, char *user) { @@ -89,13 +89,13 @@ long auth_ntlm_client (authchallenge_t challenger, authrespond_t responder, } buildSmbNtlmAuthRequest (&request, user, NULL); /* send a negotiate message */ - if ((*responder) (stream, (void *) &request, SmbLength (&request)) && + if ((*responder) (stream, NIL, (void *) &request, SmbLength (&request)) && (challenge = (*challenger) (stream, &clen))) { /* interpret the challenge message */ buildSmbNtlmAuthResponse (challenge, &response, user, pass); fs_give ((void **) &challenge); /* send a response message */ - if ((*responder) (stream, (void *) &response, SmbLength (&response))) { + if ((*responder) (stream, NIL, (void *) &response, SmbLength (&response))) { if (challenge = (*challenger) (stream, &clen)) fs_give ((void **) &challenge); else { diff --git a/pith/pine.hlp b/pith/pine.hlp index 1a3de03b..2f5fabc7 100644 --- a/pith/pine.hlp +++ b/pith/pine.hlp @@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any reasonable place to be called from. Dummy change to get revision in pine.hlp ============= h_revision ================= -Alpine Commit 408 2020-02-19 00:39:37 +Alpine Commit 409 2020-02-19 01:13:43 ============= h_news ================= -- cgit v1.2.3-70-g09d2