projects
/
platform
/
upstream
/
connman.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vpn: Make domain parameter optional
[platform/upstream/connman.git]
/
vpn
/
vpn-config.c
diff --git
a/vpn/vpn-config.c
b/vpn/vpn-config.c
old mode 100644
(file)
new mode 100755
(executable)
index
f56e51e
..
97e072c
--- a/
vpn/vpn-config.c
+++ b/
vpn/vpn-config.c
@@
-203,7
+203,11
@@
static int load_provider(GKeyFile *keyfile, const char *group,
struct vpn_config *config, enum what action)
{
struct vpn_config_provider *config_provider;
struct vpn_config *config, enum what action)
{
struct vpn_config_provider *config_provider;
+#if !defined TIZEN_EXT
const char *ident, *host, *domain;
const char *ident, *host, *domain;
+#else
+ const char *ident, *host, *domain, *name;
+#endif
int err;
/* Strip off "provider_" prefix */
int err;
/* Strip off "provider_" prefix */
@@
-229,8
+233,14
@@
static int load_provider(GKeyFile *keyfile, const char *group,
host = get_string(config_provider, "Host");
domain = get_string(config_provider, "Domain");
host = get_string(config_provider, "Host");
domain = get_string(config_provider, "Domain");
- if (host && domain) {
+#if !defined TIZEN_EXT
+ if (host) {
char *id = __vpn_provider_create_identifier(host, domain);
char *id = __vpn_provider_create_identifier(host, domain);
+#else
+ name = get_string(config_provider, "Name");
+ if (host && name) {
+ char *id = __vpn_provider_create_identifier(host, domain, name);
+#endif
struct vpn_provider *provider;
provider = __vpn_provider_lookup(id);
struct vpn_provider *provider;
provider = __vpn_provider_lookup(id);
@@
-252,7
+262,11
@@
static int load_provider(GKeyFile *keyfile, const char *group,
DBG("provider identifier %s", id);
} else {
DBG("provider identifier %s", id);
} else {
+#if !defined TIZEN_EXT
DBG("invalid values host %s domain %s", host, domain);
DBG("invalid values host %s domain %s", host, domain);
+#else
+ DBG("invalid values host %s domain %s name %s", host, domain, name);
+#endif
err = -EINVAL;
goto err;
}
err = -EINVAL;
goto err;
}