update copyright notice

diff --git a/bin/named/server.c b/bin/named/server.c
index 5e94ccd26254969051a56f30cfaa6558e9f50a01..3b67836cca11b1f4c2f5d359cf83bb18a2bba524 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: server.c,v 1.545 2009/09/01 17:36:51 jinmei Exp $ */
+/* $Id: server.c,v 1.546 2009/09/01 23:47:44 tbox Exp $ */
 
 /*! \file */
 
@@ -475,19 +475,19 @@ dstkey_fromconfig(const cfg_obj_t *vconfig, const cfg_obj_t *key,
        keyname = dns_fixedname_name(&fkeyname);
        keynamestr = cfg_obj_asstring(cfg_tuple_get(key, "name"));
 
-        if (managed) {
-                const char *initmethod;
-                initmethod = cfg_obj_asstring(cfg_tuple_get(key, "init"));
-
-                if (strcmp(initmethod, "initial-key") != 0) {
-                        cfg_obj_log(key, ns_g_lctx, ISC_LOG_ERROR,
-                                    "managed key '%s': "
-                                    "invalid initialization method '%s'",
-                                    keynamestr, initmethod);
-                        result = ISC_R_FAILURE;
-                        goto cleanup;
-                }
-        }
+       if (managed) {
+               const char *initmethod;
+               initmethod = cfg_obj_asstring(cfg_tuple_get(key, "init"));
+
+               if (strcmp(initmethod, "initial-key") != 0) {
+                       cfg_obj_log(key, ns_g_lctx, ISC_LOG_ERROR,
+                                   "managed key '%s': "
+                                   "invalid initialization method '%s'",
+                                   keynamestr, initmethod);
+                       result = ISC_R_FAILURE;
+                       goto cleanup;
+               }
+       }
 
        if (vconfig == NULL)
                viewclass = dns_rdataclass_in;

diff --git a/bin/tests/names/t_names.c b/bin/tests/names/t_names.c
index ce859dea53d16b8c130f6522f0327524e3a1e486..d3a8b66c7dcec3d707157ff8e1336fd6ae9a42b3 100644 (file)
--- a/bin/tests/names/t_names.c
+++ b/bin/tests/names/t_names.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_names.c,v 1.49 2009/09/01 00:22:25 jinmei Exp $ */
+/* $Id: t_names.c,v 1.50 2009/09/01 23:47:44 tbox Exp $ */
 
 #include <config.h>
 
@@ -1777,7 +1777,7 @@ t_dns_name_fromtext(void) {
                                                           atoi(Tokens[3])
                                                                == 0 ?
                                                                0 :
-                                                            DNS_NAME_DOWNCASE);
+                                                            DNS_NAME_DOWNCASE);
                        } else {
                                t_info("bad format at line %d\n", line);
                        }

diff --git a/lib/isc/include/isc/mem.h b/lib/isc/include/isc/mem.h
index 04a604f73f9e900f7eb2e877c3b1595d0436ce50..28edcb67a36003f7e91d21f010a4cac3f40bb130 100644 (file)
--- a/lib/isc/include/isc/mem.h
+++ b/lib/isc/include/isc/mem.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mem.h,v 1.82 2009/09/01 00:22:28 jinmei Exp $ */
+/* $Id: mem.h,v 1.83 2009/09/01 23:47:44 tbox Exp $ */
 
 #ifndef ISC_MEM_H
 #define ISC_MEM_H 1
@@ -221,7 +221,7 @@ typedef struct isc_mempoolmethods {
 } isc_mempoolmethods_t;
 
 /*%
- * This structure is actually just the common prefix of a memory context 
+ * This structure is actually just the common prefix of a memory context
  * implementation's version of an isc_mem_t.
  * \brief
  * Direct use of this structure by clients is forbidden.  mctx implementations

diff --git a/lib/isc/include/isc/socket.h b/lib/isc/include/isc/socket.h
index 15ade4ea9263a152716eb7fc0bdb425edc72dda8..8f3f398168aa185dd815103bc1425e765f8a0781 100644 (file)
--- a/lib/isc/include/isc/socket.h
+++ b/lib/isc/include/isc/socket.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket.h,v 1.90 2009/09/01 00:22:28 jinmei Exp $ */
+/* $Id: socket.h,v 1.91 2009/09/01 23:47:44 tbox Exp $ */
 
 #ifndef ISC_SOCKET_H
 #define ISC_SOCKET_H 1
@@ -887,7 +887,7 @@ isc_socket_sendto2(isc_socket_t *sock, isc_region_t *region,
 
 isc_result_t
 isc_socketmgr_createinctx(isc_mem_t *mctx, isc_appctx_t *actx,
-                         isc_socketmgr_t **managerp);
+                         isc_socketmgr_t **managerp);
 
 isc_result_t
 isc_socketmgr_create(isc_mem_t *mctx, isc_socketmgr_t **managerp);
@@ -1086,7 +1086,7 @@ isc_socketmgr_renderxml(isc_socketmgr_t *mgr, xmlTextWriterPtr writer);
  * See isc_socketmgr_create() above.
  */
 typedef isc_result_t
-(*isc_socketmgrcreatefunc_t)(isc_mem_t *mctx, isc_socketmgr_t **managerp); 
+(*isc_socketmgrcreatefunc_t)(isc_mem_t *mctx, isc_socketmgr_t **managerp);
 
 isc_result_t
 isc_socket_register(isc_socketmgrcreatefunc_t createfunc);

diff --git a/lib/isc/mem.c b/lib/isc/mem.c
index 6895a873e9769ae3e95858a05ab1fd23e7dad3c1..4e97857b3aa486ceb6327cf6e6099521f5351554 100644 (file)
--- a/lib/isc/mem.c
+++ b/lib/isc/mem.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mem.c,v 1.150 2009/09/01 00:22:28 jinmei Exp $ */
+/* $Id: mem.c,v 1.151 2009/09/01 23:47:44 tbox Exp $ */
 
 /*! \file */
 
@@ -2193,7 +2193,7 @@ isc__mempool_getfillcount(isc_mempool_t *mpctx0) {
        return (fillcount);
 }
 
-#ifdef USE_MEMIMPREGISTER 
+#ifdef USE_MEMIMPREGISTER
 isc_result_t
 isc__mem_register() {
        return (isc_mem_register(isc__mem_create2));

diff --git a/lib/isc/timer.c b/lib/isc/timer.c
index 327620b2be77d8d8e587cd25caab9d66e23d0604..d5352cddb8be04f2f7d1a29f7f59fc4753addc2c 100644 (file)
--- a/lib/isc/timer.c
+++ b/lib/isc/timer.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: timer.c,v 1.91 2009/09/01 08:12:33 jinmei Exp $ */
+/* $Id: timer.c,v 1.92 2009/09/01 23:47:44 tbox Exp $ */
 
 /*! \file */
 
@@ -1042,7 +1042,7 @@ isc__timermgr_dispatch(isc_timermgr_t *manager0) {
 }
 #endif /* USE_TIMER_THREAD */
 
-#ifdef USE_TIMERIMPREGISTER 
+#ifdef USE_TIMERIMPREGISTER
 isc_result_t
 isc__timer_register() {
        return (isc_timer_register(isc__timermgr_create));

diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index 66ad903901a37ec33dea06b231ff17aad697dbdc..db79d18edade2695c9d18d22e195b83478172f68 100644 (file)
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket.c,v 1.321 2009/09/01 08:12:33 jinmei Exp $ */
+/* $Id: socket.c,v 1.322 2009/09/01 23:47:45 tbox Exp $ */
 
 /*! \file */
 
@@ -5322,7 +5322,7 @@ isc__socket_getpeername(isc_socket_t *sock0, isc_sockaddr_t *addressp) {
        } else {
                result = ISC_R_NOTCONNECTED;
        }
-       
+
        UNLOCK(&sock->lock);
 
        return (result);
@@ -5572,7 +5572,7 @@ isc__socketmgr_waitevents(isc_socketmgr_t *manager0, struct timeval *tvp,
        REQUIRE(swaitp != NULL && *swaitp == NULL);
 
 #ifdef USE_SHARED_MANAGER
-       if (manager == NULL)
+       if (manager == NULL)
                manager = socketmgr;
 #endif
        if (manager == NULL)
@@ -5632,7 +5632,7 @@ isc__socketmgr_dispatch(isc_socketmgr_t *manager0, isc_socketwait_t *swait) {
        REQUIRE(swait == &swait_private);
 
 #ifdef USE_SHARED_MANAGER
-       if (manager == NULL)
+       if (manager == NULL)
                manager = socketmgr;
 #endif
        if (manager == NULL)
@@ -5681,7 +5681,7 @@ isc__socket_gettag(isc_socket_t *socket0) {
 }
 #endif /* BIND9 */
 
-#ifdef USE_SOCKETIMPREGISTER 
+#ifdef USE_SOCKETIMPREGISTER
 isc_result_t
 isc__socket_register() {
        return (isc_socket_register(isc__socketmgr_create));

diff --git a/lib/lwres/getipnode.c b/lib/lwres/getipnode.c
index b872e3d5adf8ed17a553e4022c9c340ca2d453bc..3bd82177b1e64987973837b3d05a3fb199d5dc38 100644 (file)
--- a/lib/lwres/getipnode.c
+++ b/lib/lwres/getipnode.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: getipnode.c,v 1.46 2009/09/01 05:50:18 each Exp $ */
+/* $Id: getipnode.c,v 1.47 2009/09/01 23:47:45 tbox Exp $ */
 
 /*! \file */
 
@@ -289,7 +289,7 @@ lwres_getipnodebyname(const char *name, int af, int flags, int *error_num) {
                        else {
                                *error_num = NO_RECOVERY;
                                goto cleanup;
-                       }
+                       }
                }
        }
 
@@ -315,7 +315,7 @@ lwres_getipnodebyname(const char *name, int af, int flags, int *error_num) {
        } else
                *error_num = tmp_err;
 
-        he3 = copyandmerge(he1, he2, af, error_num);
+       he3 = copyandmerge(he1, he2, af, error_num);
 
  cleanup:
        if (he1 != NULL)