Merge pull request #9 from eatkins/security-level

Use correct security level in jni implementation
sbt · Jun 20, 2020 · 9a4194b · 9a4194b
2 parents 6635140 + df8cff4
commit 9a4194b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/jni/org_scalasbt_ipcsocket_JNIWin32NamedPipeLibraryProvider.c b/jni/org_scalasbt_ipcsocket_JNIWin32NamedPipeLibraryProvider.c
@@ -33,6 +33,8 @@
              GetLastError());                                                  \
   } while (0);
 
+#define LOGON_DACL 2 // must match the value in Win32SecurityLevel.java
+
 static int createSecurityWithDacl(PSECURITY_ATTRIBUTES pSA, DWORD accessMask,
                                   BOOL logon);
 
@@ -49,7 +51,7 @@ Java_org_scalasbt_ipcsocket_JNIWin32NamedPipeLibraryProvider_CreateNamedPipeNati
                                              sizeof(SECURITY_ATTRIBUTES))
                                  : NULL;
   int err = security ? createSecurityWithDacl(pSA, lpSecurityAttributes,
-                                              security == 1)
+                                              security == LOGON_DACL)
                      : 0;
   if (!err || !security) {
     LPCWSTR name = (LPCWSTR)(*env)->GetStringChars(env, lpName, 0);

diff --git a/src/main/java/org/scalasbt/ipcsocket/Win32SecurityLevel.java b/src/main/java/org/scalasbt/ipcsocket/Win32SecurityLevel.java
@@ -6,5 +6,6 @@ public class Win32SecurityLevel {
    */
   public static int NO_SECURITY = 0;
   public static int OWNER_DACL = 1;
+  // LOGON_DACL must match the value in JNIWin32NamedPipeLibraryProvider.c
   public static int LOGON_DACL = 2;
 }
diff --git a/src/main/resources/win32/x86_64/sbtipcsocket.dll b/src/main/resources/win32/x86_64/sbtipcsocket.dll