[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  e2e2d72 selftest/flapping: more samba4.rpc.samr.large-dc.two subtests are flakey
       via  6f31848 Happy New Year 2013
      from  bcacd8f subunit: Update to latest upstream version.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit e2e2d72b0f373793458c0fda3d2ce28e2f3aea29
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Jan 1 15:43:57 2013 +0100

    selftest/flapping: more samba4.rpc.samr.large-dc.two subtests are flakey
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
    Autobuild-Date(master): Tue Jan  1 18:47:42 CET 2013 on sn-devel-104

commit 6f318483709fd1fecd1a1ee1f892eb1c7ca17b94
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Jan 1 15:43:36 2013 +0100

    Happy New Year 2013
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 selftest/flapping     |    2 +-
 source3/include/smb.h |    2 +-
 source4/smbd/server.c |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/flapping b/selftest/flapping
index bf7325c..170bf7b 100644
--- a/selftest/flapping
+++ b/selftest/flapping
@@ -25,4 +25,4 @@
 ^samba3.raw.samba3checkfsp.samba3checkfsp\(plugin_s4_dc\) # Seems to flap - succeeds on sn-devel, fails on Fedora 16
 ^samba3.raw.samba3closeerr.samba3closeerr\(plugin_s4_dc\) # Seems to flap - succeeds on sn-devel, fails on Fedora 16
 ^samba4.nss.test.*using.*winbind # fails sometimes on sn-devel
-^samba4.rpc.samr.large-dc.two.samr.many_accounts\(vampire_dc\) # often fails on sn-devel-104
+^samba4.rpc.samr.large-dc.two.samr.many.*\(vampire_dc\) # often fails on sn-devel-104, rid allocation?
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 2aa2ab3..a163e9e 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -30,7 +30,7 @@
 #include "libds/common/roles.h"
 
 /* logged when starting the various Samba daemons */
-#define COPYRIGHT_STARTUP_MESSAGE	"Copyright Andrew Tridgell and the Samba Team 1992-2012"
+#define COPYRIGHT_STARTUP_MESSAGE	"Copyright Andrew Tridgell and the Samba Team 1992-2013"
 
 
 #define BUFFER_SIZE (128*1024)
diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index b3d8ae5..193d504 100644
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -367,7 +367,7 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[
 	umask(0);
 
 	DEBUG(0,("%s version %s started.\n", binary_name, SAMBA_VERSION_STRING));
-	DEBUGADD(0,("Copyright Andrew Tridgell and the Samba Team 1992-2012\n"));
+	DEBUGADD(0,("Copyright Andrew Tridgell and the Samba Team 1992-2013\n"));
 
 	if (sizeof(uint16_t) < 2 || sizeof(uint32_t) < 4 || sizeof(uint64_t) < 8) {
 		DEBUG(0,("ERROR: Samba is not configured correctly for the word size on your machine\n"));


-- 
Samba Shared Repository