aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2007-06-29 04:43:15 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2007-06-29 04:43:15 +0000
commit5582e15bd9d7cebb3b8362ccf41d4c2645963401 (patch)
tree02f172178e9ab90f830bd459e2640d5a2df81aea /res
parentf8c4fe6dca28780f7ddf487bc1caceef09c3d60e (diff)
Fix 1.4 breakage
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@72554 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
-rw-r--r--res/res_jabber.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/res/res_jabber.c b/res/res_jabber.c
index 98236e6bc..6e7344591 100644
--- a/res/res_jabber.c
+++ b/res/res_jabber.c
@@ -575,11 +575,11 @@ static int aji_act_hook(void *data, int type, iks *node)
iks *x = NULL;
x = iks_new("auth");
if (x) {
- iks_insert_attrib(x, "xmlns", IKS_NS_XMPP_SASL);
int len = strlen(client->jid->user) + strlen(client->password) + 3;
/* XXX Check return values XXX */
char *s = ast_malloc(80 + len);
char *base64 = ast_malloc(80 + len * 2);
+ iks_insert_attrib(x, "xmlns", IKS_NS_XMPP_SASL);
iks_insert_attrib(x, "mechanism", "PLAIN");
sprintf(s, "%c%s%c%s", 0, client->jid->user, 0, client->password);
ast_base64encode(base64, (const unsigned char *) s, len, len * 2);
@@ -744,8 +744,8 @@ static int aji_register_query_handler(void *data, ikspak *pak)
buddy = ASTOBJ_CONTAINER_FIND(&client->buddies, pak->from->partial);
if (!buddy) {
- ast_verbose("Someone.... %s tried to register but they aren't allowed\n", pak->from->partial);
iks *iq = NULL, *query = NULL, *error = NULL, *notacceptable = NULL;
+ ast_verbose("Someone.... %s tried to register but they aren't allowed\n", pak->from->partial);
iq = iks_new("iq");
query = iks_new("query");
error = iks_new("error");