Module Name: src
Committed By: yamt
Date: Thu May 22 15:45:17 UTC 2014
Modified Files:
src/external/bsd/iscsi/dist/src/initiator [yamt-pagecache]:
iscsi-initiator.c
src/external/bsd/iscsi/dist/src/lib [yamt-pagecache]: initiator.c
libiscsi.3 util.c
src/external/bsd/iscsi/dist/src/target [yamt-pagecache]: targets.5
Log Message:
sync with head.
for a reference, the tree before this commit was tagged
as yamt-pagecache-tag8.
this commit was splitted into small chunks to avoid
a limitation of cvs. ("Protocol error: too many arguments")
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.9.2.1 \
src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c
cvs rdiff -u -r1.6.2.1 -r1.6.2.2 \
src/external/bsd/iscsi/dist/src/lib/initiator.c
cvs rdiff -u -r1.4.4.1 -r1.4.4.2 \
src/external/bsd/iscsi/dist/src/lib/libiscsi.3
cvs rdiff -u -r1.2.6.1 -r1.2.6.2 src/external/bsd/iscsi/dist/src/lib/util.c
cvs rdiff -u -r1.2 -r1.2.6.1 src/external/bsd/iscsi/dist/src/target/targets.5
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c
diff -u src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c:1.9 src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c:1.9.2.1
--- src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c:1.9 Thu Oct 6 13:05:28 2011
+++ src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c Thu May 22 15:45:17 2014
@@ -542,7 +542,6 @@ main(int argc, char **argv)
char name[1024];
char *colon;
char *host;
- char *user;
char buf[32];
char devtype;
int discover;
@@ -552,7 +551,6 @@ main(int argc, char **argv)
(void) memset(&tinfo, 0x0, sizeof(tinfo));
iscsi_initiator_set_defaults(&ini);
- user = NULL;
(void) gethostname(host = hostname, sizeof(hostname));
discover = 0;
(void) stat("/etc/hosts", &sti.st);
Index: src/external/bsd/iscsi/dist/src/lib/initiator.c
diff -u src/external/bsd/iscsi/dist/src/lib/initiator.c:1.6.2.1 src/external/bsd/iscsi/dist/src/lib/initiator.c:1.6.2.2
--- src/external/bsd/iscsi/dist/src/lib/initiator.c:1.6.2.1 Tue Apr 17 00:03:27 2012
+++ src/external/bsd/iscsi/dist/src/lib/initiator.c Thu May 22 15:45:17 2014
@@ -646,7 +646,7 @@ iscsi_initiator_get_targets(int target,
text_len = 0;
text[0] = 0x0;
- PARAM_TEXT_ADD(sess->params, "SendTargets", "all", text, &text_len,
+ PARAM_TEXT_ADD(sess->params, "SendTargets", "All", text, &text_len,
DISCOVERY_PHASE_TEXT_LEN, 1, DP_ERROR);
PARAM_TEXT_PARSE(sess->params, &sess->sess_params.cred, text,
text_len, NULL, NULL, DISCOVERY_PHASE_TEXT_LEN, 1,
@@ -749,7 +749,7 @@ discovery_phase(int target, strv_t *svp)
/* Full Feature Phase Negotiation (for SendTargets) */
text_len = 0;
text[0] = 0x0;
- PARAM_TEXT_ADD(sess->params, "SendTargets", "all", text, &text_len,
+ PARAM_TEXT_ADD(sess->params, "SendTargets", "All", text, &text_len,
DISCOVERY_PHASE_TEXT_LEN, 1, DP_ERROR);
PARAM_TEXT_PARSE(sess->params, &sess->sess_params.cred, text,
text_len, NULL, NULL, DISCOVERY_PHASE_TEXT_LEN, 1, DP_ERROR);
Index: src/external/bsd/iscsi/dist/src/lib/libiscsi.3
diff -u src/external/bsd/iscsi/dist/src/lib/libiscsi.3:1.4.4.1 src/external/bsd/iscsi/dist/src/lib/libiscsi.3:1.4.4.2
--- src/external/bsd/iscsi/dist/src/lib/libiscsi.3:1.4.4.1 Thu Nov 10 14:31:22 2011
+++ src/external/bsd/iscsi/dist/src/lib/libiscsi.3 Thu May 22 15:45:17 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: libiscsi.3,v 1.4.4.1 2011/11/10 14:31:22 yamt Exp $
+.\" $NetBSD: libiscsi.3,v 1.4.4.2 2014/05/22 15:45:17 yamt Exp $
.\"
.\" Copyright (c) 2009 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -159,4 +159,4 @@ iSCSI subsystem
first appeared in
.Nx 6.0 .
.Sh AUTHORS
-.An Alistair Crooks Aq [email protected] .
+.An Alistair Crooks Aq Mt [email protected] .
Index: src/external/bsd/iscsi/dist/src/lib/util.c
diff -u src/external/bsd/iscsi/dist/src/lib/util.c:1.2.6.1 src/external/bsd/iscsi/dist/src/lib/util.c:1.2.6.2
--- src/external/bsd/iscsi/dist/src/lib/util.c:1.2.6.1 Tue Apr 17 00:03:27 2012
+++ src/external/bsd/iscsi/dist/src/lib/util.c Thu May 22 15:45:17 2014
@@ -1273,7 +1273,7 @@ HexTextToData(const char *text, uint32_t
uint32_t n2;
uint32_t len = 0;
- if ((text[0] == '0') && (text[1] != 'x' || text[1] != 'X')) {
+ if ((text[0] == '0') && (text[1] == 'x' || text[1] == 'X')) {
/* skip prefix */
text += 2;
textLength -= 2;
Index: src/external/bsd/iscsi/dist/src/target/targets.5
diff -u src/external/bsd/iscsi/dist/src/target/targets.5:1.2 src/external/bsd/iscsi/dist/src/target/targets.5:1.2.6.1
--- src/external/bsd/iscsi/dist/src/target/targets.5:1.2 Tue Jun 30 02:44:53 2009
+++ src/external/bsd/iscsi/dist/src/target/targets.5 Thu May 22 15:45:17 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: targets.5,v 1.2 2009/06/30 02:44:53 agc Exp $
+.\" $NetBSD: targets.5,v 1.2.6.1 2014/05/22 15:45:17 yamt Exp $
.\"
.\" Copyright � 2006 Alistair Crooks. All rights reserved.
.\"
@@ -42,7 +42,7 @@ initiators by the
.Xr iscsi-target 8
service.
A description of the iSCSI protocol can be found in
-.%T "Internet Small Computer Systems Interface \\*(tNRFC\\*(sP 3720" .
+.%T "Internet Small Computer Systems Interface RFC 3720" .
.Pp
Each line in the file
(other than comment lines that begin with a
