The branch, v4-0-test has been updated
via 71df5a6 WHATSNEW: Add changes since rc6.
via 91d2752 wafsamba: Make sure md5 is really work before using it or
overriding the hash function
via 25eb1af Fix bug #9471 - SEGV when using second vfs module.
from 1cd24d5 build: Install .po files for SWAT intl support
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit 71df5a66d3679e4dabb9ae967a258af55a8a7b4d
Author: Karolin Seeger <ksee...@samba.org>
Date: Sun Dec 9 21:07:37 2012 +0100
WHATSNEW: Add changes since rc6.
Karolin
Autobuild-User(v4-0-test): Karolin Seeger <ksee...@samba.org>
Autobuild-Date(v4-0-test): Sun Dec 9 22:51:12 CET 2012 on sn-devel-104
commit 91d27520dfec5817e2e3e6826f7c7aa2ed42319b
Author: Alexander Bokovoy <a...@samba.org>
Date: Fri Dec 7 17:36:02 2012 +0200
wafsamba: Make sure md5 is really work before using it or overriding the
hash function
In FIPS mode importing md5 Python module will not cause any error but
calling md5.md5()
function will throw ValueError since md5 is not available.
Make sure md5.md5() actually works and if not, fall back to use hash
replacement that
we already have in wafsamba.
Reviewed-by: Andreas Schneider <a...@samba.org>
Autobuild-User(master): Andreas Schneider <a...@cryptomilk.org>
Autobuild-Date(master): Sat Dec 8 13:30:07 CET 2012 on sn-devel-104
(cherry picked from commit 56d9c8c4bf29eb473f9f4e7a7ef16fc6020db6b5)
Signed-off-by: Andreas Schneider <a...@samba.org>
Fix bug #9479 - Support FIPS mode when building Samba.
commit 25eb1af07cc09e5e019a0702c60a763cc3266196
Author: Tsukasa Hamano <ham...@osstech.co.jp>
Date: Thu Dec 6 13:01:33 2012 -0800
Fix bug #9471 - SEGV when using second vfs module.
Don't use default_classname_table when we obviously shoud be using
classname_table.
Reviewed by: Jeremy Allison <j...@samba.org>
Reviewed-by: Michael Adam <ob...@samba.org>
Autobuild-User(master): Michael Adam <ob...@samba.org>
Autobuild-Date(master): Fri Dec 7 17:51:50 CET 2012 on sn-devel-104
(cherry picked from commit 16d725b4f5ed77db865e2a3c27ae0eb4accca5a8)
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 32 ++++++++++++++++++++++++++++++++
buildtools/wafsamba/samba_utils.py | 8 ++++++++
lib/util/debug.c | 2 +-
3 files changed, 41 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 355de80..004c252 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -181,6 +181,38 @@ smb.conf changes
winbindd socket directory New
+CHANGES SINCE 4.0.0rc6
+======================
+
+o Michael Adam <ob...@samba.org>
+ * BUG 9456: developer-build: Fix panic when acl_xattr fails with access
+ denied.
+
+
+o Jeremy Allison <j...@samba.org>
+ * BUG 9462: Users can not be given write permissions any more by default.
+
+
+o Andrew Bartlett <abart...@samba.org>
+ * BUG 9415: Install SWAT *.msg files with waf.
+
+
+o Alexander Bokovoy <a...@samba.org>
+ * BUG 9479: Support FIPS mode when building Samba.
+
+
+o Tsukasa Hamano <ham...@osstech.co.jp>
+ * BUG 9471: Fix SEGV when using second vfs module.
+
+
+o Andreas Schneider <a...@samba.org>
+ * BUG 9459: Install manpages only if we install the target.
+
+
+o Richard Sharpe <realrichardsha...@gmail.com>
+ * BUG 9460: Respond correctly to FILE_STREAM_INFO requests.
+
+
CHANGES SINCE 4.0.0rc5
======================
diff --git a/buildtools/wafsamba/samba_utils.py
b/buildtools/wafsamba/samba_utils.py
index c1869df..cab87a4 100644
--- a/buildtools/wafsamba/samba_utils.py
+++ b/buildtools/wafsamba/samba_utils.py
@@ -388,9 +388,17 @@ def RUN_COMMAND(cmd,
# make sure we have md5. some systems don't have it
try:
from hashlib import md5
+ try:
+ foo = md5.md5('abcd')
+ except ValueError:
+ raise
except:
try:
import md5
+ try:
+ foo = md5.md5('abcd')
+ except ValueError:
+ raise
except:
import Constants
Constants.SIG_NIL = hash('abcd')
diff --git a/lib/util/debug.c b/lib/util/debug.c
index 15a2452..7509f90 100644
--- a/lib/util/debug.c
+++ b/lib/util/debug.c
@@ -1007,7 +1007,7 @@ bool dbghdrclass(int level, int cls, const char
*location, const char *func)
slprintf(header_str + hs_len,
sizeof(header_str) -1 - hs_len,
", class=%s",
- default_classname_table[cls]);
+ classname_table[cls]);
}
/* Print it all out at once to prevent split syslog output. */
--
Samba Shared Repository
