diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 1998-06-04 04:28:41 +0000 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 1998-06-04 04:28:41 +0000 |
| commit | 41620bcbb3f21e2cf7d23242ab0d21b07c308a66 (patch) | |
| tree | c31c58aeae5acf2c33d05bebe84ecd0cddfbc04c /fetchmail.c | |
| parent | 17b79e30b7dd686e0f11436030e7a9bcce7969b2 (diff) | |
| download | fetchmail-41620bcbb3f21e2cf7d23242ab0d21b07c308a66.tar.gz fetchmail-41620bcbb3f21e2cf7d23242ab0d21b07c308a66.tar.bz2 fetchmail-41620bcbb3f21e2cf7d23242ab0d21b07c308a66.zip | |
Brendan Cully's fixes for GSSAPI.
svn path=/trunk/; revision=1892
Diffstat (limited to 'fetchmail.c')
| -rw-r--r-- | fetchmail.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/fetchmail.c b/fetchmail.c index 79563ab6..29ba051f 100644 --- a/fetchmail.c +++ b/fetchmail.c @@ -339,8 +339,10 @@ int main (int argc, char **argv) { if (ctl->server.preauthenticate == A_KERBEROS_V4 || ctl->server.preauthenticate == A_KERBEROS_V5 || - ctl->server.protocol == P_IMAP_K4 || - ctl->server.protocol == P_IMAP_GSS) +#ifdef GSSAPI + ctl->server.protocol == P_IMAP_GSS || +#endif /* GSSAPI */ + ctl->server.protocol == P_IMAP_K4) /* Server won't care what the password is, but there must be some non-null string here. */ ctl->password = ctl->remotename; @@ -356,7 +358,11 @@ int main (int argc, char **argv) ctl->password = xstrdup(p->password); } - if (ctl->server.protocol != P_ETRN && ctl->server.protocol != P_IMAP_K4 && ctl->server.protocol != P_IMAP_GSS && !ctl->password) + if (ctl->server.protocol != P_ETRN && ctl->server.protocol != P_IMAP_K4 +#ifdef GSSAPI + && ctl->server.protocol != P_IMAP_GSS +#endif /* GSSAPI */ + && !ctl->password) { free(tmpbuf); #define PASSWORD_PROMPT "Enter password for %s@%s: " @@ -1081,7 +1087,9 @@ static int query_host(struct query *ctl) break; case P_IMAP: case P_IMAP_K4: +#ifdef GSSAPI case P_IMAP_GSS: +#endif /* GSSAPI */ #ifdef IMAP_ENABLE return(doIMAP(ctl)); #else |