Removed temporary probes added in commit

[nmh] / uip / popsbr.c

diff --git a/uip/popsbr.c b/uip/popsbr.c
index fb66a93b6336b0c8921b43e456fca5ac48d75686..714a8da785aa883a76916db402e323ceadbf93a1 100644 (file)
--- a/uip/popsbr.c
+++ b/uip/popsbr.c
@@ -23,8 +23,6 @@
 
 #include <h/popsbr.h>
 #include <h/signals.h>
 
 #include <h/popsbr.h>
 #include <h/signals.h>

-#include <signal.h>
-#include <errno.h>

 
 #define        TRM     "."
 #define        TRMLEN  (sizeof TRM - 1)
 
 #define        TRM     "."
 #define        TRMLEN  (sizeof TRM - 1)


@@ -46,6 +44,7 @@ static int sasl_get_user(void *, int, const char **, unsigned *);
 static int sasl_get_pass(sasl_conn_t *, void *, int, sasl_secret_t **);
 struct pass_context {
     char *user;
 static int sasl_get_pass(sasl_conn_t *, void *, int, sasl_secret_t **);
 struct pass_context {
     char *user;

+    char *password;

     char *host;
 };
 
     char *host;
 };
 


@@ -71,7 +70,7 @@ static int command(const char *, ...);
 static int multiline(void);
 
 #ifdef CYRUS_SASL
 static int multiline(void);
 
 #ifdef CYRUS_SASL

-static int pop_auth_sasl(char *, char *, char *);
+static int pop_auth_sasl(char *, char *, char *, char *);

 static int sasl_fgetc(FILE *);
 #endif /* CYRUS_SASL */
 
 static int sasl_fgetc(FILE *);
 #endif /* CYRUS_SASL */
 


@@ -91,7 +90,7 @@ static int putline (char *, FILE *);
  */
 
 int
  */
 
 int

-pop_auth_sasl(char *user, char *host, char *mech)
+pop_auth_sasl(char *user, char *password, char *host, char *mech)

 {
     int result, status, sasl_capability = 0;
     unsigned int buflen, outlen;
 {
     int result, status, sasl_capability = 0;
     unsigned int buflen, outlen;


@@ -159,6 +158,7 @@ pop_auth_sasl(char *user, char *host, char *mech)
     callbacks[POP_SASL_CB_N_USER].context = user;
     p_context.user = user;
     p_context.host = host;
     callbacks[POP_SASL_CB_N_USER].context = user;
     p_context.user = user;
     p_context.host = host;

+    p_context.password = password;

     callbacks[POP_SASL_CB_N_PASS].context = &p_context;
 
     result = sasl_client_init(callbacks);
     callbacks[POP_SASL_CB_N_PASS].context = &p_context;
 
     result = sasl_client_init(callbacks);


@@ -351,7 +351,7 @@ static int
 sasl_get_pass(sasl_conn_t *conn, void *context, int id, sasl_secret_t **psecret)
 {
     struct pass_context *p_context = (struct pass_context *) context;
 sasl_get_pass(sasl_conn_t *conn, void *context, int id, sasl_secret_t **psecret)
 {
     struct pass_context *p_context = (struct pass_context *) context;

-    char *pass = NULL;
+    char *pass = p_context->password;

     int len;
 
     NMH_UNUSED (conn);
     int len;
 
     NMH_UNUSED (conn);


@@ -359,8 +359,6 @@ sasl_get_pass(sasl_conn_t *conn, void *context, int id, sasl_secret_t **psecret)
     if (! psecret || id != SASL_CB_PASS)
        return SASL_BADPARAM;
 
     if (! psecret || id != SASL_CB_PASS)
        return SASL_BADPARAM;
 

-    ruserpass(p_context->user, &(p_context->host), &pass);
-

     len = strlen(pass);
 
     *psecret = (sasl_secret_t *) mh_xmalloc(sizeof(sasl_secret_t) + len);
     len = strlen(pass);
 
     *psecret = (sasl_secret_t *) mh_xmalloc(sizeof(sasl_secret_t) + len);


@@ -510,7 +508,7 @@ pop_init (char *host, char *port, char *user, char *pass, char *proxy,
            if (*response == '+') {
 #  ifdef CYRUS_SASL
                if (sasl) {
            if (*response == '+') {
 #  ifdef CYRUS_SASL
                if (sasl) {

-                   if (pop_auth_sasl(user, host, mech) != NOTOK)
+                   if (pop_auth_sasl(user, pass, host, mech) != NOTOK)

                        return OK;
                } else
 #  endif /* CYRUS_SASL */
                        return OK;
                } else
 #  endif /* CYRUS_SASL */