update copyright notice

diff --git a/bin/named/include/named/main.h b/bin/named/include/named/main.h
index d91dd39871f91904fe137c30ac0a63416e460805..44251fa825c696b5c367086480098128c0946e87 100644 (file)
--- a/bin/named/include/named/main.h
+++ b/bin/named/include/named/main.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: main.h,v 1.16 2009/09/29 15:06:06 fdupont Exp $ */
+/* $Id: main.h,v 1.17 2009/09/29 23:48:03 tbox Exp $ */
 
 #ifndef NAMED_MAIN_H
 #define NAMED_MAIN_H 1

diff --git a/bin/rndc/util.h b/bin/rndc/util.h
index 14b011ba52d1e3e43f3330cdae3cd811da722e77..d7277148ffa7c662fbd3258377f0755ceddb5dc1 100644 (file)
--- a/bin/rndc/util.h
+++ b/bin/rndc/util.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: util.h,v 1.11 2009/09/29 15:06:06 fdupont Exp $ */
+/* $Id: util.h,v 1.12 2009/09/29 23:48:03 tbox Exp $ */
 
 #ifndef RNDC_UTIL_H
 #define RNDC_UTIL_H 1
@@ -44,7 +44,7 @@ ISC_LANG_BEGINDECLS
 void
 notify(const char *fmt, ...) ISC_FORMAT_PRINTF(1, 2);
 
-ISC_PLATFORM_NORETURN_PRE void            
+ISC_PLATFORM_NORETURN_PRE void
 fatal(const char *format, ...)
 ISC_FORMAT_PRINTF(1, 2) ISC_PLATFORM_NORETURN_POST;
 

diff --git a/bin/win32/BINDInstall/AccountInfo.cpp b/bin/win32/BINDInstall/AccountInfo.cpp
index 7503e90d3b4a3c439f6349c120aa3943eba240ae..ec3e106fa48b62167cbcfc64bf3819b13de9927b 100644 (file)
--- a/bin/win32/BINDInstall/AccountInfo.cpp
+++ b/bin/win32/BINDInstall/AccountInfo.cpp
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 2001, 2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: AccountInfo.cpp,v 1.9 2009/09/29 04:37:08 marka Exp $ */
+/* $Id: AccountInfo.cpp,v 1.10 2009/09/29 23:48:04 tbox Exp $ */
 
 #ifndef UNICODE
 #define UNICODE
@@ -108,7 +108,7 @@ DisplayWinError(
 int
 GetAccountPrivileges(char *name, wchar_t **PrivList, unsigned int *PrivCount,
                     char **Accounts, unsigned int *totalAccounts,
-                    int maxAccounts) 
+                    int maxAccounts)
 {
        LSA_HANDLE PolicyHandle;
        TCHAR AccountName[256];         /* static account name buffer */
@@ -153,8 +153,8 @@ GetAccountPrivileges(char *name, wchar_t **PrivList, unsigned int *PrivCount,
                 /* Obtain the SID of the user/group. */
                if (!GetAccountSid(NULL, AccountName, &pSid))
                        continue;       /* Try the next one */
-               /* Get the Privileges allocated to this SID */ 
-               if ((Status = GetPrivilegesOnAccount(PolicyHandle, pSid,
+               /* Get the Privileges allocated to this SID */
+               if ((Status = GetPrivilegesOnAccount(PolicyHandle, pSid,
                        PrivList, PrivCount)) == STATUS_SUCCESS)
                {
                        iRetVal=RTN_OK;
@@ -193,7 +193,7 @@ CreateServiceAccount(char *name, char *password) {
 
        /*
         * Set up the USER_INFO_1 structure.
-        * USER_PRIV_USER: name is required here when creating an account 
+        * USER_PRIV_USER: name is required here when creating an account
         * rather than an administrator or a guest.
         */
 
@@ -239,7 +239,7 @@ AddPrivilegeToAcccount(LPTSTR name, LPWSTR PrivilegeName) {
        if (!GetAccountSid(NULL, AccountName, &pSid))
                return (RTN_NOACCOUNT);
 
-        err = LsaNtStatusToWinError(SetPrivilegeOnAccount(PolicyHandle,
+       err = LsaNtStatusToWinError(SetPrivilegeOnAccount(PolicyHandle,
                pSid, PrivilegeName, TRUE));
 
        LsaClose(PolicyHandle);
@@ -327,7 +327,7 @@ GetAccountSid(LPTSTR SystemName, LPTSTR AccountName, PSID *Sid) {
                                        cbReferencedDomain)) == NULL)
                                __leave;
                        }
-                       else 
+                       else
                                __leave;
                }
                bSuccess = TRUE;
@@ -370,7 +370,7 @@ SetPrivilegeOnAccount(LSA_HANDLE PolicyHandle, PSID AccountSid,
 
 NTSTATUS
 GetPrivilegesOnAccount(LSA_HANDLE PolicyHandle, PSID AccountSid,
-                      wchar_t **PrivList, unsigned int *PrivCount) 
+                      wchar_t **PrivList, unsigned int *PrivCount)
 {
        NTSTATUS Status;
        LSA_UNICODE_STRING *UserRights;
@@ -395,7 +395,7 @@ GetPrivilegesOnAccount(LSA_HANDLE PolicyHandle, PSID AccountSid,
                                break;
                }
                if (found != 0) {
-                       PrivList[*PrivCount] = 
+                       PrivList[*PrivCount] =
                            (wchar_t *)malloc(UserRights[i].MaximumLength);
                        if (PrivList[*PrivCount] == NULL)
                                return (RTN_NOMEMORY);

diff --git a/bin/win32/BINDInstall/BINDInstall.cpp b/bin/win32/BINDInstall/BINDInstall.cpp
index 3d430e1c3ce0afe5eca6cef97e82f665a97230ff..608f4cf23193149ee717f1b589170b01189d9504 100644 (file)
--- a/bin/win32/BINDInstall/BINDInstall.cpp
+++ b/bin/win32/BINDInstall/BINDInstall.cpp
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: BINDInstall.cpp,v 1.8 2009/09/29 04:37:08 marka Exp $ */
+/* $Id: BINDInstall.cpp,v 1.9 2009/09/29 23:48:04 tbox Exp $ */
 
 /*
  * Copyright (c) 1999-2000 by Nortel Networks Corporation

diff --git a/lib/isc/include/isc/assertions.h b/lib/isc/include/isc/assertions.h
index 26d3fa1dbe715662cec90d7492b90e53b543a4aa..2c81b1ae9880cfb51dfdb685d4817006c2be173c 100644 (file)
--- a/lib/isc/include/isc/assertions.h
+++ b/lib/isc/include/isc/assertions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1997-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: assertions.h,v 1.27 2009/09/29 15:06:07 fdupont Exp $
+ * $Id: assertions.h,v 1.28 2009/09/29 23:48:04 tbox Exp $
  */
 /*! \file isc/assertions.h
  */

diff --git a/lib/isc/include/isc/error.h b/lib/isc/include/isc/error.h
index 160b549b1eb70e31735c8c4adb73bc80dd72cf31..e0cdfa83e7cba52142aed71131956eeaba685082 100644 (file)
--- a/lib/isc/include/isc/error.h
+++ b/lib/isc/include/isc/error.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2009  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: error.h,v 1.21 2009/09/29 15:06:07 fdupont Exp $ */
+/* $Id: error.h,v 1.22 2009/09/29 23:48:04 tbox Exp $ */
 
 #ifndef ISC_ERROR_H
 #define ISC_ERROR_H 1

diff --git a/lib/isc/include/isc/refcount.h b/lib/isc/include/isc/refcount.h
index 98086b71a8ce2cf90b995f8270b409c39a224af9..b72b1585be39fc75d98668104e67b061266f580d 100644 (file)
--- a/lib/isc/include/isc/refcount.h
+++ b/lib/isc/include/isc/refcount.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2009  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: refcount.h,v 1.16 2009/09/29 15:06:07 fdupont Exp $ */
+/* $Id: refcount.h,v 1.17 2009/09/29 23:48:04 tbox Exp $ */
 
 #ifndef ISC_REFCOUNT_H
 #define ISC_REFCOUNT_H 1
@@ -28,7 +28,7 @@
 #include <isc/util.h>
 
 /*! \file isc/refcount.h
- * \brief Implements a locked reference counter.  
+ * \brief Implements a locked reference counter.
  *
  * These functions may actually be
  * implemented using macros, and implementations of these macros are below.
@@ -42,7 +42,7 @@ ISC_LANG_BEGINDECLS
  * Function prototypes
  */
 
-/* 
+/*
  * isc_result_t
  * isc_refcount_init(isc_refcount_t *ref, unsigned int n);
  *

diff --git a/lib/isc/win32/include/isc/platform.h b/lib/isc/win32/include/isc/platform.h
index b9c0c26d508fd98e02df06f93d3ec272555fa8d9..d632d3cf7e581982b51b06e87180321f2d4fc726 100644 (file)
--- a/lib/isc/win32/include/isc/platform.h
+++ b/lib/isc/win32/include/isc/platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2008  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007-2009  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: platform.h,v 1.18 2009/09/29 15:06:07 fdupont Exp $ */
+/* $Id: platform.h,v 1.19 2009/09/29 23:48:04 tbox Exp $ */
 
 #ifndef ISC_PLATFORM_H
 #define ISC_PLATFORM_H 1

diff --git a/lib/isc/win32/ntgroups.c b/lib/isc/win32/ntgroups.c
index 9c3d5acc151b8b1b06d3e061f5a9d583756105ba..729cf07e74f0e026226374c9620ccd95f1632ba1 100644 (file)
--- a/lib/isc/win32/ntgroups.c
+++ b/lib/isc/win32/ntgroups.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2006, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ntgroups.c,v 1.11 2009/09/29 04:37:08 marka Exp $ */
+/* $Id: ntgroups.c,v 1.12 2009/09/29 23:48:04 tbox Exp $ */
 
 /*
  * The NT Groups have two groups that are not well documented and are
@@ -70,21 +70,21 @@ isc_ntsecurity_getaccountgroups(char *username, char **GroupList,
 
        *totalGroups = 0;
        /*
-        * Call the NetUserGetLocalGroups function 
+        * Call the NetUserGetLocalGroups function
         * specifying information level 0.
         *
-        * The LG_INCLUDE_INDIRECT flag specifies that the 
-        * function should also return the names of the local 
+        * The LG_INCLUDE_INDIRECT flag specifies that the
+        * function should also return the names of the local
         * groups in which the user is indirectly a member.
         */
        nStatus = NetUserGetLocalGroups(NULL,
-                                   user,
-                                   dwLevel,
-                                   dwFlags,
-                                   (LPBYTE *) &pBuf,
-                                   dwPrefMaxLen,
-                                   &dwEntriesRead,
-                                   &dwTotalEntries);
+                                  user,
+                                  dwLevel,
+                                  dwFlags,
+                                  (LPBYTE *) &pBuf,
+                                  dwPrefMaxLen,
+                                  &dwEntriesRead,
+                                  &dwTotalEntries);
        /*
         * See if the call succeeds,
         */
@@ -103,7 +103,7 @@ isc_ntsecurity_getaccountgroups(char *username, char **GroupList,
                /*
                 * Loop through the entries
                 */
-                for (i = 0;
+                for (i = 0;
                     (i < dwEntriesRead && *totalGroups < maxgroups); i++) {
                        assert(pTmpLBuf != NULL);
                        if (pTmpLBuf == NULL)
@@ -127,17 +127,17 @@ isc_ntsecurity_getaccountgroups(char *username, char **GroupList,
        if (pBuf != NULL)
                NetApiBufferFree(pBuf);
 
-   
+
        /*
         * Call the NetUserGetGroups function, specifying level 0.
         */
        nStatus = NetUserGetGroups(NULL,
-                              user,
-                              dwLevel,
-                              (LPBYTE*)&pgrpBuf,
-                              dwPrefMaxLen,
-                              &dwEntriesRead,
-                              &dwTotalEntries);
+                             user,
+                             dwLevel,
+                             (LPBYTE*)&pgrpBuf,
+                             dwPrefMaxLen,
+                             &dwEntriesRead,
+                             &dwTotalEntries);
        /*
         * See if the call succeeds,
         */
@@ -149,13 +149,13 @@ isc_ntsecurity_getaccountgroups(char *username, char **GroupList,
                if (nStatus == NERR_UserNotFound)
                        dwEntriesRead = 0;
        }
- 
+
        if (pgrpBuf != NULL) {
                pTmpBuf = pgrpBuf;
                /*
                 * Loop through the entries
                 */
-                for (i = 0;
+                for (i = 0;
                     (i < dwEntriesRead && *totalGroups < maxgroups); i++) {
                        assert(pTmpBuf != NULL);