diff options
| author |  Karl Ramm <kcr@mit.edu> | 2008-12-21 08:51:16 +0000 |
|---|---|---|
| committer | Karl Ramm <kcr@mit.edu> | 2008-12-21 08:51:16 +0000 |
| commit | 9f273a1651dc34db7fa4a475c0bb0bf0f7009027 (patch) | |
| tree | a87a30e379592a6e4ed104146b6a0c3dcac0e1da /server/zserver.h | |
| parent | 9e08e46e294c598343d8e202af7a8acba6c3d056 (diff) | |
rearrange some HAVE_KRB4 vs. HAVE_KRB5 stuff
Diffstat (limited to 'server/zserver.h')
| -rw-r--r-- | server/zserver.h | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/server/zserver.h b/server/zserver.h index f253ddf..887097a 100644 --- a/server/zserver.h +++ b/server/zserver.h @@ -31,7 +31,7 @@ #include "access.h" #include "acl.h" -#if defined(HAVE_KRB5) || defined(HAVE_KRB4) + /* Kerberos-specific library interfaces used only by the server. */ #ifdef HAVE_KRB5 extern krb5_keyblock *__Zephyr_keyblock; @@ -40,13 +40,17 @@ void ZSetSession(krb5_keyblock *keyblock); Code_t ZFormatAuthenticNoticeV5(ZNotice_t*, char*, int, int*, krb5_keyblock *); krb5_error_code Z_krb5_init_keyblock(krb5_context, krb5_enctype, size_t, krb5_keyblock **); -#else -extern C_Block __Zephyr_session; -#define ZGetSession() (__Zephyr_session) #endif + +#ifdef HAVE_KRB4 void ZSetSessionDES(C_Block *key); Code_t ZFormatAuthenticNotice(ZNotice_t*, char*, int, int*, C_Block); + +#ifndef HAVE_KRB5 +extern C_Block __Zephyr_session; +#define ZGetSession() (__Zephyr_session) +#endif #endif /* For krb_rd_req prototype and definition. */ @@ -293,12 +297,14 @@ void hostm_shutdown(void); /* found in kstuff.c */ #if defined(HAVE_KRB4) || defined(HAVE_KRB5) -int GetKerberosData (int, struct in_addr, AUTH_DAT *, char *, char *); Code_t ReadKerberosData(int, int *, char **, int *); -Code_t SendKerberosData (int, KTEXT, char *, char *); void sweep_ticket_hash_table(void *); Code_t ZCheckRealmAuthentication(ZNotice_t *, struct sockaddr_in *, char *); #endif +#ifdef HAVE_KRB4 +int GetKerberosData (int, struct in_addr, AUTH_DAT *, char *, char *); +Code_t SendKerberosData (int, KTEXT, char *, char *); +#endif #ifdef HAVE_KRB5 Code_t SendKrb5Data(int, krb5_data *); Code_t GetKrb5Data(int, krb5_data *); |