Author: jdsn Date: Wed Jul 8 18:20:39 2009 New Revision: 57952 URL: http://svn.opensuse.org/viewcvs/yast?rev=57952&view=rev Log: port the fix to register against SMT with a *.novell.com domain to SP3 Modified: branches/SuSE-SLE-10-SP3-Branch/registration/VERSION branches/SuSE-SLE-10-SP3-Branch/registration/package/yast2-registration.changes branches/SuSE-SLE-10-SP3-Branch/registration/src/modules/Register.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/registration/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/registration/VERSION?rev=57952&r1=57951&r2=57952&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/registration/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/registration/VERSION Wed Jul 8 18:20:39 2009 @@ -1 +1 @@ -2.13.23 +2.13.24 Modified: branches/SuSE-SLE-10-SP3-Branch/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/registration/package/yast2-registration.changes?rev=57952&r1=57951&r2=57952&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/registration/package/yast2-registration.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/registration/package/yast2-registration.changes Wed Jul 8 18:20:39 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jul 8 18:17:37 CEST 2009 - jdsn@suse.de + +- port the fix to override certificate handling for *.novell.com + domains to SP3 (bnc#413231) +- 2.13.24 + +------------------------------------------------------------------- Wed Jul 1 14:58:37 CEST 2009 - jdsn@suse.de - backported yastbrowser from code11 to work with xulrunner 1.9 Modified: branches/SuSE-SLE-10-SP3-Branch/registration/src/modules/Register.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/registration/src/modules/Register.ycp?rev=57952&r1=57951&r2=57952&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/registration/src/modules/Register.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/registration/src/modules/Register.ycp Wed Jul 8 18:20:39 2009 @@ -314,14 +314,21 @@ symbol certmode = nil; // never ever load a certificate file for a *.novell.com smt server - if ( regexpmatch(smt_server_parsed["host"]:"", ".+\.novell\.com$")) { certmode = `none; } - else if (smt_server_cert == nil || smt_server_cert == "") { certmode = `url; } - else if ( regexpmatch(smt_server_cert, "^(https?|ftp)://.+") ) { certmode = `url; } - else if ( regexpmatch(smt_server_cert, "^floppy/.+") ) { certmode = `floppy; } - else if ( regexpmatch(smt_server_cert, "^/.+") ) { certmode = `path; } - else if ( regexpmatch(smt_server_cert, "^ask$") ) { certmode = `ask; } - else if ( regexpmatch(smt_server_cert, "^done$") ) { certmode = `done; } - else { certmode = `none; } + if ( regexpmatch(smt_server_parsed["host"]:"", ".+\.novell\.com$")) + { + y2milestone("Registration detected a *.novell.com domain. For security reasons, there will be no certificate handling in this case."); + y2milestone("In order to register at a *.novell.com domain, please make sure your registration server uses a trusted certificate and set regcert=done."); + // allow override with regcert="done" (bnc#413231) + if (smt_server_cert == "done") { certmode = `done; } + else { certmode = `none; } + } + else if (smt_server_cert == nil || smt_server_cert == "") { certmode = `url; } + else if ( regexpmatch(smt_server_cert, "^(https?|ftp)://.+") ) { certmode = `url; } + else if ( regexpmatch(smt_server_cert, "^floppy/.+") ) { certmode = `floppy; } + else if ( regexpmatch(smt_server_cert, "^/.+") ) { certmode = `path; } + else if ( smt_server_cert == "ask" ) { certmode = `ask; } + else if ( smt_server_cert == "done" ) { certmode = `done; } + else { certmode = `none; } if (! contains([`none, `done, `url, `floppy, `ask, `path], certmode) ) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org