Merge branch 'master' into vpcvpc

2 files changed, 57 insertions, 16 deletions

diff --git a/usr/src/cmd/print/printmgr/com/sun/admin/pm/server/Makefile b/usr/src/cmd/print/printmgr/com/sun/admin/pm/server/Makefile
index 67be7d0b27..e3ad77dd61 100644
--- a/usr/src/cmd/print/printmgr/com/sun/admin/pm/server/Makefile
+++ b/usr/src/cmd/print/printmgr/com/sun/admin/pm/server/Makefile
@@ -23,6 +23,8 @@
 # Use is subject to license terms.
 #
 # Copyright (c) 2018, Joyent, Inc.
+# Copyright 2020 Peter Tribble
+#
 
 #
 # Makefile for Java Print Manager server
@@ -31,8 +33,6 @@
 LIBRARY =	libpmgr.a
 VERS =		.1
 
-JNIHDR_FILES =	com_sun_admin_pm_server_DoPrinterNS.h
-
 OBJECTS =	DoPrinterNS.o NS.o
 
 CLASSFILES =	Printer.class \
@@ -59,8 +59,6 @@ CLASSFILES =	Printer.class \
 		pmNSNotConfiguredException.class \
 		pmMisc.class
 
-JNICLASSFILES =	DoPrinterNS.class
-
 include		$(SRC)/lib/Makefile.lib
 
 SRCDIR =	.
@@ -93,29 +91,19 @@ SMATCH=off
 LDLIBS +=	-lprint -lnsl -lsocket -lc
 
 CLEANFILES=	*.class
-CLOBBERFILES=	$(JNIHDR_FILES) $(LIBLINKS)
+CLOBBERFILES=	$(LIBLINKS)
 
-all: $(CLASSFILES) $(JNIHDR_FILES) $(DYNLIB)
+all: $(CLASSFILES) $(DYNLIB)
 
 install: all $(ROOTDIRS) $(ROOTLINKS)
 
 #
-# Build jni header file
-# Use $@ instead of the "unreliable" $*
-#
-$(JNIHDR_FILES): $(JNICLASSFILES)
-	$(JAVAH) -jni -classpath $(CLASSPATH) \
-		`echo $@ | sed 's/.h$$//' | tr _ .`
-
-#
 # Build standalone programs for testing
 #
 NS: NS.c
 	$(CC) NS.c $(CCGDEBUG) $(ILDOFF) -o NS -DMAIN=1 $(ENVLDLIBS1) $(ENVLIBS2) \
 	    -lprint -lnsl -lsocket
 
-lint: $(JNIHDR_FILES)
-
 cstyle:
 	cstyle $(SRCS)
 
diff --git a/usr/src/cmd/print/printmgr/com/sun/admin/pm/server/com_sun_admin_pm_server_DoPrinterNS.h b/usr/src/cmd/print/printmgr/com/sun/admin/pm/server/com_sun_admin_pm_server_DoPrinterNS.h
new file mode 100644
index 0000000000..c841395820
--- /dev/null
+++ b/usr/src/cmd/print/printmgr/com/sun/admin/pm/server/com_sun_admin_pm_server_DoPrinterNS.h
@@ -0,0 +1,53 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class com_sun_admin_pm_server_DoPrinterNS */
+
+#ifndef _Included_com_sun_admin_pm_server_DoPrinterNS
+#define _Included_com_sun_admin_pm_server_DoPrinterNS
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     com_sun_admin_pm_server_DoPrinterNS
+ * Method:    dorexec
+ * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)I
+ */
+JNIEXPORT jint JNICALL Java_com_sun_admin_pm_server_DoPrinterNS_dorexec
+  (JNIEnv *, jclass, jstring, jstring, jstring, jstring, jstring);
+
+/*
+ * Class:     com_sun_admin_pm_server_DoPrinterNS
+ * Method:    updateoldyp
+ * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)I
+ */
+JNIEXPORT jint JNICALL Java_com_sun_admin_pm_server_DoPrinterNS_updateoldyp
+  (JNIEnv *, jclass, jstring, jstring, jstring, jstring, jstring, jstring);
+
+/*
+ * Class:     com_sun_admin_pm_server_DoPrinterNS
+ * Method:    updateldap
+ * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)I
+ */
+JNIEXPORT jint JNICALL Java_com_sun_admin_pm_server_DoPrinterNS_updateldap
+  (JNIEnv *, jclass, jstring, jstring, jstring, jstring, jstring, jstring, jstring, jstring, jstring);
+
+/*
+ * Class:     com_sun_admin_pm_server_DoPrinterNS
+ * Method:    getstderr
+ * Signature: ()Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_com_sun_admin_pm_server_DoPrinterNS_getstderr
+  (JNIEnv *, jclass);
+
+/*
+ * Class:     com_sun_admin_pm_server_DoPrinterNS
+ * Method:    getstdout
+ * Signature: ()Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_com_sun_admin_pm_server_DoPrinterNS_getstdout
+  (JNIEnv *, jclass);
+
+#ifdef __cplusplus
+}
+#endif
+#endif