diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2010-07-13 09:54:50 -0300 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2010-07-13 09:54:50 -0300 |
| commit | 48349b6430f4c194bbad4e89f60079d3a8909a85 (patch) | |
| tree | 77665276bda863b8d74e95093ee08a07460d86dc /network | |
| parent | 73dfbe9fbd2d9ed00cfff4bef772b2b4ee175f1d (diff) | |
| download | bluez-48349b6430f4c194bbad4e89f60079d3a8909a85.tar.gz | |
Remove unused network configuration disable checking
Diffstat (limited to 'network')
| -rw-r--r-- | network/manager.c | 17 | ||||
| -rw-r--r-- | network/network.conf | 2 |
2 files changed, 0 insertions, 19 deletions
diff --git a/network/manager.c b/network/manager.c index 48dfff7f6..ef861c083 100644 --- a/network/manager.c +++ b/network/manager.c @@ -58,7 +58,6 @@ static void read_config(const char *file) { GKeyFile *keyfile; GError *err = NULL; - char **disabled; keyfile = g_key_file_new(); @@ -67,22 +66,6 @@ static void read_config(const char *file) goto done; } - disabled = g_key_file_get_string_list(keyfile, "General", - "Disable", NULL, &err); - if (err) { - DBG("%s: %s", file, err->message); - g_clear_error(&err); - } else { - int i; - for (i = 0; disabled[i] != NULL; i++) { - if (g_str_equal(disabled[i], "Connection")) - conf.connection_enabled = FALSE; - else if (g_str_equal(disabled[i], "Server")) - conf.server_enabled = FALSE; - } - g_strfreev(disabled); - } - conf.security = !g_key_file_get_boolean(keyfile, "General", "DisableSecurity", &err); if (err) { diff --git a/network/network.conf b/network/network.conf index c3da03e2a..5f1163959 100644 --- a/network/network.conf +++ b/network/network.conf @@ -1,7 +1,5 @@ # Configuration file for the network service -# This section contains options which are not specific to any -# particular interface [General] # Disable link encryption: default=false |