oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

(gss_auth): call gss_display_status to get a sane error message;

Browse Source 
return AUTH_{CONTINUE,ERROR}, where appropriate


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5864 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1999-04-07 14:18:04 +00:00
parent 48784ad0a1
commit 89aa595197
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
appl/ftp/ftp/gssapi.c
View File

@@ -214,7 +214,7 @@ struct sec_server_mech gss_server_mech = {
gss_userok gss_userok
}; };
#else #else /* FTP_SEVER */
extern struct sockaddr_in hisctladdr, myctladdr; extern struct sockaddr_in hisctladdr, myctladdr;
@@ -268,10 +268,22 @@ gss_auth(void *app_data, char *host)
NULL, NULL,
NULL); NULL);
if (GSS_ERROR(maj_stat)) { if (GSS_ERROR(maj_stat)) {
printf("Error initializing security context: %x.%d\n", int new_stat;
maj_stat, min_stat); int msg_ctx = 0;
return -1; gss_buffer_desc status_string;
gss_display_status(&new_stat,
min_stat,
GSS_C_MECH_CODE,
GSS_C_NO_OID,
&msg_ctx,
&status_string);
printf("Error initializing security context: %s\n",
(char*)status_string.value);
gss_release_buffer(&new_stat, &status_string);
return AUTH_CONTINUE;
} }
gss_release_buffer(&min_stat, &input); gss_release_buffer(&min_stat, &input);
if (output_token.length != 0) { if (output_token.length != 0) {
base64_encode(output_token.value, output_token.length, &p); base64_encode(output_token.value, output_token.length, &p);
@@ -290,7 +302,7 @@ gss_auth(void *app_data, char *host)
p = strstr(reply_string, "ADAT="); p = strstr(reply_string, "ADAT=");
if(p == NULL){ if(p == NULL){
printf("Error: expected ADAT in reply.\n"); printf("Error: expected ADAT in reply.\n");
return -1; return AUTH_ERROR;
} else { } else {
p+=5; p+=5;
input.value = malloc(strlen(p)); input.value = malloc(strlen(p));
@@ -299,12 +311,12 @@ gss_auth(void *app_data, char *host)
} else { } else {
if(code != 235) { if(code != 235) {
printf("Unrecognized response code: %d\n", code); printf("Unrecognized response code: %d\n", code);
return -1; return AUTH_ERROR;
} }
context_established = 1; context_established = 1;
} }
} }
return 0; return AUTH_OK;
} }
struct sec_client_mech gss_client_mech = { struct sec_client_mech gss_client_mech = {
@@ -319,4 +331,4 @@ struct sec_client_mech gss_client_mech = {
gss_decode, gss_decode,
}; };
#endif #endif /* FTP_SERVER */