The branch, master has been updated via 31e4d6d s3:smbd: preserve file type mode bits in file_set_dosmode() via f211b57 gencache: fix an extra newline in a DEBUG message in gencache_set_data_blob() via 86d78df gencache: fix an extra newline in a DEBUG message in gencache_iterate_fn() via f7525ab gencache: fix an extra newline in a DEBUG message in gencache_iterate_blobs_fn() via 762dd3c lib/util/time: strip a potential trailing newline in the asctime case. via 4d3928a gencache: unify a DEBUG message in gencache_set_data_blob() via 56ee82e gencache: unify a DEBUG message in gencache_iterate_fn() via ddf2aa3 gencache: unify a DEBUG message in gencache_iterate_blobs_fn() via 7e36b1b gencache: unify a DEBUG message in gencache_del() via c1d58f2 packaging(RHEL-CTDB): remove unpackaged manpages (samba and samba-tool) via ed28246 packaging(RHEL-CTDB): package the fake-acls vfs module from 5ab7725 s3:net: new implementation of "servid wipedbs" with smbXsrv_*
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 31e4d6d2c7779e2f688352f5947e6bbd2a1cfc60 Author: Michael Adam <ob...@samba.org> Date: Tue Feb 19 13:27:10 2013 +0100 s3:smbd: preserve file type mode bits in file_set_dosmode() When translating between dos modes and unix modes, these bits were dropped from the stat->st_ex_mode field. Pair-Programmed-With: Stefan Metzmacher <me...@samba.org> Signed-off-by: Michael Adam <ob...@samba.org> Signed-off-by: Stefan Metzmacher <me...@samba.org> Autobuild-User(master): Michael Adam <ob...@samba.org> Autobuild-Date(master): Tue Feb 19 15:45:31 CET 2013 on sn-devel-104 commit f211b57dd28e5aab69480f9e9764864922f988e4 Author: Michael Adam <ob...@samba.org> Date: Wed Feb 13 09:46:33 2013 +0100 gencache: fix an extra newline in a DEBUG message in gencache_set_data_blob() by using timestring() instead of ctime() Signed-off-by: Michael Adam <ob...@samba.org> Reviewed-by: Stefan Metzmacher <me...@samba.org> commit 86d78dfa838e8f4432d0ba73828b1f9bfc7877b8 Author: Michael Adam <ob...@samba.org> Date: Wed Feb 13 09:45:09 2013 +0100 gencache: fix an extra newline in a DEBUG message in gencache_iterate_fn() by using timestring() instead of ctime() Signed-off-by: Michael Adam <ob...@samba.org> Reviewed-by: Stefan Metzmacher <me...@samba.org> commit f7525abf3bc561a2b783523ef82520954c4e9d84 Author: Michael Adam <ob...@samba.org> Date: Wed Feb 13 09:43:19 2013 +0100 gencache: fix an extra newline in a DEBUG message in gencache_iterate_blobs_fn() by using timestring() instead of ctime() Signed-off-by: Michael Adam <ob...@samba.org> Reviewed-by: Stefan Metzmacher <me...@samba.org> commit 762dd3cf29788a9f8ab66fd96ad2b9cc20f621f3 Author: Michael Adam <ob...@samba.org> Date: Wed Feb 13 16:51:54 2013 +0100 lib/util/time: strip a potential trailing newline in the asctime case. If strftime() is not available, asctime() is used, and this usually appends a newline character to the result. This is not desired for timestamp(). Signed-off-by: Michael Adam <ob...@samba.org> Reviewed-by: Stefan Metzmacher <me...@samba.org> commit 4d3928a8f494661764f4a3367b2f1b94772dedf9 Author: Michael Adam <ob...@samba.org> Date: Mon Feb 11 13:41:12 2013 +0100 gencache: unify a DEBUG message in gencache_set_data_blob() Signed-off-by: Michael Adam <ob...@samba.org> Reviewed-by: Stefan Metzmacher <me...@samba.org> commit 56ee82e8a04a631ec4cee4e3f9a30f9104ca43c7 Author: Michael Adam <ob...@samba.org> Date: Mon Feb 11 13:42:58 2013 +0100 gencache: unify a DEBUG message in gencache_iterate_fn() Signed-off-by: Michael Adam <ob...@samba.org> Reviewed-by: Stefan Metzmacher <me...@samba.org> commit ddf2aa3340168361ba1680c05f07becaf4b25012 Author: Michael Adam <ob...@samba.org> Date: Mon Feb 11 13:42:28 2013 +0100 gencache: unify a DEBUG message in gencache_iterate_blobs_fn() Signed-off-by: Michael Adam <ob...@samba.org> Reviewed-by: Stefan Metzmacher <me...@samba.org> commit 7e36b1b8cbca1b3bcf3081928a453de581cf1977 Author: Michael Adam <ob...@samba.org> Date: Mon Feb 11 13:43:32 2013 +0100 gencache: unify a DEBUG message in gencache_del() Signed-off-by: Michael Adam <ob...@samba.org> Reviewed-by: Stefan Metzmacher <me...@samba.org> commit c1d58f222fec4b23a1e37a4e911a648afa4fdb74 Author: Michael Adam <ob...@samba.org> Date: Thu Oct 25 05:35:50 2012 -0400 packaging(RHEL-CTDB): remove unpackaged manpages (samba and samba-tool) Signed-off-by: Michael Adam <ob...@samba.org> Reviewed-by: Stefan Metzmacher <me...@samba.org> commit ed28246c2501ad1163aa979d41eba9fbf52010f5 Author: Michael Adam <ob...@samba.org> Date: Thu Oct 25 05:34:23 2012 -0400 packaging(RHEL-CTDB): package the fake-acls vfs module Signed-off-by: Michael Adam <ob...@samba.org> Reviewed-by: Stefan Metzmacher <me...@samba.org> ----------------------------------------------------------------------- Summary of changes: lib/util/time.c | 9 +++++++++ packaging/RHEL-CTDB/samba.spec.tmpl | 3 +++ source3/lib/gencache.c | 16 +++++++++------- source3/smbd/dosmode.c | 3 +++ 4 files changed, 24 insertions(+), 7 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/util/time.c b/lib/util/time.c index d5a429a..56b2ec5 100644 --- a/lib/util/time.c +++ b/lib/util/time.c @@ -450,6 +450,15 @@ _PUBLIC_ char *timestring(TALLOC_CTX *mem_ctx, time_t t) TimeBuf = talloc_strdup(mem_ctx, tempTime); #else TimeBuf = talloc_strdup(mem_ctx, asctime(tm)); + if (TimeBuf == NULL) { + return NULL; + } + if (TimeBuf[0] != '\0') { + size_t len = strlen(TimeBuf); + if (TimeBuf[len - 1] == '\n') { + TimeBuf[len - 1] = '\0'; + } + } #endif return TimeBuf; diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl b/packaging/RHEL-CTDB/samba.spec.tmpl index e79674f..c1789f2 100644 --- a/packaging/RHEL-CTDB/samba.spec.tmpl +++ b/packaging/RHEL-CTDB/samba.spec.tmpl @@ -306,6 +306,8 @@ find $RPM_BUILD_ROOT -name "*.old" -exec rm -f {} \; rm -f $RPM_BUILD_ROOT%{_mandir}/man1/log2pcap.1* rm -f $RPM_BUILD_ROOT%{_mandir}/man1/smbsh.1* rm -f $RPM_BUILD_ROOT%{_mandir}/man5/vfstest.1* +rm -f $RPM_BUILD_ROOT%{_mandir}/man8/samba-tool.8* +rm -f $RPM_BUILD_ROOT%{_mandir}/man8/samba.8* %clean @@ -405,6 +407,7 @@ exit 0 %{_libarchdir}/samba/vfs/dirsort.so %{_libarchdir}/samba/vfs/expand_msdfs.so %{_libarchdir}/samba/vfs/extd_audit.so +%{_libarchdir}/samba/vfs/fake_acls.so %{_libarchdir}/samba/vfs/fake_perms.so %{_libarchdir}/samba/vfs/fileid.so %{_libarchdir}/samba/vfs/full_audit.so diff --git a/source3/lib/gencache.c b/source3/lib/gencache.c index 0b24c0c..18bfc7c 100644 --- a/source3/lib/gencache.c +++ b/source3/lib/gencache.c @@ -286,8 +286,9 @@ bool gencache_set_data_blob(const char *keystr, const DATA_BLOB *blob, return false; } - DEBUG(10, ("Adding cache entry with key = %s and timeout =" - " %s (%d seconds %s)\n", keystr, ctime(&timeout), + DEBUG(10, ("Adding cache entry with key=[%s] and timeout=" + "[%s] (%d seconds %s)\n", keystr, + timestring(talloc_tos(), timeout), (int)(timeout - time(NULL)), timeout > time(NULL) ? "ahead" : "in the past")); @@ -356,7 +357,7 @@ bool gencache_del(const char *keystr) if (!gencache_init()) return False; - DEBUG(10, ("Deleting cache entry (key = %s)\n", keystr)); + DEBUG(10, ("Deleting cache entry (key=[%s])\n", keystr)); /* * We delete an element by setting its timeout to 0. This way we don't @@ -786,8 +787,9 @@ static int gencache_iterate_blobs_fn(struct tdb_context *tdb, TDB_DATA key, goto done; } - DEBUG(10, ("Calling function with arguments (key=%s, timeout=%s)\n", - keystr, ctime(&timeout))); + DEBUG(10, ("Calling function with arguments " + "(key=[%s], timeout=[%s])\n", + keystr, timestring(talloc_tos(), timeout))); state->fn(keystr, data_blob_const(endptr, @@ -856,8 +858,8 @@ static void gencache_iterate_fn(const char *key, DATA_BLOB value, } DEBUG(10, ("Calling function with arguments " - "(key = %s, value = %s, timeout = %s)\n", - key, valstr, ctime(&timeout))); + "(key=[%s], value=[%s], timeout=[%s])\n", + key, valstr, timestring(talloc_tos(), timeout))); state->fn(key, valstr, timeout, state->private_data); diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c index a98ac07..1949006 100644 --- a/source3/smbd/dosmode.c +++ b/source3/smbd/dosmode.c @@ -777,6 +777,9 @@ int file_set_dosmode(connection_struct *conn, struct smb_filename *smb_fname, unixmode = unix_mode(conn, dosmode, smb_fname, parent_dir); + /* preserve the file type bits */ + mask |= S_IFMT; + /* preserve the s bits */ mask |= (S_ISUID | S_ISGID); -- Samba Shared Repository