[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  d5e4f9a s4: Happy New Year 2012
       via  e1679fe s3: Happy New Year 2012
      from  e39df67 Final part of fix for bug #8679 - recvfile code path using splice() on Linux leaves data in the pipe on short write.

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


- Log -----------------------------------------------------------------
commit d5e4f9a0856a3c3df447efc1220e7ad410a68833
Author: Stefan Metzmacher <metze at samba.org>
Date:   Sun Jan 1 20:45:48 2012 +0100

    s4: Happy New Year 2012
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Sun Jan  1 22:23:48 CET 2012 on sn-devel-104

commit e1679fe2f18052331d6de96447ead4114cba380b
Author: Stefan Metzmacher <metze at samba.org>
Date:   Sun Jan 1 20:45:37 2012 +0100

    s3: Happy New Year 2012
    
    metze

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

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


Changeset truncated at 500 lines:

diff --git a/source3/include/smb.h b/source3/include/smb.h
index 1a11610..2221b72 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-2011"
+#define COPYRIGHT_STARTUP_MESSAGE	"Copyright Andrew Tridgell and the Samba Team 1992-2012"
 
 
 #if defined(LARGE_SMB_OFF_T)
diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index 86622c8..1cb829f 100644
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -364,7 +364,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-2011\n"));
+	DEBUGADD(0,("Copyright Andrew Tridgell and the Samba Team 1992-2012\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