X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=common-src%2Fsecurity-util.c;h=cda59ba23dd4ed80724861c663cb39345315c735;hb=691567b16c13087b31ee4c2b6d038e57872fae82;hp=3a2e0564bb0aa6c037d429bc470bae9b4a3d1501;hpb=cd0b924f27312d57bd42f6c4fae2b795139e2d0b;p=debian%2Famanda

diff --git a/common-src/security-util.c b/common-src/security-util.c
index 3a2e056..cda59ba 100644
--- a/common-src/security-util.c
+++ b/common-src/security-util.c
@@ -988,6 +988,7 @@ bsd_recv_security_ok(
      */
     s = body;
     if (strncmp_const_skip(s, "SERVICE ", s, ch) == 0) {
+	ch=ch;
 	serviceX = stralloc(s);
 	serviceY = strtok(serviceX, "\n");
 	if (serviceY)
@@ -1410,7 +1411,7 @@ udp_netfd_read_callback(
      * If no accept handler was setup, then just return.
      */
     if (udp->accept_fn == NULL) {
-	dbprintf(_("Receive packet from unknown source"));
+	g_debug(_("Receive packet from unknown source"));
 	return;
     }
 
@@ -1738,10 +1739,10 @@ stream_read_callback(
      * We remove it first because we don't want to get in their
      * way if they reschedule it.
      */
-    tcpm_stream_read_cancel(rs);
 
     if (rs->rc->pktlen <= 0) {
 	auth_debug(1, _("sec: stream_read_callback: %s\n"), rs->rc->errmsg);
+	tcpm_stream_read_cancel(rs);
 	security_stream_seterror(&rs->secstr, "%s", rs->rc->errmsg);
 	if(rs->closed_by_me == 0 && rs->closed_by_network == 0)
 	    sec_tcp_conn_put(rs->rc);
@@ -1772,7 +1773,7 @@ sec_tcp_conn_read_callback(
 
     assert(cookie != NULL);
 
-    auth_debug(1, _("sec: conn_read_callback\n"));
+    auth_debug(1, _("sec: conn_read_callback %d %d\n"), (int)rc->event_id, rc->read);
 
     /* Read the data off the wire.  If we get errors, shut down. */
     rval = tcpm_recv_token(rc, rc->read, &rc->handle, &rc->errmsg, &rc->pkt,
@@ -1792,6 +1793,7 @@ sec_tcp_conn_read_callback(
 		       revent);
 	/* delete our 'accept' reference */
 	if (rc->accept_fn != NULL) {
+	    (*rc->accept_fn)(NULL, NULL);
 	    if(rc->refcnt != 1) {
 		dbprintf(_("STRANGE, rc->refcnt should be 1, it is %d\n"),
 			  rc->refcnt);
@@ -2671,7 +2673,7 @@ sec_get_authenticated_peer_name_gethostname(
 	return server_hostname;
     }
     amfree(server_hostname);
-    return "localhost";
+    return strdup("localhost");
 }
 
 char *
@@ -2681,5 +2683,5 @@ sec_get_authenticated_peer_name_hostname(
     char *hostname = ((struct sec_handle *)hdl)->hostname;
     if (!hostname)
 	hostname = "";
-    return hostname;
+    return strdup(hostname);
 }