svn commit: r296898 - head/usr.sbin/iscsid

[Edward Tomasz Napierala]

Author: trasz
Date: Tue Mar 15 11:10:08 2016
New Revision: 296898
URL: https://svnweb.freebsd.org/changeset/base/296898

Log:
  Make fail() preserve the errno.
  
  MFC after:	1 month
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/usr.sbin/iscsid/iscsid.c

Modified: head/usr.sbin/iscsid/iscsid.c
==============================================================================
--- head/usr.sbin/iscsid/iscsid.c	Tue Mar 15 11:03:45 2016	(r296897)
+++ head/usr.sbin/iscsid/iscsid.c	Tue Mar 15 11:10:08 2016	(r296898)
@@ -290,7 +290,9 @@ void
 fail(const struct connection *conn, const char *reason)
 {
 	struct iscsi_daemon_fail idf;
-	int error;
+	int error, saved_errno;
+
+	saved_errno = errno;
 
 	memset(&idf, 0, sizeof(idf));
 	idf.idf_session_id = conn->conn_session_id;
@@ -299,6 +301,8 @@ fail(const struct connection *conn, cons
 	error = ioctl(conn->conn_iscsi_fd, ISCSIDFAIL, &idf);
 	if (error != 0)
 		log_err(1, "ISCSIDFAIL");
+
+	errno = saved_errno;
 }
 
 /*