svn commit: samba r22939 - in branches/SAMBA_3_0_26/source/include: .

[gd at samba.org]

Author: gd
Date: 2007-05-16 13:43:01 +0000 (Wed, 16 May 2007)
New Revision: 22939

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22939

Log:
Merge -r22468 from 3_0.

Guenther

Modified:
   branches/SAMBA_3_0_26/source/include/includes.h


Changeset:
Modified: branches/SAMBA_3_0_26/source/include/includes.h
===================================================================
--- branches/SAMBA_3_0_26/source/include/includes.h	2007-05-16 13:35:26 UTC (rev 22938)
+++ branches/SAMBA_3_0_26/source/include/includes.h	2007-05-16 13:43:01 UTC (rev 22939)
@@ -1107,9 +1107,7 @@
 krb5_error_code krb5_set_real_time(krb5_context context, int32_t seconds, int32_t microseconds);
 #endif
 
-#ifndef HAVE_KRB5_SET_DEFAULT_TGS_KTYPES
 krb5_error_code krb5_set_default_tgs_ktypes(krb5_context ctx, const krb5_enctype *enc);
-#endif
 
 #if defined(HAVE_KRB5_AUTH_CON_SETKEY) && !defined(HAVE_KRB5_AUTH_CON_SETUSERUSERKEY)
 krb5_error_code krb5_auth_con_setuseruserkey(krb5_context context, krb5_auth_context auth_context, krb5_keyblock *keyblock);