diff options
| author | Dan Winship <danw@redhat.com> | 2014-11-18 16:22:07 -0500 |
|---|---|---|
| committer | Dan Winship <danw@redhat.com> | 2014-11-19 12:02:12 -0500 |
| commit | 74678cf56ba242104f680e01e3c7e85c0c2adc43 (patch) | |
| tree | 889a573b56d2e638acd8d42d12663f798bae54c9 | |
| parent | 1ea0dd41b057959a9941a9873f7f5c454e81c0ed (diff) | |
| download | NetworkManager-74678cf56ba242104f680e01e3c7e85c0c2adc43.tar.gz | |
dhcp: re-fix system-dhcp code after re-import
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/dhcp-manager/systemd-dhcp/nm-sd-adapt.c | 4 | ||||
| -rw-r--r-- | src/dhcp-manager/systemd-dhcp/src/shared/strv.c | 2 | ||||
| -rw-r--r-- | src/dhcp-manager/systemd-dhcp/src/shared/util.c | 7 |
4 files changed, 12 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index a317705110..808e59eb33 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -99,6 +99,7 @@ libsystemd_dhcp_la_SOURCES = \ dhcp-manager/systemd-dhcp/src/shared/fileio.c \ dhcp-manager/systemd-dhcp/src/shared/strv.h \ dhcp-manager/systemd-dhcp/src/shared/strv.c \ + dhcp-manager/systemd-dhcp/src/shared/unaligned.h \ dhcp-manager/systemd-dhcp/src/shared/utf8.h \ dhcp-manager/systemd-dhcp/src/shared/utf8.c \ dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp-lease.h \ diff --git a/src/dhcp-manager/systemd-dhcp/nm-sd-adapt.c b/src/dhcp-manager/systemd-dhcp/nm-sd-adapt.c index cc5ad2abd2..a6d817278e 100644 --- a/src/dhcp-manager/systemd-dhcp/nm-sd-adapt.c +++ b/src/dhcp-manager/systemd-dhcp/nm-sd-adapt.c @@ -68,12 +68,12 @@ sd_event_source_unref (sd_event_source *s) } int -sd_event_source_set_name(sd_event_source *s, const char *name) +sd_event_source_set_description(sd_event_source *s, const char *description) { if (!s) return -EINVAL; - g_source_set_name_by_id (s->id, name); + g_source_set_name_by_id (s->id, description); return 0; } diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/strv.c b/src/dhcp-manager/systemd-dhcp/src/shared/strv.c index 52769f50a9..be2bd51106 100644 --- a/src/dhcp-manager/systemd-dhcp/src/shared/strv.c +++ b/src/dhcp-manager/systemd-dhcp/src/shared/strv.c @@ -277,6 +277,7 @@ char **strv_split_newlines(const char *s) { return l; } +#if 0 /* NM_IGNORED */ int strv_split_quoted(char ***t, const char *s, bool relax) { size_t n = 0, allocated = 0; _cleanup_strv_free_ char **l = NULL; @@ -311,6 +312,7 @@ int strv_split_quoted(char ***t, const char *s, bool relax) { return 0; } +#endif char *strv_join(char **l, const char *separator) { char *r, *e; diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/util.c b/src/dhcp-manager/systemd-dhcp/src/shared/util.c index 722e2569bd..05d4eb757a 100644 --- a/src/dhcp-manager/systemd-dhcp/src/shared/util.c +++ b/src/dhcp-manager/systemd-dhcp/src/shared/util.c @@ -2554,6 +2554,7 @@ char* dirname_malloc(const char *path) { #endif int dev_urandom(void *p, size_t n) { +#if 0 /* NM_IGNORED */ static int have_syscall = -1; int r, fd; ssize_t k; @@ -2593,6 +2594,10 @@ int dev_urandom(void *p, size_t n) { /* too short read? */ return -EIO; } +#else /* NM IGNORED */ + int fd; + ssize_t k; +#endif fd = open("/dev/urandom", O_RDONLY|O_CLOEXEC|O_NOCTTY); if (fd < 0) @@ -3337,6 +3342,7 @@ fail: return NULL; } +#if 0 /* NM_IGNORED */ char **replace_env_argv(char **argv, char **env) { char **ret, **i; unsigned k = 0, l = 0; @@ -3401,6 +3407,7 @@ char **replace_env_argv(char **argv, char **env) { ret[k] = NULL; return ret; } +#endif int fd_columns(int fd) { struct winsize ws = {}; |