- Sun Sep 9 03:01:28 PDT 2001

  - Three fixes in directim for gaim.  It works now. Yay.

diff --git a/CHANGES b/CHANGES
index 73d2fa0877018a1c6887cab20006eb56a3c0603b..f333ad10d1fc3489c9a9a8b092a28fc5685a15a0 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
 
 No release numbers
 ------------------
+ - Sun Sep  9 03:01:28 PDT 2001
+  - Three fixes in directim for gaim.  It works now. Yay.
+
  - Sat Sep  8 21:26:27 PDT 2001
   - Minor bug directim_connect
 

diff --git a/src/ft.c b/src/ft.c
index 89c065e743be6af2af4f903db31a1ec9a197db93..7a27cab6b915210edc2f0689dd9fda5096b3177c 100644 (file)
--- a/src/ft.c
+++ b/src/ft.c
@@ -314,10 +314,11 @@ faim_export aim_conn_t *aim_directim_initiate(aim_session_t *sess, aim_conn_t *c
        memcpy(cookie->cookie, ck, 8);
        cookie->type = AIM_COOKIETYPE_OFTIM;
 
+       /* this one is for the cookie */
        priv = (struct aim_directim_intdata *)calloc(1, sizeof(struct aim_directim_intdata));
 
        memcpy(priv->cookie, ck, 8);
-       memcpy(priv->sn, destsn, sizeof(priv->sn));
+       strncpy(priv->sn, destsn, sizeof(priv->sn));
        cookie->data = priv;
        aim_cachecookie(sess, cookie);
 
@@ -331,7 +332,7 @@ faim_export aim_conn_t *aim_directim_initiate(aim_session_t *sess, aim_conn_t *c
        priv = (struct aim_directim_intdata *)calloc(1, sizeof(struct aim_directim_intdata));
 
        memcpy(priv->cookie, ck, 8);
-       memcpy(priv->sn, destsn, sizeof(priv->sn));
+       strncpy(priv->sn, destsn, sizeof(priv->sn));
 
        newconn->fd = listenfd;
        newconn->subtype = AIM_CONN_SUBTYPE_OFT_DIRECTIM;
@@ -430,7 +431,7 @@ faim_export aim_conn_t *aim_directim_connect(aim_session_t *sess, const char *sn
                return NULL;
        }
 
-       if (!newconn || (newconn->fd == -1)) {
+       if (!newconn) {
                free(intdata);
                return newconn;
        }