mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-09-01 14:55:12 +00:00
Code Issues Releases Wiki Activity

Ignore bad lines in passwd/group file instead if stopping processing when we hit one.

Browse Source
This commit is contained in:
Todd C. Miller
2012-11-25 09:23:17 -05:00
parent cca915e39b
commit e81eb5b00a
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
plugins/sudoers/tsgetgrpw.c
View File

@@ -1,5 +1,6 @@
/* /*
* Copyright (c) 2005, 2008, 2010-2011 Todd C. Miller <Todd.Miller@courtesan.com> * Copyright (c) 2005, 2008, 2010-2012
* Todd C. Miller <Todd.Miller@courtesan.com>
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@@ -116,32 +117,33 @@ getpwent(void)
size_t len; size_t len;
char *cp, *colon; char *cp, *colon;
next_entry:
if ((colon = fgets(pwbuf, sizeof(pwbuf), pwf)) == NULL) if ((colon = fgets(pwbuf, sizeof(pwbuf), pwf)) == NULL)
return NULL; return NULL;
zero_bytes(&pw, sizeof(pw)); zero_bytes(&pw, sizeof(pw));
if ((colon = strchr(cp = colon, ':')) == NULL) if ((colon = strchr(cp = colon, ':')) == NULL)
return NULL; goto next_entry;
*colon++ = '\0'; *colon++ = '\0';
pw.pw_name = cp; pw.pw_name = cp;
if ((colon = strchr(cp = colon, ':')) == NULL) if ((colon = strchr(cp = colon, ':')) == NULL)
return NULL; goto next_entry;
*colon++ = '\0'; *colon++ = '\0';
pw.pw_passwd = cp; pw.pw_passwd = cp;
if ((colon = strchr(cp = colon, ':')) == NULL) if ((colon = strchr(cp = colon, ':')) == NULL)
return NULL; goto next_entry;
*colon++ = '\0'; *colon++ = '\0';
pw.pw_uid = atoi(cp); pw.pw_uid = atoi(cp);
if ((colon = strchr(cp = colon, ':')) == NULL) if ((colon = strchr(cp = colon, ':')) == NULL)
return NULL; goto next_entry;
*colon++ = '\0'; *colon++ = '\0';
pw.pw_gid = atoi(cp); pw.pw_gid = atoi(cp);
if ((colon = strchr(cp = colon, ':')) == NULL) if ((colon = strchr(cp = colon, ':')) == NULL)
return NULL; goto next_entry;
*colon++ = '\0'; *colon++ = '\0';
pw.pw_gecos = cp; pw.pw_gecos = cp;
if ((colon = strchr(cp = colon, ':')) == NULL) if ((colon = strchr(cp = colon, ':')) == NULL)
return NULL; goto next_entry;
*colon++ = '\0'; *colon++ = '\0';
pw.pw_dir = cp; pw.pw_dir = cp;
pw.pw_shell = colon; pw.pw_shell = colon;
@@ -237,20 +239,21 @@ getgrent(void)
char *cp, *colon; char *cp, *colon;
int n; int n;
next_entry:
if ((colon = fgets(grbuf, sizeof(grbuf), grf)) == NULL) if ((colon = fgets(grbuf, sizeof(grbuf), grf)) == NULL)
return NULL; return NULL;
zero_bytes(&gr, sizeof(gr)); zero_bytes(&gr, sizeof(gr));
if ((colon = strchr(cp = colon, ':')) == NULL) if ((colon = strchr(cp = colon, ':')) == NULL)
return NULL; goto next_entry;
*colon++ = '\0'; *colon++ = '\0';
gr.gr_name = cp; gr.gr_name = cp;
if ((colon = strchr(cp = colon, ':')) == NULL) if ((colon = strchr(cp = colon, ':')) == NULL)
return NULL; goto next_entry;
*colon++ = '\0'; *colon++ = '\0';
gr.gr_passwd = cp; gr.gr_passwd = cp;
if ((colon = strchr(cp = colon, ':')) == NULL) if ((colon = strchr(cp = colon, ':')) == NULL)
return NULL; goto next_entry;
*colon++ = '\0'; *colon++ = '\0';
gr.gr_gid = atoi(cp); gr.gr_gid = atoi(cp);
len = strlen(colon); len = strlen(colon);