[Midnightbsd-cvs] src [11203] trunk/sbin/iscontrol: sync with freebsd 10 stable
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Jul 1 14:21:24 EDT 2018
Revision: 11203
http://svnweb.midnightbsd.org/src/?rev=11203
Author: laffer1
Date: 2018-07-01 14:21:24 -0400 (Sun, 01 Jul 2018)
Log Message:
-----------
sync with freebsd 10 stable
Modified Paths:
--------------
trunk/sbin/iscontrol/Makefile
trunk/sbin/iscontrol/auth_subr.c
trunk/sbin/iscontrol/config.c
trunk/sbin/iscontrol/fsm.c
trunk/sbin/iscontrol/iscontrol.8
trunk/sbin/iscontrol/iscontrol.c
trunk/sbin/iscontrol/iscontrol.h
trunk/sbin/iscontrol/login.c
trunk/sbin/iscontrol/misc.c
trunk/sbin/iscontrol/pdu.c
Property Changed:
----------------
trunk/sbin/iscontrol/iscontrol.8
trunk/sbin/iscontrol/iscsi.conf.5
Modified: trunk/sbin/iscontrol/Makefile
===================================================================
--- trunk/sbin/iscontrol/Makefile 2018-07-01 18:19:55 UTC (rev 11202)
+++ trunk/sbin/iscontrol/Makefile 2018-07-01 18:21:24 UTC (rev 11203)
@@ -1,4 +1,5 @@
# $MidnightBSD$
+# $FreeBSD: stable/10/sbin/iscontrol/Makefile 277173 2015-01-14 11:29:16Z trasz $
SRCS= iscontrol.c pdu.c fsm.c config.c login.c auth_subr.c misc.c
PROG= iscontrol
@@ -9,6 +10,6 @@
WARNS?= 3
CFLAGS+= -I$S
-MAN= iscsi.conf.5 iscontrol.8
+MAN= iscontrol.8
.include <bsd.prog.mk>
Modified: trunk/sbin/iscontrol/auth_subr.c
===================================================================
--- trunk/sbin/iscontrol/auth_subr.c 2018-07-01 18:19:55 UTC (rev 11202)
+++ trunk/sbin/iscontrol/auth_subr.c 2018-07-01 18:21:24 UTC (rev 11203)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2005-2010 Daniel Braniss <danny at cs.huji.ac.il>
* All rights reserved.
@@ -26,11 +27,11 @@
*/
/*
- | $Id: auth_subr.c,v 1.2 2012-11-21 21:47:58 laffer1 Exp $
+ | $Id: auth_subr.c,v 2.2 2007/06/01 08:09:37 danny Exp $
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sbin/iscontrol/auth_subr.c 254657 2013-08-22 14:02:34Z trasz $");
#include <sys/param.h>
#include <sys/types.h>
@@ -49,7 +50,7 @@
#include <md5.h>
#include <sha.h>
-#include <dev/iscsi/initiator/iscsi.h>
+#include <dev/iscsi_initiator/iscsi.h>
#include "iscontrol.h"
static int
Modified: trunk/sbin/iscontrol/config.c
===================================================================
--- trunk/sbin/iscontrol/config.c 2018-07-01 18:19:55 UTC (rev 11202)
+++ trunk/sbin/iscontrol/config.c 2018-07-01 18:21:24 UTC (rev 11203)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2005-2009 Daniel Braniss <danny at cs.huji.ac.il>
* All rights reserved.
@@ -25,11 +26,11 @@
*
*/
/*
- | $Id: config.c,v 1.2 2012-11-21 21:47:58 laffer1 Exp $
+ | $Id: config.c,v 2.1 2006/11/12 08:06:51 danny Exp danny $
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sbin/iscontrol/config.c 254657 2013-08-22 14:02:34Z trasz $");
#include <stdlib.h>
#include <unistd.h>
@@ -41,7 +42,7 @@
#include <ctype.h>
#include <camlib.h>
-#include <dev/iscsi/initiator/iscsi.h>
+#include <dev/iscsi_initiator/iscsi.h>
#include "iscontrol.h"
/*
Modified: trunk/sbin/iscontrol/fsm.c
===================================================================
--- trunk/sbin/iscontrol/fsm.c 2018-07-01 18:19:55 UTC (rev 11202)
+++ trunk/sbin/iscontrol/fsm.c 2018-07-01 18:21:24 UTC (rev 11203)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2005-2010 Daniel Braniss <danny at cs.huji.ac.il>
* All rights reserved.
@@ -26,11 +27,11 @@
*/
/*
- | $Id: fsm.c,v 1.2 2012-11-21 21:47:58 laffer1 Exp $
+ | $Id: fsm.c,v 2.8 2007/05/19 16:34:21 danny Exp danny $
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sbin/iscontrol/fsm.c 302377 2016-07-06 17:45:38Z truckman $");
#include <sys/param.h>
#include <sys/types.h>
@@ -53,7 +54,7 @@
#include <stdarg.h>
#include <camlib.h>
-#include <dev/iscsi/initiator/iscsi.h>
+#include <dev/iscsi_initiator/iscsi.h>
#include "iscontrol.h"
typedef enum {
@@ -371,7 +372,7 @@
debug(2, "pathstr=%s", pathstr);
ccb = cam_getccb(sess->camdev);
- bzero(&(&ccb->ccb_h)[1], sizeof(struct ccb_relsim) - sizeof(struct ccb_hdr));
+ CCB_CLEAR_ALL_EXCEPT_HDR(&ccb->crs);
ccb->ccb_h.func_code = XPT_REL_SIMQ;
ccb->crs.release_flags = RELSIM_ADJUST_OPENINGS;
ccb->crs.openings = sess->op->tags;
Modified: trunk/sbin/iscontrol/iscontrol.8
===================================================================
--- trunk/sbin/iscontrol/iscontrol.8 2018-07-01 18:19:55 UTC (rev 11202)
+++ trunk/sbin/iscontrol/iscontrol.8 2018-07-01 18:21:24 UTC (rev 11203)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\" Copyright (c) 2007-2010 Daniel Braniss <danny at cs.huji.ac.il>
.\" All rights reserved.
.\"
@@ -22,9 +23,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/sbin/iscontrol/iscontrol.8 273071 2014-10-14 07:52:37Z trasz $
.\"
-.Dd August 9, 2010
+.Dd October 9, 2014
.Dt ISCONTROL 8
.Os
.Sh NAME
@@ -41,6 +42,15 @@
.Op Fl t Ar target
.Op Ar variable Ns = Ns Ar value
.Sh DESCRIPTION
+.Bf -symbolic
+This command, along with its kernel counterpart
+.Xr iscsi_initiator 4 ,
+is obsolete.
+Users are advised to use
+.Xr iscsictl 8
+instead.
+.Ef
+.Pp
Internet SCSI (iSCSI) is a network protocol standard, that allows the
use of the SCSI protocol over TCP/IP networks,
the
@@ -112,6 +122,7 @@
.Xr iscsi_initiator 4 ,
.Xr sa 4 ,
.Xr iscsi.conf 5 ,
+.Xr iscsictl 8 ,
.Xr camcontrol 8
.Sh STANDARDS
RFC 3720
Property changes on: trunk/sbin/iscontrol/iscontrol.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sbin/iscontrol/iscontrol.c
===================================================================
--- trunk/sbin/iscontrol/iscontrol.c 2018-07-01 18:19:55 UTC (rev 11202)
+++ trunk/sbin/iscontrol/iscontrol.c 2018-07-01 18:21:24 UTC (rev 11203)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2005-2010 Daniel Braniss <danny at cs.huji.ac.il>
* All rights reserved.
@@ -25,7 +26,7 @@
*
*/
/*
- | $Id: iscontrol.c,v 1.2 2012-11-21 21:47:58 laffer1 Exp $
+ | $Id: iscontrol.c,v 2.2 2006/12/01 09:11:56 danny Exp danny $
*/
/*
| the user level initiator (client)
@@ -32,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sbin/iscontrol/iscontrol.c 254657 2013-08-22 14:02:34Z trasz $");
#include <sys/param.h>
#include <sys/types.h>
@@ -55,7 +56,7 @@
#include <unistd.h>
#include <camlib.h>
-#include <dev/iscsi/initiator/iscsi.h>
+#include <dev/iscsi_initiator/iscsi.h>
#include "iscontrol.h"
static char version[] = "2.3.1"; // keep in sync with iscsi_initiator
Modified: trunk/sbin/iscontrol/iscontrol.h
===================================================================
--- trunk/sbin/iscontrol/iscontrol.h 2018-07-01 18:19:55 UTC (rev 11202)
+++ trunk/sbin/iscontrol/iscontrol.h 2018-07-01 18:21:24 UTC (rev 11203)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2005-2010 Daniel Braniss <danny at cs.huji.ac.il>
* All rights reserved.
@@ -23,10 +24,10 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sbin/iscontrol/iscontrol.h 211095 2010-08-09 12:36:36Z des $
*/
/*
- | $Id: iscontrol.h,v 1.2 2012-11-21 21:47:58 laffer1 Exp $
+ | $Id: iscontrol.h,v 2.3 2007/04/27 08:36:49 danny Exp danny $
*/
#ifdef DEBUG
int vflag;
Index: trunk/sbin/iscontrol/iscsi.conf.5
===================================================================
--- trunk/sbin/iscontrol/iscsi.conf.5 2018-07-01 18:19:55 UTC (rev 11202)
+++ trunk/sbin/iscontrol/iscsi.conf.5 2018-07-01 18:21:24 UTC (rev 11203)
Property changes on: trunk/sbin/iscontrol/iscsi.conf.5
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sbin/iscontrol/login.c
===================================================================
--- trunk/sbin/iscontrol/login.c 2018-07-01 18:19:55 UTC (rev 11202)
+++ trunk/sbin/iscontrol/login.c 2018-07-01 18:21:24 UTC (rev 11203)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2005-2010 Daniel Braniss <danny at cs.huji.ac.il>
* All rights reserved.
@@ -25,11 +26,11 @@
*
*/
/*
- | $Id: login.c,v 1.2 2012-11-21 21:47:58 laffer1 Exp $
+ | $Id: login.c,v 1.4 2007/04/27 07:40:40 danny Exp danny $
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sbin/iscontrol/login.c 254657 2013-08-22 14:02:34Z trasz $");
#include <sys/param.h>
#include <sys/types.h>
@@ -44,7 +45,7 @@
#include <stdlib.h>
#include <string.h>
-#include <dev/iscsi/initiator/iscsi.h>
+#include <dev/iscsi_initiator/iscsi.h>
#include "iscontrol.h"
static char *status_class1[] = {
Modified: trunk/sbin/iscontrol/misc.c
===================================================================
--- trunk/sbin/iscontrol/misc.c 2018-07-01 18:19:55 UTC (rev 11202)
+++ trunk/sbin/iscontrol/misc.c 2018-07-01 18:21:24 UTC (rev 11203)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2005-2010 Daniel Braniss <danny at cs.huji.ac.il>
* All rights reserved.
@@ -26,11 +27,11 @@
*/
/*
- | $Id: misc.c,v 1.2 2012-11-21 21:47:58 laffer1 Exp $
+ | $Id: misc.c,v 2.1 2006/11/12 08:06:51 danny Exp $
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sbin/iscontrol/misc.c 254657 2013-08-22 14:02:34Z trasz $");
#include <sys/param.h>
#include <sys/types.h>
@@ -44,7 +45,7 @@
#include <stdio.h>
#include <string.h>
-#include <dev/iscsi/initiator/iscsi.h>
+#include <dev/iscsi_initiator/iscsi.h>
#include "iscontrol.h"
static inline char
Modified: trunk/sbin/iscontrol/pdu.c
===================================================================
--- trunk/sbin/iscontrol/pdu.c 2018-07-01 18:19:55 UTC (rev 11202)
+++ trunk/sbin/iscontrol/pdu.c 2018-07-01 18:21:24 UTC (rev 11203)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2005-2010 Daniel Braniss <danny at cs.huji.ac.il>
* All rights reserved.
@@ -25,11 +26,11 @@
*
*/
/*
- | $Id: pdu.c,v 1.2 2012-11-21 21:47:58 laffer1 Exp $
+ | $Id: pdu.c,v 2.2 2006/12/01 09:11:56 danny Exp danny $
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sbin/iscontrol/pdu.c 254657 2013-08-22 14:02:34Z trasz $");
#include <sys/types.h>
#include <sys/time.h>
@@ -43,7 +44,7 @@
#include <stdarg.h>
#include <camlib.h>
-#include <dev/iscsi/initiator/iscsi.h>
+#include <dev/iscsi_initiator/iscsi.h>
#include "iscontrol.h"
static void pukeText(char *it, pdu_t *pp);
More information about the Midnightbsd-cvs
mailing list