You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by mt...@apache.org on 2009/09/07 15:54:44 UTC

svn commit: r812140 - in /commons/sandbox/runtime/trunk/src/main/native/os/win32: group.c user.c wusec.c

Author: mturk
Date: Mon Sep  7 13:54:44 2009
New Revision: 812140

URL: http://svn.apache.org/viewvc?rev=812140&view=rev
Log:
Fix typos

Modified:
    commons/sandbox/runtime/trunk/src/main/native/os/win32/group.c
    commons/sandbox/runtime/trunk/src/main/native/os/win32/user.c
    commons/sandbox/runtime/trunk/src/main/native/os/win32/wusec.c

Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/group.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/group.c?rev=812140&r1=812139&r2=812140&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/group.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/group.c Mon Sep  7 13:54:44 2009
@@ -118,7 +118,7 @@
     sid =  ACR_GetSidFromAccountName(name, &sidtype);
     if (!sid) {
         if ((rc = GetLastError()) != ERROR_NONE_MAPPED) {
-            ACR_THROW_OS_IF_ERR((ACR_TO_OS_ERROR(rc));
+            ACR_THROW_OS_IF_ERR(ACR_TO_OS_ERROR(rc));
         }
         return NULL;
     }

Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/user.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/user.c?rev=812140&r1=812139&r2=812140&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/user.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/user.c Mon Sep  7 13:54:44 2009
@@ -132,7 +132,7 @@
     sid =  ACR_GetSidFromAccountName(name, &sidtype);
     if (!sid) {
         if ((rc = GetLastError()) != ERROR_NONE_MAPPED) {
-            ACR_THROW_OS_IF_ERR((ACR_TO_OS_ERROR(rc));
+            ACR_THROW_OS_IF_ERR(ACR_TO_OS_ERROR(rc));
         }
         /* TODO: Throw exception */
         return NULL;

Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/wusec.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/wusec.c?rev=812140&r1=812139&r2=812140&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/wusec.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/wusec.c Mon Sep  7 13:54:44 2009
@@ -374,9 +374,9 @@
 DWORD ACR_SetSecurityInfoD(HANDLE handle, SE_OBJECT_TYPE type,
                            PSID uid, PSID gid, LPVOID psd)
 {
-    ACL dacl;
-    ACL *acl = NULL;
+    ACL *dacl = NULL;
     SECURITY_INFORMATION sinf = 0;
+
     if (uid) {
         sinf |= OWNER_SECURITY_INFORMATION;
     }
@@ -398,12 +398,11 @@
             fprintf(stderr, "No DACL present in the SD\n");
             fflush(stderr);
 #endif
-            pds = NULL;
+            dacl = NULL;
         }
         else {
             sinf |= DACL_SECURITY_INFORMATION;
-            acl = &dacl;
         }
     }
-    return SetSecurityInformation(handle, type, sinf, uid, gid, acl, NULL);
+    return SetSecurityInfo(handle, type, sinf, uid, gid, dacl, NULL);
 }