diff options
| author | Jim McDonough <jmcd@samba.org> | 2003-02-19 15:22:46 +0000 |
|---|---|---|
| committer | Jim McDonough <jmcd@samba.org> | 2003-02-19 15:22:46 +0000 |
| commit | ffcee0c95e05f652f4eebf9b9d46bd51d059891b (patch) | |
| tree | 8bdabf3472ecd136a30bba64533d8303b6e91517 | |
| parent | ad03d0a4f885a87b5dbe7c88e507b302cf06ece2 (diff) | |
| download | samba-ffcee0c95e05f652f4eebf9b9d46bd51d059891b.tar.gz samba-ffcee0c95e05f652f4eebf9b9d46bd51d059891b.tar.bz2 samba-ffcee0c95e05f652f4eebf9b9d46bd51d059891b.zip | |
Correct way to keep fucntion from proto.h
(This used to be commit 762b072efb0d6801775a874494cb19ea3d61fa97)
| -rw-r--r-- | source3/include/includes.h | 2 | ||||
| -rw-r--r-- | source3/libsmb/clikrb5.c | 11 |
2 files changed, 5 insertions, 8 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index 0d1c72cf1c..5b4c5a695f 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1238,7 +1238,7 @@ void get_auth_data_from_tkt(DATA_BLOB *auth_data, krb5_ticket *tkt); krb5_const_principal get_principal_from_tkt(krb5_ticket *tkt); krb5_error_code krb5_locate_kdc(krb5_context ctx, const krb5_data *realm, struct sockaddr **addr_pp, int *naddrs, int get_masters); krb5_error_code get_kerberos_allowed_etypes(krb5_context context, krb5_enctype **enctypes); -krb5_error_code free_kerberos_etypes(krb5_context context, krb5_enctype *enctypes); +void free_kerberos_etypes(krb5_context context, krb5_enctype *enctypes); #endif /* HAVE_KRB5 */ #endif /* _INCLUDES_H */ diff --git a/source3/libsmb/clikrb5.c b/source3/libsmb/clikrb5.c index 2e07dfdb66..da120622ea 100644 --- a/source3/libsmb/clikrb5.c +++ b/source3/libsmb/clikrb5.c @@ -127,17 +127,14 @@ krb5_error_code get_kerberos_allowed_etypes(krb5_context context, __ERROR_XX_UNKNOWN_GET_ENCTYPES_FUNCTIONS #endif - /* the following is defined as krb5_error_code to keep it from - being sucked into proto.h */ -krb5_error_code free_kerberos_etypes(krb5_context context, - krb5_enctype *enctypes) + void free_kerberos_etypes(krb5_context context, + krb5_enctype *enctypes) { #if defined(HAVE_KRB5_FREE_KTYPES) - krb5_free_ktypes(context, enctypes); + return krb5_free_ktypes(context, enctypes); #else - SAFE_FREE(enctypes); + return SAFE_FREE(enctypes); #endif - return 0; } #if defined(HAVE_KRB5_AUTH_CON_SETKEY) && !defined(HAVE_KRB5_AUTH_CON_SETUSERUSERKEY) |