[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  20f843b... s3-waf: more work on krb5 build.
       via  eb6d611... s3-waf: Allow to build with kerberos support
       via  229b090... s3-lanman: remove defines now provided by IDL.
       via  dd05e17... rap: fix typo in IDL.
      from  dc01465... s3-waf: fix the build after chgpasswd.c changes.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 20f843b678ca93ae762e91969bb13fdb33db4a3f
Author: Günther Deschner <gd at samba.org>
Date:   Wed May 26 13:29:35 2010 +0200

    s3-waf: more work on krb5 build.
    
    Guenther

commit eb6d6114f31c5ef42f7573b94e9a522121a3f0a0
Author: Kai Blin <kai at samba.org>
Date:   Tue May 25 17:53:16 2010 +0200

    s3-waf: Allow to build with kerberos support

commit 229b090308d09e749f70155c798ae3826bf24164
Author: Günther Deschner <gd at samba.org>
Date:   Wed May 26 22:49:01 2010 +0200

    s3-lanman: remove defines now provided by IDL.
    
    Guenther

commit dd05e173a2001f5f59e6dfdbebf592dc1c64fc4d
Author: Günther Deschner <gd at samba.org>
Date:   Wed May 26 22:48:32 2010 +0200

    rap: fix typo in IDL.
    
    Guenther

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

Summary of changes:
 librpc/idl/rap.idl    |    2 +-
 source3/smbd/lanman.c |   10 ----------
 source3/wscript       |   39 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 11 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/idl/rap.idl b/librpc/idl/rap.idl
index 167e17a..e403e8c 100644
--- a/librpc/idl/rap.idl
+++ b/librpc/idl/rap.idl
@@ -780,7 +780,7 @@ interface rap
 	typedef [public] enum {
 		USER_PRIV_GUEST = 0,
 		USER_PRIV_USER	= 1,
-		USER_PRV_ADMIN	= 2
+		USER_PRIV_ADMIN	= 2
 	} rap_UserPriv;
 
 	typedef struct {
diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c
index 8c4d60c..871e2b7 100644
--- a/source3/smbd/lanman.c
+++ b/source3/smbd/lanman.c
@@ -4010,16 +4010,6 @@ There is no auxiliary data in the response.
 #define usri11_code_page      84
 #define usri11_end            86
 
-#define USER_PRIV_GUEST 0
-#define USER_PRIV_USER 1
-#define USER_PRIV_ADMIN 2
-
-#define AF_OP_PRINT     0 
-#define AF_OP_COMM      1
-#define AF_OP_SERVER    2
-#define AF_OP_ACCOUNTS  3
-
-
 static bool api_RNetUserGetInfo(connection_struct *conn, uint16 vuid,
 				char *param, int tpscnt,
 				char *data, int tdscnt,
diff --git a/source3/wscript b/source3/wscript
index 166f7c5..3bc9bd1 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -426,6 +426,45 @@ krb5_get_credentials_for_user krb5_get_host_realm krb5_free_host_realm''',
                             krb5_auth_con_set_req_cksumtype''',
                             headers='krb5.h', always=True)
         conf.CHECK_VARIABLE('AP_OPTS_USE_SUBKEY', headers='krb5.h')
+        conf.CHECK_VARIABLE('KV5M_KEYTAB', headers='krb5.h')
+        conf.CHECK_VARIABLE('KRB5_KU_OTHER_CKSUM', headers='krb5.h')
+        conf.CHECK_VARIABLE('KRB5_KEYUSAGE_APP_DATA_CKSUM', headers='krb5.h')
+        conf.CHECK_STRUCTURE_MEMBER('krb5_keytab_entry', 'key', headers='krb5.h',
+                                    define='HAVE_KRB5_KEYTAB_ENTRY_KEY')
+        conf.CHECK_STRUCTURE_MEMBER('krb5_keytab_entry', 'keyblock', headers='krb5.h',
+                                    define='HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK')
+        conf.CHECK_STRUCTURE_MEMBER('krb5_address', 'magic', headers='krb5.h',
+                                    define='HAVE_MAGIC_IN_KRB5_ADDRESS')
+        conf.CHECK_STRUCTURE_MEMBER('krb5_address', 'addrtype', headers='krb5.h',
+                                    define='HAVE_ADDRTYPE_IN_KRB5_ADDRESS')
+        conf.CHECK_STRUCTURE_MEMBER('krb5_ticket', 'enc_part2', headers='krb5.h',
+                                    define='HAVE_KRB5_TKT_ENC_PART2')
+        conf.CHECK_STRUCTURE_MEMBER('krb5_creds', 'keyblock', headers='krb5.h',
+                                    define='HAVE_KRB5_KEYBLOCK_IN_CREDS')
+        conf.CHECK_STRUCTURE_MEMBER('krb5_creds', 'session', headers='krb5.h',
+                                    define='HAVE_KRB5_SESSION_IN_CREDS')
+        conf.CHECK_TYPE('krb5_encrypt_block', headers='krb5.h')
+        conf.CHECK_CODE('''
+krb5_context ctx;
+krb5_get_init_creds_opt *opt = NULL;
+krb5_get_init_creds_opt_free(ctx, opt);
+''',
+                        'KRB5_CREDS_OPT_FREE_REQUIRES_CONTEXT',
+                        headers='krb5.h', link=False,
+                        msg="Checking whether krb5_get_init_creds_opt_free takes a context argument")
+        conf.CHECK_CODE('krb5_mk_error(0,0,0)',
+                        'HAVE_SHORT_KRB5_MK_ERROR_INTERFACE',
+                        headers='krb5.h', link=False,
+                        msg="Checking whether krb5_mk_error takes 3 arguments MIT or 9 Heimdal")
+        conf.CHECK_CODE('''
+const krb5_data *pkdata;
+krb5_context context;
+krb5_principal principal;
+pkdata = krb5_princ_component(context, principal, 0);
+''',
+                        'HAVE_KRB5_PRINC_COMPONENT',
+                        headers='krb5.h', lib='krb5',
+                        msg="Checking whether krb5_princ_component is available")
 
     else:
         conf.SET_TARGET_TYPE('krb5', 'EMPTY')


-- 
Samba Shared Repository