[or-cvs] warn, not err

Roger Dingledine arma at seul.org
Sun Oct 19 01:15:38 UTC 2003


Update of /home/or/cvsroot/src/common
In directory moria.mit.edu:/home2/arma/work/onion/dev/src/common

Modified Files:
	tortls.c 
Log Message:
warn, not err


Index: tortls.c
===================================================================
RCS file: /home/or/cvsroot/src/common/tortls.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- tortls.c	19 Oct 2003 00:46:51 -0000	1.25
+++ tortls.c	19 Oct 2003 01:15:36 -0000	1.26
@@ -88,7 +88,6 @@
     case SSL_ERROR_SYSCALL:
       if (extra&CATCH_SYSCALL)
 	return _TOR_TLS_SYSCALL;
-      assert(severity != LOG_ERR); /* XXX remove me when the bug is found */
       log(severity, "TLS error: <syscall error> (errno=%d)",errno);
       tls_log_errors(severity, doing);
       return TOR_TLS_ERROR;
@@ -471,11 +470,11 @@
   int i;
   
   if (!(cert = SSL_get_peer_certificate(tls->ssl))) {
-    log_fn(LOG_ERR, "Peer has no certificate");
+    log_fn(LOG_WARN, "Peer has no certificate");
     return -1;
   }
   if (!(name = X509_get_subject_name(cert))) {
-    log_fn(LOG_ERR, "Peer certificate has no subject name");
+    log_fn(LOG_WARN, "Peer certificate has no subject name");
     return -1;
   }
   if ((nid = OBJ_txt2nid("commonName")) == NID_undef)
@@ -485,7 +484,7 @@
   if (lenout == -1)
     return -1;
   if (strspn(buf, LEGAL_NICKNAME_CHARACTERS) != lenout) {
-    log_fn(LOG_ERR, "Peer certificate nickname has illegal characters.");
+    log_fn(LOG_WARN, "Peer certificate nickname has illegal characters.");
     return -1;
   }
   return 0;



More information about the tor-commits mailing list