rxk5-1557-20090522

LICENSE IPL10
FIXES n/a

Correct several variations on failure to include krb5 headers before inclusino of rxk5.h.

====================
This delta was composed from multiple commits as part of the CVS->Git migration.
The checkin message with each commit was inconsistent.
The following are the additional commit messages.
====================
LICENSE IPL10
FIXES n/a

Move global 'i' declaration and references under AFS_RXK5 as intended.

====================
LICENSE IPL10
FIXES n/a

Add missing line continuation.
This commit is contained in:
Matt Benjamin 2009-05-22 21:43:29 +00:00
parent 0ce54da45b
commit 0119ccd8e4
13 changed files with 47 additions and 15 deletions

View File

@ -17,10 +17,15 @@
#include "afs/param.h"
#ifdef AFS_RXK5
#include <rx/rxk5.h>
#ifdef USING_K5SSL
#include <k5ssl.h>
#else
#ifdef USING_HEIMDAL
#undef u
#endif
#include <krb5.h>
#endif
#include <rx/rxk5.h>
#include <afs_capabilities.h>
void rxk5_OnetimeInit();
#endif

View File

@ -494,8 +494,8 @@ static int auth_to_cell(krb5_context context, char *cell, char *realm)
ll_free_list(&badrealms, (void(*)(char*))free);
ll_free_list(&princs_tried, NULL);
i = 0;
#ifdef AFS_RXK5
i = 0;
if (rxk5 & FORCE_RXK5) {
if (max_enc > 0) {
service_list[i++] = afskey_k5;
@ -648,11 +648,12 @@ static int auth_to_cell(krb5_context context, char *cell, char *realm)
retry++;
else
retry = 0;
#ifdef AFS_RXK5
/* Evil: overload retry loop to try next principal */
if (status && service_list[++i]) {
retry = 1 ;
}
#endif
}
if (status != 0) {

View File

@ -763,8 +763,12 @@ default_afs_rxk5_forge(krb5_context context,
char *to_free = 0;
int allowed_enctypes[] = {
/* XXX needs work... */
#ifdef ENCTYPE_AES256_CTS_HMAC_SHA1_96
ENCTYPE_AES256_CTS_HMAC_SHA1_96,
#endif
#ifdef ENCTYPE_AES128_CTS_HMAC_SHA1_96
ENCTYPE_AES128_CTS_HMAC_SHA1_96,
#endif
ENCTYPE_DES3_CBC_SHA1,
#ifdef USING_MIT
#define ENCTYPE_ARCFOUR_HMAC_MD5 ENCTYPE_ARCFOUR_HMAC
@ -800,4 +804,3 @@ out:
if (to_free) free(to_free);
return code;
}

View File

@ -157,7 +157,7 @@ ka_UserAuthenticateGeneral(afs_int32 flags, char *name, char *instance,
int remainingTime = 0;
struct ktc_encryptionKey key;
afs_int32 code, dosetpag = 0;
#if !defined(AFS_NT40_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_USR_LINUX20_ENV) && !defined(AFS_XBSD_ENV)
#if !defined(AFS_NT40_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_USR_LINUX20_ENV) && (!defined(AFS_XBSD_ENV) || defined(AFS_FBSD_ENV))
sig_t old;
#endif

View File

@ -42,6 +42,14 @@ RCSID
#include <rx/rxstat.h>
#include <rx/rx_null.h>
#ifdef AFS_RXK5
#ifdef USING_K5SSL
#include <k5ssl.h>
#else
#ifdef USING_HEIMDAL
#undef u
#endif
#include <krb5.h>
#endif
#include <rx/rxk5.h>
#ifdef USING_HEIMDAL
#define EncryptionKey Heimdal_EncryptionKey_NotNeededHere

View File

@ -82,7 +82,7 @@ KDEFS=-Wall -nostdinc -I/usr/include -D_KERNEL -DKLD_MODULE \
-mno-mmx -mno-3dnow -mno-sse -mno-sse2 \
<all -i386_fbsd_42 -i386_fbsd_43 -i386_fbsd_44 -i386_fbsd_45 -i386_fbsd_46 -i386_fbsd_47>
-mno-align-long-strings -fno-common -ffreestanding \
-I${KBLD} -include opt_global.h -fno-strict-aliasing
-I${KBLD} -include opt_global.h -fno-strict-aliasing \
<rxk5>
-I${TOP_SRCDIR}/rxk5 ${K5SSL_INC} \
<all>

View File

@ -40,8 +40,9 @@
#include <afs/afsint.h>
#include <rx/rxstat.h>
#include <des/des.h>
#include <afs/cellconfig.h>
#ifdef AFS_RXK5
#include <afs/rxk5_utilafs.h>
#include <rx/rxk5.h>
#include <rx/rxk5errors.h>

View File

@ -64,9 +64,9 @@ RCSID
#include <rx/rxkad.h>
#include <afs/cellconfig.h>
#ifdef AFS_RXK5
#include <afs/rxk5_utilafs.h>
#include <rx/rxk5.h>
#include <rx/rxk5errors.h>
#include <afs/rxk5_utilafs.h>
#include <errno.h>
#endif
#include <afs/auth.h>

View File

@ -52,8 +52,8 @@ RCSID
#include <afs/com_err.h>
#include <afs/cellconfig.h>
#ifdef AFS_RXK5
#include <afs/rxk5_utilafs.h>
#include <rx/rxk5.h>
#include <rxk5_utilafs.h>
#include <rx/rxk5errors.h>
#endif
#include "afs_token.h"

View File

@ -82,7 +82,7 @@ struct rxk5_stats {
#endif
#endif
#if defined(USING_MIT) || defined(USING_HEIMDAL) || defined(USING_K5SSL)
#ifdef KRB5_TC_MATCH_KTYPE
#if 1 /* KRB5_TC_MATCH_KTYPE */
#define RXK5_K5_CONTEXT krb5_context
#define RXK5_K5_PRINCIPAL krb5_principal
#define RXK5_K5_CREDS krb5_creds *

View File

@ -28,6 +28,19 @@
* such damages.
*/
%#include "rxk5c.h"
%#ifdef AFS_RXK5
%#ifdef USING_K5SSL
%#include <k5ssl.h>
%#else
%#ifdef USING_HEIMDAL
%#undef u
%#endif
%#include <krb5.h>
%#endif
%#endif
%#include <rx/rxk5.h>
%#ifndef TRUE

View File

@ -61,8 +61,8 @@ RCSID
#include "../tviced/serialize_state.h"
#endif /* AFS_DEMAND_ATTACH_FS */
#ifdef AFS_RXK5
#include <rx/rxk5.h>
#include <afs/rxk5_utilafs.h>
#include <rx/rxk5.h>
#endif
#ifdef AFS_PTHREAD_ENV

View File

@ -40,11 +40,12 @@ RCSID
#include <rx/xdr.h>
#include <rx/rx.h>
#include <rx/rx_globals.h>
#ifdef AFS_RXK5
#include "rxk5.h"
#include "rxk5errors.h"
#endif
#include <afs/cellconfig.h>
#ifdef AFS_RXK5
#include <afs/rxk5_utilafs.h>
#include <rx/rxk5.h>
#include <rx/rxk5errors.h>
#endif
#include <afs/keys.h>
#include <afs/auth.h>
#include <lock.h>