Fix to OPIE code.

svn path=/trunk/; revision=1949

diff --git a/imap.c b/imap.c
index 2a8314540a2310da2f3ff671a9b6501c7efb6432..412e1dc86faa8eb43706f7adab6294762dec8fbe 100644 (file)
--- a/imap.c
+++ b/imap.c
@@ -155,7 +155,7 @@ static int do_otp(int sock, struct query *ctl)
   };
 
   rval = opiegenerator(challenge, !strcmp(ctl->password, "opie") ? "" : ctl->password, response);
-  if ((rval == -2) && (cmd_opts.poll_interval == -1)) {
+  if ((rval == -2) && !run.poll_interval) {
     char secret[OPIE_SECRET_MAX+1];
     fprintf(stderr, "Secret pass phrase: ");
     if (opiereadpass(secret, sizeof(secret), 0))

diff --git a/pop3.c b/pop3.c
index fcb1c1fea114732fe9e81188e0a573d8cabee5a9..f13386d8b99be4d5c02fe59b94aac4e76f9c9a3b 100644 (file)
--- a/pop3.c
+++ b/pop3.c
@@ -153,7 +153,7 @@ int pop3_getauth(int sock, struct query *ctl, char *greeting)
          int i;
 
          i = opiegenerator(challenge, !strcmp(ctl->password, "opie") ? "" : ctl->password, response);
-         if ((i == -2) && (cmd_opts.poll_interval == -1)) {
+         if ((i == -2) && !run.poll_interval) {
            char secret[OPIE_SECRET_MAX+1];
            fprintf(stderr, "Secret pass phrase: ");
            if (opiereadpass(secret, sizeof(secret), 0))