--- a/usr/src/cmd/rad/mod/zonesbridge/Makefile	Mon Apr 16 11:41:11 2012 -0400
+++ b/usr/src/cmd/rad/mod/zonesbridge/Makefile	Thu Apr 26 00:14:30 2012 -0400
@@ -26,6 +26,7 @@
 include ../Makefile.env
 
 LDLIBS += -lzonecfg
+MAPOPTS += -z nodefs
 MOD_APIS=zonesbridge
 MOD_OBJS=mod_zonesbridge.o token.o
 MOD_LIBNAME=mod_zonesbridge.so

--- a/usr/src/lib/libUnixDomainSocket_jni/Makefile.com	Mon Apr 16 11:41:11 2012 -0400
+++ b/usr/src/lib/libUnixDomainSocket_jni/Makefile.com	Thu Apr 26 00:14:30 2012 -0400
@@ -59,7 +59,7 @@
 $(JHEADERS): $(DEPENDENCY_JARS)
 	@for f in $(DEPENDENCY_JARS); \
 	do \
-		jar tf "$$f"; \
+		$(JAR) tf "$$f"; \
 	done | $(GREP) '/$(@:%.h=%).class' | \
 	$(SED) 's/\.class$$//; s#/#.#g' | \
 	$(XARGS) echo $(JAVAH) -classpath $(CLASS_PATH) -o $@ | \