Author: jra Date: 2007-03-15 20:45:27 +0000 (Thu, 15 Mar 2007) New Revision: 21846
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21846 Log: Try and fix the Darwin build which seems to have a strange krb5. Jeremy. Modified: branches/SAMBA_3_0/source/libsmb/clikrb5.c branches/SAMBA_3_0_25/source/libsmb/clikrb5.c Changeset: Modified: branches/SAMBA_3_0/source/libsmb/clikrb5.c =================================================================== --- branches/SAMBA_3_0/source/libsmb/clikrb5.c 2007-03-15 19:18:18 UTC (rev 21845) +++ branches/SAMBA_3_0/source/libsmb/clikrb5.c 2007-03-15 20:45:27 UTC (rev 21846) @@ -1449,7 +1449,13 @@ memset(&e, 0, sizeof(e)); krb5_us_timeofday(context, &e.stime, &e.susec); e.server = server; +#if defined(krb5_err_base) e.error = error_code - krb5_err_base; +#elif defined(ERROR_TABLE_BASE_krb5) + e.error = error_code - ERROR_TABLE_BASE_krb5; +#else + e.error = error_code; /* Almost certainly wrong, but what can we do... ? */ +#endif return krb5_mk_error(context, &e, reply); #else /* Heimdal. */ Modified: branches/SAMBA_3_0_25/source/libsmb/clikrb5.c =================================================================== --- branches/SAMBA_3_0_25/source/libsmb/clikrb5.c 2007-03-15 19:18:18 UTC (rev 21845) +++ branches/SAMBA_3_0_25/source/libsmb/clikrb5.c 2007-03-15 20:45:27 UTC (rev 21846) @@ -1432,7 +1432,13 @@ memset(&e, 0, sizeof(e)); krb5_us_timeofday(context, &e.stime, &e.susec); e.server = server; +#if defined(krb5_err_base) e.error = error_code - krb5_err_base; +#elif defined(ERROR_TABLE_BASE_krb5) + e.error = error_code - ERROR_TABLE_BASE_krb5; +#else + e.error = error_code; /* Almost certainly wrong, but what can we do... ? */ +#endif return krb5_mk_error(context, &e, reply); #else /* Heimdal. */
