ncmlib: Cosmetic cleanups to chroot.c.

This commit is contained in:
Nicholas J. Kain 2013-05-08 06:58:55 -04:00
parent f78ea70d71
commit f8773742c9

View File

@ -1,7 +1,6 @@
/* chroot.c - chroots ndyndns jobs
* Time-stamp: <2010-11-03 05:23:56 njk>
/* chroot.c - chroots jobs and drops privs
*
* (c) 2005-2010 Nicholas J. Kain <njkain at gmail dot com>
* (c) 2005-2013 Nicholas J. Kain <njkain at gmail dot com>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -72,26 +71,18 @@ void wipe_chroot(void)
memset(chrootd, '\0', sizeof chrootd);
}
void imprison(const char *path)
void imprison(const char *chroot_dir)
{
int ret;
if (path == NULL)
if (chdir(chroot_dir)) {
log_line("Failed to chdir(%s)!", chroot_dir);
exit(EXIT_FAILURE);
}
if (!chroot_enable)
return;
ret = chdir(path);
if (ret) {
log_line("Failed to chdir(%s). Not invoking job.", path);
if (chroot(chroot_dir)) {
log_line("Failed to chroot(%s)!", chroot_dir);
exit(EXIT_FAILURE);
}
if (chroot_enable) {
ret = chroot(path);
if (ret) {
log_line("Failed to chroot(%s). Not invoking job.", path);
exit(EXIT_FAILURE);
}
}
}
void drop_root(uid_t uid, gid_t gid)