From dd8524937b7e89dc676b3e143f703dab9a0a4544 Mon Sep 17 00:00:00 2001
From: Johan Danielsson <joda@pdc.kth.se>
Date: Wed, 7 Apr 1999 14:16:48 +0000
Subject: [PATCH] (sec_login): if mechanism returns AUTH_CONTINUE, just
 continue with the next mechanism, this fixes the case of having GSSAPI fail
 because of non-existant of expired tickets

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5862 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 appl/ftp/ftp/security.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/appl/ftp/ftp/security.c b/appl/ftp/ftp/security.c
index 71d9aad2d..f81c1b086 100644
--- a/appl/ftp/ftp/security.c
+++ b/appl/ftp/ftp/security.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998 Kungliga Tekniska Högskolan
+ * Copyright (c) 1998, 1999 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  * 
@@ -686,7 +686,7 @@ sec_login(char *host)
 	    }else if(code == 534){
 		printf("%s rejected as security mechanism.\n", (*m)->name);
 	    }else if(ret == ERROR) {
-		printf("The server doesn't understand the FTP "
+		printf("The server doesn't support the FTP "
 		       "security extensions.\n");
 		verbose = old_verbose;
 		return -1;
@@ -696,7 +696,9 @@ sec_login(char *host)
 
 	ret = (*(*m)->auth)(app_data, host);
 	
-	if(ret != 0){
+	if(ret == AUTH_CONTINUE)
+	    continue;
+	else if(ret != AUTH_OK){
 	    /* mechanism is supposed to output error string */
 	    verbose = old_verbose;
 	    return -1;