src/usr.bin/doas/doas.c - diff

Return to doas.c CVS log

Up to [local] / src / usr.bin / doas

Diff for /src/usr.bin/doas/doas.c between version 1.8 and 1.9

version 1.8, 2015/07/18 06:33:23

version 1.9, 2015/07/18 18:44:26

Line 43

arraylen(const char **arr)

{

size_t cnt = 0;

while (*arr) {

cnt++;

arr++;

Line 165

Line 166

char **envp, int ei)

{

int i;

for (i = 0; i < nsafe; i++) {

const char **oe = oldenvp;

while (*oe) {

Line 189

Line 191

"PATH", "TERM", "USER", "USERNAME",

NULL,

};

int nsafe;

int nextras = 0;

char **envp;

const char **extra;

int ei;

int i, j;

int nsafe;

int nextras = 0;

if ((rule->options & KEEPENV) && !rule->envlist) {

j = arraylen(oldenvp);

Line 244

Line 246

int

main(int argc, char **argv, char **envp)

{

const char *safepath = "/bin:/sbin:/usr/bin:/usr/sbin:"

"/usr/local/bin:/usr/local/sbin";

char *shargv[] = { NULL, NULL };

char *sh;

const char *cmd;

char cmdline[LINE_MAX];

char myname[_PW_NAME_LEN + 1];

uid_t uid, target = 0;

gid_t groups[NGROUPS_MAX + 1];

int ngroups;

struct passwd *pw;

struct rule *rule;

const char *cmd;

uid_t uid;

uid_t target = 0;

gid_t groups[NGROUPS_MAX + 1];

int ngroups;

int i, ch;

const char *safepath = "/bin:/sbin:/usr/bin:/usr/sbin:"

"/usr/local/bin:/usr/local/sbin";

int sflag = 0;

char *shargv[] = { NULL, NULL };

char *sh;

parseconfig("/etc/doas.conf");