From 5d2a51c65c19a611198fe378b6fd33c56e054133 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Sun, 10 Jan 2016 14:14:01 +0100
Subject: [PATCH] Change copyright as per agreement with FSFE

---
 bacula/src/lib/address_conf.c |  3 +--
 bacula/src/lib/address_conf.h |  3 +--
 bacula/src/lib/alist.c        |  3 +--
 bacula/src/lib/alist.h        |  3 +--
 bacula/src/lib/attr.c         |  3 +--
 bacula/src/lib/attr.h         |  3 +--
 bacula/src/lib/base64.c       |  3 +--
 bacula/src/lib/base64.h       |  3 +--
 bacula/src/lib/berrno.c       |  3 +--
 bacula/src/lib/berrno.h       |  3 +--
 bacula/src/lib/bget_msg.c     |  3 +--
 bacula/src/lib/bget_msg.h     |  3 +--
 bacula/src/lib/binflate.c     |  3 +--
 bacula/src/lib/bits.h         |  3 +--
 bacula/src/lib/bnet.c         | 29 ++++++++++++++---------------
 bacula/src/lib/bnet_server.c  |  3 +--
 bacula/src/lib/bpipe.c        |  3 +--
 bacula/src/lib/bpipe.h        |  3 +--
 bacula/src/lib/breg.c         |  3 +--
 bacula/src/lib/breg.h         |  3 +--
 bacula/src/lib/bregex.c       |  4 +---
 bacula/src/lib/bregex.h       |  3 +--
 bacula/src/lib/bsnprintf.c    |  3 +--
 bacula/src/lib/bsock.c        |  3 +--
 bacula/src/lib/bsock.h        |  3 +--
 bacula/src/lib/bsys.c         |  3 +--
 bacula/src/lib/btime.c        |  3 +--
 bacula/src/lib/btime.h        |  3 +--
 bacula/src/lib/btimers.c      |  3 +--
 bacula/src/lib/btimers.h      |  3 +--
 bacula/src/lib/cram-md5.c     |  3 +--
 bacula/src/lib/crypto.c       |  3 +--
 bacula/src/lib/crypto.h       |  3 +--
 bacula/src/lib/daemon.c       | 13 ++++++-------
 bacula/src/lib/devlock.c      |  3 +--
 bacula/src/lib/devlock.h      |  3 +--
 bacula/src/lib/dlist.c        |  3 +--
 bacula/src/lib/dlist.h        |  3 +--
 bacula/src/lib/edit.c         |  3 +--
 bacula/src/lib/guid_to_name.c |  3 +--
 bacula/src/lib/guid_to_name.h |  3 +--
 bacula/src/lib/hmac.c         |  3 +--
 bacula/src/lib/htable.c       |  3 +--
 bacula/src/lib/htable.h       |  3 +--
 bacula/src/lib/ini.c          |  3 +--
 bacula/src/lib/ini.h          |  3 +--
 bacula/src/lib/jcr.c          |  3 +--
 bacula/src/lib/lex.c          |  3 +--
 bacula/src/lib/lex.h          |  3 +--
 bacula/src/lib/lib.h          |  3 +--
 bacula/src/lib/lockmgr.c      |  3 +--
 bacula/src/lib/lockmgr.h      |  3 +--
 bacula/src/lib/md5.c          |  3 +--
 bacula/src/lib/md5.h          |  3 +--
 bacula/src/lib/mem_pool.c     |  3 +--
 bacula/src/lib/mem_pool.h     |  3 +--
 bacula/src/lib/message.c      |  4 +---
 bacula/src/lib/message.h      |  3 +--
 bacula/src/lib/mutex_list.h   |  3 +--
 bacula/src/lib/openssl.c      |  3 +--
 bacula/src/lib/openssl.h      |  3 +--
 bacula/src/lib/parse_conf.c   |  3 +--
 bacula/src/lib/parse_conf.h   |  3 +--
 bacula/src/lib/plugins.c      |  3 +--
 bacula/src/lib/plugins.h      |  3 +--
 bacula/src/lib/priv.c         |  3 +--
 bacula/src/lib/protos.h       |  3 +--
 bacula/src/lib/queue.c        |  3 +--
 bacula/src/lib/queue.h        |  3 +--
 bacula/src/lib/rblist.c       |  3 +--
 bacula/src/lib/rblist.h       |  3 +--
 bacula/src/lib/res.c          |  3 +--
 bacula/src/lib/runscript.c    |  3 +--
 bacula/src/lib/runscript.h    |  3 +--
 bacula/src/lib/rwlock.c       |  3 +--
 bacula/src/lib/rwlock.h       |  3 +--
 bacula/src/lib/scan.c         |  3 +--
 bacula/src/lib/sellist.c      |  3 +--
 bacula/src/lib/sellist.h      |  3 +--
 bacula/src/lib/serial.c       |  3 +--
 bacula/src/lib/serial.h       |  3 +--
 bacula/src/lib/signal.c       |  3 +--
 bacula/src/lib/smartall.c     |  3 +--
 bacula/src/lib/smartall.h     |  3 +--
 bacula/src/lib/status.h       |  3 +--
 bacula/src/lib/tls.c          |  3 +--
 bacula/src/lib/tls.h          |  3 +--
 bacula/src/lib/tree.c         |  3 +--
 bacula/src/lib/tree.h         |  3 +--
 bacula/src/lib/util.c         |  3 +--
 bacula/src/lib/var.c          |  3 +--
 bacula/src/lib/waitq.h        |  3 +--
 bacula/src/lib/watchdog.c     |  3 +--
 bacula/src/lib/watchdog.h     |  3 +--
 bacula/src/lib/workq.c        |  3 +--
 bacula/src/lib/workq.h        |  3 +--
 96 files changed, 114 insertions(+), 212 deletions(-)

diff --git a/bacula/src/lib/address_conf.c b/bacula/src/lib/address_conf.c
index 66a49d2aec..669f5ef792 100644
--- a/bacula/src/lib/address_conf.c
+++ b/bacula/src/lib/address_conf.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2004-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/address_conf.h b/bacula/src/lib/address_conf.h
index e745b36bf2..4c6034646d 100644
--- a/bacula/src/lib/address_conf.h
+++ b/bacula/src/lib/address_conf.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2004-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/alist.c b/bacula/src/lib/alist.c
index 38a197f76f..132d1a0a63 100644
--- a/bacula/src/lib/alist.c
+++ b/bacula/src/lib/alist.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2003-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/alist.h b/bacula/src/lib/alist.h
index 09641497ab..c9b041a026 100644
--- a/bacula/src/lib/alist.h
+++ b/bacula/src/lib/alist.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2003-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/attr.c b/bacula/src/lib/attr.c
index 595cebd57f..24dc05f455 100644
--- a/bacula/src/lib/attr.c
+++ b/bacula/src/lib/attr.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2003-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/attr.h b/bacula/src/lib/attr.h
index d8d7a3171d..6c7655461e 100644
--- a/bacula/src/lib/attr.h
+++ b/bacula/src/lib/attr.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2003-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/base64.c b/bacula/src/lib/base64.c
index deb2caeba1..f2c58b1d97 100644
--- a/bacula/src/lib/base64.c
+++ b/bacula/src/lib/base64.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/base64.h b/bacula/src/lib/base64.h
index 63134828c2..ff48a71548 100644
--- a/bacula/src/lib/base64.h
+++ b/bacula/src/lib/base64.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/berrno.c b/bacula/src/lib/berrno.c
index 382683cd04..747337db2c 100644
--- a/bacula/src/lib/berrno.c
+++ b/bacula/src/lib/berrno.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2004-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/berrno.h b/bacula/src/lib/berrno.h
index e6b099b2d2..e5c4b70947 100644
--- a/bacula/src/lib/berrno.h
+++ b/bacula/src/lib/berrno.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2004-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/bget_msg.c b/bacula/src/lib/bget_msg.c
index ff9b0e4a8f..fc20f9412b 100644
--- a/bacula/src/lib/bget_msg.c
+++ b/bacula/src/lib/bget_msg.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2001-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/bget_msg.h b/bacula/src/lib/bget_msg.h
index fa8f0111d3..388b0e0630 100644
--- a/bacula/src/lib/bget_msg.h
+++ b/bacula/src/lib/bget_msg.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2013-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/binflate.c b/bacula/src/lib/binflate.c
index 9cd73f2f74..dcaa844a5a 100644
--- a/bacula/src/lib/binflate.c
+++ b/bacula/src/lib/binflate.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2010-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/bits.h b/bacula/src/lib/bits.h
index 497470003f..43a132b8f4 100644
--- a/bacula/src/lib/bits.h
+++ b/bacula/src/lib/bits.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/bnet.c b/bacula/src/lib/bnet.c
index 52c8e05e73..4eddee21f1 100644
--- a/bacula/src/lib/bnet.c
+++ b/bacula/src/lib/bnet.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
@@ -48,9 +47,9 @@
 #define socketClose(fd)           close(fd)
 #endif
 
-#ifndef HAVE_GETADDRINFO
+#ifndef HAVE_GETADDRINFO 
 static pthread_mutex_t ip_mutex = PTHREAD_MUTEX_INITIALIZER;
-#endif
+#endif 
 
 /*
  * Read a nbytes from the network.
@@ -328,6 +327,14 @@ bool bnet_tls_client(TLS_CONTEXT *ctx, BSOCK * bsock, alist *verify_list)
 #define NO_DATA         4          /* Valid name, no data record of requested type. */
 #endif
 
+static IPADDR *add_any(int family)
+{
+   IPADDR *addr = New(IPADDR(family));
+   addr->set_type(IPADDR::R_MULTIPLE);
+   addr->set_addr_any();
+   return addr;
+}
+
 #if defined(HAVE_GETADDRINFO)
 /* 
  * getaddrinfo.c - Simple example of using getaddrinfo(3) function.
@@ -446,7 +453,7 @@ static const char *resolv_host(int family, const char *host, dlist * addr_list)
 #ifdef HAVE_IPV6
          else {
              addr->set_addr6((struct in6_addr*)*p);
-         }
+         } 
 #endif
          addr_list->append(addr);
       }
@@ -454,16 +461,8 @@ static const char *resolv_host(int family, const char *host, dlist * addr_list)
    }
    return NULL;
 }
-#endif
-
-static IPADDR *add_any(int family)
-{
-   IPADDR *addr = New(IPADDR(family));
-   addr->set_type(IPADDR::R_MULTIPLE);
-   addr->set_addr_any();
-   return addr;
-}
-
+#endif 
+ 
 /*
  * i host = 0 means INADDR_ANY only for IPv4
  */
diff --git a/bacula/src/lib/bnet_server.c b/bacula/src/lib/bnet_server.c
index 354320dd5d..16993401b7 100644
--- a/bacula/src/lib/bnet_server.c
+++ b/bacula/src/lib/bnet_server.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/bpipe.c b/bacula/src/lib/bpipe.c
index c0ef83a633..92b5b85624 100644
--- a/bacula/src/lib/bpipe.c
+++ b/bacula/src/lib/bpipe.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2002-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/bpipe.h b/bacula/src/lib/bpipe.h
index 038be35179..9da6745b37 100644
--- a/bacula/src/lib/bpipe.h
+++ b/bacula/src/lib/bpipe.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2002-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/breg.c b/bacula/src/lib/breg.c
index 6358796200..8034c2c321 100644
--- a/bacula/src/lib/breg.c
+++ b/bacula/src/lib/breg.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/breg.h b/bacula/src/lib/breg.h
index e364860d3b..e21ffef51b 100644
--- a/bacula/src/lib/breg.h
+++ b/bacula/src/lib/breg.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2006-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/bregex.c b/bacula/src/lib/bregex.c
index 5ac6e6dfe5..994b0153bd 100644
--- a/bacula/src/lib/bregex.c
+++ b/bacula/src/lib/bregex.c
@@ -16,7 +16,6 @@
  *
  * This code draws many ideas from the regular expression packages by
  * Henry Spencer of the University of Toronto and Richard Stallman of
- * the Free Software Foundation.
  *
  * Emacs-specific code and syntax table code is almost directly borrowed
  * from GNU regexp.
@@ -35,8 +34,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2006-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/bregex.h b/bacula/src/lib/bregex.h
index 1a40e19800..654e569e5e 100644
--- a/bacula/src/lib/bregex.h
+++ b/bacula/src/lib/bregex.h
@@ -27,8 +27,7 @@ extern "C" {
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2006-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/bsnprintf.c b/bacula/src/lib/bsnprintf.c
index f669f52751..6ca14800e6 100644
--- a/bacula/src/lib/bsnprintf.c
+++ b/bacula/src/lib/bsnprintf.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2005-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/bsock.c b/bacula/src/lib/bsock.c
index 6daef479b4..ced11125ab 100644
--- a/bacula/src/lib/bsock.c
+++ b/bacula/src/lib/bsock.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/bsock.h b/bacula/src/lib/bsock.h
index 22482122be..97f84bcf2e 100644
--- a/bacula/src/lib/bsock.h
+++ b/bacula/src/lib/bsock.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/bsys.c b/bacula/src/lib/bsys.c
index 4226e01cdb..9235ab25c5 100644
--- a/bacula/src/lib/bsys.c
+++ b/bacula/src/lib/bsys.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/btime.c b/bacula/src/lib/btime.c
index 0748a10731..3f0f548e34 100644
--- a/bacula/src/lib/btime.c
+++ b/bacula/src/lib/btime.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/btime.h b/bacula/src/lib/btime.h
index c4632e8aff..6d339b21d6 100644
--- a/bacula/src/lib/btime.h
+++ b/bacula/src/lib/btime.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/btimers.c b/bacula/src/lib/btimers.c
index 543c0f0bc5..131501fe02 100644
--- a/bacula/src/lib/btimers.c
+++ b/bacula/src/lib/btimers.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2004-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/btimers.h b/bacula/src/lib/btimers.h
index c43690d313..0b14bb49ca 100644
--- a/bacula/src/lib/btimers.h
+++ b/bacula/src/lib/btimers.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2003-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/cram-md5.c b/bacula/src/lib/cram-md5.c
index 5583be49f4..035983a9df 100644
--- a/bacula/src/lib/cram-md5.c
+++ b/bacula/src/lib/cram-md5.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2001-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/crypto.c b/bacula/src/lib/crypto.c
index bf4a182e96..9f309d58e4 100644
--- a/bacula/src/lib/crypto.c
+++ b/bacula/src/lib/crypto.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2005-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/crypto.h b/bacula/src/lib/crypto.h
index 9b4728f419..f036671882 100644
--- a/bacula/src/lib/crypto.h
+++ b/bacula/src/lib/crypto.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2005-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/daemon.c b/bacula/src/lib/daemon.c
index 31e4a2519b..1f74f30bb5 100644
--- a/bacula/src/lib/daemon.c
+++ b/bacula/src/lib/daemon.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
@@ -65,16 +64,16 @@ daemon_start()
    if (debug_level > 0) {
       next_fd = 3;                    /* don't close debug output */
    }
-
-#if defined(HAVE_FCNTL_F_CLOSEM)
+ 
+#if HAVE_FCNTL_F_CLOSEM
    fcntl(next_fd, F_CLOSEM);
-#elif defined(HAVE_CLOSEFROM)
+#elif HAVE_CLOSEFROM
    closefrom(next_fd);
-#else
+#else 
    for (i=sysconf(_SC_OPEN_MAX); i >= next_fd; i--) {
       close(i);
    }
-#endif
+#endif 
 
    /* Move to root directory. For debug we stay
     * in current directory so dumps go there.
diff --git a/bacula/src/lib/devlock.c b/bacula/src/lib/devlock.c
index ca8dcb69e1..606449ffc7 100644
--- a/bacula/src/lib/devlock.c
+++ b/bacula/src/lib/devlock.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2001-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/devlock.h b/bacula/src/lib/devlock.h
index 7c3812cd55..7824d0d968 100644
--- a/bacula/src/lib/devlock.h
+++ b/bacula/src/lib/devlock.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2001-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/dlist.c b/bacula/src/lib/dlist.c
index 6ac67d7b02..5e821ba0cb 100644
--- a/bacula/src/lib/dlist.c
+++ b/bacula/src/lib/dlist.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2003-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/dlist.h b/bacula/src/lib/dlist.h
index b5d7e0696f..414999cbe7 100644
--- a/bacula/src/lib/dlist.h
+++ b/bacula/src/lib/dlist.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2004-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/edit.c b/bacula/src/lib/edit.c
index 6e3cd09541..f419ab47f8 100644
--- a/bacula/src/lib/edit.c
+++ b/bacula/src/lib/edit.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2002-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/guid_to_name.c b/bacula/src/lib/guid_to_name.c
index 3db8e8a327..fe9c244de4 100644
--- a/bacula/src/lib/guid_to_name.c
+++ b/bacula/src/lib/guid_to_name.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/guid_to_name.h b/bacula/src/lib/guid_to_name.h
index bfbecfeb6e..5c9d63d231 100644
--- a/bacula/src/lib/guid_to_name.h
+++ b/bacula/src/lib/guid_to_name.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/hmac.c b/bacula/src/lib/hmac.c
index a4e132f51b..a8d5e3dc04 100644
--- a/bacula/src/lib/hmac.c
+++ b/bacula/src/lib/hmac.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2001-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/htable.c b/bacula/src/lib/htable.c
index 2c60147748..e5ceea1e1c 100644
--- a/bacula/src/lib/htable.c
+++ b/bacula/src/lib/htable.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2003-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/htable.h b/bacula/src/lib/htable.h
index a419b5a468..31b20a0c59 100644
--- a/bacula/src/lib/htable.h
+++ b/bacula/src/lib/htable.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2004-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/ini.c b/bacula/src/lib/ini.c
index b585b1b497..b4da3a0932 100644
--- a/bacula/src/lib/ini.c
+++ b/bacula/src/lib/ini.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2010-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/ini.h b/bacula/src/lib/ini.h
index 851a578385..f6e86c8243 100644
--- a/bacula/src/lib/ini.h
+++ b/bacula/src/lib/ini.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2010-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/jcr.c b/bacula/src/lib/jcr.c
index b99041db7b..3ec16c2bb0 100644
--- a/bacula/src/lib/jcr.c
+++ b/bacula/src/lib/jcr.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/lex.c b/bacula/src/lib/lex.c
index a337757742..8221698d0d 100644
--- a/bacula/src/lib/lex.c
+++ b/bacula/src/lib/lex.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/lex.h b/bacula/src/lib/lex.h
index 17afcda18a..a6aeb91348 100644
--- a/bacula/src/lib/lex.h
+++ b/bacula/src/lib/lex.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/lib.h b/bacula/src/lib/lib.h
index cdeeeeeb8f..9ad722b079 100644
--- a/bacula/src/lib/lib.h
+++ b/bacula/src/lib/lib.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/lockmgr.c b/bacula/src/lib/lockmgr.c
index 109a7eeffb..81c54855ab 100644
--- a/bacula/src/lib/lockmgr.c
+++ b/bacula/src/lib/lockmgr.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2008-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/lockmgr.h b/bacula/src/lib/lockmgr.h
index 6cc2e4fddd..3948649986 100644
--- a/bacula/src/lib/lockmgr.h
+++ b/bacula/src/lib/lockmgr.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2008-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/md5.c b/bacula/src/lib/md5.c
index 09bafa2c1e..c838cfec0a 100644
--- a/bacula/src/lib/md5.c
+++ b/bacula/src/lib/md5.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/md5.h b/bacula/src/lib/md5.h
index a0414ba0a1..f1f5a8e108 100644
--- a/bacula/src/lib/md5.h
+++ b/bacula/src/lib/md5.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2001-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/mem_pool.c b/bacula/src/lib/mem_pool.c
index 7f8f86d906..fd748e71c7 100644
--- a/bacula/src/lib/mem_pool.c
+++ b/bacula/src/lib/mem_pool.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/mem_pool.h b/bacula/src/lib/mem_pool.h
index 0d4fccf63d..b724bb39ca 100644
--- a/bacula/src/lib/mem_pool.h
+++ b/bacula/src/lib/mem_pool.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/message.c b/bacula/src/lib/message.c
index 4c32a12825..07a75b3563 100644
--- a/bacula/src/lib/message.c
+++ b/bacula/src/lib/message.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
@@ -602,7 +601,6 @@ void close_msg(JCR *jcr)
                break;
             }
             success = jcr && (jcr->JobStatus == JS_Terminated || jcr->JobStatus == JS_Warnings);
-
             if (d->dest_code == MD_MAIL_ON_ERROR && success) {
                goto rem_temp_file;       /* no mail */
             } else if (d->dest_code == MD_MAIL_ON_SUCCESS && !success) {
diff --git a/bacula/src/lib/message.h b/bacula/src/lib/message.h
index 32b48453c4..365ec2461b 100644
--- a/bacula/src/lib/message.h
+++ b/bacula/src/lib/message.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/mutex_list.h b/bacula/src/lib/mutex_list.h
index 11a2ee743e..759c96068c 100644
--- a/bacula/src/lib/mutex_list.h
+++ b/bacula/src/lib/mutex_list.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2009-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/openssl.c b/bacula/src/lib/openssl.c
index 985a78a46e..64b0e96009 100644
--- a/bacula/src/lib/openssl.c
+++ b/bacula/src/lib/openssl.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2005-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/openssl.h b/bacula/src/lib/openssl.h
index 4e93cf0e5b..597517a4fd 100644
--- a/bacula/src/lib/openssl.h
+++ b/bacula/src/lib/openssl.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2005-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/parse_conf.c b/bacula/src/lib/parse_conf.c
index eb86e8aae4..26d81408da 100644
--- a/bacula/src/lib/parse_conf.c
+++ b/bacula/src/lib/parse_conf.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/parse_conf.h b/bacula/src/lib/parse_conf.h
index 59931a3369..9b147d6fc4 100644
--- a/bacula/src/lib/parse_conf.h
+++ b/bacula/src/lib/parse_conf.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/plugins.c b/bacula/src/lib/plugins.c
index 95ec2b1de1..9234c25195 100644
--- a/bacula/src/lib/plugins.c
+++ b/bacula/src/lib/plugins.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/plugins.h b/bacula/src/lib/plugins.h
index cd5470d22a..d4640f2c66 100644
--- a/bacula/src/lib/plugins.h
+++ b/bacula/src/lib/plugins.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/priv.c b/bacula/src/lib/priv.c
index 663b466b91..ba07529da7 100644
--- a/bacula/src/lib/priv.c
+++ b/bacula/src/lib/priv.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/protos.h b/bacula/src/lib/protos.h
index c26df09b81..067ec82b27 100644
--- a/bacula/src/lib/protos.h
+++ b/bacula/src/lib/protos.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/queue.c b/bacula/src/lib/queue.c
index 4ad37b04ce..c703546f37 100644
--- a/bacula/src/lib/queue.c
+++ b/bacula/src/lib/queue.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/queue.h b/bacula/src/lib/queue.h
index a3fa685999..c64754b836 100644
--- a/bacula/src/lib/queue.h
+++ b/bacula/src/lib/queue.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/rblist.c b/bacula/src/lib/rblist.c
index 04a142b406..10d8a8d841 100644
--- a/bacula/src/lib/rblist.c
+++ b/bacula/src/lib/rblist.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2005-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/rblist.h b/bacula/src/lib/rblist.h
index d4e1de1741..2c651d97f6 100644
--- a/bacula/src/lib/rblist.h
+++ b/bacula/src/lib/rblist.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2005-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/res.c b/bacula/src/lib/res.c
index dff2006c13..74598dc647 100644
--- a/bacula/src/lib/res.c
+++ b/bacula/src/lib/res.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/runscript.c b/bacula/src/lib/runscript.c
index 95536ab51a..bbe7ce0637 100644
--- a/bacula/src/lib/runscript.c
+++ b/bacula/src/lib/runscript.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2006-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/runscript.h b/bacula/src/lib/runscript.h
index 900c15c1e0..98b4d51245 100644
--- a/bacula/src/lib/runscript.h
+++ b/bacula/src/lib/runscript.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2006-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/rwlock.c b/bacula/src/lib/rwlock.c
index cbad3be4ae..5397511926 100644
--- a/bacula/src/lib/rwlock.c
+++ b/bacula/src/lib/rwlock.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2001-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/rwlock.h b/bacula/src/lib/rwlock.h
index f6a1178e96..a366202b50 100644
--- a/bacula/src/lib/rwlock.h
+++ b/bacula/src/lib/rwlock.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2001-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/scan.c b/bacula/src/lib/scan.c
index bbedc68c14..c29e82ba03 100644
--- a/bacula/src/lib/scan.c
+++ b/bacula/src/lib/scan.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/sellist.c b/bacula/src/lib/sellist.c
index 7fb221e987..d8f13908b8 100644
--- a/bacula/src/lib/sellist.c
+++ b/bacula/src/lib/sellist.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2011-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/sellist.h b/bacula/src/lib/sellist.h
index e0386a13c2..ba554d035e 100644
--- a/bacula/src/lib/sellist.h
+++ b/bacula/src/lib/sellist.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2011-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/serial.c b/bacula/src/lib/serial.c
index 2375ba6f5d..a7d625516b 100644
--- a/bacula/src/lib/serial.c
+++ b/bacula/src/lib/serial.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/serial.h b/bacula/src/lib/serial.h
index 75324b3c34..f8ad5d39a0 100644
--- a/bacula/src/lib/serial.h
+++ b/bacula/src/lib/serial.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/signal.c b/bacula/src/lib/signal.c
index a9c4d1aee3..4125839798 100644
--- a/bacula/src/lib/signal.c
+++ b/bacula/src/lib/signal.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/smartall.c b/bacula/src/lib/smartall.c
index 6f77db113f..0d4ecb73ac 100644
--- a/bacula/src/lib/smartall.c
+++ b/bacula/src/lib/smartall.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/smartall.h b/bacula/src/lib/smartall.h
index d40c731dca..787818326c 100644
--- a/bacula/src/lib/smartall.h
+++ b/bacula/src/lib/smartall.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/status.h b/bacula/src/lib/status.h
index 5028480a87..59271f7f87 100644
--- a/bacula/src/lib/status.h
+++ b/bacula/src/lib/status.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2008-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/tls.c b/bacula/src/lib/tls.c
index 0c9c761dcd..2fb8ec1edd 100644
--- a/bacula/src/lib/tls.c
+++ b/bacula/src/lib/tls.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2005-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/tls.h b/bacula/src/lib/tls.h
index 5747dddbc6..45fdd19244 100644
--- a/bacula/src/lib/tls.h
+++ b/bacula/src/lib/tls.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/tree.c b/bacula/src/lib/tree.c
index 81fdfe564a..04e90c4f4b 100644
--- a/bacula/src/lib/tree.c
+++ b/bacula/src/lib/tree.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2002-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/tree.h b/bacula/src/lib/tree.h
index dd70d2f282..5451eb2ea3 100644
--- a/bacula/src/lib/tree.h
+++ b/bacula/src/lib/tree.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2002-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/util.c b/bacula/src/lib/util.c
index 4267354336..4456c80a25 100644
--- a/bacula/src/lib/util.c
+++ b/bacula/src/lib/util.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/var.c b/bacula/src/lib/var.c
index 644afda95c..510deeb9e2 100644
--- a/bacula/src/lib/var.c
+++ b/bacula/src/lib/var.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2003-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/waitq.h b/bacula/src/lib/waitq.h
index 4059ee31d2..7d62ecc797 100644
--- a/bacula/src/lib/waitq.h
+++ b/bacula/src/lib/waitq.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2001-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/watchdog.c b/bacula/src/lib/watchdog.c
index 8ee7761f6e..5a7cd9cf4e 100644
--- a/bacula/src/lib/watchdog.c
+++ b/bacula/src/lib/watchdog.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2002-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/watchdog.h b/bacula/src/lib/watchdog.h
index 8298d63d99..d6b47e2d47 100644
--- a/bacula/src/lib/watchdog.h
+++ b/bacula/src/lib/watchdog.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2002-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/workq.c b/bacula/src/lib/workq.c
index 36bdd5ceb1..bfed633a8d 100644
--- a/bacula/src/lib/workq.c
+++ b/bacula/src/lib/workq.c
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2001-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/workq.h b/bacula/src/lib/workq.h
index 9a1b405128..a879834eac 100644
--- a/bacula/src/lib/workq.h
+++ b/bacula/src/lib/workq.h
@@ -1,8 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2015 Kern Sibbald
-   Copyright (C) 2001-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
-- 
2.39.5