summaryrefslogtreecommitdiff
path: root/auth2.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-05-01 21:10:33 +1000
committerDamien Miller <djm@mindrot.org>2000-05-01 21:10:33 +1000
commit35dabd0398dc4aa8735d5ec896ead6955b83b2ff (patch)
treedc981f761571cb7e6f5b7628bb7d19150559ae01 /auth2.c
parent70fb671d218378f6df6a9121a71e8320768a0be3 (diff)
[scp.c]
- fix very rare EAGAIN/EINTR issues; based on work by djm [packet.c] - less debug, rm unused [auth2.c] - disable kerb,s/key in ssh2 [sshd.8] - Minor tweaks and typo fixes. [ssh-keygen.c] - Put -d into usage and reorder. markus ok.
Diffstat (limited to 'auth2.c')
-rw-r--r--auth2.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/auth2.c b/auth2.c
index 9937ed67..cfe63cdf 100644
--- a/auth2.c
+++ b/auth2.c
@@ -27,7 +27,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "includes.h"
-RCSID("$OpenBSD: auth2.c,v 1.3 2000/04/27 15:23:02 markus Exp $");
+RCSID("$OpenBSD: auth2.c,v 1.4 2000/05/01 07:45:08 markus Exp $");
#include <openssl/dsa.h>
#include <openssl/rsa.h>
@@ -92,6 +92,10 @@ static int userauth_success = 0;
void
do_authentication2()
{
+ /* turn off skey/kerberos, not supported by SSH2 */
+ options.skey_authentication = 0;
+ options.kerberos_authentication = 0;
+
dispatch_init(&protocol_error);
dispatch_set(SSH2_MSG_SERVICE_REQUEST, &input_service_request);
dispatch_run(DISPATCH_BLOCK, &userauth_success);