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

try using "host" if there's no "ftp" principal

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10579 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2001-08-28 15:25:43 +00:00
parent 002678bb48
commit 03569fc666
1 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1998 - 2000 Kungliga Tekniska H<>gskolan * Copyright (c) 1998 - 2001 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -37,6 +37,7 @@
#include "ftp_locl.h" #include "ftp_locl.h"
#endif #endif
#include <gssapi.h> #include <gssapi.h>
#include <krb5_err.h>
RCSID("$Id$"); RCSID("$Id$");
@@ -265,24 +266,16 @@ struct sec_server_mech gss_server_mech = {
extern struct sockaddr *hisctladdr, *myctladdr; extern struct sockaddr *hisctladdr, *myctladdr;
static int static int
gss_auth(void *app_data, char *host) import_name(const char *kname, const char *host, gss_name_t *target_name)
{ {
OM_uint32 maj_stat, min_stat; OM_uint32 maj_stat, min_stat;
gss_buffer_desc name; gss_buffer_desc name;
gss_name_t target_name;
gss_buffer_desc input, output_token; name.length = asprintf((char**)&name.value, "%s@%s", kname, host);
int context_established = 0;
char *p;
int n;
gss_channel_bindings_t bindings;
struct gss_data *d = app_data;
name.length = asprintf((char**)&name.value, "ftp@%s", host);
maj_stat = gss_import_name(&min_stat, maj_stat = gss_import_name(&min_stat,
&name, &name,
GSS_C_NT_HOSTBASED_SERVICE, GSS_C_NT_HOSTBASED_SERVICE,
&target_name); target_name);
if (GSS_ERROR(maj_stat)) { if (GSS_ERROR(maj_stat)) {
OM_uint32 new_stat; OM_uint32 new_stat;
OM_uint32 msg_ctx = 0; OM_uint32 msg_ctx = 0;
@@ -301,7 +294,28 @@ gss_auth(void *app_data, char *host)
return AUTH_ERROR; return AUTH_ERROR;
} }
free(name.value); free(name.value);
return 0;
}
static int
gss_auth(void *app_data, char *host)
{
OM_uint32 maj_stat, min_stat;
gss_buffer_desc name;
gss_name_t target_name;
gss_buffer_desc input, output_token;
int context_established = 0;
char *p;
int n;
gss_channel_bindings_t bindings;
struct gss_data *d = app_data;
const char *knames[] = { "ftp", "host", NULL }, **kname = knames;
if(import_name(*kname++, host, &target_name))
return AUTH_ERROR;
input.length = 0; input.length = 0;
input.value = NULL; input.value = NULL;
@@ -337,6 +351,12 @@ gss_auth(void *app_data, char *host)
OM_uint32 new_stat; OM_uint32 new_stat;
OM_uint32 msg_ctx = 0; OM_uint32 msg_ctx = 0;
gss_buffer_desc status_string; gss_buffer_desc status_string;
if(min_stat == KRB5KDC_ERR_S_PRINCIPAL_UNKNOWN && *kname != NULL) {
if(import_name(*kname++, host, &target_name))
return AUTH_ERROR;
continue;
}
gss_display_status(&new_stat, gss_display_status(&new_stat,
min_stat, min_stat,