Hello community, here is the log from the commit of package yast2-iscsi-client checked in at Fri May 26 12:39:33 CEST 2006. -------- --- yast2-iscsi-client/yast2-iscsi-client.changes 2006-05-04 14:04:20.000000000 +0200 +++ yast2-iscsi-client/yast2-iscsi-client.changes 2006-05-25 18:19:21.000000000 +0200 @@ -1,0 +2,5 @@ +Thu May 25 18:17:55 CEST 2006 - mzugec@suse.cz + +- fixed #149055 - iscsi client login always asks for credentials + +------------------------------------------------------------------- Old: ---- yast2-iscsi-client-2.13.17.tar.bz2 New: ---- yast2-iscsi-client-2.13.18.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-iscsi-client.spec ++++++ --- /var/tmp/diff_new_pack.oRxyeF/_old 2006-05-26 12:39:28.000000000 +0200 +++ /var/tmp/diff_new_pack.oRxyeF/_new 2006-05-26 12:39:28.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-iscsi-client (Version 2.13.17) +# spec file for package yast2-iscsi-client (Version 2.13.18) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-iscsi-client -Version: 2.13.17 -Release: 6 +Version: 2.13.18 +Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-iscsi-client-2.13.17.tar.bz2 +Source0: yast2-iscsi-client-2.13.18.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite Requires: yast2 @@ -29,7 +29,7 @@ %prep -%setup -n yast2-iscsi-client-2.13.17 +%setup -n yast2-iscsi-client-2.13.18 %build %{prefix}/bin/y2tool y2autoconf @@ -65,6 +65,8 @@ %doc %{prefix}/share/doc/packages/yast2-iscsi-client %changelog -n yast2-iscsi-client +* Thu May 25 2006 - mzugec@suse.cz +- fixed #149055 - iscsi client login always asks for credentials * Thu May 04 2006 - mzugec@suse.cz - proofread * Mon Apr 24 2006 - mzugec@suse.cz ++++++ yast2-iscsi-client-2.13.17.tar.bz2 -> yast2-iscsi-client-2.13.18.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.13.17/Makefile.am new/yast2-iscsi-client-2.13.18/Makefile.am --- old/yast2-iscsi-client-2.13.17/Makefile.am 2006-05-04 13:58:15.000000000 +0200 +++ new/yast2-iscsi-client-2.13.18/Makefile.am 2006-05-25 18:03:24.000000000 +0200 @@ -8,6 +8,7 @@ #where devtools are PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) +Y2TOOL = $(PREFIX)/bin/y2tool VERSION = $(shell cat $(srcdir)/VERSION) RPMNAME = $(shell cat $(srcdir)/RPMNAME) @@ -95,7 +96,7 @@ done pot: - y2tool y2makepot -s $(srcdir) + $(Y2TOOL) y2makepot -s $(srcdir) install-pot: pot @POT_DST=`find -type d -name testsuite -prune , \ @@ -116,7 +117,7 @@ fi spellcheck: pot - y2tool pot-spellcheck + $(Y2TOOL) pot-spellcheck # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) @@ -143,20 +144,20 @@ rm -f package/*.bak rm -f package/*.auto mv $(RPMNAME)-$(VERSION).tar.bz2 package/ - if ! test -x $(PREFIX)/bin/y2tool; then \ - echo "$(PREFIX)/bin/y2tool: not found."; \ + if ! test -x $(Y2TOOL); then \ + echo "$(Y2TOOL): not found."; \ echo "You have to install yast2-devtools to making a package"; \ false; \ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ done package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local -TAGVERSION = $(PREFIX)/bin/y2tool tagversion +TAGVERSION = $(Y2TOOL) tagversion check-up-to-date check-cvs-up-to-date check-svn-up-to-date: if [ -d $(srcdir)/CVS ]; then \ @@ -200,12 +201,12 @@ fi check-textdomain: - $(PREFIX)/bin/y2tool check-textdomain $(srcdir) + $(Y2TOOL) check-textdomain $(srcdir) stable: checkin-stable checkin-stable: package - $(PREFIX)/bin/y2tool checkin-stable + $(Y2TOOL) checkin-stable # For po/ modules diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.13.17/Makefile.in new/yast2-iscsi-client-2.13.18/Makefile.in --- old/yast2-iscsi-client-2.13.17/Makefile.in 2006-05-04 13:58:24.000000000 +0200 +++ new/yast2-iscsi-client-2.13.18/Makefile.in 2006-05-25 18:03:33.000000000 +0200 @@ -198,6 +198,7 @@ #where devtools are PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) +Y2TOOL = $(PREFIX)/bin/y2tool SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) @@ -227,7 +228,7 @@ $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) $(am__append_1) @CREATE_PKGCONFIG_NOARCH_TRUE@@CREATE_PKGCONFIG_TRUE@pkgconfigdata_DATA = $(RPMNAME).pc @CREATE_PKGCONFIG_NOARCH_FALSE@@CREATE_PKGCONFIG_TRUE@pkgconfig_DATA = $(RPMNAME).pc -TAGVERSION = $(PREFIX)/bin/y2tool tagversion +TAGVERSION = $(Y2TOOL) tagversion # test ! -d $(srcdir)/po \ # || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; } # No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am @@ -724,7 +725,7 @@ done pot: - y2tool y2makepot -s $(srcdir) + $(Y2TOOL) y2makepot -s $(srcdir) install-pot: pot @POT_DST=`find -type d -name testsuite -prune , \ @@ -745,7 +746,7 @@ fi spellcheck: pot - y2tool pot-spellcheck + $(Y2TOOL) pot-spellcheck # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) @@ -772,15 +773,15 @@ rm -f package/*.bak rm -f package/*.auto mv $(RPMNAME)-$(VERSION).tar.bz2 package/ - if ! test -x $(PREFIX)/bin/y2tool; then \ - echo "$(PREFIX)/bin/y2tool: not found."; \ + if ! test -x $(Y2TOOL); then \ + echo "$(Y2TOOL): not found."; \ echo "You have to install yast2-devtools to making a package"; \ false; \ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ done package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local @@ -827,12 +828,12 @@ fi check-textdomain: - $(PREFIX)/bin/y2tool check-textdomain $(srcdir) + $(Y2TOOL) check-textdomain $(srcdir) stable: checkin-stable checkin-stable: package - $(PREFIX)/bin/y2tool checkin-stable + $(Y2TOOL) checkin-stable # For po/ modules checkpo: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.13.17/VERSION new/yast2-iscsi-client-2.13.18/VERSION --- old/yast2-iscsi-client-2.13.17/VERSION 2006-04-24 08:37:59.000000000 +0200 +++ new/yast2-iscsi-client-2.13.18/VERSION 2006-05-25 18:14:00.000000000 +0200 @@ -1 +1 @@ -2.13.17 +2.13.18 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.13.17/configure new/yast2-iscsi-client-2.13.18/configure --- old/yast2-iscsi-client-2.13.17/configure 2006-05-04 13:58:21.000000000 +0200 +++ new/yast2-iscsi-client-2.13.18/configure 2006-05-25 18:03:30.000000000 +0200 @@ -2,7 +2,7 @@ # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for yast2-iscsi-client 2.13.17. # -# Report bugs to <http://www.suse.de/feedback>. +# Report bugs to <http://bugs.opensuse.org/>. # # Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation @@ -271,7 +271,7 @@ PACKAGE_TARNAME='yast2-iscsi-client' PACKAGE_VERSION='2.13.17' PACKAGE_STRING='yast2-iscsi-client 2.13.17' -PACKAGE_BUGREPORT='http://www.suse.de/feedback' +PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" ac_default_prefix=/usr @@ -812,7 +812,7 @@ Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to <http://www.suse.de/feedback>. +Report bugs to <http://bugs.opensuse.org/>. _ACEOF fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.13.17/configure.in new/yast2-iscsi-client-2.13.18/configure.in --- old/yast2-iscsi-client-2.13.17/configure.in 2006-05-04 13:58:15.000000000 +0200 +++ new/yast2-iscsi-client-2.13.18/configure.in 2006-05-25 18:03:24.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-iscsi-client dnl -dnl -- This file is generated by y2autoconf - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-iscsi-client, 2.13.17, http://www.suse.de/feedback, yast2-iscsi-client) +AC_INIT(yast2-iscsi-client, 2.13.17, http://bugs.opensuse.org/, yast2-iscsi-client) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.13.17/src/IscsiClient.ycp new/yast2-iscsi-client-2.13.18/src/IscsiClient.ycp --- old/yast2-iscsi-client-2.13.17/src/IscsiClient.ycp 2006-04-24 08:05:44.000000000 +0200 +++ new/yast2-iscsi-client-2.13.18/src/IscsiClient.ycp 2006-05-25 18:18:25.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: IscsiClient settings, input and output functions * Authors: Michal Zugec <mzugec@suse.cz> * - * $Id: IscsiClient.ycp 30374 2006-04-24 05:55:11Z mzugec $ + * $Id: IscsiClient.ycp 31156 2006-05-25 16:17:12Z mzugec $ * * Representation of the configuration of iscsi-client. * Input and output routines. @@ -59,6 +59,38 @@ SCR::Write(.etc.iscsid.all, config); } + +global map<string, any> getNode(string rec){ + map<string, any> cmd = (map<string, any>)SCR::Execute(.target.bash_output, "iscsiadm -S -m node -r $REC", $["REC":rec]); +// y2internal("getting record ... %1", cmd); + if (cmd["exit"]:0!=0) return $[]; + map<string, any> auth = $[]; + foreach(string row, splitstring(cmd["stdout"]:"", "\n"), { + string key = splitstring(row," = ")[0]:""; + string val = splitstring(row," = ")[3]:""; + if(val == "<empty>") val=""; + switch(key){ + case("node.session.auth.authmethod"): + auth["authmethod"]=val; + break; + case("node.session.auth.username"): + auth["username"]=val; + break; + case("node.session.auth.password"): + auth["password"]=val; + break; + case("node.session.auth.username_in"): + auth["username_in"]=val; + break; + case("node.session.auth.password_in"): + auth["password_in"]=val; + break; + } + }); +// y2internal("%1", auth); + return auth; +} + // create map from given map in format needed by ini-agent map<string, any> createMap(map<string, any> old_map, list<string> comments) { @@ -194,6 +226,7 @@ y2milestone("reading current settings"); map<string, any> retcode = (map<string, any>)SCR::Execute(.target.bash_output, "iscsiadm -m session"); if (size(retcode["stderr"]:"")>0) return false; +//y2internal("retcode %1", retcode); sessions = filter(string row, splitstring(retcode["stdout"]:"", "\n"), { return ( size(row)>0 && (search(row, "session")==nil) ); }); @@ -263,7 +296,7 @@ global boolean setValue(string record, string name, string value){ y2milestone("set %1 for record %3", name, record); string command = sformat("iscsiadm -m node -r %1 --op=update --name=%2 --value=%3", record, name, value); -// y2milestone("execute command - %1", command ); + y2milestone("execute command - %1", command ); boolean ret = true; map<string, any> retcode = (map<string, any>) SCR::Execute(.target.bash_output, command); if (size(retcode["stderr"]:"")>0) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.13.17/src/dialogs.ycp new/yast2-iscsi-client-2.13.18/src/dialogs.ycp --- old/yast2-iscsi-client-2.13.17/src/dialogs.ycp 2006-04-12 16:34:46.000000000 +0200 +++ new/yast2-iscsi-client-2.13.18/src/dialogs.ycp 2006-05-25 18:03:05.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Dialogs definitions * Authors: Michal Zugec <mzugec@suse.cz> * - * $Id: dialogs.ycp 30067 2006-04-12 14:34:10Z mzugec $ + * $Id: dialogs.ycp 31155 2006-05-25 16:00:19Z mzugec $ */ { @@ -141,7 +141,7 @@ `TextEntry(`id(`user_out), _("Username")), `Password(`id(`pass_out), _("Password")) ) ), - "init" : initDiscAuth, + "init" : initConnAuth, "handle" : handleDiscAuth, "validate_type" : `function, "validate_function" : validateConnAuth, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.13.17/src/widgets.ycp new/yast2-iscsi-client-2.13.18/src/widgets.ycp --- old/yast2-iscsi-client-2.13.17/src/widgets.ycp 2006-05-04 13:57:50.000000000 +0200 +++ new/yast2-iscsi-client-2.13.18/src/widgets.ycp 2006-05-25 18:13:46.000000000 +0200 @@ -32,6 +32,7 @@ } y2milestone("Time spent: %1 msec", time_spent); stdout = (list<string>)(SCR::Read(.background.newout)); +//y2internal("stdout %1", stdout); if (cont_loop) { return_code = (integer) SCR::Read(.background.status); if (return_code == 255) { @@ -197,6 +198,21 @@ setAuthOut(false); } +void initConnAuth(string key){ + setAuthIn(false); + setAuthOut(false); + map<string, any> auth = IscsiClient::getNode(curr_rec); + if (size(auth)>0) + { +// y2internal("%1", auth); + UI::ChangeWidget(`id(`user_in),`Value, auth["username_in"]:"" ); + UI::ChangeWidget(`id(`pass_in),`Value, auth["password_in"]:"" ); + if ((size(auth["username_in"]:"")>0)&&(size(auth["password_in"]:"")>0)) setAuthOut(true); + UI::ChangeWidget(`id(`user_out),`Value, auth["username"]:"" ); + UI::ChangeWidget(`id(`pass_out),`Value, auth["password"]:"" ); + if ((size(auth["username"]:"")>0)&&(size(auth["password"]:"")>0)) setAuthOut(true); + } +} // handle for enable/disable widgets in authentication dialog symbol handleDiscAuth(string key, map event){ if (event["EventReason"]:"" == "ValueChanged"){ @@ -220,13 +236,13 @@ return nil; } -boolean validateDiscAuth(any key, map event){ +global boolean validateDiscAuth(string key, map event){ return checkAuthEntry(); } // *******************Server Location *********************** // do discovery to selected portal -boolean validateServerLocation(any key, map event){ +boolean validateServerLocation(string key, map event){ boolean ret = true; string ip = tostring(UI::QueryWidget(`hostname, `Value)); string port = tostring(UI::QueryWidget(`port, `Value)); @@ -391,7 +407,7 @@ //***************** connection autentication ******************* // login to target with authentication -boolean validateConnAuth(any key, map event){ +global boolean validateConnAuth(string key, map event){ boolean ret = true; boolean auth_none = (boolean) UI::QueryWidget(`id(`auth_none), `Value); boolean auth_in = (boolean) UI::QueryWidget(`id(`auth_in), `Value); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...
participants (1)
-
root@suse.de