Update copyright year. Fix a typo in logging.

diff --git a/src/Makefile b/src/Makefile
index 090f81b130df1a1e1722f9f905ddd0e99fa0c829..9b959abc21fffab213381489937415c3a1e60b78 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,5 +1,3 @@
-# build helloworld executable when user executes "make" 
-
 SRCS:=client.c main.c messages.c pds.c server.c ssl.c log.c conf.c crypt.c \
        timer.c messagehandler.c channel.c Mumble.pb-c.c voicetarget.c
 
@@ -15,7 +13,6 @@ umurmurd:google/protobuf-c/libprotobuf_c.a depend.mak $(OBJS)
 google/protobuf-c/libprotobuf_c.a:
        $(MAKE) -C google/protobuf-c/
 
-# remove object files and executable when user executes "make clean"
 clean:
        $(MAKE) -C google/protobuf-c/ clean
        rm -f *.o umurmurd 

diff --git a/src/channel.c b/src/channel.c
index 5c562fbbc566a613c7e1d1a4f7fad9b098f8ad9c..5476b1d92ae921be82583b9b0480d52727f301b0 100644 (file)
--- a/src/channel.c
+++ b/src/channel.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2010, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 

diff --git a/src/channel.h b/src/channel.h
index 29c28d32cc42f70403d55eba9f6eaeb1a64ff48c..c8896612fb28a0fc88f74bd700241e933d02355a 100644 (file)
--- a/src/channel.h
+++ b/src/channel.h
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2010, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 

diff --git a/src/client.c b/src/client.c
index 3a7217d93924f8a40d1ac3b5376b74d98c1587d8..99ebb8ce0b78f312420d15bcff54e2212b6dec5f 100644 (file)
--- a/src/client.c
+++ b/src/client.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2010, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 

diff --git a/src/client.h b/src/client.h
index 081c99e3a0020837617e0fbd128c2ba02c179da5..b2e49236a703c47ad4b7ea5164c13f46cff83b78 100644 (file)
--- a/src/client.h
+++ b/src/client.h
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2010, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 

diff --git a/src/conf.c b/src/conf.c
index 63e209c285e57c28046e87934073432af10dae75..4d9a0e695a3abb20bb01ff84d0eddd3352830444 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2010, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 

diff --git a/src/conf.h b/src/conf.h
index 3a469b27e6e41f2ee9d6b40c8932232dd9510b1c..5b08c39c721fa1047de1d9e72837287e32867b75 100644 (file)
--- a/src/conf.h
+++ b/src/conf.h
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2010, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 

diff --git a/src/crypt.c b/src/crypt.c
index a7eda5747e8922a21cae7e85667d17c2afffd235..7d370d0ee11c8f74d24a982ff9fdf9099f1eeba3 100644 (file)
--- a/src/crypt.c
+++ b/src/crypt.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2010, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 

diff --git a/src/crypt.h b/src/crypt.h
index e227ed2d9a701da16980a3e3a05b33ac0c4cb8a6..0b35ac3b18d56c2f855e57b61eb54ed590d82bc0 100644 (file)
--- a/src/crypt.h
+++ b/src/crypt.h
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2010, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 

diff --git a/src/log.c b/src/log.c
index 9dceaad67bfa7cfdc34651f5608dcd47c81bf875..9eb5981d1ea9d01a67683fbf0d24109018e1dd9e 100644 (file)
--- a/src/log.c
+++ b/src/log.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2010, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 
@@ -45,7 +45,7 @@ void Log_init(bool_t terminal)
 {
        termprint = terminal;
        if (!termprint)
-               openlog("uMurmud", LOG_PID, LOG_DAEMON);
+               openlog("uMurmurd", LOG_PID, LOG_DAEMON);
 }
 
 void Log_free()

diff --git a/src/log.h b/src/log.h
index 66a294907de80c6e79ca28a4ff9ceb13b96ca17f..dd323421bce6fbbaa858512789cb98ac9e2f2374 100644 (file)
--- a/src/log.h
+++ b/src/log.h
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2010, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 

diff --git a/src/main.c b/src/main.c
index 5139291e9ceda08029ba886f03dfd2eb17f1dca0..d6342f1d728cb4e387625b1014737029ff0ace64 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2010, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 

diff --git a/src/messagehandler.c b/src/messagehandler.c
index 189588ec0f5a4163d624bf8b4fbe8cccf4e772bc..8b4b94acc09dfec62c533cde2ec4560a33e74112 100644 (file)
--- a/src/messagehandler.c
+++ b/src/messagehandler.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2010, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 

diff --git a/src/messagehandler.h b/src/messagehandler.h
index cd46cd737e9ef779058dd50f05a85ca611ce76cd..ad11a59a93e8e4d657315594c0198b964ac1164c 100644 (file)
--- a/src/messagehandler.h
+++ b/src/messagehandler.h
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2010, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 

diff --git a/src/messages.c b/src/messages.c
index f7526c11e82b1dc324e8a0ee013cde0f2c94b374..ee32f7fcc481cf3fc86a082ec2630fdc3c8d3860 100644 (file)
--- a/src/messages.c
+++ b/src/messages.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2010, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 

diff --git a/src/messages.h b/src/messages.h
index eedf7fd6cbf5e3b84317138656b5b5eb437bb174..c163c6229bbe5e2a21424a1524e1f62f2d0f94e7 100644 (file)
--- a/src/messages.h
+++ b/src/messages.h
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2010, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 

diff --git a/src/pds.c b/src/pds.c
index 5c00abf6ebd1e5f85d538a0244b8338a19060a76..3a57954f68f3318688f55b0aad19f37923a843e1 100644 (file)
--- a/src/pds.c
+++ b/src/pds.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2010, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 

diff --git a/src/pds.h b/src/pds.h
index 89856030864e7f1dfdf15cc4075a7588f33bffd2..d3f12748533c17033611aaa2e4ae012e5234f93a 100644 (file)
--- a/src/pds.h
+++ b/src/pds.h
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2010, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 

diff --git a/src/server.c b/src/server.c
index d719f37b6320a43ce44a713e3dd60359d96c874d..ff20f81795b968adbca5b80cf7aa1335b310b74a 100644 (file)
--- a/src/server.c
+++ b/src/server.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2010, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 

diff --git a/src/server.h b/src/server.h
index aa48482db0f01e7a7f816fe891e9ffdf3b4ce78a..9fd01b8f362ca40123d88a804b3c13e9dcc07031 100644 (file)
--- a/src/server.h
+++ b/src/server.h
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2010, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 

diff --git a/src/ssl.c b/src/ssl.c
index 09510c033cabdb35ce118ce1ac078f71de5e0c53..1ef4892b965cc7c313e5cdab8e1df80e640ab06d 100644 (file)
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2010, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 

diff --git a/src/ssl.h b/src/ssl.h
index 6c2a8ba83bf20209649a20b2d7c584e5914604ce..4b8ac33672e58bf9eb0878bb5c616c35fc9aa966 100644 (file)
--- a/src/ssl.h
+++ b/src/ssl.h
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2010, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 

diff --git a/src/timer.c b/src/timer.c
index 53542c1feff11ee2362d52bbfe4d818b5c38dc13..53a63c9d58b85b5bb62b61e09e717feacb0cdec9 100644 (file)
--- a/src/timer.c
+++ b/src/timer.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2010, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 

diff --git a/src/timer.h b/src/timer.h
index bb7f9bcaaeb53d9a0060d12b0a7faeb1b3b99de2..e0669376a03f880a962a5b84a89127a7e5c557eb 100644 (file)
--- a/src/timer.h
+++ b/src/timer.h
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2010, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.