Updated connman to version 1.35

[platform/upstream/connman.git] / vpn / plugins / l2tp.c

diff --git a/vpn/plugins/l2tp.c b/vpn/plugins/l2tp.c
index 22f9dcf..a0d22c4 100755 (executable)
--- a/vpn/plugins/l2tp.c
+++ b/vpn/plugins/l2tp.c
@@ -108,13 +108,13 @@ struct {
        { "PPPD.RefuseMSCHAP2", "refuse-mschapv2", OPT_PPPD, NULL, OPT_BOOL },
        { "PPPD.NoBSDComp", "nobsdcomp", OPT_PPPD, NULL, OPT_BOOL },
        { "PPPD.NoPcomp", "nopcomp", OPT_PPPD, NULL, OPT_BOOL },
-       { "PPPD.UseAccomp", "accomp", OPT_PPPD, NULL, OPT_BOOL },
+       { "PPPD.UseAccomp", "noaccomp", OPT_PPPD, NULL, OPT_BOOL },
        { "PPPD.NoDeflate", "nodeflate", OPT_PPPD, NULL, OPT_BOOL },
        { "PPPD.ReqMPPE", "require-mppe", OPT_PPPD, NULL, OPT_BOOL },
        { "PPPD.ReqMPPE40", "require-mppe-40", OPT_PPPD, NULL, OPT_BOOL },
        { "PPPD.ReqMPPE128", "require-mppe-128", OPT_PPPD, NULL, OPT_BOOL },
        { "PPPD.ReqMPPEStateful", "mppe-stateful", OPT_PPPD, NULL, OPT_BOOL },
-       { "PPPD.NoVJ", "no-vj-comp", OPT_PPPD, NULL, OPT_BOOL },
+       { "PPPD.NoVJ", "novj", OPT_PPPD, NULL, OPT_BOOL },
 };
 
 static DBusConnection *connection;
@@ -497,8 +497,9 @@ static void request_input_reply(DBusMessage *reply, void *user_data)
 
        DBG("provider %p", l2tp_reply->provider);
 
-       if (dbus_message_get_type(reply) == DBUS_MESSAGE_TYPE_ERROR) {
-               error = dbus_message_get_error_name(reply);
+       if (!reply || dbus_message_get_type(reply) == DBUS_MESSAGE_TYPE_ERROR) {
+               if (reply)
+                       error = dbus_message_get_error_name(reply);
                goto done;
        }