head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.8
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.6
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.4
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.2
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2010Q4:1.1.0.56
	pkgsrc-2010Q4-base:1.1
	pkgsrc-2010Q3:1.1.0.54
	pkgsrc-2010Q3-base:1.1
	pkgsrc-2010Q2:1.1.0.52
	pkgsrc-2010Q2-base:1.1
	pkgsrc-2010Q1:1.1.0.50
	pkgsrc-2010Q1-base:1.1
	pkgsrc-2009Q4:1.1.0.48
	pkgsrc-2009Q4-base:1.1
	pkgsrc-2009Q3:1.1.0.46
	pkgsrc-2009Q3-base:1.1
	pkgsrc-2009Q2:1.1.0.44
	pkgsrc-2009Q2-base:1.1
	pkgsrc-2009Q1:1.1.0.42
	pkgsrc-2009Q1-base:1.1
	pkgsrc-2008Q4:1.1.0.40
	pkgsrc-2008Q4-base:1.1
	pkgsrc-2008Q3:1.1.0.38
	pkgsrc-2008Q3-base:1.1
	cube-native-xorg:1.1.0.36
	cube-native-xorg-base:1.1
	pkgsrc-2008Q2:1.1.0.34
	pkgsrc-2008Q2-base:1.1
	cwrapper:1.1.0.32
	pkgsrc-2008Q1:1.1.0.30
	pkgsrc-2008Q1-base:1.1
	pkgsrc-2007Q4:1.1.0.28
	pkgsrc-2007Q4-base:1.1
	pkgsrc-2007Q3:1.1.0.26
	pkgsrc-2007Q3-base:1.1
	pkgsrc-2007Q2:1.1.0.24
	pkgsrc-2007Q2-base:1.1
	pkgsrc-2007Q1:1.1.0.22
	pkgsrc-2007Q1-base:1.1
	pkgsrc-2006Q4:1.1.0.20
	pkgsrc-2006Q4-base:1.1
	pkgsrc-2006Q3:1.1.0.18
	pkgsrc-2006Q3-base:1.1
	pkgsrc-2006Q2:1.1.0.16
	pkgsrc-2006Q2-base:1.1
	pkgsrc-2006Q1:1.1.0.14
	pkgsrc-2006Q1-base:1.1
	pkgsrc-2005Q4:1.1.0.12
	pkgsrc-2005Q4-base:1.1
	pkgsrc-2005Q3:1.1.0.10
	pkgsrc-2005Q3-base:1.1
	pkgsrc-2005Q2:1.1.0.8
	pkgsrc-2005Q2-base:1.1
	pkgsrc-2005Q1:1.1.0.6
	pkgsrc-2005Q1-base:1.1
	pkgsrc-2004Q4:1.1.0.4
	pkgsrc-2004Q4-base:1.1
	pkgsrc-2004Q3:1.1.0.2
	pkgsrc-2004Q3-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2011.02.04.12.05.45;	author adam;	state dead;
branches;
next	1.1;

1.1
date	2004.07.22.18.02.10;	author kristerw;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Changes 0.8:
* Optimization: A bunch of patches by M. Doliner (see svn log for more details)
* Feature: Allow the service admin to see the occupants of every rooms
* Feature: Allow the service admin to enter a room with nicknames locked even
  if his nickname isn't the one needed
* Feature: option to disable room logging on the whole component
* Feature: option to save room log files in subdirectories according to date
* Feature: Patch by Smoku to hide empty rooms from disco/browse lists
* Bugfix: Two vulnerabilities in mysql module
* Bugfix: send code=110 when needed according to XEP-0045
* Bugfix: Fix crash when changing roles
* Bugfix: Fixed a bug when entering/leaving a room, it was considered as a nick
  change
* Bugfix: Corrected the errors sent by mu-conference
* Bugfix: Better error code when choosing a nick not conform with the room
  policy
* Bugfix: Fixed a segfault in the decline messages handler
* Bugfix: Avoid a segfault when asking unique room name with a too big user jid
* Bugfix: going in an infinite loop if the user invite the jid ""
* Bugfix: Changed error handling
  - Don't kick a user if the message error is not delivery-related,
    otherwise user could be kicked when refusing a file transfer for example
  - If the user is not kicked, don't discard the error, send it to the
    other user/chatroom
* Bugfix: Hide XEP-0203 delay nodes when sending back presences stanzas
@
text
@$NetBSD: patch-ab,v 1.1 2004/07/22 18:02:10 kristerw Exp $

--- jcomp/jcr_elements.c.orig	Thu Jul 22 19:49:51 2004
+++ jcomp/jcr_elements.c	Thu Jul 22 19:51:32 2004
@@@@ -32,6 +32,8 @@@@
     if (strncasecmp(name, "stream:stream", 13) == 0) {
       char *pass = xmlnode_get_data(xmlnode_get_tag(jcr->config,"secret"));
       int i = 0;
+      char hashbuf[41];
+      xmlnode cur;
       if (attrib == NULL) return;
       while (attrib[i] != '\0') {
         if (strncasecmp(attrib[i], "id", 2) == 0)
@@@@ -39,12 +41,11 @@@@
         i += 2;
       }
       p = pool_new();
-      char hashbuf[41];
       //    log_debug(JDBG, "%s = '%s'", attrib[i], attrib[i+1]);
       shahash_r(spools(p, attrib[i + 1], pass, p), hashbuf);
 
       /* Build a handshake packet */
-      xmlnode cur = xmlnode_new_tag("handshake");
+      cur = xmlnode_new_tag("handshake");
       xmlnode_insert_cdata(cur, hashbuf, -1);
 
       /* Transmit handshake */
@@@@ -91,6 +92,7 @@@@
     if (jcr->current == NULL) {
       g_io_channel_close(jcr->gio);
     } else {
+      xmlnode parent;
       if (strncasecmp(name, "stream:error", 12) == 0) {
         log_warn(JDBG, "%s", xmlnode2str(jcr->current));
         g_io_channel_write_chars(jcr->gio, "</stream:stream>", 15, &bytes, NULL);
@@@@ -100,7 +102,7 @@@@
         break;
       }
 
-      xmlnode parent = xmlnode_get_parent(jcr->current);
+      parent = xmlnode_get_parent(jcr->current);
       if (parent == NULL) {
         x = xmlnode_dup(jcr->current);
         to = jid_new(x->p, xmlnode_get_attrib(x, "to"));
@


1.1
log
@Convert some C99-isms to C89 to make this build with gcc 2.95.
@
text
@d1 1
a1 1
$NetBSD$
@