|
 |
86624f |
From 7daf5993995baad0f5c7f7ae3822dae37eb9f46f Mon Sep 17 00:00:00 2001
|
|
|
86624f |
From: Sumit Bose <sbose@redhat.com>
|
|
|
86624f |
Date: Fri, 30 Oct 2020 16:44:23 +0100
|
|
|
86624f |
Subject: [PATCH 4/6] service: do not copy option values to avoid memory leaks
|
|
|
86624f |
|
|
|
86624f |
---
|
|
|
86624f |
service/realm-adcli-enroll.c | 15 ++++++++-------
|
|
|
86624f |
service/realm-options.c | 8 +++-----
|
|
|
86624f |
2 files changed, 11 insertions(+), 12 deletions(-)
|
|
|
86624f |
|
|
|
86624f |
diff --git a/service/realm-adcli-enroll.c b/service/realm-adcli-enroll.c
|
|
|
86624f |
index 2731283..e0d752b 100644
|
|
|
86624f |
--- a/service/realm-adcli-enroll.c
|
|
|
86624f |
+++ b/service/realm-adcli-enroll.c
|
|
|
86624f |
@@ -80,7 +80,8 @@ realm_adcli_enroll_join_async (RealmDisco *disco,
|
|
|
86624f |
GBytes *input = NULL;
|
|
|
86624f |
const gchar *upn;
|
|
|
86624f |
GPtrArray *args;
|
|
|
86624f |
- const gchar *os;
|
|
|
86624f |
+ const gchar *os_n = NULL;
|
|
|
86624f |
+ const gchar *os_v = NULL;
|
|
|
86624f |
gchar *ccache_arg = NULL;
|
|
|
86624f |
gchar *upn_arg = NULL;
|
|
|
86624f |
gchar *server_arg = NULL;
|
|
|
86624f |
@@ -144,16 +145,16 @@ realm_adcli_enroll_join_async (RealmDisco *disco,
|
|
|
86624f |
g_ptr_array_add (args, (gpointer)computer_ou);
|
|
|
86624f |
}
|
|
|
86624f |
|
|
|
86624f |
- os = realm_options_ad_specific (options, "os-name");
|
|
|
86624f |
- if (os != NULL && !g_str_equal (os, "")) {
|
|
|
86624f |
+ os_n = realm_options_ad_specific (options, "os-name");
|
|
|
86624f |
+ if (os_n != NULL && !g_str_equal (os_n, "")) {
|
|
|
86624f |
g_ptr_array_add (args, "--os-name");
|
|
|
86624f |
- g_ptr_array_add (args, (gpointer)os);
|
|
|
86624f |
+ g_ptr_array_add (args, (gpointer)os_n);
|
|
|
86624f |
}
|
|
|
86624f |
|
|
|
86624f |
- os = realm_options_ad_specific (options, "os-version");
|
|
|
86624f |
- if (os != NULL && !g_str_equal (os, "")) {
|
|
|
86624f |
+ os_v = realm_options_ad_specific (options, "os-version");
|
|
|
86624f |
+ if (os_v != NULL && !g_str_equal (os_v, "")) {
|
|
|
86624f |
g_ptr_array_add (args, "--os-version");
|
|
|
86624f |
- g_ptr_array_add (args, (gpointer)os);
|
|
|
86624f |
+ g_ptr_array_add (args, (gpointer)os_v);
|
|
|
86624f |
}
|
|
|
86624f |
|
|
|
86624f |
switch (cred->type) {
|
|
|
86624f |
diff --git a/service/realm-options.c b/service/realm-options.c
|
|
|
86624f |
index d42eb7c..4ebd6c0 100644
|
|
|
86624f |
--- a/service/realm-options.c
|
|
|
86624f |
+++ b/service/realm-options.c
|
|
|
86624f |
@@ -179,7 +179,7 @@ realm_options_computer_name (GVariant *options,
|
|
|
86624f |
g_free (section);
|
|
|
86624f |
}
|
|
|
86624f |
|
|
|
86624f |
- return g_strdup (computer_name);
|
|
|
86624f |
+ return computer_name;
|
|
|
86624f |
}
|
|
|
86624f |
|
|
|
86624f |
const gchar *
|
|
|
86624f |
@@ -197,22 +197,20 @@ realm_options_ad_specific (GVariant *options,
|
|
|
86624f |
value = realm_settings_value ("active-directory", option_name);
|
|
|
86624f |
}
|
|
|
86624f |
|
|
|
86624f |
- return g_strdup (value);
|
|
|
86624f |
+ return value;
|
|
|
86624f |
}
|
|
|
86624f |
|
|
|
86624f |
gboolean realm_option_use_ldaps (GVariant *options)
|
|
|
86624f |
{
|
|
|
86624f |
- gchar *use_ldaps_str;
|
|
|
86624f |
+ const gchar *use_ldaps_str;
|
|
|
86624f |
|
|
|
86624f |
use_ldaps_str = realm_options_ad_specific (options,
|
|
|
86624f |
REALM_DBUS_OPTION_USE_LDAPS);
|
|
|
86624f |
if (use_ldaps_str != NULL
|
|
|
86624f |
&& ( g_ascii_strcasecmp (use_ldaps_str, "True") == 0
|
|
|
86624f |
|| g_ascii_strcasecmp (use_ldaps_str, "Yes") == 0)) {
|
|
|
86624f |
- g_free (use_ldaps_str);
|
|
|
86624f |
return TRUE;
|
|
|
86624f |
}
|
|
|
86624f |
- g_free (use_ldaps_str);
|
|
|
86624f |
|
|
|
86624f |
return FALSE;
|
|
|
86624f |
}
|
|
|
86624f |
--
|
|
|
86624f |
2.26.2
|
|
|
86624f |
|