Merge head

2 files changed, 6 insertions, 7 deletions

diff --git a/sbin/swapon/swapon.8 b/sbin/swapon/swapon.8
index ec2ad7265136..c4286d7be177 100644
--- a/sbin/swapon/swapon.8
+++ b/sbin/swapon/swapon.8
@@ -28,7 +28,7 @@
 .\"     @(#)swapon.8	8.1 (Berkeley) 6/5/93
 .\" $FreeBSD$
 .\"
-.Dd June 21, 2013
+.Dd November 22, 2013
 .Dt SWAPON 8
 .Os
 .Sh NAME
@@ -60,9 +60,7 @@ At boot time all swap entries in
 .Pa /etc/fstab
 are added automatically when the system goes multi-user.
 Swap devices use a fixed interleave; the maximum number of devices
-is specified by the kernel configuration option
-.Dv NSWAPDEV ,
-which is typically set to 4.
+is unlimited.
 There is no priority mechanism.
 .Pp
 The
@@ -193,8 +191,8 @@ overridden.
 512 byte blocks are used by default.
 .El
 .Sh FILES
-.Bl -tag -width ".Pa /dev/{ad,da}?s?b" -compact
-.It Pa /dev/{ad,da}?s?b
+.Bl -tag -width ".Pa /dev/{ada,da}?s?b" -compact
+.It Pa /dev/{ada,da}?s?b
 standard paging devices
 .It Pa /dev/md?
 memory disk devices
diff --git a/sbin/swapon/swapon.c b/sbin/swapon/swapon.c
index bf621c1132f9..5c6086d9bb97 100644
--- a/sbin/swapon/swapon.c
+++ b/sbin/swapon/swapon.c
@@ -266,7 +266,8 @@ static const char *
 swap_on_off_gbde(const char *name, int doingall)
 {
 	const char *ret;
-	char pass[64 * 2 + 1], bpass[64];
+	char pass[64 * 2 + 1];
+	unsigned char bpass[64];
 	char *dname;
 	int i, error;