[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-1374-g5121499
The branch, master has been updated
via 5121499816db70bf7bd380f604c22311be8fd3de (commit)
from b4a4186556f6d33be40ef7358bcd71c83a8092f2 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 5121499816db70bf7bd380f604c22311be8fd3de
Author: Volker Lendecke v...@samba.org
Date: Fri Sep 4 07:59:51 2009 +0200
s3:winbind: Fix Coverity ID 933: FORWARD_NULL
---
Summary of changes:
source3/winbindd/winbindd_misc.c |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/winbindd_misc.c b/source3/winbindd/winbindd_misc.c
index b967390..606a4e1 100644
--- a/source3/winbindd/winbindd_misc.c
+++ b/source3/winbindd/winbindd_misc.c
@@ -446,6 +446,7 @@ void winbindd_domain_info(struct winbindd_cli_state *cli)
if (req == NULL) {
DEBUG(3, (wb_domain_request_send failed\n));
request_error(cli);
+ return;
}
tevent_req_set_callback(req, domain_info_done, state);
}
--
Samba Shared Repository
Build status as of Fri Sep 4 06:00:17 2009
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2009-09-03 00:00:03.0 -0600 +++ /home/build/master/cache/broken_results.txt 2009-09-04 00:00:35.0 -0600 @@ -1,4 +1,4 @@ -Build status as of Thu Sep 3 06:00:02 2009 +Build status as of Fri Sep 4 06:00:17 2009 Build counts: Tree Total Broken Panic @@ -10,13 +10,13 @@ lorikeet 0 0 0 pidl 1 1 0 ppp 0 0 0 -rsync26 11 0 +rsync26 12 0 samba-docs 0 0 0 samba-web0 0 0 samba_3_current 23 22 0 -samba_3_master 24 24 3 -samba_3_next 24 23 1 -samba_4_0_test 26 25 3 -talloc 4 4 0 -tdb 4 4 0 +samba_3_master 24 23 1 +samba_3_next 24 23 0 +samba_4_0_test 26 26 10 +talloc 21 21 0 +tdb 3 3 0
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-1375-g8995491
The branch, master has been updated
via 8995491f59e7b6cee79b4249424e886f54f6b94d (commit)
from 5121499816db70bf7bd380f604c22311be8fd3de (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 8995491f59e7b6cee79b4249424e886f54f6b94d
Author: Andrew Tridgell tri...@samba.org
Date: Fri Sep 4 17:22:20 2009 +1000
ldb: make ldb module programming less error prone
When a top level method in a module returns an error, it is supposed
to call ldb_module_done(). We ran across a case where this wasn't
done, and then found that in fact that are hundreds of similar cases
in our modules. It took Andrew and I a full day to work out that this
was the cause of a subtle segv in another part of the code.
To try to prevent this happening again, this patch changes
ldb_next_request() to catch the error by checking if a module
returning an error has called ldb_module_done(). If it hasn't then the
call is made on behalf of the module.
---
Summary of changes:
source4/lib/ldb/common/ldb_modules.c | 14 ++
source4/lib/ldb/include/ldb_private.h |3 +++
2 files changed, 17 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/lib/ldb/common/ldb_modules.c
b/source4/lib/ldb/common/ldb_modules.c
index b792daa..79a97ca 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -577,6 +577,17 @@ int ldb_next_request(struct ldb_module *module, struct
ldb_request *request)
/* Set a default error string, to place the blame somewhere */
ldb_asprintf_errstring(module-ldb, error in module %s: %s
(%d), module-ops-name, ldb_strerror(ret), ret);
}
+
+ if (!(request-handle-flags LDB_HANDLE_FLAG_DONE_CALLED)) {
+ /* It is _extremely_ common that a module returns a
+* failure without calling ldb_module_done(), but that
+* guarantees we will end up hanging in
+* ldb_wait(). This fixes it without having to rewrite
+* all our modules, and leaves us one less sharp
+* corner for module developers to cut themselves on
+*/
+ ldb_module_done(request, NULL, NULL, ret);
+ }
return ret;
}
@@ -629,6 +640,7 @@ struct ldb_handle *ldb_handle_new(TALLOC_CTX *mem_ctx,
struct ldb_context *ldb)
h-status = LDB_SUCCESS;
h-state = LDB_ASYNC_INIT;
h-ldb = ldb;
+ h-flags = 0;
return h;
}
@@ -715,6 +727,8 @@ int ldb_module_done(struct ldb_request *req,
ares-response = talloc_steal(ares, response);
ares-error = error;
+ req-handle-flags |= LDB_HANDLE_FLAG_DONE_CALLED;
+
req-callback(req, ares);
return error;
}
diff --git a/source4/lib/ldb/include/ldb_private.h
b/source4/lib/ldb/include/ldb_private.h
index 3cda9a3..a70d9c7 100644
--- a/source4/lib/ldb/include/ldb_private.h
+++ b/source4/lib/ldb/include/ldb_private.h
@@ -47,10 +47,13 @@ struct ldb_module_ops;
struct ldb_backend_ops;
+#define LDB_HANDLE_FLAG_DONE_CALLED 1
+
struct ldb_handle {
int status;
enum ldb_state state;
struct ldb_context *ldb;
+ unsigned flags;
};
/* basic module structure */
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-1376-gffd48a7
The branch, master has been updated
via ffd48a79ee34dc90c0f6f16564c3a0de8b53d3d2 (commit)
from 8995491f59e7b6cee79b4249424e886f54f6b94d (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit ffd48a79ee34dc90c0f6f16564c3a0de8b53d3d2
Author: Andrew Tridgell tri...@samba.org
Date: Fri Sep 4 18:07:04 2009 +1000
s4:python fixed subunit tests of dcerpc
The version of the unitest python module in Ubuntu Jaunty doesn't seem
to support this many level of subdirectories. Moving the tests up one
level solves the problem.
---
Summary of changes:
.../python/samba/tests/{dcerpc = }/bare.py|0
.../python/samba/tests/{dcerpc = }/misc.py|0
.../python/samba/tests/{dcerpc = }/registry.py|0
.../python/samba/tests/{dcerpc = }/rpcecho.py |0
.../python/samba/tests/{dcerpc = }/sam.py |0
.../python/samba/tests/{dcerpc = }/unix.py|0
source4/selftest/tests.sh | 12 ++--
7 files changed, 6 insertions(+), 6 deletions(-)
rename source4/scripting/python/samba/tests/{dcerpc = }/bare.py (100%)
rename source4/scripting/python/samba/tests/{dcerpc = }/misc.py (100%)
rename source4/scripting/python/samba/tests/{dcerpc = }/registry.py (100%)
rename source4/scripting/python/samba/tests/{dcerpc = }/rpcecho.py (100%)
rename source4/scripting/python/samba/tests/{dcerpc = }/sam.py (100%)
rename source4/scripting/python/samba/tests/{dcerpc = }/unix.py (100%)
Changeset truncated at 500 lines:
diff --git a/source4/scripting/python/samba/tests/dcerpc/bare.py
b/source4/scripting/python/samba/tests/bare.py
similarity index 100%
rename from source4/scripting/python/samba/tests/dcerpc/bare.py
rename to source4/scripting/python/samba/tests/bare.py
diff --git a/source4/scripting/python/samba/tests/dcerpc/misc.py
b/source4/scripting/python/samba/tests/misc.py
similarity index 100%
rename from source4/scripting/python/samba/tests/dcerpc/misc.py
rename to source4/scripting/python/samba/tests/misc.py
diff --git a/source4/scripting/python/samba/tests/dcerpc/registry.py
b/source4/scripting/python/samba/tests/registry.py
similarity index 100%
rename from source4/scripting/python/samba/tests/dcerpc/registry.py
rename to source4/scripting/python/samba/tests/registry.py
diff --git a/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
b/source4/scripting/python/samba/tests/rpcecho.py
similarity index 100%
rename from source4/scripting/python/samba/tests/dcerpc/rpcecho.py
rename to source4/scripting/python/samba/tests/rpcecho.py
diff --git a/source4/scripting/python/samba/tests/dcerpc/sam.py
b/source4/scripting/python/samba/tests/sam.py
similarity index 100%
rename from source4/scripting/python/samba/tests/dcerpc/sam.py
rename to source4/scripting/python/samba/tests/sam.py
diff --git a/source4/scripting/python/samba/tests/dcerpc/unix.py
b/source4/scripting/python/samba/tests/unix.py
similarity index 100%
rename from source4/scripting/python/samba/tests/dcerpc/unix.py
rename to source4/scripting/python/samba/tests/unix.py
diff --git a/source4/selftest/tests.sh b/source4/selftest/tests.sh
index 5251791..dd5bf6d 100755
--- a/source4/selftest/tests.sh
+++ b/source4/selftest/tests.sh
@@ -433,22 +433,22 @@ plantest registry.python none
PYTHONPATH=$PYTHONPATH:$samba4srcdir/lib/regist
plantest tdb.python none PYTHONPATH=$PYTHONPATH:../lib/tdb/python/tests
$SUBUNITRUN simple
plantest auth.python none PYTHONPATH=$PYTHONPATH:$samba4srcdir/auth/tests/
$SUBUNITRUN bindings
plantest security.python none
PYTHONPATH=$PYTHONPATH:$samba4srcdir/libcli/security/tests $SUBUNITRUN
bindings
-plantest misc.python none $SUBUNITRUN samba.tests.dcerpc.misc
+plantest misc.python none $SUBUNITRUN samba.tests.misc
plantest param.python none
PYTHONPATH=$PYTHONPATH:$samba4srcdir/param/tests $SUBUNITRUN bindings
plantest upgrade.python none $SUBUNITRUN samba.tests.upgrade
plantest samba.python none $SUBUNITRUN samba.tests
plantest provision.python none $SUBUNITRUN samba.tests.provision
plantest samba3.python none $SUBUNITRUN samba.tests.samba3
-plantest samr.python dc:local $SUBUNITRUN samba.tests.dcerpc.sam
-plantest dcerpc.bare.python dc:local $SUBUNITRUN samba.tests.dcerpc.bare
-plantest unixinfo.python dc:local $SUBUNITRUN samba.tests.dcerpc.unix
+plantest samr.python dc:local $SUBUNITRUN samba.tests.sam
+plantest dcerpc.bare.python dc:local $SUBUNITRUN samba.tests.bare
+plantest unixinfo.python dc:local $SUBUNITRUN samba.tests.unix
plantest samdb.python none $SUBUNITRUN samba.tests.samdb
plantest shares.python none $SUBUNITRUN samba.tests.shares
plantest messaging.python none
PYTHONPATH=$PYTHONPATH:$samba4srcdir/lib/messaging/tests $SUBUNITRUN bindings
plantest samba3sam.python none
PYTHONPATH=$PYTHONPATH:$samba4srcdir/dsdb/samdb/ldb_modules/tests
[SCM] Samba Shared Repository - branch v3-5-test updated - release-4-0-0alpha8-1370-gf267d11
The branch, v3-5-test has been updated via f267d1151cafe64fe7129e2a6a635d476b6481cc (commit) via 25eb0060d60a46a6122475b32de71ae8511a75c5 (commit) from 8df4d1015106dd706b05dbf68f01ea9266af1653 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log - commit f267d1151cafe64fe7129e2a6a635d476b6481cc Author: Stefan Metzmacher me...@samba.org Date: Fri Sep 4 08:52:45 2009 +0200 s3:configure: turn off the merged build by default for the 3.5.x releases metze commit 25eb0060d60a46a6122475b32de71ae8511a75c5 Author: Stefan Metzmacher me...@samba.org Date: Fri Sep 4 08:47:56 2009 +0200 s4: disable source4 directory for the 3.5.x releases metze (cherry picked from commit 6ced4bcadf05578bba83cb061310ad4dcf1e9c94) (cherry picked from commit f97a1a0d3b708872534c85dbc5ae53215577057c) --- Summary of changes: source3/configure.in |7 +- source4/autogen.sh | 91 +++--- source4/configure.ac | 216 -- 3 files changed, 14 insertions(+), 300 deletions(-) delete mode 100644 source4/configure.ac Changeset truncated at 500 lines: diff --git a/source3/configure.in b/source3/configure.in index 3255751..cf65726 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -6530,9 +6530,10 @@ if test x$enable_merged_build = xauto; then 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 + # Don't enable merged build automatically in 3.5.0. + #if test x$developer = xyes; then + # enable_merged_build=$merged_build_possible + #fi fi if test x$enable_merged_build = xyes; then diff --git a/source4/autogen.sh b/source4/autogen.sh index 2d995ca..f30d42f 100755 --- a/source4/autogen.sh +++ b/source4/autogen.sh @@ -1,84 +1,13 @@ #!/bin/sh -# Run this script to build samba from git. +echo +echo +echo +echo The build in source4 is not supported in the 3.5.x releases! +echo Please use the source4 of the master branch +echo or the latest samba4 alpha release +echo +echo +echo +exit 1 -while true; do -case $1 in - --version-file) - VERSION_FILE=$2 - shift 2 - ;; - *) - break - ;; -esac -done - -## insert all possible names (only works with -## autoconf 2.x) -TESTAUTOHEADER=autoheader autoheader-2.53 autoheader2.50 autoheader259 autoheader253 -TESTAUTOCONF=autoconf autoconf-2.53 autoconf2.50 autoconf259 autoconf253 - -AUTOHEADERFOUND=0 -AUTOCONFFOUND=0 - -if which which /dev/null 21; then -echo -n -else - echo $0: need 'which' to figure out if we have the right autoconf to build samba from git 2 - exit 1 -fi -## -## Look for autoheader -## -for i in $TESTAUTOHEADER; do - if which $i /dev/null 21; then - if test `$i --version | head -n 1 | cut -d. -f 2 | sed s/[^0-9]//g` -ge 53; then - AUTOHEADER=$i - AUTOHEADERFOUND=1 - break - fi - fi -done - -## -## Look for autoconf -## - -for i in $TESTAUTOCONF; do - if which $i /dev/null 21; then - if test `$i --version | head -n 1 | cut -d. -f 2 | sed s/[^0-9]//g` -ge 53; then - AUTOCONF=$i - AUTOCONFFOUND=1 - break - fi - fi -done - - -## -## do we have it? -## -if test $AUTOCONFFOUND = 0 -o $AUTOHEADERFOUND = 0; then - echo $0: need autoconf 2.53 or later to build samba from git 2 - exit 1 -fi - -echo $0: running script/mkversion.sh -./script/mkversion.sh $VERSION_FILE || exit 1 - -rm -rf autom4te*.cache -rm -f configure include/config_tmp.h* - -IPATHS=-I. -I../lib/replace - -echo $0: running $AUTOHEADER $IPATHS -$AUTOHEADER $IPATHS || exit 1 - -echo $0: running $AUTOCONF $IPATHS -$AUTOCONF $IPATHS || exit 1 - -rm -rf autom4te*.cache - -echo Now run ./configure and then make. -exit 0 diff --git a/source4/configure.ac b/source4/configure.ac deleted file mode 100644 index 3f10419..000 --- a/source4/configure.ac +++ /dev/null @@ -1,216 +0,0 @@ -dnl -*- mode: m4-mode -*- -dnl Process this file with autoconf to produce a configure script. - -AC_PREREQ(2.54) - -AC_INIT([samba],[4],[samba-techni...@samba.org]) - -AC_CONFIG_SRCDIR([include/includes.h]) -AC_CONFIG_HEADER(include/config_tmp.h) -AC_DEFINE(CONFIG_H_IS_FROM_SAMBA,1,[Marker for samba's config.h.]) - -# Configuration rules. -m4_include(build/m4/env.m4) -m4_include(../lib/replace/samba.m4)
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-1377-g704b739
The branch, master has been updated
via 704b739ad8b5441e4c84215044a77e74e54cf425 (commit)
from ffd48a79ee34dc90c0f6f16564c3a0de8b53d3d2 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 704b739ad8b5441e4c84215044a77e74e54cf425
Author: Jeff Layton jlay...@redhat.com
Date: Fri Sep 4 06:29:44 2009 -0400
cifs.upcall: do a brute-force search for KRB5 credcache
A few weeks ago, I added some code to cifs.upcall to take the pid sent
by the kernel and use that to get the value of the $KRB5CCNAME
environment var for the process. That works fine on the initial mount,
but could be problematic on reconnect.
There's no guarantee on a reconnect that the process that initiates the
upcall will have $KRB5CCNAME pointed at the correct credcache. Because
of this, the current scheme isn't going to be reliable enough and we
need to use something different.
This patch replaces that scheme with one very similar to the one used by
rpc.gssd in nfs-utils. It searches the credcache dir (currently
hardcoded to /tmp) for a valid credcache for the given uid. If it finds
one then it uses that as the credentials cache. If it finds more than
one, it uses the one with the latest TGT expiration.
Signed-off-by: Jeff Layton jlay...@redhat.com
---
Summary of changes:
client/cifs.upcall.c | 186 +-
1 files changed, 139 insertions(+), 47 deletions(-)
Changeset truncated at 500 lines:
diff --git a/client/cifs.upcall.c b/client/cifs.upcall.c
index 1645322..71e60c6 100644
--- a/client/cifs.upcall.c
+++ b/client/cifs.upcall.c
@@ -31,6 +31,11 @@ create dns_resolver * * /usr/local/sbin/cifs.upcall %k
#include cifs_spnego.h
+#defineCIFS_DEFAULT_KRB5_DIR /tmp
+#defineCIFS_DEFAULT_KRB5_PREFIXkrb5cc_
+
+#defineMAX_CCNAME_LEN PATH_MAX + 5
+
const char *CIFSSPNEGO_VERSION = 1.3;
static const char *prog = cifs.upcall;
typedef enum _sectype {
@@ -39,60 +44,148 @@ typedef enum _sectype {
MS_KRB5
} sectype_t;
-/*
- * given a process ID, get the value of the KRB5CCNAME environment variable
- * in the context of that process. On error, just return NULL.
- */
-static char *
-get_krb5_ccname(pid_t pid)
+static inline int
+k5_data_equal(krb5_data d1, krb5_data d2, unsigned int length)
{
- int fd;
- ssize_t len, left;
+ if (!length)
+ length = d1.length;
- /*
-* FIXME: sysconf for ARG_MAX instead? Kernel seems to be limited to a
-* page however, so it may not matter.
-*/
- char buf[4096];
- char *p, *value = NULL;
-
- buf[4095] = '\0';
- snprintf(buf, 4095, /proc/%d/environ, pid);
- fd = open(buf, O_RDONLY);
- if (fd 0) {
- syslog(LOG_DEBUG, %s: unable to open %s: %d, __func__, buf,
- errno);
- return NULL;
+ return (d1.length == length
+ d1.length == d2.length
+ memcmp(d1.data, d2.data, length) == 0);
+
+}
+
+/* does the ccache have a valid TGT? */
+static time_t
+get_tgt_time(const char *ccname) {
+ krb5_context context;
+ krb5_ccache ccache;
+ krb5_cc_cursor cur;
+ krb5_creds creds;
+ krb5_principal principal;
+ krb5_data tgt = { .data = krbtgt,
+ .length = 6 };
+ time_t credtime = 0;
+
+ if (krb5_init_context(context)) {
+ syslog(LOG_DEBUG, %s: unable to init krb5 context, __func__);
+ return 0;
}
- /* FIXME: don't assume that we get it all in the first read? */
- len = read(fd, buf, 4096);
- close(fd);
- if (len 0) {
- syslog(LOG_DEBUG, %s: unable to read from /proc/%d/environ:
- %d, __func__, pid, errno);
+ if (krb5_cc_resolve(context, ccname, ccache)) {
+ syslog(LOG_DEBUG, %s: unable to resolve krb5 cache, __func__);
+ goto err_cache;
+ }
+
+ if (krb5_cc_set_flags(context, ccache, 0)) {
+ syslog(LOG_DEBUG, %s: unable to set flags, __func__);
+ goto err_cache;
+ }
+
+ if (krb5_cc_get_principal(context, ccache, principal)) {
+ syslog(LOG_DEBUG, %s: unable to get principal, __func__);
+ goto err_princ;
+ }
+
+ if (krb5_cc_start_seq_get(context, ccache, cur)) {
+ syslog(LOG_DEBUG, %s: unable to seq start, __func__);
+ goto err_ccstart;
+ }
+
+ while (!credtime !krb5_cc_next_cred(context, ccache, cur, creds)) {
+ if (k5_data_equal(creds.server-realm, principal-realm, 0)
+
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-1379-g5e59c17
The branch, master has been updated via 5e59c17e5c547b7a2cea8c40738bd7a3ca94dfad (commit) via 1bb68402a2e37f39118e039ac69e03ba66f2 (commit) from 704b739ad8b5441e4c84215044a77e74e54cf425 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 5e59c17e5c547b7a2cea8c40738bd7a3ca94dfad Author: Stefan Metzmacher me...@samba.org Date: Fri Sep 4 12:57:13 2009 +0200 s4:configure: require tevent = 0.9.8 metze commit 1bb68402a2e37f39118e039ac69e03ba66f2 Author: Stefan Metzmacher me...@samba.org Date: Fri Sep 4 12:56:39 2009 +0200 tevent: change version to 0.9.8 after some critical bugs have been fixed metze --- Summary of changes: lib/tevent/configure.ac |2 +- source4/min_versions.m4 |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/tevent/configure.ac b/lib/tevent/configure.ac index 89190af..c759b83 100644 --- a/lib/tevent/configure.ac +++ b/lib/tevent/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.50) -AC_INIT(tevent, 0.9.7) +AC_INIT(tevent, 0.9.8) AC_CONFIG_SRCDIR([tevent.c]) AC_CONFIG_HEADER(config.h) diff --git a/source4/min_versions.m4 b/source4/min_versions.m4 index 329ecea..0ca6046 100644 --- a/source4/min_versions.m4 +++ b/source4/min_versions.m4 @@ -3,4 +3,4 @@ define(TDB_MIN_VERSION,1.1.5) define(TALLOC_MIN_VERSION,2.0.0) define(LDB_REQUIRED_VERSION,0.9.6) -define(TEVENT_REQUIRED_VERSION,0.9.7) +define(TEVENT_REQUIRED_VERSION,0.9.8) -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated - release-4-0-0alpha8-1372-g87822aa
The branch, v3-5-test has been updated via 87822aa751846365040cf9c19f6bed3515c27393 (commit) via 11e756d695c236b31c3d1a5f9bd34de9b8ec0d48 (commit) from f267d1151cafe64fe7129e2a6a635d476b6481cc (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log - commit 87822aa751846365040cf9c19f6bed3515c27393 Author: Stefan Metzmacher me...@samba.org Date: Fri Sep 4 12:57:13 2009 +0200 s4:configure: require tevent = 0.9.8 metze (cherry picked from commit 5e59c17e5c547b7a2cea8c40738bd7a3ca94dfad) commit 11e756d695c236b31c3d1a5f9bd34de9b8ec0d48 Author: Stefan Metzmacher me...@samba.org Date: Fri Sep 4 12:56:39 2009 +0200 tevent: change version to 0.9.8 after some critical bugs have been fixed metze (cherry picked from commit 1bb68402a2e37f39118e039ac69e03ba66f2) --- Summary of changes: lib/tevent/configure.ac |2 +- source4/min_versions.m4 |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/tevent/configure.ac b/lib/tevent/configure.ac index 89190af..c759b83 100644 --- a/lib/tevent/configure.ac +++ b/lib/tevent/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.50) -AC_INIT(tevent, 0.9.7) +AC_INIT(tevent, 0.9.8) AC_CONFIG_SRCDIR([tevent.c]) AC_CONFIG_HEADER(config.h) diff --git a/source4/min_versions.m4 b/source4/min_versions.m4 index 329ecea..0ca6046 100644 --- a/source4/min_versions.m4 +++ b/source4/min_versions.m4 @@ -3,4 +3,4 @@ define(TDB_MIN_VERSION,1.1.5) define(TALLOC_MIN_VERSION,2.0.0) define(LDB_REQUIRED_VERSION,0.9.6) -define(TEVENT_REQUIRED_VERSION,0.9.7) +define(TEVENT_REQUIRED_VERSION,0.9.8) -- Samba Shared Repository
[SCM] CTDB repository - branch master updated - ctdb-1.0.88-10-gf76132b
The branch, master has been updated
via f76132b0d555e52ee0a379ec2c156350b37b0280 (commit)
from 46823aa7c673bc18a1424500b3f01da9c2dd6333 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -
commit f76132b0d555e52ee0a379ec2c156350b37b0280
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Fri Sep 4 04:09:30 2009 +1000
lower the loglevel for the info messages that a public ip is not hosted
locally for takeip/releaseip
---
Summary of changes:
server/ctdb_takeover.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/server/ctdb_takeover.c b/server/ctdb_takeover.c
index 07a0a94..f2f57eb 100644
--- a/server/ctdb_takeover.c
+++ b/server/ctdb_takeover.c
@@ -208,7 +208,7 @@ int32_t ctdb_control_takeover_ip(struct ctdb_context *ctdb,
/* update out vnn list */
vnn = find_public_ip_vnn(ctdb, pip-addr);
if (vnn == NULL) {
- DEBUG(DEBUG_ERR,(takeoverip called for an ip '%s' that is not
a public address\n,
+ DEBUG(DEBUG_INFO,(takeoverip called for an ip '%s' that is not
a public address\n,
ctdb_addr_to_str(pip-addr)));
return 0;
}
@@ -357,7 +357,7 @@ int32_t ctdb_control_release_ip(struct ctdb_context *ctdb,
/* update our vnn list */
vnn = find_public_ip_vnn(ctdb, pip-addr);
if (vnn == NULL) {
- DEBUG(DEBUG_ERR,(takeoverip called for an ip '%s' that is not
a public address\n,
+ DEBUG(DEBUG_INFO,(releaseip called for an ip '%s' that is not
a public address\n,
ctdb_addr_to_str(pip-addr)));
return 0;
}
--
CTDB repository
[SCM] CTDB repository - annotated tag ctdb-1.0.89 created - ctdb-1.0.89
The annotated tag, ctdb-1.0.89 has been created at 54613faede708c3500258c9ce31870507d855871 (tag) tagging 46823aa7c673bc18a1424500b3f01da9c2dd6333 (commit) replaces ctdb-1.0.88 tagged by Ronnie Sahlberg on Sat Sep 5 02:37:33 2009 +1000 - Log - tag for 1.0.89 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.6 (GNU/Linux) iD8DBQBKoUJf2aJ36aon/y8RAs47AJ0Xu07jxiM+4zOpX15V2RN+Umou+gCfbNL0 4aMaufMc/a6+Vd5LBSkouOk= =xOTc -END PGP SIGNATURE- Michael Adam (1): set broadcast addresses in the takeip event. Ronnie Sahlberg (8): skip any persistent databases ending in .bak remove a check for the reclock file we dont need redirect stderr to dev null since the rule might not exist when we try to unconditionally delete it overwrite the state file, dont append to it. new prototype banning code Merge r...@10.1.1.27:/shared/ctdb/ctdb-git make it possible to have ctdb manage (start/stop/monitor) winbind without having samba new version 1.0.89 --- -- CTDB repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-1380-gab6e829
The branch, master has been updated
via ab6e82910af87ca4c4572d973fb657c4004b443b (commit)
from 5e59c17e5c547b7a2cea8c40738bd7a3ca94dfad (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit ab6e82910af87ca4c4572d973fb657c4004b443b
Author: Simo Sorce i...@samba.org
Date: Fri Sep 4 18:20:29 2009 -0400
Add release script for tevent
---
Summary of changes:
lib/{talloc = tevent}/release-script.sh | 24
1 files changed, 12 insertions(+), 12 deletions(-)
copy lib/{talloc = tevent}/release-script.sh (53%)
Changeset truncated at 500 lines:
diff --git a/lib/talloc/release-script.sh b/lib/tevent/release-script.sh
similarity index 53%
copy from lib/talloc/release-script.sh
copy to lib/tevent/release-script.sh
index 6b6c0e7..077f562 100755
--- a/lib/talloc/release-script.sh
+++ b/lib/tevent/release-script.sh
@@ -5,12 +5,12 @@ if [ $1 = ]; then
exit 1
fi
-if [ ! -d lib/talloc ]; then
+if [ ! -d lib/tevent ]; then
echo Run this script from the samba base directory.
exit 1
fi
-git clean -f -x -d lib/talloc
+git clean -f -x -d lib/tevent
git clean -f -x -d lib/replace
curbranch=`git-branch |grep ^* | tr -d * `
@@ -19,30 +19,30 @@ version=$1
strver=`echo ${version} | tr . -`
# Checkout the release tag
-git branch -f talloc-release-script-${strver} talloc-${strver}
+git branch -f tevent-release-script-${strver} tevent-${strver}
if [ ! $? = 0 ]; then
-echo Unable to checkout talloc-${strver} release
+echo Unable to checkout tevent-${strver} release
exit 1
fi
-git checkout talloc-release-script-${strver}
+git checkout tevent-release-script-${strver}
# Test configure agrees with us
-confver=`grep ^AC_INIT lib/talloc/configure.ac | tr -d AC_INIT(talloc, |
tr -d )`
+confver=`grep ^AC_INIT lib/tevent/configure.ac | tr -d AC_INIT(tevent, |
tr -d )`
if [ ! $confver = $version ]; then
echo Wrong version, requested release for ${version}, found ${confver}
exit 1
fi
# Now build tarball
-cp -a lib/talloc talloc-${version}
-cp -a lib/replace talloc-${version}/libreplace
-pushd talloc-${version}
+cp -a lib/tevent tevent-${version}
+cp -a lib/replace tevent-${version}/libreplace
+pushd tevent-${version}
./autogen.sh
popd
-tar cvzf talloc-${version}.tar.gz talloc-${version}
-rm -fr talloc-${version}
+tar cvzf tevent-${version}.tar.gz tevent-${version}
+rm -fr tevent-${version}
#Clean up
git checkout $curbranch
-git branch -d talloc-release-script-${strver}
+git branch -d tevent-release-script-${strver}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-1382-ga32f4dd
The branch, master has been updated
via a32f4dd3cfd43022ab3224366e026664b238429e (commit)
via 5afa115f2ad150563fdf8ba978e5f165d75eba4b (commit)
from ab6e82910af87ca4c4572d973fb657c4004b443b (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit a32f4dd3cfd43022ab3224366e026664b238429e
Author: Andrew Kroeger and...@id10ts.net
Date: Fri Sep 4 16:45:01 2009 -0500
util:tests: Correct time tests for negative UTC offsets.
All:
Please find attached a patch to fix the timestring and http_timestring
tests on hosts that have a negative UTC offset (west of the Prime Meridian).
Sincerely,
Andrew Kroeger
From 8a8ca35edccf64aa98f2f3ae1469c4c27db8215e Mon Sep 17 00:00:00 2001
From: Andrew Kroeger and...@id10ts.net
Date: Fri, 4 Sep 2009 01:31:50 -0500
Subject: [PATCH] util:tests: Correct time tests for negative UTC offsets.
The timestring and http_timestring tests were failing on hosts with negative
offsets from UTC. Due to the timezone offset, the returned values were
back in
the year 1969 (before the epoch) and did not match the test patterns.
The correction computes the offset from UTC, and if it is negative that
offset
is added onto the value given to the timestring() and http_timestring()
calls so
that the returned values fall on 01-Jan-1970 and match the test pattern.
commit 5afa115f2ad150563fdf8ba978e5f165d75eba4b
Author: Andrew Kroeger and...@id10ts.net
Date: Fri Sep 4 16:42:28 2009 -0500
selftest: Account for 0-based months in date parsing and printing.
All:
Please find attached 2 patches to correct date/time parsing and output
in the Subunit processing. The first patch corrects the logic to
account for months being 0-based. The second corrects the time
formatting, as it is dealing with local, not Zulu (UTC) time.
Sincerely,
Andrew Kroeger
From 3cf81eea1309084a973359c7f6a2375d5d20a3f0 Mon Sep 17 00:00:00 2001
From: Andrew Kroeger and...@id10ts.net
Date: Fri, 4 Sep 2009 01:24:00 -0500
Subject: [PATCH] selftest: Account for 0-based months in date parsing and
printing.
---
Summary of changes:
lib/util/tests/time.c | 25 +++--
selftest/Subunit.pm |6 +++---
2 files changed, 26 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/tests/time.c b/lib/util/tests/time.c
index b7cb608..d08a4e7 100644
--- a/lib/util/tests/time.c
+++ b/lib/util/tests/time.c
@@ -44,7 +44,17 @@ static bool test_http_timestring(struct torture_context
*tctx)
{
const char *start = Thu, 01 Jan 1970;
char *result;
- result = http_timestring(tctx, 42);
+ /*
+* Correct test for negative UTC offset. Without the correction, the
+* test fails when run on hosts with negative UTC offsets, as the date
+* returned is back in 1969 (pre-epoch).
+*/
+ time_t now = time(NULL);
+ struct tm local = *localtime(now);
+ struct tm gmt = *gmtime(now);
+ time_t utc_offset = mktime(local) - mktime(gmt);
+
+ result = http_timestring(tctx, 42 - (utc_offset 0 ? utc_offset : 0));
torture_assert(tctx, !strncmp(start, result,
strlen(start)), result);
torture_assert_str_equal(tctx, never,
@@ -55,7 +65,18 @@ static bool test_http_timestring(struct torture_context
*tctx)
static bool test_timestring(struct torture_context *tctx)
{
const char *start = Thu Jan 1;
- char *result = timestring(tctx, 42);
+ char *result;
+ /*
+* Correct test for negative UTC offset. Without the correction, the
+* test fails when run on hosts with negative UTC offsets, as the date
+* returned is back in 1969 (pre-epoch).
+*/
+ time_t now = time(NULL);
+ struct tm local = *localtime(now);
+ struct tm gmt = *gmtime(now);
+ time_t utc_offset = mktime(local) - mktime(gmt);
+
+ result = timestring(tctx, 42 - (utc_offset 0 ? utc_offset : 0));
torture_assert(tctx, !strncmp(start, result, strlen(start)),
result);
return true;
diff --git a/selftest/Subunit.pm b/selftest/Subunit.pm
index ecd712a..9d67c81 100644
--- a/selftest/Subunit.pm
+++ b/selftest/Subunit.pm
@@ -36,8 +36,8 @@ sub parse_results($$$)
$msg_ops-control_msg($_);
$msg_ops-start_test($1);
push (@$open_tests, $1);
- } elsif (/^time: (\d+)-(\d+)-(\d+) (\d+):(\d+):(\d+)Z\n/) {
- $msg_ops-report_time(mktime($6, $5, $4, $3, $2,
$1-1900));
+ } elsif (/^time: (\d+)-(\d+)-(\d+) (\d+):(\d+):(\d+)\n/) {
+
