---
scripts/libppp-plugin.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/scripts/libppp-plugin.c b/scripts/libppp-plugin.c
index e77b8cc..cae7d8c 100644
--- a/scripts/libppp-plugin.c
+++ b/scripts/libppp-plugin.c
@@ -84,7 +84,7 @@ static int ppp_have_secret()
static int ppp_get_secret(char *username, char *password)
{
DBusMessage *msg, *reply;
- const char *user, *pass;
+ const char *ppp_user, *pass;
DBusError err;
if (username == NULL && password == NULL)
@@ -118,7 +118,7 @@ static int ppp_get_secret(char *username, char *password)
dbus_error_init(&err);
- if (dbus_message_get_args(reply, &err, DBUS_TYPE_STRING, &user,
+ if (dbus_message_get_args(reply, &err, DBUS_TYPE_STRING, &ppp_user,
DBUS_TYPE_STRING, &pass,
DBUS_TYPE_INVALID) == FALSE) {
if (dbus_error_is_set(&err) == TRUE)
@@ -129,7 +129,7 @@ static int ppp_get_secret(char *username, char *password)
}
if (username != NULL)
- strcpy(username, user);
+ strcpy(username, ppp_user);
strcpy(password, pass);
@@ -273,10 +273,10 @@ static void ppp_phase_change(void *data, int arg)
int plugin_init(void)
{
- DBusError error;
+ DBusError dbus_error;
static const char *bus, *inter, *p;
- dbus_error_init(&error);
+ dbus_error_init(&dbus_error);
bus = getenv("CONNMAN_BUSNAME");
inter = getenv("CONNMAN_INTERFACE");
@@ -294,10 +294,10 @@ int plugin_init(void)
return -1;
}
- connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error);
+ connection = dbus_bus_get(DBUS_BUS_SYSTEM, &dbus_error);
if (connection == NULL) {
- if (dbus_error_is_set(&error) == TRUE)
- dbus_error_free(&error);
+ if (dbus_error_is_set(&dbus_error) == TRUE)
+ dbus_error_free(&dbus_error);
ppp_exit(NULL, 0);
return -1;
--
1.7.9.5
_______________________________________________
connman mailing list
[email protected]
http://lists.connman.net/listinfo/connman
