(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
This commit is contained in:
@@ -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).
|
* (Royal Institute of Technology, Stockholm, Sweden).
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
@@ -686,7 +686,7 @@ sec_login(char *host)
|
|||||||
}else if(code == 534){
|
}else if(code == 534){
|
||||||
printf("%s rejected as security mechanism.\n", (*m)->name);
|
printf("%s rejected as security mechanism.\n", (*m)->name);
|
||||||
}else if(ret == ERROR) {
|
}else if(ret == ERROR) {
|
||||||
printf("The server doesn't understand the FTP "
|
printf("The server doesn't support the FTP "
|
||||||
"security extensions.\n");
|
"security extensions.\n");
|
||||||
verbose = old_verbose;
|
verbose = old_verbose;
|
||||||
return -1;
|
return -1;
|
||||||
@@ -696,7 +696,9 @@ sec_login(char *host)
|
|||||||
|
|
||||||
ret = (*(*m)->auth)(app_data, 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 */
|
/* mechanism is supposed to output error string */
|
||||||
verbose = old_verbose;
|
verbose = old_verbose;
|
||||||
return -1;
|
return -1;
|
||||||
|
Reference in New Issue
Block a user