5f94f2b Fix typos — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Fix typos

Baptiste Daroussin committed 9 years ago

commit 5f94f2b36bfb69762bebb22b3d9b33a7d29e321c
parent a42547f

3 files changed +7 -7

modified libpkg/fetch.c

@@ -545,7 +545,7 @@ pkg_fetch_file_to_fd(struct pkg_repo *repo, const char *url, int dest,

 			if (geteuid() == 0) {
 				nobody = getpwnam("nobody");
 				if (nobody == NULL)
 					err(EXIT_FAILURE, "Enable to drop priviledges");
 					err(EXIT_FAILURE, "Unable to drop priviledges");
 				setgroups(1, &nobody->pw_gid);
 				setegid(nobody->pw_gid);
 				setgid(nobody->pw_gid);

@@ -554,7 +554,7 @@ pkg_fetch_file_to_fd(struct pkg_repo *repo, const char *url, int dest,

 			}
 			rl_zero.rlim_cur = rl_zero.rlim_max = 0;
 			if (setrlimit(RLIMIT_NPROC, &rl_zero) == -1)
 				err(2, "Enable to setrlimit(RLIMIT_NPROC)");
 				err(2, "Unable to setrlimit(RLIMIT_NPROC)");
 			break;
 		default:
 			while (waitpid(pid, &pstat, 0) == -1 && errno == EINTR)

modified src/event.c

@@ -264,9 +264,9 @@ event_sandboxed_call(pkg_sandbox_cb func, int fd, void *ud)

 	rl_zero.rlim_cur = rl_zero.rlim_max = 0;
 	if (setrlimit(RLIMIT_FSIZE, &rl_zero) == -1)
 		err(EXIT_FAILURE, "Enable to setrlimit(RLIMIT_FSIZE)");
 		err(EXIT_FAILURE, "Unable to setrlimit(RLIMIT_FSIZE)");
 	if (setrlimit(RLIMIT_NPROC, &rl_zero) == -1)
 		err(EXIT_FAILURE, "Enable to setrlimit(RLIMIT_NPROC)");
 		err(EXIT_FAILURE, "Unable to setrlimit(RLIMIT_NPROC)");
 	/* Here comes child process */
 #ifdef HAVE_CAPSICUM

@@ -374,7 +374,7 @@ event_sandboxed_get_string(pkg_sandbox_cb func, char **result, int64_t *len,

 	rl_zero.rlim_cur = rl_zero.rlim_max = 0;
 	if (setrlimit(RLIMIT_NPROC, &rl_zero) == -1)
 		err(EXIT_FAILURE, "Enable to setrlimit(RLIMIT_NPROC)");
 		err(EXIT_FAILURE, "Unable to setrlimit(RLIMIT_NPROC)");
 #ifdef HAVE_CAPSICUM
 	if (cap_enter() < 0 && errno != ENOSYS) {

modified src/utils.c

@@ -1011,9 +1011,9 @@ drop_privileges(void)

 	if (geteuid() == 0) {
 		nobody = getpwnam("nobody");
 		if (nobody == NULL)
 			err(EXIT_FAILURE, "Enable to drop priviledges");
 			err(EXIT_FAILURE, "Unable to drop priviledges");
 		if (chroot("/var/empty") == -1)
 			err(EXIT_FAILURE, "Enable to chroot in /var/empty");
 			err(EXIT_FAILURE, "Unable to chroot in /var/empty");
 		chdir("/");
 		setgroups(1, &nobody->pw_gid);
 		setegid(nobody->pw_gid);