Author: emaste
Date: Fri Nov 10 14:53:16 2017
New Revision: 325664
URL: https://svnweb.freebsd.org/changeset/base/325664
Log:
Strip EOL whitespace in usr.sbin/{jail,jexec}
Modified:
head/usr.sbin/jail/command.c
head/usr.sbin/jail/jail.8
head/usr.sbin/jail/jail.c
head/usr.sbin/jexec/jexec.c
Modified: head/usr.sbin/jail/command.c
==============================================================================
--- head/usr.sbin/jail/command.c Fri Nov 10 14:46:50 2017
(r325663)
+++ head/usr.sbin/jail/command.c Fri Nov 10 14:53:16 2017
(r325664)
@@ -432,7 +432,7 @@ run_command(struct cfjail *j)
argv[argc] = down ? "-alias" : "alias";
argv[argc + 1] = NULL;
- break;
+ break;
#endif
case IP_VNET_INTERFACE:
@@ -603,13 +603,13 @@ run_command(struct cfjail *j)
bg = 1;
}
comcs = alloca(comstring->len + 1);
- strcpy(comcs, comstring->s);
+ strcpy(comcs, comstring->s);
argc = 0;
for (cs = strtok(comcs, " \t\f\v\r\n"); cs;
cs = strtok(NULL, " \t\f\v\r\n"))
argc++;
argv = alloca((argc + 1) * sizeof(char *));
- strcpy(comcs, comstring->s);
+ strcpy(comcs, comstring->s);
argc = 0;
for (cs = strtok(comcs, " \t\f\v\r\n"); cs;
cs = strtok(NULL, " \t\f\v\r\n"))
Modified: head/usr.sbin/jail/jail.8
==============================================================================
--- head/usr.sbin/jail/jail.8 Fri Nov 10 14:46:50 2017 (r325663)
+++ head/usr.sbin/jail/jail.8 Fri Nov 10 14:53:16 2017 (r325664)
@@ -483,7 +483,7 @@ and uname -K.
Some restrictions of the jail environment may be set on a per-jail
basis.
With the exception of
-.Va allow.set_hostname
+.Va allow.set_hostname
and
.Va allow.reserved_ports ,
these boolean parameters are off by default.
@@ -614,7 +614,7 @@ Sockets within a jail are normally restricted to IPv4,
(UNIX), and route. This allows access to other protocol stacks that
have not had jail functionality added to them.
.It Va allow.reserved_ports
-The jail root may bind to ports lower than 1024.
+The jail root may bind to ports lower than 1024.
.El
.El
.Pp
Modified: head/usr.sbin/jail/jail.c
==============================================================================
--- head/usr.sbin/jail/jail.c Fri Nov 10 14:46:50 2017 (r325663)
+++ head/usr.sbin/jail/jail.c Fri Nov 10 14:53:16 2017 (r325664)
@@ -94,7 +94,7 @@ static const enum intparam startcommands[] = {
IP_MOUNT_DEVFS,
IP_MOUNT_FDESCFS,
IP_MOUNT_PROCFS,
- IP_EXEC_PRESTART,
+ IP_EXEC_PRESTART,
IP__OP,
IP_VNET_INTERFACE,
IP_EXEC_START,
@@ -269,7 +269,7 @@ main(int argc, char **argv)
&sysval, &sysvallen, NULL, 0) == 0)
add_param(NULL, NULL,
perm_sysctl[pi].ipnum,
- (sysval ? 1 : 0) ^
+ (sysval ? 1 : 0) ^
perm_sysctl[pi].rev
? NULL : "false");
}
Modified: head/usr.sbin/jexec/jexec.c
==============================================================================
--- head/usr.sbin/jexec/jexec.c Fri Nov 10 14:46:50 2017 (r325663)
+++ head/usr.sbin/jexec/jexec.c Fri Nov 10 14:53:16 2017 (r325664)
@@ -187,5 +187,5 @@ usage(void)
fprintf(stderr, "%s\n",
"usage: jexec [-l] [-u username | -U username] jail [command ...]");
- exit(1);
+ exit(1);
}
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
