[SCM] Samba Shared Repository - branch master updated
Andrew Tridgell
tridge at samba.org
Tue Nov 23 17:03:01 MST 2010
The branch, master has been updated
via 1f478af s4-devel: we don't need to override these scripts now
via 57f9de0 s3-torture: remove the merged_build tests for building smbtorture4
via 93d311c s4-dynconfig: override more paths when running from the build directory
via 5d014ca s4-kcc: disable the NDR printing of DRS getinfo requests
from 6af05f1 Fix bug #7812 - vfs_acl_xattr/vfs_acl_tdb: ACL inheritance cannot be disabled
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 1f478afe22c5dc68d7a69e4127c3a8cd6dca1def
Author: Andrew Tridgell <tridge at samba.org>
Date: Wed Nov 24 10:11:14 2010 +1100
s4-devel: we don't need to override these scripts now
Autobuild-User: Andrew Tridgell <tridge at samba.org>
Autobuild-Date: Wed Nov 24 01:02:43 CET 2010 on sn-devel-104
commit 57f9de012e891feb75b40a58d16cf0f63fd158c1
Author: Andrew Tridgell <tridge at samba.org>
Date: Wed Nov 24 10:06:38 2010 +1100
s3-torture: remove the merged_build tests for building smbtorture4
s3 now builds smbtorture4 if the required packages (perl, python, ads)
are available. This should ensure that smbtorture4 is built in the
build farm when possible
commit 93d311c07e0b38193f823515b068e87dec144312
Author: Andrew Tridgell <tridge at samba.org>
Date: Tue Nov 23 22:44:53 2010 +1100
s4-dynconfig: override more paths when running from the build directory
this ensures consistency between binaries and scripts when testing as
a developer
commit 5d014cad087baf4d40af58cec2b6b875356e8548
Author: Andrew Tridgell <tridge at samba.org>
Date: Tue Nov 23 22:43:33 2010 +1100
s4-kcc: disable the NDR printing of DRS getinfo requests
-----------------------------------------------------------------------
Summary of changes:
source3/configure.in | 33 +++++-------------------------
source4/dsdb/kcc/kcc_drs_replica_info.c | 4 +++
source4/dynconfig/dynconfig.c | 1 +
source4/dynconfig/dynconfig.h | 1 +
source4/dynconfig/wscript | 17 ++++++++++-----
source4/param/loadparm.c | 6 ++--
source4/scripting/devel/config_base | 2 -
7 files changed, 26 insertions(+), 38 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/configure.in b/source3/configure.in
index f5a39ad..011bd1a 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -197,7 +197,7 @@ AC_ARG_WITH(profiling-data,
)
dnl Checks for programs.
-merged_build_possible=yes
+smbtorture4_possible=yes
AC_PROG_INSTALL
AC_PROG_AWK
@@ -207,11 +207,11 @@ AC_SAMBA_GNU_MAKE([true], [true])
# Check for perl
m4_include(../m4/check_perl.m4)
-AC_SAMBA_PERL([true], [merged_build_possible=no])
+AC_SAMBA_PERL([true], [smbtorture4_possible=no])
# Check for python
m4_include(../m4/check_python.m4)
-AC_SAMBA_PYTHON_DEVEL([true], [merged_build_possible=no])
+AC_SAMBA_PYTHON_DEVEL([true], [smbtorture4_possible=no])
AC_CHECK_TOOL(AR, ar)
@@ -1986,7 +1986,7 @@ if test x"$BLDSHARED" != x"true"; then
SHLD="shared-libraries-disabled"
PICFLAG="${PIE_CFLAGS}"
SHLIBEXT="shared_libraries_disabled"
- merged_build_possible=no
+ smbtorture4_possible=no
fi
AC_MSG_CHECKING([used PICFLAG])
@@ -4408,7 +4408,7 @@ LIBS="$ac_save_LIBS"
fi
if test x"$use_ads" != xyes; then
- merged_build_possible=no
+ smbtorture4_possible=no
fi
AC_CHECK_LIB_EXT(nscd, NSCD_LIBS, nscd_flush_cache)
@@ -6896,30 +6896,9 @@ MSG
fi
-AC_ARG_ENABLE(merged-build,
-[AS_HELP_STRING([--enable-merged-build], [Build Samba 4 as well])],
-[ enable_merged_build=$enableval ], [ enable_merged_build=auto ])
-
-if test x"$enable_merged_build" = x"yes" -a \
- x"$merged_build_possible" = x"no" ; then
- AC_MSG_ERROR(Merged build required but not possible)
-fi
-
m4_include(../lib/zlib/zlib.m4)
-if test x$enable_merged_build = xauto; then
-
- AC_MSG_CHECKING([whether it would be possible to do a merged build])
- AC_MSG_RESULT([$merged_build_possible])
-
- # Enable merged build automatically if possible, when in developer mode
- if test "x$developer" = xyes; then
- enable_merged_build=$merged_build_possible
- fi
-fi
-
-if test x$enable_merged_build = xyes; then
- MERGED_BUILD=1
+if test x$smbtorture4_possible = xyes; then
saved_USESHARED="$USESHARED"
USESHARED="false"
smbtorture4_path="bin/smbtorture4"
diff --git a/source4/dsdb/kcc/kcc_drs_replica_info.c b/source4/dsdb/kcc/kcc_drs_replica_info.c
index fab7202..e2e49b8 100644
--- a/source4/dsdb/kcc/kcc_drs_replica_info.c
+++ b/source4/dsdb/kcc/kcc_drs_replica_info.c
@@ -780,7 +780,9 @@ NTSTATUS kccdrs_replica_get_info(struct irpc_message *msg,
mem_ctx = talloc_new(msg);
NT_STATUS_HAVE_NO_MEMORY(mem_ctx);
+#if 0
NDR_PRINT_IN_DEBUG(drsuapi_DsReplicaGetInfo, req);
+#endif
/* check request version */
if (req->in.level != DRSUAPI_DS_REPLICA_GET_INFO &&
@@ -885,6 +887,8 @@ NTSTATUS kccdrs_replica_get_info(struct irpc_message *msg,
done:
/* put the status on the result field of the reply */
req->out.result = status;
+#if 0
NDR_PRINT_OUT_DEBUG(drsuapi_DsReplicaGetInfo, req);
+#endif
return NT_STATUS_OK;
}
diff --git a/source4/dynconfig/dynconfig.c b/source4/dynconfig/dynconfig.c
index 358874e..ac79141 100644
--- a/source4/dynconfig/dynconfig.c
+++ b/source4/dynconfig/dynconfig.c
@@ -66,6 +66,7 @@ const char *dyn_##name = name; \
/* these are in common with s3 */
DEFINE_DYN_CONFIG_PARAM(SBINDIR)
+DEFINE_DYN_CONFIG_PARAM(SCRIPTSBINDIR)
DEFINE_DYN_CONFIG_PARAM(BINDIR)
DEFINE_DYN_CONFIG_PARAM(SWATDIR)
DEFINE_DYN_CONFIG_PARAM(CONFIGFILE) /**< Location of smb.conf file. **/
diff --git a/source4/dynconfig/dynconfig.h b/source4/dynconfig/dynconfig.h
index 48f8ab6..48b4f54 100644
--- a/source4/dynconfig/dynconfig.h
+++ b/source4/dynconfig/dynconfig.h
@@ -26,6 +26,7 @@
extern const char *dyn_BINDIR;
extern const char *dyn_SBINDIR;
+extern const char *dyn_SCRIPTSBINDIR;
extern const char *dyn_CONFIGFILE;
extern const char *dyn_NCALRPCDIR;
extern const char *dyn_LOGFILEBASE;
diff --git a/source4/dynconfig/wscript b/source4/dynconfig/wscript
index d975698..375d4a1 100644
--- a/source4/dynconfig/wscript
+++ b/source4/dynconfig/wscript
@@ -17,6 +17,7 @@ dir_options = {
dyn_cflags = {
'BINDIR' : '${BINDIR}',
'SBINDIR' : '${SBINDIR}',
+ 'SCRIPTSBINDIR' : '${SBINDIR}',
'CONFIGDIR' : '${SYSCONFDIR}',
'CONFIGFILE' : '${SYSCONFDIR}/smb.conf',
'LMHOSTSFILE' : '${SYSCONFDIR}/lmhosts',
@@ -47,6 +48,7 @@ dyn_cflags = {
dyn_cflags_fhs = {
'BINDIR' : '${BINDIR}',
'SBINDIR' : '${SBINDIR}',
+ 'SCRIPTSBINDIR' : '${SBINDIR}',
'CONFIGDIR' : '${SYSCONFDIR}/samba',
'CONFIGFILE' : '${SYSCONFDIR}/samba/smb.conf',
'LMHOSTSFILE' : '${SYSCONFDIR}/samba/lmhosts',
@@ -119,15 +121,18 @@ def configure(conf):
def dynconfig_cflags(bld, list=None):
'''work out the extra CFLAGS for dynconfig.c'''
cflags = []
+ # override some paths when running from the build directory
+ override = { 'MODULESDIR' : 'bin/modules',
+ 'SCRIPTSBINDIR' : 'scripting/bin',
+ 'SETUPDIR' : 'setup' }
for f in dyn_cflags.keys():
if list and not f in list:
continue
- if not Options.is_install and f == 'MODULESDIR':
- # we want binaries run from the source dir to use the current
- # modules, not the installed ones
- cflags.append('-DMODULESDIR="%s"' % os.path.join(os.getcwd(), 'bin/modules'))
- else:
- cflags.append('-D%s="%s"' % (f, bld.env[f]))
+ value = bld.env[f]
+ if not Options.is_install:
+ if f in override:
+ value = os.path.join(os.getcwd(), override[f])
+ cflags.append('-D%s="%s"' % (f, value))
return cflags
Build.BuildContext.dynconfig_cflags = dynconfig_cflags
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index f60e4eb..f6f894d 100644
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -2456,14 +2456,14 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
lpcfg_do_global_parameter(lp_ctx, "tls certfile", "tls/cert.pem");
lpcfg_do_global_parameter(lp_ctx, "tls cafile", "tls/ca.pem");
lpcfg_do_global_parameter_var(lp_ctx, "setup directory", "%s",
- dyn_SETUPDIR);
+ dyn_SETUPDIR);
lpcfg_do_global_parameter(lp_ctx, "prefork children:smb", "4");
lpcfg_do_global_parameter(lp_ctx, "ntp signd socket directory", dyn_NTP_SIGND_SOCKET_DIR);
lpcfg_do_global_parameter(lp_ctx, "rndc command", "/usr/sbin/rndc");
- lpcfg_do_global_parameter_var(lp_ctx, "dns update command", "%s/samba_dnsupdate", dyn_SBINDIR);
- lpcfg_do_global_parameter_var(lp_ctx, "spn update command", "%s/samba_spnupdate", dyn_SBINDIR);
+ lpcfg_do_global_parameter_var(lp_ctx, "dns update command", "%s/samba_dnsupdate", dyn_SCRIPTSBINDIR);
+ lpcfg_do_global_parameter_var(lp_ctx, "spn update command", "%s/samba_spnupdate", dyn_SCRIPTSBINDIR);
lpcfg_do_global_parameter(lp_ctx, "nsupdate command", "/usr/bin/nsupdate -g");
for (i = 0; parm_table[i].label; i++) {
diff --git a/source4/scripting/devel/config_base b/source4/scripting/devel/config_base
index 2536065..9d5a12b 100755
--- a/source4/scripting/devel/config_base
+++ b/source4/scripting/devel/config_base
@@ -8,8 +8,6 @@
import sys, os
vars = {
- "dns update command" : "${PREFIX}/bin/samba_dnsupdate",
- "spn update command" : "${PREFIX}/bin/samba_spnupdate",
"ncalrpc dir" : "${PREFIX}/var/ncalrpc",
"private dir" : "${PREFIX}/private",
"lock dir" : "${PREFIX}/var/locks",
--
Samba Shared Repository
More information about the samba-cvs
mailing list