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

add krb4 and correct some if's

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@6926 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1999-09-10 19:57:18 +00:00
parent ab374023d2
commit b66ae18014
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/krb5/keytab.c
View File

@@ -57,6 +57,10 @@ krb5_kt_register(krb5_context context,
return 0; return 0;
} }
#ifdef KRB4
extern krb5_kt_ops krb4_fkt_ops;
#endif
krb5_error_code krb5_error_code
krb5_kt_resolve(krb5_context context, krb5_kt_resolve(krb5_context context,
const char *name, const char *name,
@@ -74,6 +78,10 @@ krb5_kt_resolve(krb5_context context,
if(ret) return ret; if(ret) return ret;
ret = krb5_kt_register(context, &krb5_mkt_ops); ret = krb5_kt_register(context, &krb5_mkt_ops);
if(ret) return ret; if(ret) return ret;
#ifdef KRB4
ret = krb5_kt_register(context, &krb4_fkt_ops);
if(ret) return ret;
#endif
} }
residual = strchr(name, ':'); residual = strchr(name, ':');
@@ -306,7 +314,7 @@ krb5_kt_next_entry(krb5_context context,
krb5_keytab_entry *entry, krb5_keytab_entry *entry,
krb5_kt_cursor *cursor) krb5_kt_cursor *cursor)
{ {
if(id->next_entry) if(id->next_entry == NULL)
return HEIM_ERR_OPNOTSUPP; return HEIM_ERR_OPNOTSUPP;
return (*id->next_entry)(context, id, entry, cursor); return (*id->next_entry)(context, id, entry, cursor);
} }
@@ -317,7 +325,7 @@ krb5_kt_end_seq_get(krb5_context context,
krb5_keytab id, krb5_keytab id,
krb5_kt_cursor *cursor) krb5_kt_cursor *cursor)
{ {
if(id->end_seq_get) if(id->end_seq_get == NULL)
return HEIM_ERR_OPNOTSUPP; return HEIM_ERR_OPNOTSUPP;
return (*id->end_seq_get)(context, id, cursor); return (*id->end_seq_get)(context, id, cursor);
} }