[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 8aab926 tevent: Fix a typo via 1cb16a0 s3: Fix a typo from d957fd5 selftest: Test both users created in plugin_s4_dc environment http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 8aab926c2804230b633e0eb29655f4e32226aa4f Author: Volker Lendecke v...@samba.org Date: Mon May 9 07:13:00 2011 +0200 tevent: Fix a typo Autobuild-User: Volker Lendecke vlen...@samba.org Autobuild-Date: Mon May 9 08:17:08 CEST 2011 on sn-devel-104 commit 1cb16a9ee0cd8c442d2b52031f69805b4b8c Author: Samba-JP oota rib...@samba.gr.jp Date: Mon May 9 07:12:25 2011 +0200 s3: Fix a typo --- Summary of changes: docs-xml/manpages-3/idmap_rid.8.xml |2 +- lib/tevent/tevent.h |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/manpages-3/idmap_rid.8.xml b/docs-xml/manpages-3/idmap_rid.8.xml index a2a1c58..2fb246f 100644 --- a/docs-xml/manpages-3/idmap_rid.8.xml +++ b/docs-xml/manpages-3/idmap_rid.8.xml @@ -28,7 +28,7 @@ Currently, there should to be an explicit idmap configuration for each domain that should use the idmap_rid backend, using disjoint ranges. One usually needs to define a writeable default idmap range, using - a backent like parametertdb/parameter or parameterldap/parameter + a backend like parametertdb/parameter or parameterldap/parameter that can create unix ids, in order to be able to map the BUILTIN sids and other domains, and also in order to be able to create group mappings. See the example below. diff --git a/lib/tevent/tevent.h b/lib/tevent/tevent.h index 665c491..f4eb60c 100644 --- a/lib/tevent/tevent.h +++ b/lib/tevent/tevent.h @@ -136,7 +136,7 @@ struct tevent_context *tevent_context_init_byname(TALLOC_CTX *mem_ctx, const cha const char **tevent_backend_list(TALLOC_CTX *mem_ctx); /** - * @brief Set the default tevent backent. + * @brief Set the default tevent backend. * * @param[in] backend The name of the backend to set. */ -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 14f9916 build: Remove --disable-s3build so we can rely on these
subsystems
via 7e8f086 s3-build: Move generated config.h and config.h.in to
include/autoconf
from 8aab926 tevent: Fix a typo
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 14f99167f600ae9a3351d4ff7d089e54ca3149ac
Author: Andrew Bartlett abart...@samba.org
Date: Mon May 9 11:00:18 2011 +0200
build: Remove --disable-s3build so we can rely on these subsystems
This will make it easier to write code that uses the whole codebase.
Andrew Bartlett
Autobuild-User: Andrew Bartlett abart...@samba.org
Autobuild-Date: Mon May 9 12:25:33 CEST 2011 on sn-devel-104
commit 7e8f086798c36f64581ed7444df535e85fa0b5af
Author: Andrew Bartlett abart...@samba.org
Date: Mon May 9 10:59:15 2011 +0200
s3-build: Move generated config.h and config.h.in to include/autoconf
This ensures that these are not found by the waf build, which causes
issues when the wrong config.h is used by the recursive smbtorture build
Andrew Bartlett
---
Summary of changes:
.gitignore|4 ++--
selftest/wscript |4 +---
source3/Makefile-smbtorture4 |2 +-
source3/Makefile.in | 10 +-
source3/configure.in |4 ++--
source3/include/autoconf/README |5 +
source3/script/mkbuildoptions.awk |2 +-
source4/librpc/wscript_build |7 +--
wscript | 11 +--
wscript_build |3 +--
10 files changed, 20 insertions(+), 32 deletions(-)
create mode 100644 source3/include/autoconf/README
Changeset truncated at 500 lines:
diff --git a/.gitignore b/.gitignore
index a8eacd5..383bb1e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,8 +71,8 @@ source3/exports/libtalloc.syms
source3/exports/libtdb.syms
source3/exports/libwbclient.syms
source3/include/build_env.h
-source3/include/config.h
-source3/include/config.h.in
+source3/include/autoconf/config.h
+source3/include/autoconf/config.h.in
source3/include/includes.h.gch
source3/include/stamp-h
source3/include/version.h
diff --git a/selftest/wscript b/selftest/wscript
index ce1be81..ab9f269 100644
--- a/selftest/wscript
+++ b/selftest/wscript
@@ -187,10 +187,8 @@ def cmd_testonly(opt):
if Options.options.TARGET:
env.SELFTEST_TARGET = Options.options.TARGET
-elif env.enable_s3build:
-env.SELFTEST_TARGET = samba
else:
-env.SELFTEST_TARGET = samba4
+env.SELFTEST_TARGET = samba
if env.SELFTEST_TARGET == samba4:
env.SELFTEST_DIR = ${srcdir}/source4/selftest
diff --git a/source3/Makefile-smbtorture4 b/source3/Makefile-smbtorture4
index 355c146..0dc4706 100644
--- a/source3/Makefile-smbtorture4
+++ b/source3/Makefile-smbtorture4
@@ -6,7 +6,7 @@ SAMBA4_BINARIES=smbtorture,ndrdump
samba4-configure:
@(cd .. \
CFLAGS='' $(WAF) reconfigure || \
- CFLAGS='' $(WAF) configure --enable-socket-wrapper
--enable-nss-wrapper --enable-uid-wrapper --nonshared-binary=$(SAMBA4_BINARIES)
--enable-auto-reconfigure --disable-s3build --enable-developer)
+ CFLAGS='' $(WAF) configure --enable-socket-wrapper
--enable-nss-wrapper --enable-uid-wrapper --nonshared-binary=$(SAMBA4_BINARIES)
--enable-auto-reconfigure --enable-developer)
.PHONY: samba4-configure
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 456d4f5..55a3201 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1766,16 +1766,16 @@ lib/version.o: lib/version.c include/version.h
echo $(COMPILE_CC_PATH) 12;\
$(COMPILE_CC_PATH) /dev/null 21
-smbd/build_options.o: smbd/build_options.c Makefile include/config.h
include/build_env.h include/proto.h
+smbd/build_options.o: smbd/build_options.c Makefile include/autoconf/config.h
include/build_env.h include/proto.h
@echo Compiling $*.c
@$(COMPILE_CC_PATH) exit 0;\
echo The following command failed: 12;\
echo $(COMPILE_CC_PATH) 12;\
$(COMPILE_CC_PATH) /dev/null 21
-smbd/build_options.c: include/config.h.in script/mkbuildoptions.awk
+smbd/build_options.c: include/autoconf/config.h.in script/mkbuildoptions.awk
@echo Generating $@
- @dir=smbd $(MAKEDIR) $(AWK) -f $(srcdir)/script/mkbuildoptions.awk
$(builddir)/smbd/build_options.c $(srcdir)/include/config.h.in
+ @dir=smbd $(MAKEDIR) $(AWK) -f $(srcdir)/script/mkbuildoptions.awk
$(builddir)/smbd/build_options.c $(srcdir)/include/autoconf/config.h.in
bin/.dummy:
@if (: $@ || : $@) /dev/null 21; then :; else \
@@ -3362,12 +3362,12 @@ realclean:: clean
distclean:: realclean
-rm -f
autobuild: intermittent test failure detected
The autobuild test system has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey/2011-05-09-1453/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2011-05-09-1453/samba3.stderr http://git.samba.org/autobuild.flakey/2011-05-09-1453/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2011-05-09-1453/samba4.stderr http://git.samba.org/autobuild.flakey/2011-05-09-1453/samba4.stdout The top commit at the time of the failure was: commit 14f99167f600ae9a3351d4ff7d089e54ca3149ac Author: Andrew Bartlett abart...@samba.org Date: Mon May 9 11:00:18 2011 +0200 build: Remove --disable-s3build so we can rely on these subsystems This will make it easier to write code that uses the whole codebase. Andrew Bartlett Autobuild-User: Andrew Bartlett abart...@samba.org Autobuild-Date: Mon May 9 12:25:33 CEST 2011 on sn-devel-104
[SCM] CTDB repository - branch 1.2 updated - ctdb-1.9.1-420-g89547a1
The branch, 1.2 has been updated
via 89547a1910fd74f98ae9d5737914328eb5cc3eaf (commit)
from 3c21f5b6d7ba2d993c279bb75d37c46d1994ba6d (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=1.2
- Log -
commit 89547a1910fd74f98ae9d5737914328eb5cc3eaf
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Tue May 10 06:19:34 2011 +1000
Dont exit from checking interfaces once we have found one interface that is
not
in use by public addresses. this can happen when we have removed existing
interfaces/ip addresses and prevents us from verifying the status of other
interfaces
---
Summary of changes:
config/events.d/10.interface |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/config/events.d/10.interface b/config/events.d/10.interface
index 81eff51..7f5791a 100755
--- a/config/events.d/10.interface
+++ b/config/events.d/10.interface
@@ -42,7 +42,7 @@ monitor_interfaces()
ip addr show $IFACE 2/dev/null /dev/null || {
echo Interface $IFACE does not exist but it is used by public
addresses.
- exit 1
+ continue
}
# These interfaces are sometimes bond devices
--
CTDB repository
[SCM] CTDB repository - branch master updated - ctdb-1.10-198-gd67955b
The branch, master has been updated
via d67955b42f7627be9dae995230c8fcbb8a948ec2 (commit)
from 8837daa424732aeb5a20814b1709c345a97a0e09 (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master
- Log -
commit d67955b42f7627be9dae995230c8fcbb8a948ec2
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Tue May 10 06:19:34 2011 +1000
Dont exit from checking interfaces once we have found one interface that is
not
in use by public addresses. this can happen when we have removed existing
interfaces/ip addresses and prevents us from verifying the status of other
interfaces
---
Summary of changes:
config/events.d/10.interface |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/config/events.d/10.interface b/config/events.d/10.interface
index 81eff51..7f5791a 100755
--- a/config/events.d/10.interface
+++ b/config/events.d/10.interface
@@ -42,7 +42,7 @@ monitor_interfaces()
ip addr show $IFACE 2/dev/null /dev/null || {
echo Interface $IFACE does not exist but it is used by public
addresses.
- exit 1
+ continue
}
# These interfaces are sometimes bond devices
--
CTDB repository
[SCM] CTDB repository - branch 1.2 updated - ctdb-1.9.1-421-g83c2263
The branch, 1.2 has been updated
via 83c226362fefb104d6dddac802c192a799d03acf (commit)
from 89547a1910fd74f98ae9d5737914328eb5cc3eaf (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=1.2
- Log -
commit 83c226362fefb104d6dddac802c192a799d03acf
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Tue May 10 08:25:27 2011 +1000
If samba fails to start for some reason, make this cause the startup event
to fail too, so that ctdbd will re-try the startup event later.
Or else this will leave samba not running.
CQ S1023394
---
Summary of changes:
config/events.d/50.samba | 17 ++---
1 files changed, 14 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/config/events.d/50.samba b/config/events.d/50.samba
index a1f99fb..184fb2f 100755
--- a/config/events.d/50.samba
+++ b/config/events.d/50.samba
@@ -65,7 +65,11 @@ start_samba() {
# start the winbind service
[ $CTDB_MANAGES_WINBIND = yes ] {
- service $CTDB_SERVICE_WINBIND start
+ service $CTDB_SERVICE_WINBIND start || {
+ echo failed to start winbind
+ exit 1
+ }
+
}
# start Samba service. Start it reniced, as under very heavy load
@@ -74,8 +78,15 @@ start_samba() {
[ $CTDB_MANAGES_SAMBA = yes ] {
/usr/bin/net serverid wipe
- nice_service $CTDB_SERVICE_NMB start
- nice_service $CTDB_SERVICE_SMB start
+ nice_service $CTDB_SERVICE_NMB start || {
+ echo failed to start nmbd
+ exit 1
+ }
+
+ nice_service $CTDB_SERVICE_SMB start || {
+ echo failed to start samba
+ exit 1
+ }
}
return 0
}
--
CTDB repository
[SCM] CTDB repository - branch master updated - ctdb-1.10-199-gf90485b
The branch, master has been updated
via f90485b08d32cbe56050718a3b28ca0fe1d64e0f (commit)
from d67955b42f7627be9dae995230c8fcbb8a948ec2 (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master
- Log -
commit f90485b08d32cbe56050718a3b28ca0fe1d64e0f
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Tue May 10 08:25:27 2011 +1000
If samba fails to start for some reason, make this cause the startup event
to fail too, so that ctdbd will re-try the startup event later.
Or else this will leave samba not running.
CQ S1023394
---
Summary of changes:
config/events.d/50.samba | 17 ++---
1 files changed, 14 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/config/events.d/50.samba b/config/events.d/50.samba
index 415b89f..7a152b5 100755
--- a/config/events.d/50.samba
+++ b/config/events.d/50.samba
@@ -65,7 +65,11 @@ start_samba() {
# start the winbind service
[ $CTDB_MANAGES_WINBIND = yes ] {
- service $CTDB_SERVICE_WINBIND start
+ service $CTDB_SERVICE_WINBIND start || {
+ echo failed to start winbind
+ exit 1
+ }
+
}
# start Samba service. Start it reniced, as under very heavy load
@@ -74,8 +78,15 @@ start_samba() {
[ $CTDB_MANAGES_SAMBA = yes ] {
/usr/bin/net serverid wipe
- nice_service $CTDB_SERVICE_NMB start
- nice_service $CTDB_SERVICE_SMB start
+ nice_service $CTDB_SERVICE_NMB start || {
+ echo failed to start nmbd
+ exit 1
+ }
+
+ nice_service $CTDB_SERVICE_SMB start || {
+ echo failed to start samba
+ exit 1
+ }
}
return 0
}
--
CTDB repository
[SCM] CTDB repository - branch 1.2 updated - ctdb-1.9.1-422-g4dde1ff
The branch, 1.2 has been updated
via 4dde1ff6aba0caec284f15539bfee2dbf6848c8e (commit)
from 83c226362fefb104d6dddac802c192a799d03acf (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=1.2
- Log -
commit 4dde1ff6aba0caec284f15539bfee2dbf6848c8e
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Tue May 10 10:51:37 2011 +1000
New version 1.2.29
---
Summary of changes:
packaging/RPM/ctdb.spec.in | 11 ++-
1 files changed, 10 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/RPM/ctdb.spec.in b/packaging/RPM/ctdb.spec.in
index 6d97420..ccb9ad7 100644
--- a/packaging/RPM/ctdb.spec.in
+++ b/packaging/RPM/ctdb.spec.in
@@ -3,7 +3,7 @@ Name: ctdb
Summary: Clustered TDB
Vendor: Samba Team
Packager: Samba Team sa...@samba.org
-Version: 1.2.28
+Version: 1.2.29
Release: 1GITHASH
Epoch: 0
License: GNU GPL version 3
@@ -142,6 +142,15 @@ development libraries for ctdb
%{_libdir}/libctdb.a
%changelog
+* Tue May 10 2011 : Version 1.2.29
+ - Add workaround to RHEL5.5 kernel bug with how it reports bond interface
+ status when mode 4 is used.
+ - Remove some log messages that fill up syslog CQ S1023302
+ - Dont call UPDATE event if the interface didnt change. This only causes a
lot of i
+ spam in the syslog S1018175
+ - Remove log messages that are benign and can be ignored S1023378
+ - If service smb start fails, make the whole startup event fail so that
+ we retry to start samba again later. CQ S1023394
* Mon Apr 11 2011 : Version 1.2.28
- Update how we handle interface link status
also check for and become unhealthy if an interface has been deleted
--
CTDB repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 0d93eb8 tdb_wrap.h: not a public header.
via 7deeaca gencache: don't use CLEAR_IF_FIRST as fallback.
via 3ccfe7c Add -fno-common where supported (WAF only)
from 14f9916 build: Remove --disable-s3build so we can rely on these
subsystems
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 0d93eb8f5501c348451a7d78e83516873d71cda0
Author: Rusty Russell ru...@rustcorp.com.au
Date: Tue May 10 11:46:53 2011 +0930
tdb_wrap.h: not a public header.
It is a private library, and OpenChange has their own which they use, so
it's not for them either.
Signed-off-by: Rusty Russell ru...@rustcorp.com.au
Autobuild-User: Rusty Russell ru...@rustcorp.com.au
Autobuild-Date: Tue May 10 05:21:19 CEST 2011 on sn-devel-104
commit 7deeacae2bab03d5e2ea2642f028a4011ce3bec3
Author: Rusty Russell ru...@rustcorp.com.au
Date: Tue Apr 19 12:06:05 2011 +0930
gencache: don't use CLEAR_IF_FIRST as fallback.
CLEAR_IF_FIRST only works if *all* openers use that flag.
So just truncate the file: it's racy, but that's what we're doing anyway.
We'd really need a TDB_OPENCHECK_OR_CLEAR flag to do this properly (or in
TDB2, a open hook at the right point).
Signed-off-by: Rusty Russell ru...@rustcorp.com.au
commit 3ccfe7cb7be80cc6fa5b8fc437af72168515b892
Author: Rusty Russell ru...@rustcorp.com.au
Date: Tue May 10 11:37:30 2011 +0930
Add -fno-common where supported (WAF only)
Normally under UNIX, uninitialized non-static global variables get
placed in the common section, where they are merged at link time.
This means if two C files define int debug, they will end up
referring to the same variable. Or if one does float level and the
other does int level you'll get an accidental union.
Such bugs can be hard to track down; fortunately GCC offers
-fno-common to disable this feature. It didn't reveal any places
which need fixing, however).
Signed-off-by: Rusty Russell ru...@rustcorp.com.au
---
Summary of changes:
buildtools/wafsamba/samba_autoconf.py |2 +-
lib/util/wscript_build|1 -
source3/lib/gencache.c| 10 +++---
source3/libsmb/samlogon_cache.c | 13 +++--
4 files changed, 7 insertions(+), 19 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_autoconf.py
b/buildtools/wafsamba/samba_autoconf.py
index 174ca14..207d732 100644
--- a/buildtools/wafsamba/samba_autoconf.py
+++ b/buildtools/wafsamba/samba_autoconf.py
@@ -597,7 +597,7 @@ def SAMBA_CONFIG_H(conf, path=None):
if Options.options.developer:
# we add these here to ensure that -Wstrict-prototypes is not set
during configure
-conf.ADD_CFLAGS('-Wall -g -Wshadow -Wstrict-prototypes -Wpointer-arith
-Wcast-align -Wwrite-strings -Werror-implicit-function-declaration -Wformat=2
-Wno-format-y2k -Wmissing-prototypes',
+conf.ADD_CFLAGS('-Wall -g -Wshadow -Wstrict-prototypes -Wpointer-arith
-Wcast-align -Wwrite-strings -Werror-implicit-function-declaration -Wformat=2
-Wno-format-y2k -Wmissing-prototypes -fno-common',
testflags=True)
if os.getenv('TOPLEVEL_BUILD'):
conf.ADD_CFLAGS('-Wcast-qual', testflags=True)
diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index fc5f4b5..740e68b 100755
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -113,7 +113,6 @@ bld.SAMBA_SUBSYSTEM('UTIL_PW',
bld.SAMBA_LIBRARY('tdb-wrap',
source='tdb_wrap.c',
deps='tdb talloc samba-util',
- public_headers='tdb_wrap.h',
private_library=True,
local_include=False
)
diff --git a/source3/lib/gencache.c b/source3/lib/gencache.c
index 7a86063..8d4861a 100644
--- a/source3/lib/gencache.c
+++ b/source3/lib/gencache.c
@@ -81,14 +81,10 @@ again:
return false;
}
first_try = false;
- DEBUG(0, (gencache_init: tdb_check(%s) failed - retry
after CLEAR_IF_FIRST\n,
+ DEBUG(0, (gencache_init: tdb_check(%s) failed - retry
after truncate\n,
cache_fname));
- cache = tdb_open_log(cache_fname, 0,
TDB_CLEAR_IF_FIRST|TDB_INCOMPATIBLE_HASH, open_flags, 0644);
- if (cache) {
- tdb_close(cache);
- cache = NULL;
- goto again;
- }
+ truncate(cache_fname, 0);
+ goto again;
}
}
diff --git
