[or-cvs] backport the part where we stop crying wolf about

[arma at seul.org]

Update of /home/or/cvsroot/tor/src/or
In directory moria:/home/arma/work/onion/tor-011x/tor/src/or

Modified Files:
      Tag: tor-0_1_1-patches
	connection_or.c 
Log Message:
backport the part where we stop crying wolf about
tor_tls_get_peer_cert_nickname() warns.


Index: connection_or.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/connection_or.c,v
retrieving revision 1.216
retrieving revision 1.216.2.1
diff -u -p -d -r1.216 -r1.216.2.1
--- connection_or.c	18 Mar 2006 01:24:04 -0000	1.216
+++ connection_or.c	6 Jun 2006 09:04:51 -0000	1.216.2.1
@@ -581,11 +581,13 @@ connection_or_check_valid_handshake(conn
 
   check_no_tls_errors();
   if (! tor_tls_peer_has_cert(conn->tls)) {
-    log_info(LD_PROTOCOL,"Peer didn't send a cert! Closing.");
+    log_info(LD_PROTOCOL,"Peer (%s:%d) didn't send a cert! Closing.",
+             conn->address, conn->port);
     return -1;
   }
   check_no_tls_errors();
-  if (tor_tls_get_peer_cert_nickname(conn->tls, nickname, sizeof(nickname))) {
+  if (tor_tls_get_peer_cert_nickname(severity, conn->tls, nickname,
+                                     sizeof(nickname))) {
     log_fn(severity,LD_PROTOCOL,"Other side (%s:%d) has a cert without a "
            "valid nickname. Closing.",
            conn->address, conn->port);