[SCM] Samba Shared Repository - branch master updated
Günther Deschner
gd at samba.org
Wed Dec 1 11:36:01 MST 2010
The branch, master has been updated
via 71e2d9e s3-waf: more krb5 configure checks.
via 4c2ef4f s3-waf: add configure check for dirfd and build vfs_syncops vfs_dirsort if possible.
via a699729 s3-waf: add idmap_ldap to default static module list.
via 651a15d s3-waf: align some krb5/gssapi configure checks with classic build.
from 133a2ff s3-waf: avoid module name uppercasing.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 71e2d9e7e825e57e8240d61ed1091edca0089ed5
Author: Günther Deschner <gd at samba.org>
Date: Wed Dec 1 15:04:55 2010 +0100
s3-waf: more krb5 configure checks.
Guenther
Autobuild-User: Günther Deschner <gd at samba.org>
Autobuild-Date: Wed Dec 1 19:35:50 CET 2010 on sn-devel-104
commit 4c2ef4ffaa8846fa941037f6cbaf35c85d4b7327
Author: Günther Deschner <gd at samba.org>
Date: Wed Dec 1 13:24:55 2010 +0100
s3-waf: add configure check for dirfd and build vfs_syncops vfs_dirsort if possible.
Guenther
commit a69972944768cdb5a3fcfcfd7c37099241b0e127
Author: Günther Deschner <gd at samba.org>
Date: Wed Dec 1 13:02:15 2010 +0100
s3-waf: add idmap_ldap to default static module list.
Guenther
commit 651a15d2521a55cb69d5f8d35c8f6840f8a297c5
Author: Günther Deschner <gd at samba.org>
Date: Wed Dec 1 12:48:15 2010 +0100
s3-waf: align some krb5/gssapi configure checks with classic build.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source3/wscript | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/wscript b/source3/wscript
index 2556ed6..709651f 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -318,13 +318,15 @@ return acl_get_perm_np(permset_d, perm);
conf.SET_TARGET_TYPE('acl', 'EMPTY')
conf.SET_TARGET_TYPE('attr', 'EMPTY')
+ if conf.CHECK_FUNCS('dirfd'):
+ conf.DEFINE('HAVE_DIRFD_DECL', 1)
default_static_modules=TO_LIST('''pdb_smbpasswd pdb_tdbsam pdb_wbc_sam pdb_ldap rpc_lsarpc rpc_samr
rpc_winreg rpc_initshutdown rpc_dssetup rpc_wkssvc rpc_svcctl
rpc_ntsvcs rpc_netlogon rpc_netdfs rpc_srvsvc rpc_spoolss
rpc_eventlog auth_sam auth_unix auth_winbind auth_wbc auth_server
auth_domain auth_builtin auth_netlogond vfs_default
- nss_info_template idmap_tdb idmap_passdb
+ nss_info_template idmap_ldap idmap_tdb idmap_passdb
idmap_nss''')
default_shared_modules=TO_LIST('''vfs_recycle vfs_audit vfs_extd_audit vfs_full_audit vfs_netatalk
@@ -343,6 +345,9 @@ return acl_get_perm_np(permset_d, perm);
if Options.options.with_acl_support:
default_static_modules.extend(TO_LIST('vfs_posixacl'))
+ if conf.CONFIG_SET('HAVE_DIRFD_DECL'):
+ default_shared_modules.extend(TO_LIST('vfs_syncops vfs_dirsort'))
+
explicit_shared_modules = TO_LIST(Options.options.shared_modules, delimiter=',')
explicit_static_modules = TO_LIST(Options.options.static_modules, delimiter=',')
@@ -511,7 +516,7 @@ return acl_get_perm_np(permset_d, perm);
conf.check_cfg(path="krb5-config", args="--cflags --libs",
package="gssapi", uselib_store="krb5")
conf.CHECK_HEADERS('krb5.h krb5/locate_plugin.h', lib='krb5')
- conf.CHECK_HEADERS('gssapi.h gssapi/gssapi_generic.h gssapi/gssapi.h com_err.h', lib='krb5')
+ conf.CHECK_HEADERS('gssapi.h gssapi/gssapi_generic.h gssapi/gssapi.h gssapi/gssapi_ext.h com_err.h', lib='krb5')
if conf.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'):
conf.env['WINBIND_KRB5_LOCATOR'] = 'bin/winbind_krb5_locator.so'
@@ -523,6 +528,7 @@ return acl_get_perm_np(permset_d, perm);
conf.CHECK_FUNCS_IN('roken_getaddrinfo_hostspec', 'roken')
if conf.CHECK_FUNCS_IN('gss_display_status', 'gssapi gssapi_krb5'):
conf.DEFINE('HAVE_GSSAPI', '1')
+ conf.CHECK_FUNCS_IN('gss_wrap_iov', 'gssapi gssapi_krb5 krb5')
conf.CHECK_FUNCS_IN('krb5_mk_req_extended krb5_kt_compare', 'krb5')
conf.CHECK_FUNCS('''
krb5_set_real_time krb5_set_default_in_tkt_etypes krb5_set_default_tgs_enctypes
@@ -564,6 +570,11 @@ 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_context ctx;
@@ -610,6 +621,25 @@ return 0;
headers='krb5.h stdlib.h', lib='krb5',
addmain=False, cflags='-Werror',
msg="Checking whether krb5_enctype_to_string takes krb5_context argument")
+ conf.CHECK_CODE('''
+int main(void) {
+krb5_context ctx = NULL;
+krb5_principal princ = NULL;
+const char *str = krb5_princ_realm(ctx, princ)->data;
+return 0;
+}''',
+ 'HAVE_KRB5_PRINC_REALM',
+ headers='krb5.h', lib='krb5',
+ addmain=False,
+ msg="Checking whether the macro krb5_princ_realm is defined")
+ if conf.CHECK_CODE('''krb5_verify_checksum(0, 0, 0, 0, 0, 0, 0);''',
+ 'KRB5_VERIFY_CHECKSUM_ARGS',
+ headers='krb5.h', lib='krb5',
+ msg="Checking whether krb5_verify_checksum takes 7 arguments"):
+ conf.DEFINE('KRB5_VERIFY_CHECKSUM_ARGS', '7')
+ else:
+ conf.DEFINE('KRB5_VERIFY_CHECKSUM_ARGS', '6')
+
conf.DEFINE('HAVE_KRB5', '1')
else:
--
Samba Shared Repository
More information about the samba-cvs
mailing list