summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEzra Peisach <epeisach@mit.edu>2001-07-30 18:22:14 +0000
committerEzra Peisach <epeisach@mit.edu>2001-07-30 18:22:14 +0000
commit9b14df00e562889e5e5e7150106a475c6f42bc41 (patch)
tree0fe4cc1655e5cc4edef7705eac8b57aabcd4ac50 /src
parent6cd3b98ad8d20b49aaa5876343cafd3c05f63ad0 (diff)
* ftp.c: Declare mech_type in struct gss_trials gss_OID to be
compatible with GSS_C_NO_OID type. (was gss_OID *). git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13652 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r--src/appl/gssftp/ftp/ChangeLog5
-rw-r--r--src/appl/gssftp/ftp/ftp.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/appl/gssftp/ftp/ChangeLog b/src/appl/gssftp/ftp/ChangeLog
index d9fc10c2b..490be31b6 100644
--- a/src/appl/gssftp/ftp/ChangeLog
+++ b/src/appl/gssftp/ftp/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-30 Ezra Peisach <epeisach@mit.edu>
+
+ * ftp.c: Declare mech_type in struct gss_trials gss_OID to be
+ compatible with GSS_C_NO_OID type. (was gss_OID *).
+
2001-07-27 Danilo Almeida <dalmeida@mit.edu>
* ftp.c: Remove local Win32-specific definition of gss_mech_krb5.
diff --git a/src/appl/gssftp/ftp/ftp.c b/src/appl/gssftp/ftp/ftp.c
index da7c761f1..e5027da81 100644
--- a/src/appl/gssftp/ftp/ftp.c
+++ b/src/appl/gssftp/ftp/ftp.c
@@ -1961,7 +1961,7 @@ char realm[REALM_SZ + 1];
#ifdef GSSAPI
struct {
- gss_OID *mech_type;
+ gss_OID mech_type;
char *service_name;
} gss_trials[] = {
{ GSS_C_NO_OID, "ftp" },