admin/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #146 from stweil/master

Browse Source 
Fix wrong checks for username
This commit is contained in:
Ronnie Sahlberg
2015-03-07 07:38:04 -08:00
parent 54e32122d3 dd1ee0f51c
commit b03959dbb5
6 changed files with 63 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
.gitignore vendored
View File

@@ -16,6 +16,7 @@
*.o
*.lo
*.la
*.so
bin
/config.h
/config.log
@@ -31,10 +32,18 @@ TAGS
/doc/Makefile
/examples/Makefile.in
/examples/Makefile
/examples/iscsi-dd
/examples/iscsiclient
/examples/ld_iscsi.so
/lib/Makefile.in
/lib/Makefile
/test-tool/Makefile.in
/test-tool/Makefile
/utils/Makefile.in
/utils/Makefile
/utils/iscsi-inq
/utils/iscsi-ls
/utils/iscsi-perf
/utils/iscsi-readcapacity16
/utils/iscsi-swp
/libiscsi.pc

2
aros/iscsi-ls.c
View File

@@ -404,7 +404,7 @@ int main(int argc, char *argv[])
iscsi_set_session_type(iscsi, ISCSI_SESSION_DISCOVERY);
if (iscsi_url->user != NULL) {
if (iscsi_url->user[0] != '\0') {
state.username = iscsi_url->user;
state.password = iscsi_url->passwd;
if (iscsi_set_initiator_username_pwd(iscsi, iscsi_url->user, iscsi_url->passwd) != 0) {

4
examples/iscsi-dd.c
View File

@@ -269,7 +269,7 @@ int main(int argc, char *argv[])
iscsi_set_targetname(client.src_iscsi, iscsi_url->target);
iscsi_set_session_type(client.src_iscsi, ISCSI_SESSION_NORMAL);
iscsi_set_header_digest(client.src_iscsi, ISCSI_HEADER_DIGEST_NONE_CRC32C);
if (iscsi_url->user != NULL) {
if (iscsi_url->user[0] != '\0') {
if (iscsi_set_initiator_username_pwd(client.src_iscsi, iscsi_url->user, iscsi_url->passwd) != 0) {
fprintf(stderr, "Failed to set initiator username and password\n");
exit(10);
@@ -328,7 +328,7 @@ int main(int argc, char *argv[])
iscsi_set_targetname(client.dst_iscsi, iscsi_url->target);
iscsi_set_session_type(client.dst_iscsi, ISCSI_SESSION_NORMAL);
iscsi_set_header_digest(client.dst_iscsi, ISCSI_HEADER_DIGEST_NONE_CRC32C);
if (iscsi_url->user != NULL) {
if (iscsi_url->user[0] != '\0') {
if (iscsi_set_initiator_username_pwd(client.dst_iscsi, iscsi_url->user, iscsi_url->passwd) != 0) {
fprintf(stderr, "Failed to set initiator username and password\n");
exit(10);

2
examples/ld_iscsi.c
View File

@@ -96,7 +96,7 @@ int open(const char *path, int flags, mode_t mode)
iscsi_set_session_type(iscsi, ISCSI_SESSION_NORMAL);
iscsi_set_header_digest(iscsi, ISCSI_HEADER_DIGEST_NONE_CRC32C);
if (iscsi_url->user != NULL) {
if (iscsi_url->user[0] != '\0') {
if (iscsi_set_initiator_username_pwd(iscsi, iscsi_url->user, iscsi_url->passwd) != 0) {
LD_ISCSI_DPRINTF(0,"Failed to set initiator username and password");
iscsi_destroy_context(iscsi);

2
test-tool/iscsi-support.c
View File

@@ -407,7 +407,7 @@ iscsi_context_login(const char *initiatorname, const char *url, int *lun)
iscsi_set_session_type(iscsi, ISCSI_SESSION_NORMAL);
iscsi_set_header_digest(iscsi, ISCSI_HEADER_DIGEST_NONE_CRC32C);
if (iscsi_url->user != NULL) {
if (iscsi_url->user[0] != '\0') {
if (iscsi_set_initiator_username_pwd(iscsi, iscsi_url->user, iscsi_url->passwd) != 0) {
fprintf(stderr, "Failed to set initiator username and password\n");
iscsi_destroy_url(iscsi_url);

2
utils/iscsi-perf.c
View File

@@ -253,7 +253,7 @@ int main(int argc, char *argv[])
iscsi_set_session_type(client.iscsi, ISCSI_SESSION_NORMAL);
iscsi_set_header_digest(client.iscsi, ISCSI_HEADER_DIGEST_NONE_CRC32C);
if (iscsi_url->user != NULL) {
if (iscsi_url->user[0] != '\0') {
if (iscsi_set_initiator_username_pwd(client.iscsi, iscsi_url->user, iscsi_url->passwd) != 0) {
fprintf(stderr, "Failed to set initiator username and password\n");
exit(10);