Mercurial > dovecot > core-2.2
changeset 11284:a8a8686e6979 HEAD
Added restrict_access_get_env()
author | Timo Sirainen <tss@iki.fi> |
---|---|
date | Wed, 12 May 2010 16:39:03 +0200 |
parents | 6599d3d52c76 |
children | 1a3c9bd45b11 |
files | src/lib/restrict-access.c src/lib/restrict-access.h |
diffstat | 2 files changed, 18 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lib/restrict-access.c Wed May 12 16:07:40 2010 +0200 +++ b/src/lib/restrict-access.c Wed May 12 16:39:03 2010 +0200 @@ -376,38 +376,42 @@ return str == NULL || *str == '\0' ? NULL : str; } -void restrict_access_by_env(const char *home, bool disallow_root) +void restrict_access_get_env(struct restrict_access_settings *set_r) { - struct restrict_access_settings set; const char *value; - restrict_access_init(&set); - + restrict_access_init(set_r); if ((value = getenv("RESTRICT_SETUID")) != NULL) { - if (str_to_uid(value, &set.uid) < 0) + if (str_to_uid(value, &set_r->uid) < 0) i_fatal("Invalid uid: %s", value); } if ((value = getenv("RESTRICT_SETGID")) != NULL) { - if (str_to_gid(value, &set.gid) < 0) + if (str_to_gid(value, &set_r->gid) < 0) i_fatal("Invalid gid: %s", value); } if ((value = getenv("RESTRICT_SETGID_PRIV")) != NULL) { - if (str_to_gid(value, &set.privileged_gid) < 0) + if (str_to_gid(value, &set_r->privileged_gid) < 0) i_fatal("Invalid privileged_gid: %s", value); } if ((value = getenv("RESTRICT_GID_FIRST")) != NULL) { - if (str_to_gid(value, &set.first_valid_gid) < 0) + if (str_to_gid(value, &set_r->first_valid_gid) < 0) i_fatal("Invalid first_valid_gid: %s", value); } if ((value = getenv("RESTRICT_GID_LAST")) != NULL) { - if (str_to_gid(value, &set.last_valid_gid) < 0) + if (str_to_gid(value, &set_r->last_valid_gid) < 0) i_fatal("Invalid last_value_gid: %s", value); } - set.extra_groups = null_if_empty(getenv("RESTRICT_SETEXTRAGROUPS")); - set.system_groups_user = null_if_empty(getenv("RESTRICT_USER")); - set.chroot_dir = null_if_empty(getenv("RESTRICT_CHROOT")); + set_r->extra_groups = null_if_empty(getenv("RESTRICT_SETEXTRAGROUPS")); + set_r->system_groups_user = null_if_empty(getenv("RESTRICT_USER")); + set_r->chroot_dir = null_if_empty(getenv("RESTRICT_CHROOT")); +} +void restrict_access_by_env(const char *home, bool disallow_root) +{ + struct restrict_access_settings set; + + restrict_access_get_env(&set); restrict_access(&set, home, disallow_root); /* clear the environment, so we don't fail if we get back here */
--- a/src/lib/restrict-access.h Wed May 12 16:07:40 2010 +0200 +++ b/src/lib/restrict-access.h Wed May 12 16:39:03 2010 +0200 @@ -32,6 +32,8 @@ /* Set environment variables so they can be read with restrict_access_by_env(). */ void restrict_access_set_env(const struct restrict_access_settings *set); +/* Read restrict_access_set_env() environments back into struct. */ +void restrict_access_get_env(struct restrict_access_settings *set_r); /* Read restrictions from environment and call restrict_access(). If disallow_roots is TRUE, we'll kill ourself if we didn't have the environment settings. */