diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2001-02-12 03:38:05 +0000 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2001-02-12 03:38:05 +0000 |
| commit | 28ac3fc988917a1f6b9df8edb762b29d328f1821 (patch) | |
| tree | a98f8536009505f976c7fb47ee7bc23e13ece2f4 | |
| parent | 9f47c849d0a49b3e3099e2f8bf5e376199065eb7 (diff) | |
| download | fetchmail-28ac3fc988917a1f6b9df8edb762b29d328f1821.tar.gz fetchmail-28ac3fc988917a1f6b9df8edb762b29d328f1821.tar.bz2 fetchmail-28ac3fc988917a1f6b9df8edb762b29d328f1821.zip | |
Trivially get rid of 60 conflicts.
svn path=/trunk/; revision=3075
| -rw-r--r-- | rcfile_y.y | 28 |
1 files changed, 16 insertions, 12 deletions
@@ -180,12 +180,18 @@ serv_option : AKA alias_list current.server.port = $2; #endif /* INET6_ENABLE */ } - | INTERVAL NUMBER {current.server.interval = $2;} - | PREAUTHENTICATE ANY {current.server.preauthenticate = A_ANY;} - | PREAUTHENTICATE PASSWORD {current.server.preauthenticate = A_PASSWORD;} - | PREAUTHENTICATE GSSAPI {current.server.preauthenticate = A_GSSAPI;} - | PREAUTHENTICATE KERBEROS4 {current.server.preauthenticate = A_KERBEROS_V4;} - | PREAUTHENTICATE KERBEROS5 {current.server.preauthenticate = A_KERBEROS_V5;} + | INTERVAL NUMBER + {current.server.interval = $2;} + | PREAUTHENTICATE ANY + {current.server.preauthenticate = A_ANY;} + | PREAUTHENTICATE PASSWORD + {current.server.preauthenticate = A_PASSWORD;} + | PREAUTHENTICATE GSSAPI + {current.server.preauthenticate = A_GSSAPI;} + | PREAUTHENTICATE KERBEROS4 + {current.server.preauthenticate = A_KERBEROS_V4;} + | PREAUTHENTICATE KERBEROS5 + {current.server.preauthenticate = A_KERBEROS_V5;} | PREAUTHENTICATE KERBEROS { #ifdef KERBEROS_V5 current.server.preauthenticate = A_KERBEROS_V5; @@ -193,12 +199,10 @@ serv_option : AKA alias_list current.server.preauthenticate = A_KERBEROS_V4; #endif /* KERBEROS_V5 */ } - | PREAUTHENTICATE GSSAPI { - current.server.preauthenticate = A_GSSAPI; - } - | PREAUTHENTICATE SSH {current.server.preauthenticate = A_SSH;} - | TIMEOUT NUMBER {current.server.timeout = $2;} - + | PREAUTHENTICATE SSH + {current.server.preauthenticate = A_SSH;} + | TIMEOUT NUMBER + {current.server.timeout = $2;} | ENVELOPE NUMBER STRING { current.server.envelope = |