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

Make heimdal smaller and deprecate old functions

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@24175 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2008-12-11 05:12:42 +00:00
parent 85de455dde
commit 731f131f32
4 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/krb5/get_in_tkt.c
View File

@@ -35,6 +35,9 @@
RCSID("$Id$"); RCSID("$Id$");
#undef __attribute__
#define __attribute__(x)
krb5_error_code KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_FUNCTION
krb5_init_etype (krb5_context context, krb5_init_etype (krb5_context context,
unsigned *len, unsigned *len,
@@ -299,7 +302,6 @@ noreferral:
} }
static krb5_error_code static krb5_error_code
decrypt_tkt (krb5_context context, decrypt_tkt (krb5_context context,
krb5_keyblock *key, krb5_keyblock *key,
@@ -546,6 +548,7 @@ out:
return ret; return ret;
} }
#ifndef HEIMDAL_SMALLER
static krb5_error_code static krb5_error_code
make_pa_enc_timestamp(krb5_context context, PA_DATA *pa, make_pa_enc_timestamp(krb5_context context, PA_DATA *pa,
@@ -882,6 +885,7 @@ krb5_get_in_cred(krb5_context context,
krb5_const_pointer decryptarg, krb5_const_pointer decryptarg,
krb5_creds *creds, krb5_creds *creds,
krb5_kdc_rep *ret_as_reply) krb5_kdc_rep *ret_as_reply)
__attribute__((deprecated))
{ {
krb5_error_code ret; krb5_error_code ret;
AS_REQ a; AS_REQ a;
@@ -1046,6 +1050,7 @@ krb5_get_in_tkt(krb5_context context,
krb5_creds *creds, krb5_creds *creds,
krb5_ccache ccache, krb5_ccache ccache,
krb5_kdc_rep *ret_as_reply) krb5_kdc_rep *ret_as_reply)
__attribute__((deprecated))
{ {
krb5_error_code ret; krb5_error_code ret;
@@ -1067,3 +1072,5 @@ krb5_get_in_tkt(krb5_context context,
ret = krb5_cc_store_cred (context, ccache, creds); ret = krb5_cc_store_cred (context, ccache, creds);
return ret; return ret;
} }
#endif /* HEIMDAL_SMALLER */

8
lib/krb5/get_in_tkt_pw.c
View File

@@ -35,6 +35,11 @@
RCSID("$Id$"); RCSID("$Id$");
#ifndef HEIMDAL_SMALLER
#undef __attribute__
#define __attribute__(x)
krb5_error_code KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_FUNCTION
krb5_password_key_proc (krb5_context context, krb5_password_key_proc (krb5_context context,
krb5_enctype type, krb5_enctype type,
@@ -74,6 +79,7 @@ krb5_get_in_tkt_with_password (krb5_context context,
krb5_ccache ccache, krb5_ccache ccache,
krb5_creds *creds, krb5_creds *creds,
krb5_kdc_rep *ret_as_reply) krb5_kdc_rep *ret_as_reply)
__attribute__((deprecated))
{ {
return krb5_get_in_tkt (context, return krb5_get_in_tkt (context,
options, options,
@@ -88,3 +94,5 @@ krb5_get_in_tkt_with_password (krb5_context context,
ccache, ccache,
ret_as_reply); ret_as_reply);
} }
#endif /* HEIMDAL_SMALLER */

8
lib/krb5/get_in_tkt_with_keytab.c
View File

@@ -35,6 +35,11 @@
RCSID("$Id$"); RCSID("$Id$");
#ifndef HEIMDAL_SMALLER
#undef __attribute__
#define __attribute__(x)
krb5_error_code KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_FUNCTION
krb5_keytab_key_proc (krb5_context context, krb5_keytab_key_proc (krb5_context context,
krb5_enctype enctype, krb5_enctype enctype,
@@ -78,6 +83,7 @@ krb5_get_in_tkt_with_keytab (krb5_context context,
krb5_ccache ccache, krb5_ccache ccache,
krb5_creds *creds, krb5_creds *creds,
krb5_kdc_rep *ret_as_reply) krb5_kdc_rep *ret_as_reply)
__attribute__((deprecated))
{ {
krb5_keytab_key_proc_args a; krb5_keytab_key_proc_args a;
@@ -97,3 +103,5 @@ krb5_get_in_tkt_with_keytab (krb5_context context,
ccache, ccache,
ret_as_reply); ret_as_reply);
} }
#endif

8
lib/krb5/get_in_tkt_with_skey.c
View File

@@ -35,6 +35,11 @@
RCSID("$Id$"); RCSID("$Id$");
#ifndef HEIMDAL_SMALLER
#undef __attribute__
#define __attribute__(x)
static krb5_error_code static krb5_error_code
krb5_skey_key_proc (krb5_context context, krb5_skey_key_proc (krb5_context context,
krb5_enctype type, krb5_enctype type,
@@ -55,6 +60,7 @@ krb5_get_in_tkt_with_skey (krb5_context context,
krb5_ccache ccache, krb5_ccache ccache,
krb5_creds *creds, krb5_creds *creds,
krb5_kdc_rep *ret_as_reply) krb5_kdc_rep *ret_as_reply)
__attribute__((deprecated))
{ {
if(key == NULL) if(key == NULL)
return krb5_get_in_tkt_with_keytab (context, return krb5_get_in_tkt_with_keytab (context,
@@ -80,3 +86,5 @@ krb5_get_in_tkt_with_skey (krb5_context context,
ccache, ccache,
ret_as_reply); ret_as_reply);
} }
#endif /* HEIMDAL_SMALLER */