cmd: simplify lxc-usernsexec

Calculate length only once. Signed-off-by: 's avatarChristian Brauner <christian.brauner@ubuntu.com>
parent 73572438
...@@ -194,8 +194,9 @@ static int parse_map(char *map) ...@@ -194,8 +194,9 @@ static int parse_map(char *map)
* only use the first one for each of uid and gid, because otherwise we're not * only use the first one for each of uid and gid, because otherwise we're not
* sure which entries the user wanted. * sure which entries the user wanted.
*/ */
static int read_default_map(char *fnam, int which, char *username) static int read_default_map(char *fnam, int which, char *user)
{ {
size_t len;
char *p1, *p2; char *p1, *p2;
FILE *fin; FILE *fin;
struct id_map *newmap; struct id_map *newmap;
...@@ -207,10 +208,9 @@ static int read_default_map(char *fnam, int which, char *username) ...@@ -207,10 +208,9 @@ static int read_default_map(char *fnam, int which, char *username)
if (!fin) if (!fin)
return -1; return -1;
len = strlen(user);
while (getline(&line, &sz, fin) != -1) { while (getline(&line, &sz, fin) != -1) {
if (sz <= strlen(username) || if (sz <= len || strncmp(line, user, len) != 0 || line[len] != ':')
strncmp(line, username, strlen(username)) != 0 ||
line[strlen(username)] != ':')
continue; continue;
p1 = strchr(line, ':'); p1 = strchr(line, ':');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment