From 3cf4fb207983a3b5b86bbfc0bf56931d81be2edc Mon Sep 17 00:00:00 2001 From: Douglas Gilbert Date: Tue, 20 Oct 2015 23:10:59 +0000 Subject: sg_stpg: fix truncation of target port field git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@645 6180dd3e-e324-4e3e-922d-17de1ae2f315 --- ChangeLog | 3 +++ configure.ac | 2 +- debian/changelog | 6 ++++++ sg3_utils.spec | 6 +++++- src/sg_stpg.c | 8 ++++---- 5 files changed, 19 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index b438075a..f435b25a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,9 @@ Each utility has its own version number, date of last change and some description at the top of its ".c" file. All utilities in the main directory have their own "man" pages. There is also a sg3_utils man page. +Changelog for sg3_utils-1.42 [20150722] [svn: r645] + - sg_stpg: fix truncation of target port field + Changelog for sg3_utils-1.41 [20150511] [svn: r644] - sg_zone: new utility for open, close and finish zone commands introduced in zbc-r02 diff --git a/configure.ac b/configure.ac index e643506a..4c63024c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT(sg3_utils, 1.41, dgilbert@interlog.com) +AC_INIT(sg3_utils, 1.42, dgilbert@interlog.com) AM_INIT_AUTOMAKE AM_MAINTAINER_MODE diff --git a/debian/changelog b/debian/changelog index 0f7db92d..a4982fe6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +sg3-utils (1.42-0.1) unstable; urgency=low + + * New upstream version + + -- Douglas Gilbert Tue, 21 Jul 2015 17:00:00 -0400 + sg3-utils (1.41-0.1) unstable; urgency=low * New upstream version diff --git a/sg3_utils.spec b/sg3_utils.spec index 52d9dbe1..75881f43 100644 --- a/sg3_utils.spec +++ b/sg3_utils.spec @@ -1,6 +1,6 @@ Summary: Utilities for devices that use SCSI command sets Name: sg3_utils -Version: 1.41 +Version: 1.42 # Release: 1%{?dist} Release: 1 License: GPL @@ -79,6 +79,10 @@ fi %{_libdir}/*.la %changelog +* Tue Jul 21 2015 - dgilbert at interlog dot com +- track t10 changes + * sg3_utils-1.42 + * Tue Apr 28 2015 - dgilbert at interlog dot com - track t10 changes * sg3_utils-1.41 diff --git a/src/sg_stpg.c b/src/sg_stpg.c index 912cc3b7..be14682a 100644 --- a/src/sg_stpg.c +++ b/src/sg_stpg.c @@ -1,5 +1,5 @@ /* -* Copyright (c) 2004-2013 Hannes Reinecke, Christophe Varoqui, Douglas Gilbert +* Copyright (c) 2004-2015 Hannes Reinecke, Christophe Varoqui, Douglas Gilbert * All rights reserved. * Use of this source code is governed by a BSD-style * license that can be found in the BSD_LICENSE file. @@ -24,7 +24,7 @@ * to the given SCSI device. */ -static const char * version_str = "1.7 20130730"; +static const char * version_str = "1.8 20150721"; #define TGT_GRP_BUFF_LEN 1024 #define MX_ALLOC_LEN (0xc000 + 0x80) @@ -273,8 +273,8 @@ encode_tpgs_states(unsigned char *buff, struct tgtgrp *tgtState, int numgrp) for (i = 0, desc = buff + 4; i < numgrp; desc += 4, i++) { desc[0] = tgtState[i].current & 0x0f; - desc[2] = (tgtState[i].id >> 8) & 0x0f; - desc[3] = tgtState[i].id & 0x0f; + desc[2] = (tgtState[i].id >> 8) & 0xff; + desc[3] = tgtState[i].id & 0xff; } } -- cgit v1.2.3