OS-2544 ipf rules from the GZ should be add to in-zone rules, not replace them (man page and style fixes)

8 files changed, 17 insertions, 13 deletions

diff --git a/usr/src/cmd/ipf/tools/ipmon.c b/usr/src/cmd/ipf/tools/ipmon.c
index cf10eece9b..07d3d40be2 100644
--- a/usr/src/cmd/ipf/tools/ipmon.c
+++ b/usr/src/cmd/ipf/tools/ipmon.c
@@ -1511,6 +1511,7 @@ char *argv[];
 			break;
 #if SOLARIS
 		case 'G' :
+			/* Already handled by getzoneopt() above */
 			break;
 #endif
 		case 'n' :
@@ -1567,6 +1568,7 @@ char *argv[];
 			break;
 #if SOLARIS
 		case 'z' :
+			/* Already handled by getzoneopt() above */
 			break;
 #endif
 		default :
diff --git a/usr/src/cmd/ipf/tools/ippool.c b/usr/src/cmd/ipf/tools/ippool.c
index d918af8e10..3eca3e1776 100644
--- a/usr/src/cmd/ipf/tools/ippool.c
+++ b/usr/src/cmd/ipf/tools/ippool.c
@@ -169,6 +169,7 @@ char *argv[];
 #else
 			usage(argv[0]);
 #endif
+			break;
 		case 'i' :
 			s = strchr(optarg, '/');
 			if (s == NULL)
diff --git a/usr/src/man/man1m/ipfs.1m b/usr/src/man/man1m/ipfs.1m
index d54777e068..5514e96ea9 100644
--- a/usr/src/man/man1m/ipfs.1m
+++ b/usr/src/man/man1m/ipfs.1m
@@ -168,7 +168,7 @@ beginning of this operation and unlocked once complete.
 .sp
 .ne 2
 .na
-\fB\fB-z\fR\fR
+\fB\fB-z\fR \fIzonename\fR\fR
 .ad
 .RS 6n
 Operate on the in-zone state information for the specified zone. If neither
@@ -180,7 +180,7 @@ more information.
 .sp
 .ne 2
 .na
-\fB\fB-G\fR\fR
+\fB\fB-G\fR \fIzonename\fR\fR
 .ad
 .RS 6n
 Operate on the global zone controlled state information for the specified
diff --git a/usr/src/man/man1m/ipfstat.1m b/usr/src/man/man1m/ipfstat.1m
index 65898ea804..ba46c2c44b 100644
--- a/usr/src/man/man1m/ipfstat.1m
+++ b/usr/src/man/man1m/ipfstat.1m
@@ -355,7 +355,7 @@ Turn verbose mode on. Displays additional debugging information.
 .sp
 .ne 2
 .na
-\fB\fB-z\fR\fR
+\fB\fB-z\fR \fIzonename\fR\fR
 .ad
 .RS 18n
 Report the in-zone statistics for the specified zone. If neither this option
@@ -367,7 +367,7 @@ information.
 .sp
 .ne 2
 .na
-\fB\fB-G\fR\fR
+\fB\fB-G\fR \fIzonename\fR\fR
 .ad
 .RS 18n
 Report the global zone controlled statistics for the specified zone. If
diff --git a/usr/src/man/man1m/ipmon.1m b/usr/src/man/man1m/ipmon.1m
index 86e8ff93e6..07574790b9 100644
--- a/usr/src/man/man1m/ipmon.1m
+++ b/usr/src/man/man1m/ipmon.1m
@@ -347,7 +347,7 @@ Show the log header record data in hex.
 .sp
 .ne 2
 .na
-\fB\fB-z\fR\fR
+\fB\fB-z\fR \fIzonename\fR\fR
 .ad
 .sp .6
 .RS 4n
@@ -360,7 +360,7 @@ information.
 .sp
 .ne 2
 .na
-\fB\fB-G\fR\fR
+\fB\fB-G\fR \fIzonename\fR\fR
 .ad
 .sp .6
 .RS 4n
diff --git a/usr/src/man/man1m/ipnat.1m b/usr/src/man/man1m/ipnat.1m
index 6760b2598b..ed382fa7a9 100644
--- a/usr/src/man/man1m/ipnat.1m
+++ b/usr/src/man/man1m/ipnat.1m
@@ -144,7 +144,7 @@ active rules/table entries.
 .sp
 .ne 2
 .na
-\fB\fB-z\fR\fR
+\fB\fB-z\fR \fIzonename\fR\fR
 .ad
 .RS 15n
 Operate on the in-zone IP NAT for the specified zone. If neither this option
@@ -156,12 +156,13 @@ information.
 .sp
 .ne 2
 .na
-\fB\fB-G\fR\fR
+\fB\fB-G\fR \fIzonename\fR\fR
 .ad
 .RS 15n
 Operate on the global zone controlled IP NAT for the specified zone. If
 neither this option nor \fB-z\fR is specified, the current zone is used. This
-command is only available in the Global Zone. See \fBZONES\fR in \fBipf\fR(1m)for more information.
+command is only available in the Global Zone. See \fBZONES\fR in \fBipf\fR(1m)
+for more information.
 .RE
 
 .SH FILES
diff --git a/usr/src/man/man1m/ippool.1m b/usr/src/man/man1m/ippool.1m
index 0bb1a2a690..c7cae2029e 100644
--- a/usr/src/man/man1m/ippool.1m
+++ b/usr/src/man/man1m/ippool.1m
@@ -115,19 +115,19 @@ Turn verbose mode on.
 .sp
 .ne 2
 .na
-\fB\fB-z\fR\fR
+\fB\fB-z\fR \fIzonename\fR\fR
 .ad
 .RS 6n
 Manage the specified zone's in-zone IP pools. If neither this option nor
 \fB-G\fR is specified, the current zone is used. This command is only
-available in the Global Zone. See \fBZONES\fR in \fBipf\fR(1m)for more
+available in the Global Zone. See \fBZONES\fR in \fBipf\fR(1m) for more
 information.
 .RE
 
 .sp
 .ne 2
 .na
-\fB\fB-G\fR\fR
+\fB\fB-G\fR \fIzonename\fR\fR
 .ad
 .RS 6n
 Manage the specified zone's global zone controlled IP pools. If neither this
diff --git a/usr/src/uts/common/inet/ipf/fil.c b/usr/src/uts/common/inet/ipf/fil.c
index 86fc33a088..f96d2780e6 100644
--- a/usr/src/uts/common/inet/ipf/fil.c
+++ b/usr/src/uts/common/inet/ipf/fil.c
@@ -5722,7 +5722,7 @@ void *data;
 	if (error != 0)
 		return EFAULT;
 
-	if (memchr(ipfzo.ipfz_zonename, NULL, ZONENAME_MAX) == NULL)
+	if (memchr(ipfzo.ipfz_zonename, '\0', ZONENAME_MAX) == NULL)
 		return EFAULT;
 
 	if ((zone = zone_find_by_name(ipfzo.ipfz_zonename)) == NULL)