[SCM] Samba Shared Repository - branch v3-6-test updated

[Günther Deschner]

The branch, v3-6-test has been updated
       via  78688b2 s3-waf: add krb5 configure check for WRFILE_KEYTAB.
       via  1bab5af s3-waf: add krb5 configure checks for enctype 23.
       via  d53ffff s3-waf: more krb5 configure checks.
      from  9a04ae2 Replace lseek()/write()/lseek() triple with pwrite call. We already emulate this inside pwrite under the covers.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 78688b2c6041f858731956d7a5da839b67304917
Author: Günther Deschner <gd at samba.org>
Date:   Wed Dec 1 23:15:34 2010 +0100

    s3-waf: add krb5 configure check for WRFILE_KEYTAB.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Fri Dec  3 13:54:25 CET 2010 on sn-devel-104
    (cherry picked from commit 189b4bc1c27f0bfe08d86236ce20e281ff4215dd)

commit 1bab5afd213187dc1e85753ea0565aa7eaca2da5
Author: Günther Deschner <gd at samba.org>
Date:   Wed Dec 1 23:07:41 2010 +0100

    s3-waf: add krb5 configure checks for enctype 23.
    
    Guenther
    (cherry picked from commit 704f138b8e553de846e9d3d022d5ea26429a8e37)

commit d53ffff2ae37a93b3f31297e967e68debdc3febb
Author: Günther Deschner <gd at samba.org>
Date:   Wed Dec 1 21:26:29 2010 +0100

    s3-waf: more krb5 configure checks.
    
    Guenther
    (cherry picked from commit 5676acbb73270edb7ef6d7e0e64c2bc35b4ffd45)

-----------------------------------------------------------------------

Summary of changes:
 source3/wscript |   48 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 46 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/wscript b/source3/wscript
index 709651f..3354ec1 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -570,12 +570,21 @@ krb5_get_credentials_for_user krb5_get_host_realm krb5_free_host_realm''',
                                     define='HAVE_KRB5_KEYBLOCK_IN_CREDS')
         conf.CHECK_STRUCTURE_MEMBER('krb5_creds', 'session', headers='krb5.h',
                                     define='HAVE_KRB5_SESSION_IN_CREDS')
-        if conf.CHECK_STRUCTURE_MEMBER('krb5_ticket', 'enc_part.enctype', headers='krb5.h') and conf.CHECK_STRUCTURE_MEMBER('krb5_ticket', 'enc_part.kvno', headers='krb5.h'):
-            conf.DEFINE('KRB5_TICKET_HAS_KEYINFO', '1')
         conf.CHECK_STRUCTURE_MEMBER('krb5_ap_req', 'ticket', headers='krb5.h',
                                     define='HAVE_TICKET_POINTER_IN_KRB5_AP_REQ')
 
         conf.CHECK_TYPE('krb5_encrypt_block', headers='krb5.h')
+
+        conf.CHECK_CODE('''
+krb5_ticket ticket;
+krb5_kvno kvno;
+krb5_enctype enctype;
+enctype = ticket.enc_part.enctype;
+kvno = ticket.enc_part.kvno;
+''',
+                        'KRB5_TICKET_HAS_KEYINFO',
+                        headers='krb5.h', link=False,
+                        msg="Checking whether the krb5_ticket structure contains the kvno and enctype")
         conf.CHECK_CODE('''
 krb5_context ctx;
 krb5_get_init_creds_opt *opt = NULL;
@@ -640,6 +649,41 @@ return 0;
 	else:
             conf.DEFINE('KRB5_VERIFY_CHECKSUM_ARGS', '6')
 
+	conf.CHECK_CODE('''
+krb5_enctype enctype;
+enctype = ENCTYPE_ARCFOUR_HMAC_MD5;
+''',
+            '_HAVE_ENCTYPE_ARCFOUR_HMAC_MD5',
+            headers='krb5.h', lib='krb5',
+            msg="Checking whether the ENCTYPE_ARCFOUR_HMAC_MD5 key type definition is available");
+	conf.CHECK_CODE('''
+krb5_keytype keytype;
+keytype = KEYTYPE_ARCFOUR_56;
+''',
+            '_HAVE_KEYTYPE_ARCFOUR_56',
+            headers='krb5.h', lib='krb5',
+            msg="Checking whether the HAVE_KEYTYPE_ARCFOUR_56 key type definition is available");
+	if conf.CONFIG_SET('_HAVE_ENCTYPE_ARCFOUR_HMAC_MD5') and conf.CONFIG_SET('_HAVE_KEYTYPE_ARCFOUR_56'):
+            conf.DEFINE('HAVE_ENCTYPE_ARCFOUR_HMAC_MD5', '1')
+
+	conf.CHECK_CODE('''
+krb5_enctype enctype;
+enctype = ENCTYPE_ARCFOUR_HMAC;
+''',
+            'HAVE_ENCTYPE_ARCFOUR_HMAC',
+            headers='krb5.h', lib='krb5',
+            msg="Checking whether the ENCTYPE_ARCFOUR_HMAC key type definition is available");
+
+	conf.CHECK_CODE('''
+krb5_context context;
+krb5_keytab keytab;
+krb5_init_context(&context);
+return krb5_kt_resolve(context, "WRFILE:api", &keytab);
+''',
+            'HAVE_WRFILE_KEYTAB',
+            headers='krb5.h', lib='krb5', execute=True,
+            msg="Checking whether the WRFILE:-keytab is supported");
+
         conf.DEFINE('HAVE_KRB5', '1')
 
     else:


-- 
Samba Shared Repository