Attachment 2398 Details for Bug 2140 – minor nits for capsicum

[patch] minor nits for capsicum

file_2140.txt (text/plain), 1.07 KB, created by Loganaden Velvindron on 2014-01-18 00:11:50 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Loganaden Velvindron

Created: 2014-01-18 00:11:50 AEDT

Size: 1.07 KB

patch

obsolete

>diff --git a/sandbox-capsicum.c b/sandbox-capsicum.c
>index 5853a13..f648c6e 100644
>--- a/sandbox-capsicum.c
>+++ b/sandbox-capsicum.c
>@@ -87,9 +87,9 @@ ssh_sandbox_child(struct ssh_sandbox *box)
> 	if (cap_rights_limit(STDIN_FILENO, &rights) < 0 && errno != ENOSYS)
> 		fatal("can't limit stdin: %m");
> 	if (cap_rights_limit(STDOUT_FILENO, &rights) < 0 && errno != ENOSYS)
>-		fatal("can't limit stdin: %m");
>+		fatal("can't limit stdout: %m");
> 	if (cap_rights_limit(STDERR_FILENO, &rights) < 0 && errno != ENOSYS)
>-		fatal("can't limit stdin: %m");
>+		fatal("can't limit stderr: %m");
> 
> 	cap_rights_init(&rights, CAP_READ, CAP_WRITE);
> 	if (cap_rights_limit(box->monitor->m_recvfd, &rights) == -1)
>@@ -97,7 +97,7 @@ ssh_sandbox_child(struct ssh_sandbox *box)
> 	cap_rights_init(&rights, CAP_WRITE);
> 	if (cap_rights_limit(box->monitor->m_log_sendfd, &rights) == -1)
> 		fatal("%s: failed to limit the logging socket", __func__);
>-	if (cap_enter() != 0 && errno != ENOSYS)
>+	if (cap_enter() < 0 && errno != ENOSYS)
> 		fatal("%s: failed to enter capability mode", __func__);
> 
> }

Actions: View | Diff

Attachments on bug 2140: 2326 | 2352 | 2364 | 2365 | 2371 | 2397 | 2398 | 2401 | 2405