Author: jdsn Date: Tue Feb 17 20:20:26 2009 New Revision: 55571 URL: http://svn.opensuse.org/viewcvs/yast?rev=55571&view=rev Log: fix to override certificate handling for *.novell.com domains (bnc#413231) 2.13.23 (internal version) Modified: branches/SuSE-SLE-10-SP2-Branch/registration/VERSION branches/SuSE-SLE-10-SP2-Branch/registration/package/yast2-registration.changes branches/SuSE-SLE-10-SP2-Branch/registration/src/modules/Register.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/registration/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/registration/VERSION?rev=55571&r1=55570&r2=55571&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/registration/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/registration/VERSION Tue Feb 17 20:20:26 2009 @@ -1 +1 @@ -2.13.22 +2.13.23 Modified: branches/SuSE-SLE-10-SP2-Branch/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/registration/package/yast2-registration.changes?rev=55571&r1=55570&r2=55571&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/registration/package/yast2-registration.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/registration/package/yast2-registration.changes Tue Feb 17 20:20:26 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Feb 9 16:30:37 CET 2009 - jdsn@suse.de + +- fix to override certificate handling for *.novell.com domains + (bnc#413231) +- 2.13.23 + +------------------------------------------------------------------- Tue Apr 8 16:06:58 CEST 2008 - jdsn@suse.de - fix SMT certificate installation in autoyast mode (bnc#377929) Modified: branches/SuSE-SLE-10-SP2-Branch/registration/src/modules/Register.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/registration/src/modules/Register.ycp?rev=55571&r1=55570&r2=55571&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/registration/src/modules/Register.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/registration/src/modules/Register.ycp Tue Feb 17 20:20:26 2009 @@ -275,14 +275,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