diff -ur GSSAPI-0.13/GSSAPI.xs GSSAPI-0.13.vas/GSSAPI.xs --- GSSAPI-0.13/GSSAPI.xs 2001-11-07 03:59:13.000000000 +1000 +++ GSSAPI-0.13.vas/GSSAPI.xs 2005-11-21 15:54:17.000000000 +1000 @@ -3,8 +3,10 @@ #include "XSUB.h" /* #include "/src/admin/kerberos/krb5-1.2.1-local/src/lib/gssapi/krb5/gssapiP_krb5.h" */ -#include -#include +#include +#include + +#define gss_release_oid(m,o) 0 static double constant_GSS_S_NO(char *name, int len, int arg) @@ -1280,15 +1282,18 @@ typedef void * GSSAPI_obj; - int oid_set_is_dynamic(GSSAPI__OID__Set oidset) { +#if 0 return (oidset != (gss_OID_set)gss_mech_set_krb5 && oidset != (gss_OID_set)gss_mech_set_krb5_old && oidset != (gss_OID_set)gss_mech_set_krb5_both && oidset != (gss_OID_set)gss_mech_set_krb5_v2 && oidset != (gss_OID_set)gss_mech_set_krb5_v1v2); +#else + return 1; +#endif } diff -ur GSSAPI-0.13/Makefile.PL GSSAPI-0.13.vas/Makefile.PL --- GSSAPI-0.13/Makefile.PL 2000-08-28 12:51:34.000000000 +1000 +++ GSSAPI-0.13.vas/Makefile.PL 2005-11-21 15:49:46.000000000 +1000 @@ -10,15 +10,19 @@ close(MANIFEST); +$vasLIB=`/opt/vintela/vas/bin/vas-config --libs`; +$vasINC=`/opt/vintela/vas/bin/vas-config --cflags`; WriteMakefile( 'NAME' => 'GSSAPI', 'VERSION_FROM' => 'GSSAPI.pm', # finds $VERSION 'PREREQ_PM' => {}, # e.g., Module::Name => 1.1 - 'LIBS' => ['-L/usr/local/lib -lgssapi_krb5'], # e.g., '-lm' + 'LIBS' => $vasLIB, + 'LDDLFLAGS' => '', 'DEFINE' => '', # e.g., '-DHAVE_SOMETHING' - 'INC' => '', # e.g., '-I/usr/include/other' + 'INC' => $vasINC, 'macro' => { OTHER_XS => $otherxs }, 'depend' => { 'GSSAPI.c' => '$(OTHER_XS)' }, + 'dynamic_lib' => { 'OTHERLDFLAGS' => $vasLIB }, ); Only in GSSAPI-0.13.vas: Makefile.old Only in GSSAPI-0.13.vas: vas.patch diff -ur GSSAPI-0.13/xs/OID.xs GSSAPI-0.13.vas/xs/OID.xs --- GSSAPI-0.13/xs/OID.xs 2000-08-29 09:23:31.000000000 +1000 +++ GSSAPI-0.13.vas/xs/OID.xs 2005-11-21 15:46:46.000000000 +1000 @@ -61,46 +61,45 @@ GSSAPI::OID_const gss_nt_user_name() CODE: - RETVAL = gss_nt_user_name; + RETVAL = GSS_C_NT_USER_NAME; OUTPUT: RETVAL GSSAPI::OID_const gss_nt_machine_uid_name() CODE: - RETVAL = gss_nt_machine_uid_name; + RETVAL = GSS_C_NT_MACHINE_UID_NAME; OUTPUT: RETVAL GSSAPI::OID_const gss_nt_string_uid_name() CODE: - RETVAL = gss_nt_string_uid_name; + RETVAL = GSS_C_NT_STRING_UID_NAME; OUTPUT: RETVAL GSSAPI::OID_const -gss_nt_service_name() +gss_nt_hostbased_service() CODE: - RETVAL = gss_nt_service_name; + RETVAL = GSS_C_NT_HOSTBASED_SERVICE; OUTPUT: RETVAL GSSAPI::OID_const -gss_nt_exported_name() +gss_nt_anonymous() CODE: - RETVAL = gss_nt_exported_name; + RETVAL = GSS_C_NT_ANONYMOUS; OUTPUT: RETVAL GSSAPI::OID_const -gss_nt_service_name_v2() +gss_nt_exported_name() CODE: - RETVAL = gss_nt_service_name_v2; + RETVAL = GSS_C_NT_EXPORT_NAME; OUTPUT: RETVAL - # # Kerberos OIDs # @@ -108,34 +107,20 @@ GSSAPI::OID_const gss_nt_krb5_name() CODE: - RETVAL = gss_nt_krb5_name; + RETVAL = GSS_KRB5_NT_USER_NAME; OUTPUT: RETVAL GSSAPI::OID_const gss_nt_krb5_principal() CODE: - RETVAL = gss_nt_krb5_principal; + RETVAL = GSS_KRB5_NT_PRINCIPAL_NAME; OUTPUT: RETVAL GSSAPI::OID_const gss_mech_krb5() CODE: - RETVAL = gss_mech_krb5; - OUTPUT: - RETVAL - -GSSAPI::OID_const -gss_mech_krb5_old() - CODE: - RETVAL = gss_mech_krb5_old; - OUTPUT: - RETVAL - -GSSAPI::OID_const -gss_mech_krb5_v2() - CODE: - RETVAL = gss_mech_krb5_v2; + RETVAL = GSS_KRB5_MECHANISM; OUTPUT: RETVAL diff -ur GSSAPI-0.13/xs/OID__Set.xs GSSAPI-0.13.vas/xs/OID__Set.xs --- GSSAPI-0.13/xs/OID__Set.xs 2000-08-29 09:23:31.000000000 +1000 +++ GSSAPI-0.13.vas/xs/OID__Set.xs 2005-11-21 15:39:30.000000000 +1000 @@ -44,7 +44,7 @@ RETVAL isthere - +#if 0 # # Kerberos OID_sets # @@ -84,3 +84,4 @@ OUTPUT: RETVAL +#endif