Skip to content

L
lxc
Commit 37fc7b9e by Stéphane Graber
Options

Fix lxc-user-nic to work on bionic

This adds a couple of missing includes, uses the local version of getline on bionic and replaces getpwuid_r by getpwuid. Signed-off-by: 's avatarStéphane Graber <stgraber@ubuntu.com> Acked-by: 's avatarSerge E. Hallyn <serge.hallyn@ubuntu.com>
parent e768f9c0
Showing with 12 additions and 6 deletions
src/lxc/lxc_user_nic.c
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include <alloca.h> #include <alloca.h>
#include <string.h> #include <string.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/socket.h>
#include <errno.h> #include <errno.h>
#include <ctype.h> #include <ctype.h>
#include <sys/stat.h> #include <sys/stat.h>
...@@ -40,6 +41,13 @@ ...@@ -40,6 +41,13 @@
#include <linux/if_bridge.h> #include <linux/if_bridge.h>
#include <linux/rtnetlink.h> #include <linux/rtnetlink.h>
#include <linux/sockios.h> #include <linux/sockios.h>
#include "config.h"
#ifndef HAVE_GETLINE
#ifdef HAVE_FGETLN
#include <../include/getline.h>
#endif
#endif
#if ISTEST #if ISTEST
#define CONF_FILE "/tmp/lxc-usernet" #define CONF_FILE "/tmp/lxc-usernet"
...@@ -116,16 +124,14 @@ int open_and_lock(char *path) ...@@ -116,16 +124,14 @@ int open_and_lock(char *path)
char *get_username(char **buf) char *get_username(char **buf)
{ {
struct passwd pwd; struct passwd *pwd = getpwuid(getuid());
struct passwd *result;
int ret = getpwuid_r(getuid(), &pwd, *buf, 400, &result);
if (ret < 0) { if (pwd == NULL) {
perror("getpwuid_r"); perror("getpwuid");
return NULL; return NULL;
} }
return pwd.pw_name; return pwd->pw_name;
} }
/* The configuration file consists of lines of the form: /* The configuration file consists of lines of the form:
......
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