svn commit: r281488 - stable/10/usr.sbin/ctld

Alexander Motin mav at FreeBSD.org
Mon Apr 13 09:18:57 UTC 2015


Author: mav
Date: Mon Apr 13 09:18:56 2015
New Revision: 281488
URL: https://svnweb.freebsd.org/changeset/base/281488

Log:
  MFC r281163: Make ctld to not exit on ECONNABORTED on accept().
  
  That is not really an error for the main process.

Modified:
  stable/10/usr.sbin/ctld/ctld.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/ctld/ctld.c
==============================================================================
--- stable/10/usr.sbin/ctld/ctld.c	Mon Apr 13 09:17:57 2015	(r281487)
+++ stable/10/usr.sbin/ctld/ctld.c	Mon Apr 13 09:18:56 2015	(r281488)
@@ -2382,8 +2382,11 @@ found:
 					client_fd = accept(portal->p_socket,
 					    (struct sockaddr *)&client_sa,
 					    &client_salen);
-					if (client_fd < 0)
+					if (client_fd < 0) {
+						if (errno == ECONNABORTED)
+							continue;
 						log_err(1, "accept");
+					}
 					assert(client_salen >= client_sa.ss_len);
 
 					handle_connection(portal, client_fd,


More information about the svn-src-all mailing list