From: mid <mid>
Date: Sun, 9 Sep 2001 10:11:21 +0000 (+0000)
Subject:  - Sun Sep  9 03:01:28 PDT 2001
X-Git-Tag: rel_0_99_2~9
X-Git-Url: http://andersk.mit.edu/gitweb/libfaim.git/commitdiff_plain/9522736c4c85bc364899e1dbc0e54f65a35ed603

 - 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 73d2fa0..f333ad1 100644
--- 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 89c065e..7a27cab 100644
--- 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;
 	}