[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  a06e5cd... s4: Happy New Year 2010
       via  2ed51fb... s3: Happy New Year 2010
      from  283a73c... s3: Trim down smbcontrol a bit

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


- Log -----------------------------------------------------------------
commit a06e5cdb99ddf7abf16486d3837105ec4e0da9ee
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Jan 4 08:42:49 2010 +0100

    s4: Happy New Year 2010
    
    metze

commit 2ed51fbc4c3ff576db31c0258a91dc6347aae670
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Jan 4 08:42:03 2010 +0100

    s3: Happy New Year 2010
    
    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 4affd4a..b23ea64 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -27,7 +27,7 @@
 #define _SMB_H
 
 /* logged when starting the various Samba daemons */
-#define COPYRIGHT_STARTUP_MESSAGE	"Copyright Andrew Tridgell and the Samba Team 1992-2009"
+#define COPYRIGHT_STARTUP_MESSAGE	"Copyright Andrew Tridgell and the Samba Team 1992-2010"
 
 
 #if defined(LARGE_SMB_OFF_T)
diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index ddfa220..e73cdfd 100644
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -326,7 +326,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-2009\n"));
+	DEBUGADD(0,("Copyright Andrew Tridgell and the Samba Team 1992-2010\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