[SCM] Samba Shared Repository - branch master updated

Günther Deschner gd at samba.org
Fri Jan 13 03:16:04 MST 2012


The branch, master has been updated
       via  1bbcc65 s3-waf: check for KRB5_PDU_NONE as in the autoconf build.
       via  07664f9 s3-autoconf: fix the build of the pdb_ldap shared module in autoconf build as well.
       via  91c04ea s3-waf: fix compile of pdb_ldap as shared module by moving ldap schema helpers to libpdb.so
       via  31d9b24 s3-waf: also check for gsskrb5_extract_authz_data_from_sec_context() during configure.
      from  342be28 s3:build: add auth/gensec/spnego.o

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


- Log -----------------------------------------------------------------
commit 1bbcc65399fffc962066c087fcad7d5b3a4811dd
Author: Günther Deschner <gd at samba.org>
Date:   Thu Jan 12 16:29:39 2012 +0100

    s3-waf: check for KRB5_PDU_NONE as in the autoconf build.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Fri Jan 13 11:15:35 CET 2012 on sn-devel-104

commit 07664f9a99e646948e3aafe2f667b838eceedda2
Author: Günther Deschner <gd at samba.org>
Date:   Thu Jan 12 15:08:34 2012 +0100

    s3-autoconf: fix the build of the pdb_ldap shared module in autoconf build as well.
    
    Guenther

commit 91c04ea04fd11eb82866336a9cedbcd45e8e87b6
Author: Günther Deschner <gd at samba.org>
Date:   Thu Jan 12 15:06:25 2012 +0100

    s3-waf: fix compile of pdb_ldap as shared module by moving ldap schema helpers to libpdb.so
    
    These helpers are used in other parts of Samba as well (like in idmap and in the
    net provision code).
    
    Guenther

commit 31d9b24eef6a7f7d1e5d97351df9bbab65fa0ef1
Author: Günther Deschner <gd at samba.org>
Date:   Thu Jan 12 14:27:10 2012 +0100

    s3-waf: also check for gsskrb5_extract_authz_data_from_sec_context() during
    configure.
    
    Guenther

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

Summary of changes:
 source3/Makefile.in          |    7 +++----
 source3/configure.in         |    2 +-
 source3/passdb/wscript_build |    2 +-
 source3/wscript              |    4 +++-
 source3/wscript_build        |    3 ++-
 5 files changed, 10 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 96c58c8..810fdaf 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -808,7 +808,7 @@ PASSDB_OBJ = $(PASSDB_GET_SET_OBJ) passdb/passdb.o passdb/pdb_interface.o \
 		passdb/login_cache.o @PDB_STATIC@ \
 		passdb/account_pol.o $(PRIVILEGES_OBJ) \
 		lib/util_nscd.o lib/winbind_util.o $(SERVER_MUTEX_OBJ) \
-		passdb/pdb_util.o
+		passdb/pdb_util.o passdb/pdb_ldap_schema.o
 
 DEVEL_HELP_WEIRD_OBJ = ../lib/util/charset/weird.o
 CHARSET_MACOSXFS_OBJ = ../lib/util/charset/charset_macosxfs.o
@@ -2854,11 +2854,10 @@ bin/sam. at SHLIBEXT@: $(BINARY_PREREQS) $(AUTH_SAM_OBJ)
 	@$(SHLD_MODULE) $(AUTH_SAM_OBJ)
 
 bin/ldapsam. at SHLIBEXT@: $(BINARY_PREREQS) passdb/pdb_ldap.o passdb/pdb_nds.o \
-			passdb/pdb_ipa.o passdb/pdb_ldap_util.o \
-	passdb/pdb_ldap_schema.o
+			passdb/pdb_ipa.o passdb/pdb_ldap_util.o
 	@echo "Building plugin $@"
 	@$(SHLD_MODULE) passdb/pdb_ldap.o passdb/pdb_nds.o passdb/pdb_ipa.o \
-			passdb/pdb_ldap_util.o passdb/pdb_ldap_schema.o $(LDAP_LIBS)
+			passdb/pdb_ldap_util.o $(LDAP_LIBS)
 
 bin/ads. at SHLIBEXT@: $(BINARY_PREREQS) passdb/pdb_ads.o
 	@echo "Building plugin $@"
diff --git a/source3/configure.in b/source3/configure.in
index e59d1e5..61ae567 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6957,7 +6957,7 @@ if test x"$MODULE_DEFAULT_vfs_notify_fam" = xSTATIC -o \
 	AC_SUBST(SMBD_FAM_LIBS)
 fi
 
-SMB_MODULE(pdb_ldap, passdb/pdb_ldap.o passdb/pdb_nds.o passdb/pdb_ipa.o passdb/pdb_ldap_util.o passdb/pdb_ldap_schema.o,
+SMB_MODULE(pdb_ldap, passdb/pdb_ldap.o passdb/pdb_nds.o passdb/pdb_ipa.o passdb/pdb_ldap_util.o,
 		   "bin/ldapsam.$SHLIBEXT", PDB,
 		   [ PASSDB_LIBS="$PASSDB_LIBS $LDAP_LIBS" ] )
 SMB_MODULE(pdb_ads, passdb/pdb_ads.o \$(TLDAP_OBJ), "bin/ads.$SHLIBEXT", PDB)
diff --git a/source3/passdb/wscript_build b/source3/passdb/wscript_build
index dbf9707..662cfd2 100644
--- a/source3/passdb/wscript_build
+++ b/source3/passdb/wscript_build
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 PDB_TDBSAM_SRC =    'pdb_tdb.c'
-PDB_LDAP_SRC =      'pdb_ldap.c pdb_nds.c pdb_ipa.c pdb_ldap_util.c pdb_ldap_schema.c'
+PDB_LDAP_SRC =      'pdb_ldap.c pdb_nds.c pdb_ipa.c pdb_ldap_util.c'
 PDB_ADS_SRC =       'pdb_ads.c'
 PDB_SMBPASSWD_SRC = 'pdb_smbpasswd.c'
 PDB_WBC_SAM_SRC =   'pdb_wbc_sam.c'
diff --git a/source3/wscript b/source3/wscript
index 3eafc2d..1a5a5c4 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -570,7 +570,8 @@ msg.msg_acctrightslen = sizeof(fd);
         if conf.CHECK_FUNCS_IN('gss_display_status', 'gssapi') or \
            conf.CHECK_FUNCS_IN('gss_display_status', 'gssapi_krb5'):
             have_gssapi=True
-        conf.CHECK_FUNCS_IN('gss_wrap_iov gss_krb5_import_cred gss_get_name_attribute gss_mech_krb5 gss_oid_equal gss_inquire_sec_context_by_oid', 'gssapi gssapi_krb5 krb5')
+        conf.CHECK_FUNCS_IN('''gss_wrap_iov gss_krb5_import_cred gss_get_name_attribute gss_mech_krb5 gss_oid_equal
+gss_inquire_sec_context_by_oid gsskrb5_extract_authz_data_from_sec_context''', 'gssapi gssapi_krb5 krb5')
         conf.CHECK_FUNCS_IN('krb5_mk_req_extended krb5_kt_compare', 'krb5')
         conf.CHECK_FUNCS('''
 krb5_set_default_in_tkt_etypes krb5_set_default_tgs_enctypes
@@ -600,6 +601,7 @@ krb5_get_credentials_for_user krb5_get_host_realm krb5_free_host_realm''',
         conf.CHECK_VARIABLE('KRB5_KEYUSAGE_APP_DATA_CKSUM', headers='krb5.h')
 	conf.CHECK_VARIABLE('ENCTYPE_AES128_CTS_HMAC_SHA1_96', headers='krb5.h')
 	conf.CHECK_VARIABLE('ENCTYPE_AES256_CTS_HMAC_SHA1_96', headers='krb5.h')
+	conf.CHECK_DECLS('KRB5_PDU_NONE', reverse=True, 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',
diff --git a/source3/wscript_build b/source3/wscript_build
index bddca32..f1787ab 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -230,7 +230,8 @@ PASSDB_SRC = '''${PASSDB_GET_SET_SRC} passdb/passdb.c
                 passdb/login_cache.c
                 passdb/account_pol.c ${PRIVILEGES_SRC}
                 lib/util_nscd.c lib/winbind_util.c ${SERVER_MUTEX_SRC}
-                passdb/pdb_util.c passdb/pdb_interface.c'''
+                passdb/pdb_util.c passdb/pdb_interface.c
+                passdb/pdb_ldap_schema.c'''
 #FIXME: lib/winbind_util.c probably is not part of PASSDB_SRC
 
 GROUPDB_SRC = '''groupdb/mapping.c groupdb/mapping_tdb.c'''


-- 
Samba Shared Repository


More information about the samba-cvs mailing list