[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 59e9661 Add regression test for bug #9329 - Directory listing with
SeBackup can crash smbd.
from a71ad96 ldb: Add ldbdump, based on tdbdump
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 59e9661de2dd19808295002f1329b27d5dca09e6
Author: Jeremy Allison
Date: Mon Oct 29 14:49:36 2012 -0700
Add regression test for bug #9329 - Directory listing with SeBackup can
crash smbd.
Ensure we exercise the SeBackup code path on directory listings.
Signed-off-by: Jeremy Allison
Reviewed-by: Michael Adam
Autobuild-User(master): Michael Adam
Autobuild-Date(master): Wed Oct 31 03:21:38 CET 2012 on sn-devel-104
---
Summary of changes:
source3/script/tests/test_smbclient_s3.sh | 62 +++-
source3/selftest/tests.py | 10 ++--
2 files changed, 64 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/script/tests/test_smbclient_s3.sh
b/source3/script/tests/test_smbclient_s3.sh
index 3341c62..fb518c5 100755
--- a/source3/script/tests/test_smbclient_s3.sh
+++ b/source3/script/tests/test_smbclient_s3.sh
@@ -2,9 +2,9 @@
# this runs the file serving tests that are expected to pass with samba3
-if [ $# -lt 7 ]; then
+if [ $# -lt 11 ]; then
cat <&1
+ret=$?
+if [ $ret != 0 ] ; then
+ priv_username="$DOMAIN\\$USERNAME"
+else
+ priv_username=$USERNAME
+fi
+
+$NET sam rights grant $priv_username SeBackupPrivilege 2>&1
+ret=$?
+if [ $ret != 0 ] ; then
+ echo "Failed to add SeBackupPrivilege to user $priv_username - $ret"
+ false
+ return
+fi
+
+cat > $tmpfile <&1
+ret=$?
+if [ $ret != 0 ] ; then
+ echo "failed to remove SeBackupPrivilege from user $priv_username -
$ret"
+ false
+ return
+fi
+}
+
LOGDIR_PREFIX=test_smbclient_s3
# possibly remove old logdirs:
@@ -552,6 +604,10 @@ testit "using an authentication file" \
test_auth_file || \
failed=`expr $failed + 1`
+testit "list with backup privilege" \
+test_backup_privilege_list || \
+failed=`expr $failed + 1`
+
testit "rm -rf $LOGDIR" \
rm -rf $LOGDIR || \
failed=`expr $failed + 1`
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 9b0527c..def4d83 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -180,20 +180,20 @@ plantestsuite("samba3.blackbox.smbclient_auth.plain (%s)
bad username" % env, en
# plain
for env in ["s3dc"]:
-plantestsuite("samba3.blackbox.smbclient_s3.plain (%s)" % env, env,
[os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER',
'$SERVER_IP', '$DOMAIN', '$DC_USERNAME', '$DC_PASSWORD', '$USERID',
'$LOCAL_PATH', '$PREFIX', smbclient3, wbinfo, configuration])
+plantestsuite("samba3.blackbox.smbclient_s3.plain (%s)" % env, env,
[os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER',
'$SERVER_IP', '$DOMAIN', '$DC_USERNAME', '$DC_PASSWORD', '$USERID',
'$LOCAL_PATH', '$PREFIX', smbclient3, wbinfo, net, configuration])
for env in ["member", "s3member"]:
-plantestsuite("samba3.blackbox.smbclient_s3.plain (%s) member creds" %
env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"),
'$SERVER', '$SERVER_IP', '$SERVER', '$SERVER$USERNAME', '$PASSWORD',
'$USERID', '$LOCAL_PATH', '$PREFIX', smbclient3, wbinfo, configuration])
+plantestsuite("samba3.blackbox.smbclient_s3.plain (%s) member creds" %
env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"),
'$SERVER', '$SERVER_IP', '$SERVER', '$SERVER$USERNAME', '$PASSWORD',
'$USERID', '$LOCAL_PATH', '$PREFIX', smbclient3, wbinfo, net, configuration])
for env in ["s3dc"]:
-plantestsuite("samba3.blackbox.smbclient_s3.sign (%s)" % env, env,
[os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER',
'$SERVER_IP', '$DOMAIN', '$DC_USERNAME', '$DC_PASSWORD', '$USERID',
'$LOCAL_PATH', '$PREFIX', smbclient3, wbinfo, configuration,
"--signing=required"])
+plantestsuite("samba3.blackbox.smbclient_s3.sign (%s)" % env, env,
[os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER',
'$SERVER_IP', '$DOMAIN', '$DC_USERNAME', '$DC_PASSWORD', '$USERID',
'$LOCAL_PATH', '$PREFIX', smbclient3, wbinfo, net, configuration,
"--signing=required"])
for env in ["member", "s3member"]:
-plantestsuite("samba3.blackbox.smbclient_s3.sign (%s) member creds" % env,
env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"),
'$SERVER', '$SERVER_IP', '$SERVER', '$SERVER$USERNAME', '$PASSWORD',
'$USERID', '$LOCAL_PATH', '$PREFIX', smbclient3, wbinfo, configuration,
"--signing=required"])
+plantestsuite("samba3.blackbox.smbclient_s3.sign (%s) member creds"
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/2012-10-31-0246/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2012-10-31-0246/samba3.stderr http://git.samba.org/autobuild.flakey/2012-10-31-0246/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2012-10-31-0246/samba.stderr http://git.samba.org/autobuild.flakey/2012-10-31-0246/samba.stdout The top commit at the time of the failure was: commit a71ad96bd046f1199e67b4fe8fc7783cbd8dd771 Author: Andrew Bartlett Date: Tue Oct 30 15:41:27 2012 +1100 ldb: Add ldbdump, based on tdbdump This uses a tdb_traverse or (more usefully) the tdb_rescue API, like tdbdump. The difference here is that it uses ldb helper functions to further eliminate faulty records, which avoids creating duplicates in the output. (The duplicates come from parts of records that are left in blank space in the db, which tdb_rescue finds, but which are not actually a full record). Andrew Bartlett Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Tue Oct 30 23:56:11 CET 2012 on sn-devel-104
[SCM] CTDB repository - annotated tag ctdb-2.0 created - ctdb-2.0
The annotated tag, ctdb-2.0 has been created at 23282c5c861fe5674960ad38ca635350937c6758 (tag) tagging cd64035d71ddff6aebe6c15a49e09527283425d2 (commit) replaces ctdb-1.13 tagged by Amitay Isaacs on Wed Oct 31 12:36:10 2012 +1100 - Log - New version 2.0 Amitay Isaacs (89): build: Add rules to create ctags/etags packaging: Setup directories for rpmbuild build: Remove re-definition of same variable build: Display correct LIB_FLAGS while building build: Use system talloc library if available build: Use system tevent library if available build: Use system tdb library if available recovery: Add prototypes for tdb internal functions build: Substitute POPT macros once and reuse variables tests/tool: Fix the nodestatus test tests/tool: New nodestatus test tests: exportfs always outputs with options in brackets tests: Add a script to run cluster tests and make target "test_cluster" tests: Add regular expression parsing for hop_count_buckets tests: Fix the error messages in test event script ctdbd: Fix the error message string tests: Check for assigned IP addresses only if we are on real cluster tests: Check assigned IPs from ctdb output tests: Set the debug level = 3 when running local tests tests: Use CTDB_TEST_REAL_CLUSTER to decide if tests use local daemons recoverd: Fix spurious warnings when running with --nopublicipcheck ctdbd: Fix spurious warnings when running with --nopublicipcheck includes: Move special tevent defines from tevent.h to includes.h Remove explicit include of lib/tevent/tevent.h. ctdb_test: Remove faked wrappers for tevent functions in stub testing lib/tevent: Remove local modifications to tevent lib/tevent: Remove the files required to build tevent as a library lib/tevent: Sync tevent from samba git tree lib/talloc: Remove the files required to build talloc as a library lib/talloc: Sync talloc from samba git tree lib/tdb: Remove the files required to build tdb as a library lib/tdb: Sync tdb from samba git tree tests/tool: Fix the nodestatus test tests/tool: New nodestatus test tests: Fix wrapper scripts tests: CTDB_TEST_WRAPPER has to be an absolute path on a real cluster tests: test_wrap needs to set TEST_SCRIPTS_DIR tests/simple: Fix typo in the test message server: locking: Provide a common API for non-blocking locking of TDBs Revert "server: locking: Provide a common API for non-blocking locking of TDBs" tests: Use per node log files when running tests with local daemons packaging: make ctdb-tests package depend on nc server: Replace BOOL datatype with bool, True/False with true/false tests: Fix flakey behavior of ctdb_fetch test tests: Fix ctdb_fetch test (parse extra lines of output) tests: Increment RSN always in ctdb_update_record_persistent test Fix compiler warnings. util: Do not try to lockdown memory when running in local daemons mode ctdbd: Return explicit boolean values for function returning bool Remove tevent_loop_allow_nesting() web: Add my name to the developer list. util: Do not lock down memory when running with local daemons doc: Fix path string of /etc/sysconfig/ctdb file Revert "when creating/adding a public ip, set the initial interface to be the first interface specified" doc: Fix the hyperlink for "Testing CTDB" page scripts: Remove duplicate code from init script to set tunables doc: Fix documentation for setup event doc: Add info about execute permissions on event scripts header: Added DB statistics update macros common: Add routines to get process and lock information ctdbd: locking: Provide non-blocking API for locking of TDB record/db/alldb tools/ctdb: Display the locking statistics tests: Fix statistics test for new output lines from locking API ctdbd_test: Include ctdb_lock.c code for test stubs ctdb_freeze: Replace locking functions with locking API ctdb_recover: Replace static locking functions with locking API ctdbd: Replace lockwait with locking API and remove ctdb_lockwait.c locking: Schedule a new lock request everytime a lock is released locking: Add database priority handling for older versions of samba locking: Do not use ctdb_kill() to kill smbd processes build: Set CTDB_PATH to /tmp/ctdb.socket if SOCKPATH is not defined web: Remove reference to non-existent config files web: Add the links to ftp/http ctdb download area web: Add posix locking information to prerequisites doc: README - add information about CTDB, license and website build: Extract building of manpages in a separate Makefile packaging:
[SCM] CTDB repository - branch master updated - ctdb-1.13-341-gcd64035
The branch, master has been updated
via cd64035d71ddff6aebe6c15a49e09527283425d2 (commit)
from ceac026713a7ee30ea865ed4a9422900ed76fdf6 (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master
- Log -
commit cd64035d71ddff6aebe6c15a49e09527283425d2
Author: Martin Schwenke
Date: Wed Oct 31 12:33:25 2012 +1100
ctdbd: Fix compilation warning in locking code
Signed-off-by: Martin Schwenke
---
Summary of changes:
server/ctdb_lock.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/server/ctdb_lock.c b/server/ctdb_lock.c
index 8097e84..81f0eb3 100644
--- a/server/ctdb_lock.c
+++ b/server/ctdb_lock.c
@@ -1039,13 +1039,13 @@ void ctdb_lock_blocked_handler(struct tevent_context
*ev,
DEBUG(DEBUG_WARNING,
("Process %s (pid=%d) locked database %s (inode %lu) for
%.0lf seconds\n",
(process_name ? process_name : "unknown"),
- blocker_pid, db_name, inode,
+ blocker_pid, db_name, (unsigned long)inode,
timeval_elapsed(&lock_ctx->start_time)));
} else {
DEBUG(DEBUG_WARNING,
("Process %s (pid=%d) locked database (inode %lu) for
%.0lf seconds\n",
(process_name ? process_name : "unknown"),
- blocker_pid, inode,
+ blocker_pid, (unsigned long)inode,
timeval_elapsed(&lock_ctx->start_time)));
}
--
CTDB repository
[SCM] CTDB repository - branch master updated - ctdb-1.13-340-gceac026
The branch, master has been updated
via ceac026713a7ee30ea865ed4a9422900ed76fdf6 (commit)
via aad1584da8a8425bc6f5163c95810e9d2390dc91 (commit)
from 16a91c2a4d03b46743611e2fe844bb2cef95e46a (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master
- Log -
commit ceac026713a7ee30ea865ed4a9422900ed76fdf6
Author: Amitay Isaacs
Date: Wed Oct 31 12:17:27 2012 +1100
web: Update instructions for building from tarball
Signed-off-by: Amitay Isaacs
commit aad1584da8a8425bc6f5163c95810e9d2390dc91
Author: Amitay Isaacs
Date: Wed Oct 31 12:10:22 2012 +1100
tests: Do not check release suffix in ctdb version test
release suffix added by RPM is to track packaging changes. Core CTDB
version does not include the release suffix.
Signed-off-by: Amitay Isaacs
---
Summary of changes:
tests/simple/01_ctdb_version.sh |3 ++-
web/building.html | 10 +-
2 files changed, 11 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/tests/simple/01_ctdb_version.sh b/tests/simple/01_ctdb_version.sh
index 5a36ea4..3e1ed3e 100755
--- a/tests/simple/01_ctdb_version.sh
+++ b/tests/simple/01_ctdb_version.sh
@@ -39,8 +39,9 @@ if ! try_command_on_node -v 0 "rpm -q ctdb" ; then
fi
rpm_ver="${out#ctdb-}"
# Some version of RPM append the architecture to the version.
+# And also remove the release suffix.
arch=$(uname -m)
-rpm_ver="${rpm_ver%.${arch}}"
+rpm_ver="${rpm_ver%-*.${arch}}"
try_command_on_node -v 0 "$CTDB version"
ctdb_ver="${out#CTDB version: }"
diff --git a/web/building.html b/web/building.html
index fc4789c..7475078 100644
--- a/web/building.html
+++ b/web/building.html
@@ -4,7 +4,7 @@
Building CTDB and Samba
CTDB
-To build a copy of the CTDB code you should do this:
+To build a copy of CTDB code from a git tree you should do this:
cd ctdb
./autogen.sh
@@ -13,6 +13,14 @@ To build a copy of the CTDB code you should do this:
make install
+To build a copy of CTDB code from a tarball you should do this:
+
+ tar xf ctdb-x.y.tar.gz
+ cd ctdb-x.y
+ ./configure
+ make
+ make install
+
You need to install ctdb on all nodes of your cluster.
--
CTDB repository
Re: [SCM] Samba Shared Repository - branch master updated
On Tue, 2012-10-30 at 23:57 +0100, Andrew Bartlett wrote: > commit cc6d0decc7980028293168aee267e7610752fc80 > Author: Andrew Bartlett > Date: Tue Oct 30 10:21:42 2012 +1100 > > ldb: Change ltdb_unpack_data to take an ldb_context > > It always de-references the module to find the ldb anyway. > > Andrew Bartlett Andrew, why are you messing over with these interface conventions ? I see no rationale for this change, can you please revert and learn a bit about consistent and predictable interfaces ? Thanks. Simo. -- Simo Sorce Samba Team GPL Compliance Officer Principal Software Engineer at Red Hat, Inc.
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via a71ad96 ldb: Add ldbdump, based on tdbdump via 4b2f3c6 ldb: Remove no-longer-existing ltdb_unpack_data_free from ldb_tdb.h via cc6d0de ldb: Change ltdb_unpack_data to take an ldb_context via 42c379f samba-tool: Add samba-tool processes subcommand via a732f2a pymessaging: Add irpc_servers_byname() and irpc_all_servers() via 76b7348 pymessaging: Use the server_id IDL structure rather than a tuple via 3b4ef03 imessaging: Add irpc_all_servers() to list all available servers from 39e58d6 s3fs-utils: Free the popt context in smbcacls and smbquotas. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit a71ad96bd046f1199e67b4fe8fc7783cbd8dd771 Author: Andrew Bartlett Date: Tue Oct 30 15:41:27 2012 +1100 ldb: Add ldbdump, based on tdbdump This uses a tdb_traverse or (more usefully) the tdb_rescue API, like tdbdump. The difference here is that it uses ldb helper functions to further eliminate faulty records, which avoids creating duplicates in the output. (The duplicates come from parts of records that are left in blank space in the db, which tdb_rescue finds, but which are not actually a full record). Andrew Bartlett Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Tue Oct 30 23:56:11 CET 2012 on sn-devel-104 commit 4b2f3c6dec997b0dd4bcafeae662a71ebd34e12b Author: Andrew Bartlett Date: Tue Oct 30 10:22:28 2012 +1100 ldb: Remove no-longer-existing ltdb_unpack_data_free from ldb_tdb.h commit cc6d0decc7980028293168aee267e7610752fc80 Author: Andrew Bartlett Date: Tue Oct 30 10:21:42 2012 +1100 ldb: Change ltdb_unpack_data to take an ldb_context It always de-references the module to find the ldb anyway. Andrew Bartlett commit 42c379f0dfdeb36598bb2636aa2b6e3ca4410930 Author: Andrew Bartlett Date: Mon Oct 29 15:36:36 2012 +1100 samba-tool: Add samba-tool processes subcommand This will allow administrators to inspect the process list in a similar way to what running on a platform with setproctitle might permit. --pid= returns the registered server names for a PID (eg kdc, cldap_server) --name= returns the pids registered with a particular name. Andrew Bartlett commit a732f2a621665923322422c5a3d788c9d1aa8df9 Author: Andrew Bartlett Date: Mon Oct 29 15:34:41 2012 +1100 pymessaging: Add irpc_servers_byname() and irpc_all_servers() This will allow python scripts to inspect the process list. Andrew Bartlett commit 76b7348299870279acec5b7c9f02f4e4b2461703 Author: Andrew Bartlett Date: Mon Oct 29 15:33:59 2012 +1100 pymessaging: Use the server_id IDL structure rather than a tuple This will make it easier to pass this structure in and out. The tuple is still accepted as input. Andrew Bartlett commit 3b4ef03097293f758d8f11cbe434063ed1dc6b91 Author: Andrew Bartlett Date: Mon Oct 29 15:32:21 2012 +1100 imessaging: Add irpc_all_servers() to list all available servers This is implemented with a tdb_traverse_read(), and will allow a tool to disover the name and server_id of all Samba processes, as each process registers itself to recieve messages. Andrew Bartlett --- Summary of changes: lib/ldb/ldb_tdb/ldb_index.c|2 +- lib/ldb/ldb_tdb/ldb_pack.c |4 +- lib/ldb/ldb_tdb/ldb_search.c |6 +- lib/ldb/ldb_tdb/ldb_tdb.c |2 +- lib/ldb/ldb_tdb/ldb_tdb.h |4 +- lib/ldb/tools/ldbdump.c| 219 lib/ldb/wscript|4 + librpc/wscript_build |5 + source4/lib/messaging/irpc.h |2 + source4/lib/messaging/messaging.c | 71 +++ source4/lib/messaging/pymessaging.c| 124 +++- source4/librpc/idl/irpc.idl| 13 +- source4/librpc/wscript_build |6 + source4/scripting/python/samba/netcmd/main.py |2 + source4/scripting/python/samba/netcmd/processes.py | 78 +++ source4/scripting/python/samba/tests/messaging.py | 13 +- .../python/samba/tests/samba_tool/processes.py | 35 +++ source4/selftest/tests.py |1 + 18 files changed, 572 insertions(+), 19 deletions(-) create mode 100644 lib/ldb/tools/ldbdump.c create mode 100644 source4/scripting/python/samba/netcmd/processes.py create mode 100644 source4/scripting/python/samba/tests/samba_tool/processes.py Changeset truncated at 500 lines: diff --git a/lib/ldb/ldb_
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 39e58d6 s3fs-utils: Free the popt context in smbcacls and smbquotas.
via aca807c s3fs-net: Use talloc for memory allocation.
from a88e3be s3:docs document shadow:snapdirseverywhere option of
vfs_shadow_copy2
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 39e58d6845ee4dab0e9ae1537fccaed837ead728
Author: Andreas Schneider
Date: Mon Oct 29 21:12:14 2012 +0100
s3fs-utils: Free the popt context in smbcacls and smbquotas.
Signed-off-by: Andreas Schneider
Reviewed by: Jeremy Allison
Autobuild-User(master): Jeremy Allison
Autobuild-Date(master): Tue Oct 30 20:22:46 CET 2012 on sn-devel-104
commit aca807c94cdb44cc846562400495ee3a7114f8e0
Author: Andreas Schneider
Date: Mon Oct 29 21:12:13 2012 +0100
s3fs-net: Use talloc for memory allocation.
Signed-off-by: Andreas Schneider
Reviewed by: Jeremy Allison
---
Summary of changes:
source3/utils/net.c|2 +-
source3/utils/smbcacls.c |2 ++
source3/utils/smbcquotas.c |2 ++
3 files changed, 5 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/utils/net.c b/source3/utils/net.c
index eccb522..85fe2f6 100644
--- a/source3/utils/net.c
+++ b/source3/utils/net.c
@@ -868,7 +868,7 @@ static struct functable net_func[] = {
break;
case 'U':
c->opt_user_specified = true;
- c->opt_user_name = SMB_STRDUP(c->opt_user_name);
+ c->opt_user_name = talloc_strdup(c, c->opt_user_name);
p = strchr(c->opt_user_name,'%');
if (p) {
*p = 0;
diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index 3d18bee..7df4e48 100644
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -1435,6 +1435,8 @@ static struct cli_state *connect_one(struct
user_auth_info *auth_info,
return -1;
}
+ poptFreeContext(pc);
+
string_replace(path,'/','\\');
server = talloc_strdup(frame, path+2);
diff --git a/source3/utils/smbcquotas.c b/source3/utils/smbcquotas.c
index be82e34..b962103 100644
--- a/source3/utils/smbcquotas.c
+++ b/source3/utils/smbcquotas.c
@@ -688,6 +688,8 @@
FSQFLAGS:QUOTA_ENABLED/DENY_DISK/LOG_SOFTLIMIT/LOG_HARD_LIMIT", "SETSTRING" },
exit(EXIT_PARSE_ERROR);
}
+ poptFreeContext(pc);
+
string_replace(path, '/', '\\');
server = SMB_STRDUP(path+2);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via a88e3be s3:docs document shadow:snapdirseverywhere option of vfs_shadow_copy2 from d8fc4cd s3:smb2_read: fix SMBD_SMB2_NUM_IOV_PER_REQ check for sendfile() support (bug #9341) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit a88e3be794a7458ad644e5b73435971533aa7dbe Author: Christian Ambach Date: Tue Oct 30 15:39:02 2012 +0100 s3:docs document shadow:snapdirseverywhere option of vfs_shadow_copy2 Autobuild-User(master): Volker Lendecke Autobuild-Date(master): Tue Oct 30 18:32:57 CET 2012 on sn-devel-104 --- Summary of changes: docs-xml/manpages/vfs_shadow_copy2.8.xml | 15 +++ 1 files changed, 15 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/manpages/vfs_shadow_copy2.8.xml b/docs-xml/manpages/vfs_shadow_copy2.8.xml index 34f3d1b..b313416 100644 --- a/docs-xml/manpages/vfs_shadow_copy2.8.xml +++ b/docs-xml/manpages/vfs_shadow_copy2.8.xml @@ -157,6 +157,21 @@ + + shadow:snapdirseverywhere = yes/no + + + If you enable + shadow:snapdirseverywhere then this module will look + out for snapshot directories in the current and all parent + directories of the current working directory. + An example where this is needed are independent filesets in + IBM's GPFS, but other filesystems might support snapshotting + only particular subtrees of the filesystem as well. + + + + -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via d8fc4cd s3:smb2_read: fix SMBD_SMB2_NUM_IOV_PER_REQ check for sendfile() support (bug #9341) from e6643fb wafbuild: use -Wstack-protector if available http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit d8fc4cd25e40164e23c0375b073cb42723892146 Author: Stefan Metzmacher Date: Tue Oct 30 11:08:19 2012 +0100 s3:smb2_read: fix SMBD_SMB2_NUM_IOV_PER_REQ check for sendfile() support (bug #9341) Reported-by: Sebastien LAVEZE Signed-off-by: Stefan Metzmacher Reviewed-by: Michael Adam Tested-by: Sebastien LAVEZE Autobuild-User(master): Michael Adam Autobuild-Date(master): Tue Oct 30 16:49:26 CET 2012 on sn-devel-104 --- Summary of changes: source3/smbd/smb2_read.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/smbd/smb2_read.c b/source3/smbd/smb2_read.c index 2890f86..41adb03 100644 --- a/source3/smbd/smb2_read.c +++ b/source3/smbd/smb2_read.c @@ -277,7 +277,7 @@ static NTSTATUS schedule_smb2_sendfile_read(struct smbd_smb2_request *smb2req, if (!lp__use_sendfile(SNUM(fsp->conn)) || smb2req->do_signing || smb2req->do_encryption || - smb2req->in.vector_count < (2*SMBD_SMB2_NUM_IOV_PER_REQ) || + smb2req->in.vector_count >= (2*SMBD_SMB2_NUM_IOV_PER_REQ) || (fsp->base_fsp != NULL) || (fsp->wcp != NULL) || (!S_ISREG(fsp->fsp_name->st.st_ex_mode)) || -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via e6643fb wafbuild: use -Wstack-protector if available
via 9a03cc9 wafbuild: use WERROR_FLAGS in
wscript_configure_system_mitkrb5
via fdead58 ccan/wafbuild: use WERROR_CFLAGS instead of -Werror
via 7fcb253 wafbuild: reorder the Werror checks so that the ambigous w2
option is being checked last
via 5169204 wafbuild: merge the missing IBM compiler Werror flag
"-qhalt=w" to waf
via 0342ca4 wfabuild: fix the -errwarn compile flag test
from a3a1cd4 packaging: Add NetworkManager dispatcher script for winbind.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit e6643fbf48afccd0acedb65fbe24d3ce84d44c40
Author: Björn Jacke
Date: Tue Oct 30 13:00:58 2012 +0100
wafbuild: use -Wstack-protector if available
Autobuild-User(master): Björn Jacke
Autobuild-Date(master): Tue Oct 30 15:04:30 CET 2012 on sn-devel-104
commit 9a03cc93f45a6908c73afe2d059a4ebf5534fdb7
Author: Björn Jacke
Date: Tue Oct 30 12:19:24 2012 +0100
wafbuild: use WERROR_FLAGS in wscript_configure_system_mitkrb5
commit fdead585dc11101761ac975935134c6a84ea3b4f
Author: Björn Jacke
Date: Tue Oct 30 12:07:26 2012 +0100
ccan/wafbuild: use WERROR_CFLAGS instead of -Werror
commit 7fcb2532b99ddf65d78dd02ea06ce8a1a6229949
Author: Björn Jacke
Date: Tue Oct 30 11:48:25 2012 +0100
wafbuild: reorder the Werror checks so that the ambigous w2 option is being
checked last
commit 51692042d9f898c5e8f1cbc78031e37d23ec032a
Author: Björn Jacke
Date: Tue Oct 30 11:37:34 2012 +0100
wafbuild: merge the missing IBM compiler Werror flag "-qhalt=w" to waf
commit 0342ca40629d5a57db02c7f840809dfa0bde6780
Author: Björn Jacke
Date: Tue Oct 30 11:32:52 2012 +0100
wfabuild: fix the -errwarn compile flag test
as in the autoconf build this must be "-errwarn=%all"
---
Summary of changes:
lib/ccan/wscript | 17 +++--
lib/replace/wscript |9 -
lib/util/util_net.c |3 +++
wscript_configure_system_mitkrb5 |4 ++--
4 files changed, 20 insertions(+), 13 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/ccan/wscript b/lib/ccan/wscript
index 4af9dd4..59b8205 100644
--- a/lib/ccan/wscript
+++ b/lib/ccan/wscript
@@ -7,26 +7,23 @@ def configure(conf):
conf.CHECK_HEADERS('err.h')
conf.CHECK_HEADERS('byteswap.h')
conf.CHECK_FUNCS('bswap_64', link=False, headers="byteswap.h")
-
-# FIXME: if they don't have -Werror, these will all fail. But they
-# probably will anyway...
conf.CHECK_CODE('int __attribute__((cold)) func(int x) { return x; }',
-addmain=False, link=False, cflags="-Werror",
+addmain=False, link=False,
cflags=conf.env['WERROR_CFLAGS'],
define='HAVE_ATTRIBUTE_COLD')
conf.CHECK_CODE('int __attribute__((const)) func(int x) { return x; }',
-addmain=False, link=False, cflags="-Werror",
+addmain=False, link=False,
cflags=conf.env['WERROR_CFLAGS'],
define='HAVE_ATTRIBUTE_CONST')
conf.CHECK_CODE('void __attribute__((noreturn)) func(int x) { exit(x); }',
-addmain=False, link=False, cflags="-Werror",
+addmain=False, link=False,
cflags=conf.env['WERROR_CFLAGS'],
define='HAVE_ATTRIBUTE_NORETURN')
conf.CHECK_CODE('void __attribute__((format(__printf__, 1, 2))) func(const
char *fmt, ...) { }',
-addmain=False, link=False, cflags="-Werror",
+addmain=False, link=False,
cflags=conf.env['WERROR_CFLAGS'],
define='HAVE_ATTRIBUTE_PRINTF')
conf.CHECK_CODE('int __attribute__((unused)) func(int x) { return x; }',
-addmain=False, link=False, cflags="-Werror",
+addmain=False, link=False,
cflags=conf.env['WERROR_CFLAGS'],
define='HAVE_ATTRIBUTE_UNUSED')
conf.CHECK_CODE('int __attribute__((used)) func(int x) { return x; }',
-addmain=False, link=False, cflags="-Werror",
+addmain=False, link=False,
cflags=conf.env['WERROR_CFLAGS'],
define='HAVE_ATTRIBUTE_USED')
# We try to use headers for a compile-time test.
conf.CHECK_CODE(code = """#ifdef __BYTE_ORDER
@@ -121,7 +118,7 @@ def configure(conf):
link=True,
define='HAVE_TYPEOF')
conf.CHECK_CODE('int __attribute__((warn_unused_result)) func(int x) {
return x; }',
-addmain=False, link=False, cflags="-Werror",
+addmain=False, link=False,
cflags=conf.env['WERROR_CFLAGS'],
define='HAVE_WARN_UNUSED_RESULT')
# backtrace coul
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via a3a1cd4 packaging: Add NetworkManager dispatcher script for winbind.
from 4dfded0 s3: Use file_id_string in file_id_string_tos
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit a3a1cd4797c99cb5fd0234c2dfe40e5dcafb05f8
Author: Andreas Schneider
Date: Fri Oct 26 12:46:21 2012 +0200
packaging: Add NetworkManager dispatcher script for winbind.
Signed-off-by: Andreas Schneider
Signed-off-by: Andreas Schneider
Reviewed-by: David Disseldorp
Autobuild-User(master): David Disseldorp
Autobuild-Date(master): Tue Oct 30 13:17:02 CET 2012 on sn-devel-104
---
Summary of changes:
packaging/NetworkManager/30-winbind-systemd | 20
packaging/NetworkManager/README |6 ++
2 files changed, 26 insertions(+), 0 deletions(-)
create mode 100755 packaging/NetworkManager/30-winbind-systemd
create mode 100644 packaging/NetworkManager/README
Changeset truncated at 500 lines:
diff --git a/packaging/NetworkManager/30-winbind-systemd
b/packaging/NetworkManager/30-winbind-systemd
new file mode 100755
index 000..af0edf9
--- /dev/null
+++ b/packaging/NetworkManager/30-winbind-systemd
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+winbind_is_active=$(/bin/systemctl is-active winbind.service)
+test "${winbind_is_active}" = "active" || exit 0
+
+winbind_offline_logon=$(testparm -s --parameter-name "winbind offline logon"
2>/dev/null)
+test "${winbind_offline_logon}" = "Yes" || exit 0
+
+case "$2" in
+ up|vpn-up)
+ nmb_is_active=$(/bin/systemctl is-active nmb.service)
+ if test "${nmb_is_active}" = "active"; then
+ /bin/systemctl try-restart nmb.service || :
+ fi
+ /usr/bin/smbcontrol winbind online || :
+ ;;
+ down)
+ /usr/bin/smbcontrol winbind offline
+ ;;
+esac
diff --git a/packaging/NetworkManager/README b/packaging/NetworkManager/README
new file mode 100644
index 000..0db8be6
--- /dev/null
+++ b/packaging/NetworkManager/README
@@ -0,0 +1,6 @@
+This directory includes files for the dispatcher of NetworkManager. The files
+need to be copied to /etc/NetworkManager/dispatcher.d/ and will be
automatically
+called if a network interface goes up or down.
+
+30-winbind-systemd: This will set winbind into offline mode if you have winbind
+offline logon turned on.
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-0-test updated
The branch, v4-0-test has been updated via 7e100a2 WHATSNEW: Correct list of changed parameters. from 4309dd1 VERSION: Bump version number up to 4.0.0rc5 http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test - Log - commit 7e100a2d8fe479e612bae0cae9dc6003bf723768 Author: Karolin Seeger Date: Tue Oct 30 11:31:08 2012 +0100 WHATSNEW: Correct list of changed parameters. These synonyms do still exist. Thanks to Björn Baumbach for noticing! Karolin Autobuild-User(v4-0-test): Karolin Seeger Autobuild-Date(v4-0-test): Tue Oct 30 13:13:46 CET 2012 on sn-devel-104 --- Summary of changes: WHATSNEW.txt |2 -- 1 files changed, 0 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index dc3b1e4..bbc11c8 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -125,8 +125,6 @@ smb.conf changes kernel share modes New kpasswd portNew krb5 port New - max protocolRemoved - min protocolRemoved nbt client socket address New nbt portNew nsupdate commandNew -- Samba Shared Repository
[SCM] Samba Website Repository - branch master updated
The branch, master has been updated via e09853f Announce Samba 4.0.0rc4. from b9b2ca2 Announce Samba 3.6.9. http://gitweb.samba.org/?p=samba-web.git;a=shortlog;h=master - Log - commit e09853fae9f5f8b82d646c4b0665d4aadc349744 Author: Karolin Seeger Date: Tue Oct 30 09:15:42 2012 +0100 Announce Samba 4.0.0rc4. Karolin --- Summary of changes: generated_news/latest_10_bodies.html| 21 + generated_news/latest_10_headlines.html |4 ++-- generated_news/latest_2_bodies.html | 20 ++-- 3 files changed, 21 insertions(+), 24 deletions(-) Changeset truncated at 500 lines: diff --git a/generated_news/latest_10_bodies.html b/generated_news/latest_10_bodies.html index 5decb2b..c160bf2 100644 --- a/generated_news/latest_10_bodies.html +++ b/generated_news/latest_10_bodies.html @@ -1,3 +1,12 @@ + 30 October 2012 + Samba 4.0.0rc4 Available for Download + This is the fourth release candidate of the Samba 4.0 series. + +The uncompressed tarballs and patch files have been signed +using GnuPG (ID 6568B7EA). The source code can be +https://download.samba.org/pub/samba/rc/samba-4.0.0rc4.tar.gz";>downloaded now. +See https://download.samba.org/pub/samba/rc/WHATSNEW-4-0-0rc4.txt";>the release notes for more info. + 29 October 2012 Samba 3.6.9 Available for Download This is the latest stable release of the Samba 3.6 series. @@ -87,15 +96,3 @@ the release notes for more info. using GnuPG (ID 6568B7EA). The source code can be http://samba.org/samba/ftp/stable/samba-3.5.16.tar.gz";>downloaded now. A http://samba.org/samba/ftp/patches/patch-3.5.15-3.5.16.diffs.gz";>patch against Samba 3.5.15 is also available. See http://samba.org/samba/history/samba-3.5.16.html";>the release notes for more info. - - 25 June 2012 - Samba 3.6.6 Available for Download - This is the latest stable release of the Samba 3.6 series. - -The uncompressed tarballs and patch files have been signed -using GnuPG (ID 6568B7EA). The source code can be -http://samba.org/samba/ftp/stable/samba-3.6.6.tar.gz";>downloaded -now. A http://samba.org/samba/ftp/patches/patch-3.6.5-3.6.6.diffs.gz";> -patch against Samba 3.6.5 is also available. -See http://samba.org/samba/history/samba-3.6.6.html";> -the release notes for more info. diff --git a/generated_news/latest_10_headlines.html b/generated_news/latest_10_headlines.html index d536110..259af8d 100644 --- a/generated_news/latest_10_headlines.html +++ b/generated_news/latest_10_headlines.html @@ -1,4 +1,6 @@ +30 October 2012 Samba 4.0.0rc4 Available for Download + 29 October 2012 Samba 3.6.9 Available for Download 16 October 2012 Samba 4.0.0rc3 Available for Download @@ -16,6 +18,4 @@ 06 August 2012 Samba 3.6.7 Available for Download 02 July 2012 Samba 3.5.16 Available for Download - -25 June 2012 Samba 3.6.6 Available for Download diff --git a/generated_news/latest_2_bodies.html b/generated_news/latest_2_bodies.html index 5125f47..b485893 100644 --- a/generated_news/latest_2_bodies.html +++ b/generated_news/latest_2_bodies.html @@ -1,3 +1,13 @@ + 30 October 2012 + Samba 4.0.0rc4 Available for Download + This is the fourth release candidate of the Samba 4.0 series. + +The uncompressed tarballs and patch files have been signed +using GnuPG (ID 6568B7EA). The source code can be +https://download.samba.org/pub/samba/rc/samba-4.0.0rc4.tar.gz";>downloaded now. +See https://download.samba.org/pub/samba/rc/WHATSNEW-4-0-0rc4.txt";>the release notes for more info. + + 29 October 2012 Samba 3.6.9 Available for Download This is the latest stable release of the Samba 3.6 series. @@ -9,13 +19,3 @@ now. A http://samba.org/samba/ftp/patches/patch-3.6.8-3.6.9.diffs.g patch against Samba 3.6.8 is also available. See http://samba.org/samba/history/samba-3.6.9.html";> the release notes for more info. - - - 16 October 2012 - Samba 4.0.0rc3 Available for Download - This is the third release candidate of the Samba 4.0 series. - -The uncompressed tarballs and patch files have been signed -using GnuPG (ID 6568B7EA). The source code can be -https://download.samba.org/pub/samba/rc/samba-4.0.0rc3.tar.gz";>downloaded now. -See https://download.samba.org/pub/samba/rc/WHATSNEW-4-0-0rc3.txt";>the release notes for more info. -- Samba Website Repository
[SCM] Samba Shared Repository - annotated tag samba-4.0.0rc4 created
The annotated tag, samba-4.0.0rc4 has been created at 5ee38616a89f84a71acd9448985dcec5a4d2148e (tag) tagging 8c72009f6d9bf85d35d4cefedc935c14dd799516 (commit) replaces samba-4.0.0rc3 tagged by Karolin Seeger on Tue Oct 30 09:08:56 2012 +0100 - Log - samba: tag release samba-4.0.0rc4 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.18 (GNU/Linux) iD8DBQBQj4sibzORW2Vot+oRAlqFAJ9SnbA8FYiBn9oiQwRif1yaEBAqRgCeK2N6 rYmjiTq7ivnx4bzEkWThCDU= =f7yN -END PGP SIGNATURE- Andreas Schneider (2): BUG #9295: Build standard auth modules as internal modules. packaging: Move smbprint to a comman location. Andrew Bartlett (2): build: Assert that auth_domain, auth_builtin, auth_sam, auth_winbind are builtin ldb: bump version to 1.1.13 so the 4.0 release can get the isprint fix Björn Baumbach (2): docs: fix opening and ending tag mismatch: para docs: fix opening and ending tag mismatch: para Christian Ambach (1): s3:utils/net fix a compiler warning David Disseldorp (1): pam_winbind: fix segfault in pam_sm_authenticate() Gregor Beck (22): s3:auth: use const in smb_pam_xxx_session() s3:rpc_server/srvsvc: remove function net_enum_pipes() s3:lib: remove unused function connections_traverse() s3:smbcontrol: don't do stack_trace by connection but by server_id. s3:count_current_connections: do not clear orphaned entries from connections.tdb s3:net_status_shares: use connections_forall_read for a read only traversal s3:smbd: pass smbXsrv_session instead of user_struct to session_claim() and session_yield() s3:smbd: remove smbd_server_connection argument from session_claim() s3:smbd: initialize session->global before calling session_claim s3:smbd: use session_global_id as session number for pam and utmp s3:smbXsrv_session: add smbXsrv_session_global_traverse() s3:smbXsrv_tcon: add smbXsrv_tcon_global_traverse() s3:build: move sessionid_tdb.o and conn_tdb.o to SMBD_OBJ_BASE s3:smbd:setup_new_vc_session: traverse sessions instead of connections to shutdown other smbds s3:smbd/connection: use smbXsrv_tcon_traverse to count connections s3:lib: implement sessionid_traverse_read with smb2srv_session_traverse_read s3:smbd: don't use (fill) sessionid.tdb in session_claim/yield any more. s3:net_serverid: remove sessionid_traverse from "net serverid wipedbs" s3:lib: remove unused sessionid_*() functions s3:net_serverid: remove connections_forall from "net serverid wipedbs" s3:lib: remove function connections_forall() s3:lib/conn_tdb: implement connections_forall_read() based on smbXsrv_*_global_traverse() Jelmer Vernooij (62): wafsamba: Ignore some more symbols when checking for dupes. (cherry picked from commit 276460cf8afb4894fe1e980c7a75e866c14ba144) samba.provision.sambadns: Use == to compare strings, not 'is'. (cherry picked from commit 2adf27a99b999a4fd0329d9fa398a9208b60e367) samba4-tests: Move 'samba.tests.source' up. selftests.tests: Remove reference to Samba 4. (cherry picked from commit 1080b6c2caf1191fd896f3caf38e576a00b01982) selftest: Move some tests to common test script. (cherry picked from commit 1aa291c331c29c2f5ee4572b660c4c2061755856) samba.join: Fix multiple spaces. selftest: Move more tests to common list script. samba-tool user test: Fix expected output. smb.conf(5): Extend 'server min protocol' description. (cherry picked from commit dfe75c2f3591652a370a36f73f70e8055bda9d11) smb.conf(5): Add basic documentation for 'winbindd socket directory'. (cherry picked from commit d0b38752471dd870ad640fd39076bc51f84c57d1) smb.conf(5): Add basic documentation for 'winbindd privileged socket directory'. (cherry picked from commit 3cea6257a9e4a3e1dc46e6c555d57992a73d6e6c) smb.conf(5): Add : to idmap config description to mark it as parametric. (cherry picked from commit c6ba8575ea7fe8b0fdc49d4f823ca441ae99070a) smb.conf(5): Add basic documentation for 'ntvfs handler'. (cherry picked from commit 394258ad4c3413388e800800b2b1b941de037fa3) smb.conf(5): Add basic documentation for 'dns forwarder'. (cherry picked from commit e9d91cd4a133d7acb377341282230f99f5e10a12) smb.conf(5): Add basic documentation 'winbind sealed pipes'. (cherry picked from commit e7c8fcaea5b06897603abb6f4f38ce39b400c9a7) samba-tool user: Fix typos, improve messages. (cherry picked from commit d09f15163843c5a027476e9087ae96700f6de003) smb.conf(5): Add basic documentation for 'samba kcc command'. (cherry picked from commit a63d6a909406c2d0e04f6142f9614c3543ae2d1b) smb.conf(5): Add basic documentation for 'server services'. (cherry picked from commit 3cc61af7ff3b90026fdc6fc84ad905041154bfaf) smb.conf(5): Add basic documentation for 'dns update command'. (ch
[SCM] Samba Shared Repository - branch v4-0-stable updated
The branch, v4-0-stable has been updated via 8c72009 VERSION: Disable GIT snapshot to prepare rc4 release. via f6b8919 WHATSNEW: Update changes since rc3. via e83ad06 source3.selftest: Move last variables to selftesthelpers. via ff52138 source3.selftest: Move more variables to be in common. (cherry picked from commit 66980989e5b28490cd7b04b576cf39d26f183b90) via 23a6320 selftesthelpers: Fix detection of tap2subunit. via d1deda0 selftest: Add --random-order option. (cherry picked from commit 67dd28f3605db4cbdc5feacc1121ec3d7dd075a6) via cf1ede2 source4.selftest.tests: Add FIXME about database verification. (cherry picked from commit 1190f385f72f68f22277c8b380f2d4c461c413a4) via 2008f37 selftesthelpers: Simplify detection of tap2subunit. (cherry picked from commit 05dc5a39a6ad4b1ffafc904faea3e8e40f6f5cde) via 85bf826 source3.selftests.tests: Use common plansmbtorture4testsuite() function. (cherry picked from commit fd607e0a9eefb79130941e244435980afbbb4bf7) via 81c796d source3.selftest.tests: Add suffix for smbclient3/ntlm_auth3. (cherry picked from commit efb27e29dadf58d2dec651ca3a0c108b4cf515ae) via 020f3f4 source3.selftest.tests: Remove tabs. (cherry picked from commit a841f0fced7abfb0f6d98390c07becdf49a91af5) via 5abde61 source4.selftest.tests: Add suffix for smbclient4/nmblookup4. (cherry picked from commit ea5e2b56c14072eeaa785d05f1da4d439667e8b6) via a3d1446 selftesthelpers: Add function for printing smbtorture4 version. (cherry picked from commit 58345820c078f79fe7f67b8e6f947691f7237641) via 4d2fc2a selftest: Move determining of smbtorture4 options to selftesthelpers. (cherry picked from commit 8237e2727da0d04b82cb3cf644dd337a4c77fe34) via 244ca61 selftest/selftesthelpers: Share environment handling for extra smbtorture options. (cherry picked from commit fcb7926ce544a8d4b0e5aa6577fe21712b38bb53) via e2adfe7 selftest/selftesthelpers.py: Share configuration variable, strip whitespace. (cherry picked from commit 6bcb25673bdc249f5a49ded912d90bc84b13809d) via 5cdec48 selftesthelpers: Share code for listing smbtorture4 tests. (cherry picked from commit 4c4d3c86f0430d38f78d16dcb5d365b577ef4227) via af3f83a source4.selftest.tests: Rename plansmbtorturesuite() to plansmbtorture4suite(). (cherry picked from commit 868c8c058306b66fb3baa4a36bfe91d6461805d5) via 220b98d source4.selftest.tests: Consistent naming of smbtorture binary. (cherry picked from commit 55507d0612ecf2db34867eb6065fc5038ea81aa0) via 76bbf16 samba.tests.docs: Ignore removed parameters. (cherry picked from commit 364ed82d22bbcd69ae237098ba8d6946969bd390) via 7461d45 smb.conf(5): Mark four removed parameters as such. (cherry picked from commit 4b4e8e21235615af94788fa0ebfa0b0bc09f14fd) via c7e9ab5 samba.tests.docs: Assume docs are generated by waf. (cherry picked from commit ed37b8ad14d496114654017d394fa18d63456aee) via 87f45c8 samba.tests.docs: Write error output from xsltproc to standard out. (cherry picked from commit cfa72bcc5e93a840fc07f5d419216443ef8f7599) via f31db3e samba.tests.docs: Skip tests if xsltproc is not present. (cherry picked from commit 8412b57f5ce40901a0a4e2e66c5f9bcbdcb4b46e) via afd55f7 smb.conf(5): Consistent spelling of parameter names. via a23aa34 samba.tests.docs: Support spaces before synonyms. (cherry picked from commit 32fad2b910a9e4f9b753b43cb818c72829236a88) via 6a34a8a samba.tests.docs: Support synonyms. (cherry picked from commit be4dea45daca51a817a7c383a4092bf69650c6cd) via a05c65f samba.tests.docs: Distinguish between unknown and undocumened parameters. (cherry picked from commit d0e644e0c83636b4e4c6b52ce0f861ffe38cedeb) via 97ddb5c tests: Convert find_missing_doc into a unit test. (cherry picked from commit d2f8fe855d0705faf216714cf147038563c0ba7e) via ccec37c smb.conf(5): Fix mixing of tabs and spaces. (cherry picked from commit 47902702b3e6390de05f8fca2bc457936af9f5c1) via 6461f02 smb.conf(5): Add basic documentation for 'nsupdate command'. (cherry picked from commit aad30c062fd176fa15994a44a0178d51764cdbf7) via d6bb051 smb.conf(5): Add basic documentation for 'afs token lifetime'. (cherry picked from commit 0cea6daffe42f5b9b6ee61eb430da3f86bea31df) via 2a2efb9 smb.conf(5): Add 'ldap password sync' as synonym for 'ldap passwd sync'. (cherry picked from commit 695df863eddd6ee323229fe29a4a40712f3553b4) via 2059769 smb.conf(5): Add 'socket address' as alias for 'nbt client socket address'. (cherry picked from commit 6c160e3892eea219c50bbb2d1113460817bfad08) via b4eb7ff smb.conf(5): Add basic documentation for 'tls dh params file'. (cherry picked from commit 03b48e2bdbea30afad9b414fbab5dae67e57b5cf) via b0cd55e smb.conf(5): Add basic documentation for 'tls enabled'. (cherry picked from
[SCM] Samba Shared Repository - branch v4-0-test updated
The branch, v4-0-test has been updated via 4309dd1 VERSION: Bump version number up to 4.0.0rc5 via 8c72009 VERSION: Disable GIT snapshot to prepare rc4 release. from f6b8919 WHATSNEW: Update changes since rc3. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test - Log - commit 4309dd11e02e41758a03065d435bdd6ce78c4e56 Author: Karolin Seeger Date: Tue Oct 30 09:58:41 2012 +0100 VERSION: Bump version number up to 4.0.0rc5 and re-enable GIT snapshots. Karolin commit 8c72009f6d9bf85d35d4cefedc935c14dd799516 Author: Karolin Seeger Date: Tue Oct 30 09:57:37 2012 +0100 VERSION: Disable GIT snapshot to prepare rc4 release. Karolin --- Summary of changes: VERSION |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/VERSION b/VERSION index bdc8768..00ea5a6 100644 --- a/VERSION +++ b/VERSION @@ -87,7 +87,7 @@ SAMBA_VERSION_PRE_RELEASE= # e.g. SAMBA_VERSION_RC_RELEASE=1 # # -> "3.0.0rc1" # -SAMBA_VERSION_RC_RELEASE=4 +SAMBA_VERSION_RC_RELEASE=5 # To mark SVN snapshots this should be set to 'yes'# -- Samba Shared Repository
[SCM] CTDB repository - branch master updated - ctdb-1.13-338-g16a91c2
The branch, master has been updated
via 16a91c2a4d03b46743611e2fe844bb2cef95e46a (commit)
via 3d4838db51dd8199b9c29aebb6e7bfbd2a27b8bb (commit)
via f8af7d8de76e68e5c4bde15f832a31ce9107e8c7 (commit)
via 8df7ea6b20417833792932487a082b3c71bb6837 (commit)
via b151f9b62299ec5b887c62cef780547a39c0ba9d (commit)
from 9be3b23adbfc844b71bf1d4ddf0fbc3b269f15fa (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master
- Log -
commit 16a91c2a4d03b46743611e2fe844bb2cef95e46a
Author: Amitay Isaacs
Date: Tue Oct 30 11:54:52 2012 +1100
packaging: Use maketarball.sh script to create tarball for RPM
This removes the duplicate code for building tarball and reuses existing
script.
Signed-off-by: Amitay Isaacs
commit 3d4838db51dd8199b9c29aebb6e7bfbd2a27b8bb
Author: Amitay Isaacs
Date: Tue Oct 30 11:52:19 2012 +1100
packaging: Use optional argument as targetdir when creating tarball
In addition, do not modify CTDB version string with extra suffix.
Signed-off-by: Amitay Isaacs
commit f8af7d8de76e68e5c4bde15f832a31ce9107e8c7
Author: Amitay Isaacs
Date: Tue Oct 30 11:49:28 2012 +1100
tool/ctdb: Always support ctdb version command, don't make it optional
Signed-off-by: Amitay Isaacs
commit 8df7ea6b20417833792932487a082b3c71bb6837
Author: Amitay Isaacs
Date: Tue Oct 30 11:48:23 2012 +1100
build: Add rules to create include/version.h when building from git tree
Signed-off-by: Amitay Isaacs
commit b151f9b62299ec5b887c62cef780547a39c0ba9d
Author: Amitay Isaacs
Date: Tue Oct 30 11:47:24 2012 +1100
packaging: Create include/version.h to define CTDB_VERSION_STRING
Signed-off-by: Amitay Isaacs
---
Summary of changes:
Makefile.in|8 +++-
packaging/RPM/ctdb.spec.in |2 +-
packaging/RPM/makerpms.sh | 23 +--
packaging/maketarball.sh | 28 ++--
packaging/mkversion.sh | 14 ++
tools/ctdb.c | 11 +++
6 files changed, 44 insertions(+), 42 deletions(-)
Changeset truncated at 500 lines:
diff --git a/Makefile.in b/Makefile.in
index 3294503..fef2e45 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -63,6 +63,8 @@ SHLD=${CC} ${CFLAGS} ${LDSHFLAGS} -o $@
LIB_FLAGS=@LDFLAGS@ -Llib @LIBS@ $(POPT_LIBS) $(TALLOC_LIBS) $(TEVENT_LIBS)
$(TDB_LIBS) \
@INFINIBAND_LIBS@ @CTDB_PCAP_LDFLAGS@
+CTDB_VERSION_H = include/version.h
+
UTIL_OBJ = lib/util/idtree.o lib/util/db_wrap.o lib/util/strlist.o
lib/util/util.o \
lib/util/util_time.o lib/util/util_file.o lib/util/fault.o
lib/util/substitute.o \
lib/util/signal.o
@@ -112,7 +114,7 @@ DIRS = lib bin tests/bin
.SUFFIXES: .c .o .h
-all: showflags dirs $(CTDB_SERVER_OBJ) $(CTDB_CLIENT_OBJ) $(CTDB_LIB_OBJ)
$(BINS) $(SBINS) $(TEST_BINS)
+all: showflags dirs $(CTDB_VERSION_H) $(CTDB_SERVER_OBJ) $(CTDB_CLIENT_OBJ)
$(CTDB_LIB_OBJ) $(BINS) $(SBINS) $(TEST_BINS)
showflags:
@echo 'ctdb will be compiled with flags:'
@@ -138,6 +140,10 @@ showlayout::
dirs:
@mkdir -p $(DIRS)
+$(CTDB_VERSION_H):
+ @echo Generating $@
+ @./packaging/mkversion.sh
+
bin/ctdbd: $(CTDB_SERVER_OBJ)
@echo Linking $@
@$(CC) $(CFLAGS) -o $@ $(CTDB_SERVER_OBJ) $(LIB_FLAGS)
diff --git a/packaging/RPM/ctdb.spec.in b/packaging/RPM/ctdb.spec.in
index b0555c7..50287ab 100644
--- a/packaging/RPM/ctdb.spec.in
+++ b/packaging/RPM/ctdb.spec.in
@@ -71,7 +71,7 @@ export CC
## always run autogen.sh
./autogen.sh
-CFLAGS="$RPM_OPT_FLAGS $EXTRA -O0 -D_GNU_SOURCE
-DCTDB_VERS=\"%{version}-%{release}\"" ./configure \
+CFLAGS="$RPM_OPT_FLAGS $EXTRA -O0 -D_GNU_SOURCE" ./configure \
%if %with_included_talloc
--with-included-talloc \
%endif
diff --git a/packaging/RPM/makerpms.sh b/packaging/RPM/makerpms.sh
index 254abde..c216185 100755
--- a/packaging/RPM/makerpms.sh
+++ b/packaging/RPM/makerpms.sh
@@ -52,7 +52,7 @@ mkdir -p `rpm --eval %_rpmdir`/noarch
mkdir -p `rpm --eval %_rpmdir`/i386
mkdir -p `rpm --eval %_rpmdir`/x86_64
-VERSION=$(${TOPDIR}/packaging/mkversion.sh)
+VERSION=$(${TOPDIR}/packaging/mkversion.sh ${TOPDIR}/include/version.h)
if [ -z "$VERSION" ]; then
exit 1
fi
@@ -61,23 +61,10 @@ sed -e s/@VERSION@/$VERSION/g \
< ${DIRNAME}/${SPECFILE_IN} \
> ${DIRNAME}/${SPECFILE}
-VERSION=$(grep ^Version ${DIRNAME}/${SPECFILE} | sed -e 's/^Version:\ \+//')
-
-if echo | gzip -c --rsyncable - > /dev/null 2>&1 ; then
- GZIP="gzip -9 --rsyncable"
-else
- GZIP="gzip -9"
-fi
-
-pushd ${TOPDIR}
-echo -n "Creating ctdb-${VERSION}.tar.gz ... "
-git archive --prefix=ctdb-${VERSION}/ HEAD | ${GZIP} >
${SRCDIR}/ctdb-${VERSION}.tar.gz
-RC=$?
-popd
-echo "Done."
-if [ $RC -ne 0 ]; then
-echo "Build failed!"
-
