Author: mzugec Date: Thu Jul 10 15:20:27 2008 New Revision: 48963 URL: http://svn.opensuse.org/viewcvs/yast?rev=48963&view=rev Log: improved InitiatorName validation according rfc3722 Modified: branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/widgets.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/widgets.ycp?rev=48963&r1=48962&r2=48963&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/widgets.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/widgets.ycp Thu Jul 10 15:20:27 2008 @@ -253,18 +253,21 @@ string i_name = (string)UI::QueryWidget(`initiator_name, `Value); // regexp for "iqn.yyyy-mm." - string reg1 = "^iqn\.[[:digit:]]\{4\}\-[[:digit:]]\{2\}\."; + string reg1 = "[[:digit:]]\{4\}\-[[:digit:]]\{2\}\."; // regexp for "cz.suse" or just "suse" - string reg2 = "[[:alnum:]\.]*[[:alnum:]]"; +// string reg2 = "[[:alnum:]\.]*[[:alnum:]]"; + string reg2 = "[[:alnum:]\.\:-]*"; // regexp for [:identifier] - string reg3 = "[:[:alnum:]*.{,1}]*"; +// string reg3 = "[:[:alnum:]*.{,1}]*"; - boolean correct = regexpmatch(i_name, sformat("%1%2%3", reg1, reg2, reg3)); +// boolean correct = regexpmatch(i_name, sformat("%1%2%3", reg1, reg2, reg3)); + boolean correct = regexpmatch(i_name, sformat("^iqn\.%1%2$", reg1, reg2)) || + regexpmatch(i_name, sformat("^eui\.%1%2$", reg1, reg2)); if (!correct) Popup::Warning(_("Incorrect InitiatorName Correct syntax is -iqn.yyyy-mm.reversed domain name[:identifier] - +iqn.yyyy-mm.reversed.domain.name[:identifier] + or eui.yyyy-mm.reversed.domain.name[:identifier] Example: iqn.2007-04.cz.server:storage.disk.sdb ")); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org