comparison: libpurple/protocols/oscar/kerberos.c
libpurple/protocols/oscar/kerberos.c
- branch
- release-2.x.y
- changeset 37702
- 68c2c37b6bd1
- parent 37701
- 16fb6c8feaea
- child 37703
- 82f57388d70c
equal
deleted
inserted
replaced
| 37701:16fb6c8feaea | 37702:68c2c37b6bd1 |
|---|---|
| 91 server = purple_account_get_string(account, "server", AIM_DEFAULT_KDC_SERVER); | 91 server = purple_account_get_string(account, "server", AIM_DEFAULT_KDC_SERVER); |
| 92 port = purple_account_get_int(account, "port", AIM_DEFAULT_KDC_PORT); | 92 port = purple_account_get_int(account, "port", AIM_DEFAULT_KDC_PORT); |
| 93 if (port != 443) | 93 if (port != 443) |
| 94 port_str = g_strdup_printf (":%d", port); | 94 port_str = g_strdup_printf (":%d", port); |
| 95 url = g_strdup_printf ("https://%s%s/", server, port_str ? port_str : ""); | 95 url = g_strdup_printf ("https://%s%s/", server, port_str ? port_str : ""); |
| 96 if (port_str) | 96 g_free (port_str); |
| 97 g_free (port_str); | |
| 98 | 97 |
| 99 return url; | 98 return url; |
| 100 } | 99 } |
| 101 | 100 |
| 102 /* | 101 /* |
| 139 static void | 138 static void |
| 140 aim_xsnac_free(aim_xsnac_t *xsnac) | 139 aim_xsnac_free(aim_xsnac_t *xsnac) |
| 141 { | 140 { |
| 142 gint i; | 141 gint i; |
| 143 | 142 |
| 144 if (xsnac->principal1) | 143 g_free (xsnac->principal1); |
| 145 g_free (xsnac->principal1); | 144 g_free (xsnac->principal2); |
| 146 if (xsnac->principal2) | |
| 147 g_free (xsnac->principal2); | |
| 148 aim_tlvlist_free (xsnac->tlvlist); | 145 aim_tlvlist_free (xsnac->tlvlist); |
| 149 | 146 |
| 150 for (i = 0; i < xsnac->num_tokens; i++) { | 147 for (i = 0; i < xsnac->num_tokens; i++) { |
| 151 g_free(xsnac->tokens[i].main_tlv->value); | 148 g_free(xsnac->tokens[i].main_tlv->value); |
| 152 g_free(xsnac->tokens[i].main_tlv); | 149 g_free(xsnac->tokens[i].main_tlv); |
| 153 if (xsnac->tokens[i].principal1) | 150 g_free (xsnac->tokens[i].principal1); |
| 154 g_free (xsnac->tokens[i].principal1); | 151 g_free (xsnac->tokens[i].service); |
| 155 if (xsnac->tokens[i].principal1_again) | 152 g_free (xsnac->tokens[i].principal1_again); |
| 156 if (xsnac->tokens[i].service) | 153 g_free (xsnac->tokens[i].principal2); |
| 157 g_free (xsnac->tokens[i].service); | 154 g_free (xsnac->tokens[i].footer); |
| 158 g_free (xsnac->tokens[i].principal1_again); | |
| 159 if (xsnac->tokens[i].principal2) | |
| 160 g_free (xsnac->tokens[i].principal2); | |
| 161 if (xsnac->tokens[i].footer) | |
| 162 g_free (xsnac->tokens[i].footer); | |
| 163 aim_tlvlist_free (xsnac->tokens[i].tlvlist); | 155 aim_tlvlist_free (xsnac->tokens[i].tlvlist); |
| 164 } | 156 } |
| 165 g_free (xsnac->tokens); | 157 g_free (xsnac->tokens); |
| 166 } | 158 } |
| 167 | 159 |
| 310 purple_connection_error_reason(gc, | 302 purple_connection_error_reason(gc, |
| 311 PURPLE_CONNECTION_ERROR_NETWORK_ERROR, | 303 PURPLE_CONNECTION_ERROR_NETWORK_ERROR, |
| 312 _("Unknown error during authentication")); | 304 _("Unknown error during authentication")); |
| 313 } | 305 } |
| 314 aim_xsnac_free (&xsnac); | 306 aim_xsnac_free (&xsnac); |
| 315 if (tlsCertName) | 307 g_free (tlsCertName); |
| 316 g_free (tlsCertName); | 308 g_free (bosip); |
| 317 if (bosip) | |
| 318 g_free (bosip); | |
| 319 } | 309 } |
| 320 | 310 |
| 321 /** | 311 /** |
| 322 * This function sends a binary blob request to the Kerberos KDC server | 312 * This function sends a binary blob request to the Kerberos KDC server |
| 323 * https://kdc.uas.aol.com with the user's username and password and | 313 * https://kdc.uas.aol.com with the user's username and password and |
