Changeset 155

Timestamp:

Sep 20, 2010, 9:02:51 PM (15 years ago)

Author:

dmik

Message:

jdk: Adopted com.sun.security.auth.module package.

Location:

trunk/openjdk/jdk

Files:

• make/com/sun/Makefile (modified) (1 diff)
• make/com/sun/security/auth/module/Makefile (modified) (1 diff)
• src/windows/native/com/sun/security/auth/module/nt.c (modified) (1 diff)

trunk/openjdk/jdk/make/com/sun/Makefile

@@ -40 +40 @@
 
 # Omit mirror since it's built with the apt tool.
-ifndef OS2_TEMP # security
+ifndef OS2_TEMP # GUI stuff
 SUBDIRS = $(SCRIPT_SUBDIR) image security crypto/provider jndi jmx \
     java inputmethods org rowset net/httpserver net/ssl demo \
     tools jarsigner
 else
-SUBDIRS = $(SCRIPT_SUBDIR) jndi jmx \
-    java org rowset net/httpserver demo \
-    jarsigner
+SUBDIRS = $(SCRIPT_SUBDIR) security crypto/provider jndi jmx \
+    java org rowset net/httpserver net/ssl demo \
+    tools jarsigner
 endif
 

trunk/openjdk/jdk/make/com/sun/security/auth/module/Makefile

@@ -61 +61 @@
 endif # windows
 
+ifeq ($(PLATFORM), os2)
+  LIBRARY = jaas_nt
+  include FILES_export_windows.gmk
+  include FILES_c_windows.gmk
+  # We need some extra libs
+  EXTRA_LIBS += -lnetapi32.lib -ladvapi32.lib -lmpr.lib
+endif # os2
+
 ifeq ($(PLATFORM), solaris)
   LIBRARY = jaas_unix

trunk/openjdk/jdk/src/windows/native/com/sun/security/auth/module/nt.c

@@ -29 +29 @@
 #include <windows.h>
 #include <stdio.h>
+#include <string.h>
 #include <wchar.h>
 #include <ntsecapi.h>