From 02ce048c915fce17094fe4e533d3c299319b884a Mon Sep 17 00:00:00 2001
From: Tinderbox User <tbox@isc.org>
Date: Thu, 8 Feb 2018 23:46:17 +0000
Subject: [PATCH] update copyright notice / whitespace

---
 bin/dig/dig.docbook                        |  3 ++-
 bin/named/control.c                        |  2 +-
 bin/tests/system/conf.sh.win32             |  2 +-
 bin/tests/system/rpzrecurse/clean.sh       |  2 +-
 bin/tests/system/rpzrecurse/ns1/named.conf |  8 ++++----
 bin/tests/system/rpzrecurse/setup.sh       |  2 +-
 lib/isc/win32/socket.c                     |  2 +-
 lib/samples/sample-update.c                | 22 +++++++++++-----------
 8 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/bin/dig/dig.docbook b/bin/dig/dig.docbook
index 7a5f6e4181..bdd24b2fe2 100644
--- a/bin/dig/dig.docbook
+++ b/bin/dig/dig.docbook
@@ -1,7 +1,7 @@
 <!DOCTYPE book [
 <!ENTITY mdash "&#8212;">]>
 <!--
- - Copyright (C) 2000-2011, 2013-2017  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2000-2011, 2013-2018  Internet Systems Consortium, Inc. ("ISC")
  -
  - This Source Code Form is subject to the terms of the Mozilla Public
  - License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -48,6 +48,7 @@
       <year>2015</year>
       <year>2016</year>
       <year>2017</year>
+      <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
diff --git a/bin/named/control.c b/bin/named/control.c
index 27e52957cd..875fd74022 100644
--- a/bin/named/control.c
+++ b/bin/named/control.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001-2007, 2009-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2001-2007, 2009-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/conf.sh.win32 b/bin/tests/system/conf.sh.win32
index 9daf108c5d..bda29fceaa 100644
--- a/bin/tests/system/conf.sh.win32
+++ b/bin/tests/system/conf.sh.win32
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rpzrecurse/clean.sh b/bin/tests/system/rpzrecurse/clean.sh
index 99d5500619..ea04f0b879 100644
--- a/bin/tests/system/rpzrecurse/clean.sh
+++ b/bin/tests/system/rpzrecurse/clean.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rpzrecurse/ns1/named.conf b/bin/tests/system/rpzrecurse/ns1/named.conf
index f7f4887b92..d1b1319be3 100644
--- a/bin/tests/system/rpzrecurse/ns1/named.conf
+++ b/bin/tests/system/rpzrecurse/ns1/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -20,12 +20,12 @@ options {
 };
 
 key rndc_key {
-        secret "1234abcd8765";
-        algorithm hmac-sha256;
+	secret "1234abcd8765";
+	algorithm hmac-sha256;
 };
 
 controls {
-        inet 10.53.0.1 port 9953 allow { any; } keys { rndc_key; };
+	inet 10.53.0.1 port 9953 allow { any; } keys { rndc_key; };
 };
 
 zone "." {
diff --git a/bin/tests/system/rpzrecurse/setup.sh b/bin/tests/system/rpzrecurse/setup.sh
index f5332044cb..795d357acd 100644
--- a/bin/tests/system/rpzrecurse/setup.sh
+++ b/bin/tests/system/rpzrecurse/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/lib/isc/win32/socket.c b/lib/isc/win32/socket.c
index c63ad64f04..ffb7dadf8f 100644
--- a/lib/isc/win32/socket.c
+++ b/lib/isc/win32/socket.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/lib/samples/sample-update.c b/lib/samples/sample-update.c
index d1a019d36b..7be557e2d3 100644
--- a/lib/samples/sample-update.c
+++ b/lib/samples/sample-update.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009, 2010, 2012-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009, 2010, 2012-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -86,22 +86,22 @@ usage(void) {
 #ifdef _WIN32
 static void
 InitSockets(void) {
-        WORD wVersionRequested;
-        WSADATA wsaData;
-        int err;
+	WORD wVersionRequested;
+	WSADATA wsaData;
+	int err;
 
-        wVersionRequested = MAKEWORD(2, 0);
+	wVersionRequested = MAKEWORD(2, 0);
 
-        err = WSAStartup(wVersionRequested, &wsaData);
-        if (err != 0) {
-                fprintf(stderr, "WSAStartup() failed: %d\n", err);
-                exit(1);
-        }
+	err = WSAStartup(wVersionRequested, &wsaData);
+	if (err != 0) {
+		fprintf(stderr, "WSAStartup() failed: %d\n", err);
+		exit(1);
+	}
 }
 
 static void
 DestroySockets(void) {
-        WSACleanup();
+	WSACleanup();
 }
 #else
 #define InitSockets() ((void)0)