jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-31 05:27:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

STABLE14-krb5-aklog-kimpersonate-conditionalize-20070920

Browse Source 
make kimpersonate conitional


(cherry picked from commit a0fa3b559836d134c44eae20cbd6d7d1d04a0d10)
This commit is contained in:
Derrick Brashear 2007-10-10 18:47:58 +00:00
parent 4a3ee37fe1
commit b06b03559d
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/aklog/aklog_main.c
View File

@ -199,7 +199,7 @@ static int get_user_realm(krb5_context, char *);
#error "Must have either krb5_princ_size or krb5_principal_get_comp_string" #error "Must have either krb5_princ_size or krb5_principal_get_comp_string"
#endif #endif
#if !defined(HAVE_KRB5_ENCRYPT_TKT_PART) #if !defined(HAVE_KRB5_ENCRYPT_TKT_PART) && defined(HAVE_ENCODE_KRB5_ENC_TKT_PART)
krb5_error_code krb5_error_code
krb5_encrypt_tkt_part(krb5_context context, krb5_encrypt_tkt_part(krb5_context context,
const krb5_keyblock *key, const krb5_keyblock *key,
@ -1690,6 +1690,7 @@ static krb5_error_code get_credv5_akimpersonate(krb5_context context,
int *paddress, int *paddress,
krb5_creds** out_creds /* out */ ) krb5_creds** out_creds /* out */ )
{ {
#if defined(USING_HEIMDAL) || (defined(HAVE_ENCODE_KRB5_ENC_TKT) && defined(HAVE_ENCODE_KRB5_TICKET))
krb5_error_code code; krb5_error_code code;
krb5_keytab kt = 0; krb5_keytab kt = 0;
krb5_kt_cursor cursor[1]; krb5_kt_cursor cursor[1];
@ -1994,8 +1995,12 @@ cleanup:
krb5_free_keyblock_contents(context, session_key); krb5_free_keyblock_contents(context, session_key);
out: out:
return code; return code;
#else
return -1;
#endif
} }
static krb5_error_code get_credv5(krb5_context context, static krb5_error_code get_credv5(krb5_context context,
char *name, char *inst, char *realm, char *name, char *inst, char *realm,
krb5_creds **creds) krb5_creds **creds)

2
src/cf/kerberos.m4
View File

@ -58,7 +58,7 @@ if test X$conf_krb5 = XYES; then
CPPFLAGS="$CPPFLAGS $KRB5CFLAGS" CPPFLAGS="$CPPFLAGS $KRB5CFLAGS"
save_LIBS="$LIBS" save_LIBS="$LIBS"
LIBS="$LIBS $KRB5LIBS" LIBS="$LIBS $KRB5LIBS"
AC_CHECK_FUNCS([add_to_error_table add_error_table krb5_princ_size krb5_principal_get_comp_string]) AC_CHECK_FUNCS([add_to_error_table add_error_table krb5_princ_size krb5_principal_get_comp_string encode_krb5_enc_tkt_part encode_krb5_ticket])
AC_CHECK_FUNCS([krb5_524_convert_creds], , AC_CHECK_FUNCS([krb5_524_convert_creds], ,
[AC_CHECK_FUNCS([krb524_convert_creds_kdc], , [AC_CHECK_FUNCS([krb524_convert_creds_kdc], ,
[AC_CHECK_LIB([krb524], [krb524_convert_creds_kdc], [AC_CHECK_LIB([krb524], [krb524_convert_creds_kdc],

2
src/cf/osconf.m4
View File

@ -461,6 +461,7 @@ case $AFS_SYSNAME in
EXTRA_VLIBOBJS="fstab.o" EXTRA_VLIBOBJS="fstab.o"
SHLIB_LINKER="${MT_CC} -dynamiclib" SHLIB_LINKER="${MT_CC} -dynamiclib"
SHLIB_SUFFIX="dylib" SHLIB_SUFFIX="dylib"
RANLIB="ranlib -c"
;; ;;
*_darwin_90) *_darwin_90)
@ -478,6 +479,7 @@ case $AFS_SYSNAME in
EXTRA_VLIBOBJS="fstab.o" EXTRA_VLIBOBJS="fstab.o"
SHLIB_LINKER="${MT_CC} -dynamiclib" SHLIB_LINKER="${MT_CC} -dynamiclib"
SHLIB_SUFFIX="dylib" SHLIB_SUFFIX="dylib"
RANLIB="ranlib -c"
;; ;;
ppc_linux*) ppc_linux*)