Added mhbuild: -nocontentid to profile used for tests, to simplify

[mmh] / uip / popsbr.c

diff --git a/uip/popsbr.c b/uip/popsbr.c
index feb7aa0..c566264 100644 (file)
--- a/uip/popsbr.c
+++ b/uip/popsbr.c
@@ -343,12 +343,12 @@ sasl_get_user(void *context, int id, const char **result, unsigned *len)
 static int
 sasl_get_pass(sasl_conn_t *conn, void *context, int id, sasl_secret_t **psecret)
 {
-    NMH_UNUSED (conn);
-
     struct pass_context *p_context = (struct pass_context *) context;
     char *pass = NULL;
     int len;
 
+    NMH_UNUSED (conn);
+
     if (! psecret || id != SASL_CB_PASS)
        return SASL_BADPARAM;
 
@@ -418,14 +418,13 @@ int
 pop_init (char *host, char *port, char *user, char *pass, char *proxy,
          int snoop, int sasl, char *mech)
 {
+    int fd1, fd2;
+    char buffer[BUFSIZ];
 #ifndef CYRUS_SASL
     NMH_UNUSED (sasl);
     NMH_UNUSED (mech);
 #endif /* ! CYRUS_SASL */
 
-    int fd1, fd2;
-    char buffer[BUFSIZ];
-
     if (proxy && *proxy) {
        int pid;
        int inpipe[2];    /* for reading from the server */