mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-28 17:30:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'svn-trunk' into master

Browse Source
This commit is contained in:
Bart Van Assche
2020-10-13 20:39:41 -07:00
parent a25f11b67e 2fb10fb2ff
commit d69000a256
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
iscsi-scst/usr/chap.c
View File

@@ -38,7 +38,7 @@
#define BASE64_FORMAT 0x02
#define CHAP_DIGEST_ALG_MD5 5
#define CHAP_DIGEST_ALG_SHA1 7
#define CHAP_DIGEST_ALG_SHA1 6
#define CHAP_MD5_DIGEST_LEN 16
#define CHAP_SHA1_DIGEST_LEN 20
@@ -370,7 +370,7 @@ static int chap_initiator_auth_create_challenge(struct connection *conn)
conn->auth.chap.digest_alg = CHAP_DIGEST_ALG_MD5;
conn->auth_state = CHAP_AUTH_STATE_CHALLENGE;
break;
} else if (!strcmp(p, "7")) {
} else if (!strcmp(p, "6")) {
conn->auth.chap.digest_alg = CHAP_DIGEST_ALG_SHA1;
conn->auth_state = CHAP_AUTH_STATE_CHALLENGE;
break;

10
scstadmin/scstadmin.sysfs/scst-1.0.0/lib/SCST/SCST.pm
View File

@@ -2223,8 +2223,14 @@ sub replaceLun {
$o_string =~ s/\s$//;
my ($path, $cmd);
$path = make_path(SCST_TARGETS_DIR(), $driver, $target, SCST_LUNS,
SCST_MGMT_IO);
if (defined($group)) {
$path = make_path(SCST_TARGETS_DIR(), $driver, $target,
SCST_GROUPS, $group, SCST_LUNS,
SCST_MGMT_IO);
} else {
$path = make_path(SCST_TARGETS_DIR(), $driver, $target,
SCST_LUNS, SCST_MGMT_IO);
}
$cmd .= "replace $device $lun $o_string";
my $bytes = - ENOENT;