update copyright notice

diff --git a/bin/win32/BINDInstall/AccountInfo.cpp b/bin/win32/BINDInstall/AccountInfo.cpp
index f52172338700f38b9e85e01d9d0deba7c12a822a..78e5f097c5e3036db3b6032a706bc8d83e6dd5a9 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.8.128.1 2009/09/29 05:09:43 marka Exp $ */
+/* $Id: AccountInfo.cpp,v 1.8.128.2 2009/09/29 23:46:40 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 ab7d9d96e953a9994b6d466235c47db78adbd33e..817301f2ae408afa92ce38906f4be810e717f9ed 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.7.128.1 2009/09/29 05:09:43 marka Exp $ */
+/* $Id: BINDInstall.cpp,v 1.7.128.2 2009/09/29 23:46:40 tbox Exp $ */
 
 /*
  * Copyright (c) 1999-2000 by Nortel Networks Corporation

diff --git a/lib/isc/win32/ntgroups.c b/lib/isc/win32/ntgroups.c
index a212cba7527cc6d7f5e8fd445fe209fc5ab74649..c1a8c97f609a717572a4cadd719252d1d6eb6426 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.10.128.1 2009/09/29 05:09:43 marka Exp $ */
+/* $Id: ntgroups.c,v 1.10.128.2 2009/09/29 23:46:40 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);