diff options
| author | Jeremy Allison <jra@samba.org> | 2003-01-21 13:33:31 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2003-01-21 13:33:31 +0000 |
| commit | 18c2948bc536552ed2949f8fe1d06a72b9cc66dd (patch) | |
| tree | 55a2a3dcd04a773cb076b22a5bf851ca619ec871 /source3 | |
| parent | b0aadff2020886cbc2a35bf115e6c359ff28d870 (diff) | |
| download | samba-18c2948bc536552ed2949f8fe1d06a72b9cc66dd.tar.gz samba-18c2948bc536552ed2949f8fe1d06a72b9cc66dd.tar.bz2 samba-18c2948bc536552ed2949f8fe1d06a72b9cc66dd.zip | |
Fixup proto generation to not include krb5 specific symbols
if no kerberos selected. Noticed by Metze.
Jeremy.
(This used to be commit 0c98f779f05431ac4d298c9f021fca85d16aebae)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/include/includes.h | 3 | ||||
| -rw-r--r-- | source3/libsmb/clikrb5.c | 10 |
2 files changed, 8 insertions, 5 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index 618719d630..23d6d1c457 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1214,6 +1214,9 @@ krb5_error_code krb5_set_real_time(krb5_context context, int32_t seconds, int32_ krb5_error_code krb5_set_default_tgs_ktypes(krb5_context ctx, const krb5_enctype *enc); #endif +/* Samba wrapper function for krb5 functionality. */ +void setup_kaddr( krb5_address *pkaddr, struct sockaddr *paddr); + #endif /* HAVE_KRB5 */ #endif /* _INCLUDES_H */ diff --git a/source3/libsmb/clikrb5.c b/source3/libsmb/clikrb5.c index b56de62730..2047efd704 100644 --- a/source3/libsmb/clikrb5.c +++ b/source3/libsmb/clikrb5.c @@ -27,7 +27,7 @@ /* * This function is not in the Heimdal mainline. */ -krb5_error_code krb5_set_real_time(krb5_context context, int32_t seconds, int32_t microseconds) + krb5_error_code krb5_set_real_time(krb5_context context, int32_t seconds, int32_t microseconds) { krb5_error_code ret; int32_t sec, usec; @@ -44,7 +44,7 @@ krb5_error_code krb5_set_real_time(krb5_context context, int32_t seconds, int32_ #endif #if defined(HAVE_KRB5_SET_DEFAULT_IN_TKT_ETYPES) && !defined(HAVE_KRB5_SET_DEFAULT_TGS_KTYPES) -krb5_error_code krb5_set_default_tgs_ktypes(krb5_context ctx, const krb5_enctype *enc) + krb5_error_code krb5_set_default_tgs_ktypes(krb5_context ctx, const krb5_enctype *enc) { return krb5_set_default_in_tkt_etypes(ctx, enc); } @@ -52,7 +52,7 @@ krb5_error_code krb5_set_default_tgs_ktypes(krb5_context ctx, const krb5_enctype #if defined(HAVE_ADDR_TYPE_IN_KRB5_ADDRESS) /* HEIMDAL */ -void setup_kaddr( krb5_address *pkaddr, struct sockaddr *paddr) + void setup_kaddr( krb5_address *pkaddr, struct sockaddr *paddr) { pkaddr->addr_type = KRB5_ADDRESS_INET; pkaddr->address.length = sizeof(((struct sockaddr_in *)paddr)->sin_addr); @@ -60,14 +60,14 @@ void setup_kaddr( krb5_address *pkaddr, struct sockaddr *paddr) } #elif defined(HAVE_ADDRTYPE_IN_KRB5_ADDRESS) /* MIT */ -void setup_kaddr( krb5_address *pkaddr, struct sockaddr *paddr) + void setup_kaddr( krb5_address *pkaddr, struct sockaddr *paddr) { pkaddr->addrtype = ADDRTYPE_INET; pkaddr->length = sizeof(((struct sockaddr_in *)paddr)->sin_addr); pkaddr->contents = (char *)&(((struct sockaddr_in *)paddr)->sin_addr); } #else -__ERROR__XX__UNKNOWN_ADDRTYPE + __ERROR__XX__UNKNOWN_ADDRTYPE #endif /* |