Changeset 3fbce97 for protocols/msn/soap.c

Timestamp:

2016-09-24T20:14:34Z (8 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

ba52ac5

Parents:

63cad66 (diff), 82cb190 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into parson

File:

• protocols/msn/soap.c (modified) (6 diffs)

protocols/msn/soap.c

@@ -270 +270 @@
         struct im_connection *ic = soap_req->ic;
         struct msn_data *md = ic->proto_data;
-        char pass[MAX_PASSPORT_PWLEN + 1];
 
         if (sd->redirect) {
@@ -286 +285 @@
         }
 
-        strncpy(pass, ic->acc->pass, MAX_PASSPORT_PWLEN);
-        pass[MAX_PASSPORT_PWLEN] = '\0';
         soap_req->payload = g_markup_printf_escaped(SOAP_PASSPORT_SSO_PAYLOAD,
-                                                    ic->acc->user, pass, md->pp_policy);
+                                                    ic->acc->user, ic->acc->pass, md->pp_policy);
 
         return MSN_SOAP_OK;
@@ -327 +324 @@
         struct xt_node *code = xt_find_node(node->children, "faultcode");
         struct xt_node *string = xt_find_node(node->children, "faultstring");
+        struct xt_node *reqstatus = xt_find_path(node, "psf:pp/psf:reqstatus");
         struct xt_node *url;
 
@@ -335 +333 @@
                    url->text_len > 0) {
                 sd->redirect = g_strdup(url->text);
+        } else if (reqstatus && strcmp(reqstatus->text, "0x800488fe") == 0) {
+                char *msg = "Location blocked. Log in to live.com, go to recent activity and click 'this was me'";
+                sd->error = g_strdup_printf("%s (%s)", code->text, msg);
         } else {
                 sd->error = g_strdup_printf("%s (%s)", code->text, string && string->text_len ?
@@ -346 +347 @@
         { "wsse:BinarySecurityToken", "wst:RequestedSecurityToken", msn_soap_passport_sso_token },
         { "S:Fault", "S:Envelope", msn_soap_passport_failure },
+        { "S:Fault", "wst:RequestSecurityTokenResponse", msn_soap_passport_failure },
         { NULL, NULL, NULL }
 };
@@ -774 +776 @@
                 imcb_log(soap_req->ic, "Warning: %d contacts were in both your "
                          "block and your allow list. Assuming they're all "
-                         "allowed. Use the official WLM client once to fix "
-                         "this.", wtf);
+                         "allowed.", wtf);
         }