Skip to content

Instantly share code, notes, and snippets.

@ikelos
Created June 25, 2018 23:18
Show Gist options
  • Save ikelos/972e0c1d07ffcec9f18b6cd5f9f598bf to your computer and use it in GitHub Desktop.
Save ikelos/972e0c1d07ffcec9f18b6cd5f9f598bf to your computer and use it in GitHub Desktop.
diff --git a/src/resolve/resolvconf-compat.c b/src/resolve/resolvconf-compat.c
index d7e6800..41be295 100644
--- a/src/resolve/resolvconf-compat.c
+++ b/src/resolve/resolvconf-compat.c
@@ -43,7 +43,7 @@ static int parse_nameserver(const char *string) {
assert(string);
for (;;) {
- _cleanup_free_ char *word = NULL;
+ char *word = NULL;
r = extract_first_word(&string, &word, NULL, 0);
if (r < 0)
@@ -64,7 +64,7 @@ static int parse_search_domain(const char *string) {
assert(string);
for (;;) {
- _cleanup_free_ char *word = NULL;
+ char *word = NULL;
r = extract_first_word(&string, &word, NULL, EXTRACT_QUOTES);
if (r < 0)
@@ -229,7 +229,7 @@ int resolvconf_parse_argv(int argc, char *argv[]) {
unsigned n = 0;
for (;;) {
- _cleanup_free_ char *line = NULL;
+ char *line = NULL;
const char *a, *l;
r = read_line(stdin, LONG_LINE_MAX, &line);
diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c
index e96c13f..1565da9 100644
--- a/src/resolve/resolvectl.c
+++ b/src/resolve/resolvectl.c
@@ -3092,7 +3092,7 @@ int main(int argc, char **argv) {
goto finish;
}
- if (streq(program_invocation_short_name, "systemd-resolve"))
+ if (streq(program_invocation_short_name, "resolvconf") || streq(program_invocation_short_name, "systemd-resolve"))
r = compat_main(argc, argv, bus);
else
r = native_main(argc, argv, bus);
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment