March 2012 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r67629 - in /branches/SuSE-Code-11-SP1-Branch/vm: VERSION package/yast2-vm.changes src/vm_finish.ycp
by charlesa＠svn2.opensuse.org 14 Mar '12

14 Mar '12

Author: charlesa Date: Thu Mar 15 00:05:10 2012 New Revision: 67629 URL: http://svn.opensuse.org/viewcvs/yast?rev=67629&view=rev Log: - bnc#720929 - OES11LH: Upgrade from OES 2 SP2 to OES 11 RC3 re-adds "x0..respawn..xterm" to inittab Modified: branches/SuSE-Code-11-SP1-Branch/vm/VERSION branches/SuSE-Code-11-SP1-Branch/vm/package/yast2-vm.changes branches/SuSE-Code-11-SP1-Branch/vm/src/vm_finish.ycp Modified: branches/SuSE-Code-11-SP1-Branch/vm/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/vm/VE… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/vm/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/vm/VERSION Thu Mar 15 00:05:10 2012 @@ -1 +1 @@ -2.17.2 +2.17.3 Modified: branches/SuSE-Code-11-SP1-Branch/vm/package/yast2-vm.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/vm/pa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/vm/package/yast2-vm.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/vm/package/yast2-vm.changes Thu Mar 15 00:05:10 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Mar 14 17:00:46 MDT 2012 - carnold(a)novell.com + +- bnc#720929 - OES11LH: Upgrade from OES 2 SP2 to OES 11 RC3 + re-adds "x0..respawn..xterm" to inittab + +------------------------------------------------------------------- Tue Mar 8 16:17:23 MST 2011 - carnold(a)novell.com - bnc#508347 - Yast2 virtualization installation error but success Modified: branches/SuSE-Code-11-SP1-Branch/vm/src/vm_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/vm/sr… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/vm/src/vm_finish.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/vm/src/vm_finish.ycp Thu Mar 15 00:05:10 2012 @@ -97,14 +97,20 @@ y2milestone("check for xvc0 in inittab and securetty"); if ( !contains(SCR::Dir(.etc.inittab), "x0") ) { - y2milestone("Adding the x0 entry in the inittab file"); - SCR::Write (.etc.inittab.x0, sformat ("12345:respawn:/sbin/agetty -L 9600 xvc0 xterm")); - SCR::Write (.etc.inittab, nil); - string dev_xvc0 = "/dev/xvc0"; - if ( ! FileUtils::Exists(dev_xvc0) ) + // On an upgrade, don't add new entry if existing one is commented out - bnc#720929 + if ( 0 != SCR::Execute(.target.bash,"/usr/bin/grep -q '^#x0:' /etc/inittab") ) { - y2milestone("%1 not found, commenting out the x0 entry in the inittab", dev_xvc0); - SCR::Execute(.target.bash,"/bin/sed --in-place 's/^x0:/#x0:/g' /etc/inittab"); + y2milestone("Adding the x0 entry in the inittab file"); + SCR::Write (.etc.inittab.x0, sformat ("12345:respawn:/sbin/agetty -L 9600 xvc0 xterm")); + SCR::Write (.etc.inittab, nil); + string dev_xvc0 = "/dev/xvc0"; + if ( ! FileUtils::Exists(dev_xvc0) ) + { + y2milestone("%1 not found, commenting out the x0 entry in the inittab", dev_xvc0); + SCR::Execute(.target.bash,"/bin/sed --in-place 's/^x0:/#x0:/g' /etc/inittab"); + } + } else { + y2milestone("The x0 entry in the inittab is there but commented out"); } } SCR::Execute(.target.bash,"/usr/bin/grep -q xvc0 /etc/securetty || echo xvc0 >> /etc/securetty"); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67628 - in /trunk/bootloader: package/yast2-bootloader.changes src/clients/bootloader_finish.ycp
by aschnell＠svn2.opensuse.org 14 Mar '12

14 Mar '12

Author: aschnell Date: Wed Mar 14 15:44:39 2012 New Revision: 67628 URL: http://svn.opensuse.org/viewcvs/yast?rev=67628&view=rev Log: - adapted ssh command for 2nd stage ssh installation (bnc#745340) Modified: trunk/bootloader/package/yast2-bootloader.changes trunk/bootloader/src/clients/bootloader_finish.ycp Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloa… ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Wed Mar 14 15:44:39 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Mar 14 15:43:44 CET 2012 - aschnell(a)suse.de + +- adapted ssh command for 2nd stage ssh installation (bnc#745340) + +------------------------------------------------------------------- Mon Mar 5 14:42:10 CET 2012 - mchang(a)suse.com - add basic grub2 support that only handles installs Modified: trunk/bootloader/src/clients/bootloader_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/clients/bootloade… ============================================================================== --- trunk/bootloader/src/clients/bootloader_finish.ycp (original) +++ trunk/bootloader/src/clients/bootloader_finish.ycp Wed Mar 14 15:44:39 2012 @@ -126,10 +126,11 @@ string usessh_msg = ""; if (Linuxrc::usessh ()) { // TRANSLATORS: part of the reboot message + /// %1 is replaced with a command name // (message ID#SSH) - usessh_msg = _("Then reconnect and run the following: -/usr/lib/YaST2/startup/YaST2.ssh -"); + usessh_msg = sformat(_("Then reconnect and run the following: +%1 +"), "yast2.ssh"); } // TRANSLATORS: reboot message -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67627 - in /trunk/installation: package/yast2-installation.changes startup/Second-Stage/S08-start startup/YaST2.call startup/YaST2.ssh startup/common/network.sh
by aschnell＠svn2.opensuse.org 14 Mar '12

14 Mar '12

Author: aschnell Date: Wed Mar 14 15:43:28 2012 New Revision: 67627 URL: http://svn.opensuse.org/viewcvs/yast?rev=67627&view=rev Log: - create link yast2.ssh for 2nd stage ssh installation (bnc#745340) Modified: trunk/installation/package/yast2-installation.changes trunk/installation/startup/Second-Stage/S08-start trunk/installation/startup/YaST2.call trunk/installation/startup/YaST2.ssh trunk/installation/startup/common/network.sh Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Wed Mar 14 15:43:28 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Mar 14 15:42:19 CET 2012 - aschnell(a)suse.de + +- create link yast2.ssh for 2nd stage ssh installation (bnc#745340) + +------------------------------------------------------------------- Wed Feb 15 11:46:45 CET 2012 - gs(a)suse.de - Improve layout of the release notes dialog (bnc #550610) Modified: trunk/installation/startup/Second-Stage/S08-start URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/startup/Second-Stag… ============================================================================== --- trunk/installation/startup/Second-Stage/S08-start (original) +++ trunk/installation/startup/Second-Stage/S08-start Wed Mar 14 15:43:28 2012 @@ -31,10 +31,12 @@ #================================================== # We are going to start a SSH based remote session #-------------------------------------------------- + ln -sf /usr/lib/YaST2/startup/YaST2.ssh /sbin/yast2.ssh ssh_message while [ -f /var/lib/YaST2/runme_at_boot ]; do sleep 3 done + rm /sbin/yast2.ssh fi #============================================= Modified: trunk/installation/startup/YaST2.call URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/startup/YaST2.call?… ============================================================================== --- trunk/installation/startup/YaST2.call (original) +++ trunk/installation/startup/YaST2.call Wed Mar 14 15:43:28 2012 @@ -274,8 +274,7 @@ if [ -n "$SecondStageRequired" -a "$SecondStageRequired" = "1" ] ; then echo "*** Preparing SSH installation for reboot ***" - echo "*** NOTE: after reboot, you have to reconnect and call ***" - echo "*** /usr/lib/YaST2/startup/YaST2.ssh ***" + echo "*** NOTE: after reboot, you have to reconnect and call yast2.ssh ***" log "\tPreparing SSH installation for reboot" fi } Modified: trunk/installation/startup/YaST2.ssh URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/startup/YaST2.ssh?r… ============================================================================== --- trunk/installation/startup/YaST2.ssh (original) +++ trunk/installation/startup/YaST2.ssh Wed Mar 14 15:43:28 2012 @@ -38,8 +38,7 @@ Your system has been updated and needs to reboot ... Reconnect to the system after it reboots and call - /usr/lib/YaST2/startup/YaST2.ssh again to continue - the installation ... + yast2.ssh again to continue the installation ... EOF } Modified: trunk/installation/startup/common/network.sh URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/startup/common/netw… ============================================================================== --- trunk/installation/startup/common/network.sh (original) +++ trunk/installation/startup/common/network.sh Wed Mar 14 15:43:28 2012 @@ -72,7 +72,7 @@ *** sshd has been started *** you can login now and proceed with the installation - run the command '/usr/lib/YaST2/startup/YaST2.ssh' + run the command 'yast2.ssh' active interfaces: -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67626 - /tags/stable-2_22_3/ncurses-pkg/
by gs＠svn2.opensuse.org 14 Mar '12

14 Mar '12

Author: gs Date: Wed Mar 14 14:27:23 2012 New Revision: 67626 URL: http://svn.opensuse.org/viewcvs/yast?rev=67626&view=rev Log: Created tag stable-2_22_3 for ncurses-pkg Added: tags/stable-2_22_3/ncurses-pkg/ - copied from r67625, trunk/ncurses-pkg/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67625 - in /trunk/ncurses-pkg: VERSION package/yast2-ncurses-pkg.changes
by gs＠svn2.opensuse.org 14 Mar '12

14 Mar '12

Author: gs Date: Wed Mar 14 14:26:47 2012 New Revision: 67625 URL: http://svn.opensuse.org/viewcvs/yast?rev=67625&view=rev Log: 2.22.3 Modified: trunk/ncurses-pkg/VERSION trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes Modified: trunk/ncurses-pkg/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/VERSION?rev=67625&r1… ============================================================================== --- trunk/ncurses-pkg/VERSION (original) +++ trunk/ncurses-pkg/VERSION Wed Mar 14 14:26:47 2012 @@ -1 +1 @@ -2.22.2 +2.22.3 Modified: trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/package/yast2-ncurse… ============================================================================== --- trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes (original) +++ trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes Wed Mar 14 14:26:47 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Mar 14 13:42:38 CET 2012 - gs(a)suse.de + +- Online Update: possibility to search in patch summary, improve + formatting of patch descriptions +- 2.22.3 + +------------------------------------------------------------------- Tue Mar 6 13:25:45 CET 2012 - gs(a)suse.de - Better formatting also for notify messages (bnc #746876) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67624 - in /trunk/ncurses-pkg/src: NCPackageSelector.cc NCPackageSelector.h NCPkgFilterSearch.cc NCPkgPatchSearch.cc NCPkgPatchSearch.h
by gs＠svn2.opensuse.org 14 Mar '12

14 Mar '12

Author: gs Date: Wed Mar 14 13:42:03 2012 New Revision: 67624 URL: http://svn.opensuse.org/viewcvs/yast?rev=67624&view=rev Log: search in patch summary is possible Modified: trunk/ncurses-pkg/src/NCPackageSelector.cc trunk/ncurses-pkg/src/NCPackageSelector.h trunk/ncurses-pkg/src/NCPkgFilterSearch.cc trunk/ncurses-pkg/src/NCPkgPatchSearch.cc trunk/ncurses-pkg/src/NCPkgPatchSearch.h Modified: trunk/ncurses-pkg/src/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelecto… ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelector.cc (original) +++ trunk/ncurses-pkg/src/NCPackageSelector.cc Wed Mar 14 13:42:03 2012 @@ -380,7 +380,7 @@ // // Fills the patch list with search results // -bool NCPackageSelector::fillPatchSearchList( const string & expr ) +bool NCPackageSelector::fillPatchSearchList( const string & expr, bool checkName, bool checkSum ) { NCPkgTable * packageList = PackageList(); @@ -396,7 +396,14 @@ q.addString( expr ); q.addKind( zypp::ResKind::patch ); q.addAttribute( zypp::sat::SolvAttr::keywords ); - q.addAttribute( zypp::sat::SolvAttr::name ); + if ( checkName ) + { + q.addAttribute( zypp::sat::SolvAttr::name ); + } + if ( checkSum ) + { + q.addAttribute( zypp::sat::SolvAttr::summary ); + } for( zypp::PoolQuery::Selectable_iterator it = q.selectableBegin(); it != q.selectableEnd(); it++) Modified: trunk/ncurses-pkg/src/NCPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelecto… ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelector.h (original) +++ trunk/ncurses-pkg/src/NCPackageSelector.h Wed Mar 14 13:42:03 2012 @@ -300,7 +300,7 @@ * @param checkRequires Check in Requires (true or false) * @return bool */ - bool fillPatchSearchList( const string & expr ); + bool fillPatchSearchList( const string & expr, bool checkName, bool checkSum ); bool fillDefaultList(); Modified: trunk/ncurses-pkg/src/NCPkgFilterSearch.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterSearc… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterSearch.cc (original) +++ trunk/ncurses-pkg/src/NCPkgFilterSearch.cc Wed Mar 14 13:42:03 2012 @@ -321,10 +321,6 @@ settings->doCheckRequires() ); } - else - { - packager->fillPatchSearchList( filter ); - } return true; } Modified: trunk/ncurses-pkg/src/NCPkgPatchSearch.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgPatchSearch… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgPatchSearch.cc (original) +++ trunk/ncurses-pkg/src/NCPkgPatchSearch.cc Wed Mar 14 13:42:03 2012 @@ -70,7 +70,7 @@ , searchExpr( 0 ) , packager( pkger ) { - createLayout( _("Search for Patch Name") ); + createLayout( _("Search for Patches") ); } /////////////////////////////////////////////////////////////////// @@ -117,8 +117,16 @@ new NCSpacing( vSplit, YD_VERT, false, 0.6 ); + NCMultiSelectionBox * settings = new NCMultiSelectionBox( vSplit, NCPkgStrings::SearchIn() ); + YItemCollection items; + searchName = new YItem ( _( "Name of the Patch" ), true); + items.push_back( searchName ); + searchSum = new YItem ( _( "Summary" ), true); + items.push_back( searchSum ); + settings->addItems( items ); + + new NCSpacing( vSplit, YD_VERT, false, 0.6 ); NCLayoutBox * hSplit3 = new NCLayoutBox( vSplit, YD_HORIZ ); - new NCSpacing( hSplit3, YD_HORIZ, true, 0.2 ); // add the cancel and the ok button @@ -131,7 +139,7 @@ cancelButton->setFunctionKey( 9 ); new NCSpacing( hSplit3, YD_HORIZ, true, 0.2 ); - + new NCSpacing( vSplit, YD_VERT, false, 0.6 ); } /////////////////////////////////////////////////////////////////// @@ -200,7 +208,7 @@ // int NCPkgPatchSearch::preferredHeight() { - return 10; + return 16; } /////////////////////////////////////////////////////////////////// @@ -248,8 +256,9 @@ postevent.result = getSearchExpression(); string filter = postevent.result; - - packager->fillPatchSearchList( filter ); + bool checkName = searchName->selected(); + bool checkSum = searchSum->selected(); + packager->fillPatchSearchList( filter, checkName, checkSum ); } Modified: trunk/ncurses-pkg/src/NCPkgPatchSearch.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgPatchSearch… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgPatchSearch.h (original) +++ trunk/ncurses-pkg/src/NCPkgPatchSearch.h Wed Mar 14 13:42:03 2012 @@ -70,6 +70,9 @@ private: NCComboBox * searchExpr; + + YItem * searchName; + YItem * searchSum; NCPushButton * cancelButton; NCPushButton * okButton; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67623 - in /trunk/network: package/yast2-network.changes src/modules/Provider.ycp
by mvidner＠svn2.opensuse.org 14 Mar '12

14 Mar '12

Author: mvidner Date: Wed Mar 14 12:02:27 2012 New Revision: 67623 URL: http://svn.opensuse.org/viewcvs/yast?rev=67623&view=rev Log: No need to chmod /etc/sysconfig/network/providers (bnc#713661) ... after placing files there (which opens up a race): filesystem.rpm and permissions.rpm have the correct permissions for it already. Modified: trunk/network/package/yast2-network.changes trunk/network/src/modules/Provider.ycp Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Wed Mar 14 12:02:27 2012 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Mar 14 12:00:35 CET 2012 - mvidner(a)suse.cz + +- No need to chmod /etc/sysconfig/network/providers after placing + files there (which opens up a race): filesystem.rpm and + permissions.rpm have the correct permissions for it already + (bnc#713661) + +------------------------------------------------------------------- Wed Mar 7 11:10:31 CET 2012 - mvidner(a)suse.cz - Sleep between writing udev rules and ifcfgs so that Modified: trunk/network/src/modules/Provider.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Provider.ycp… ============================================================================== --- trunk/network/src/modules/Provider.ycp (original) +++ trunk/network/src/modules/Provider.ycp Wed Mar 14 12:02:27 2012 @@ -309,10 +309,6 @@ /* Flush */ SCR::Write(.sysconfig.network.providers, nil); - /* Change the rights (provider can contain password #13353 */ - SCR::Execute(.target.bash, "/bin/chown root:root /etc/sysconfig/network/providers"); - SCR::Execute(.target.bash, "/bin/chmod 0700 /etc/sysconfig/network/providers"); - return ret; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67622 - in /trunk/ncurses-pkg/src: NCPackageSelector.cc NCPkgPackageDetails.cc
by gs＠svn2.opensuse.org 14 Mar '12

14 Mar '12

Author: gs Date: Wed Mar 14 11:34:54 2012 New Revision: 67622 URL: http://svn.opensuse.org/viewcvs/yast?rev=67622&view=rev Log: add <pre> tags to patch descriptions Modified: trunk/ncurses-pkg/src/NCPackageSelector.cc trunk/ncurses-pkg/src/NCPkgPackageDetails.cc Modified: trunk/ncurses-pkg/src/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelecto… ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelector.cc (original) +++ trunk/ncurses-pkg/src/NCPackageSelector.cc Wed Mar 14 11:34:54 2012 @@ -1343,7 +1343,7 @@ NCPopupInfo * info = new NCPopupInfo ( wpos( NCurses::lines()/10, NCurses::cols()/10), // headline of a popup showing the package license - string( _("End User License Agreement") ), + _("End User License Agreement"), "" + pkgName + " " + html_text, NCPkgStrings::AcceptLabel(), Modified: trunk/ncurses-pkg/src/NCPkgPackageDetails.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgPackageDeta… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgPackageDetails.cc (original) +++ trunk/ncurses-pkg/src/NCPkgPackageDetails.cc Wed Mar 14 11:34:54 2012 @@ -415,8 +415,19 @@ // get and format the patch description string value = patchPtr->description(); + string html_text = ""; + const string htmlIdent(DOCTYPETAG); + + if ( value.find( htmlIdent ) != string::npos ) + { + html_text = value; // HTML text + } + else + { + html_text = "<pre>" + value + "</pre>"; // add <pre> to preserve newlines and spaces + } - descr += createHtmlText( value ); + descr += html_text; descr += _("References: "); for ( Patch::ReferenceIterator rit = patchPtr->referencesBegin(); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67621 - in /trunk/users/src: Makefile.am Users.pm ldap_dialogs.ycp widgets.ycp
by jsuchome＠svn2.opensuse.org 14 Mar '12

14 Mar '12

Author: jsuchome Date: Wed Mar 14 09:46:22 2012 New Revision: 67621 URL: http://svn.opensuse.org/viewcvs/yast?rev=67621&view=rev Log: User specific LDAP configuration moved here from ldap-client (fate#313143); still WIP Added: trunk/users/src/ldap_dialogs.ycp (with props) Modified: trunk/users/src/Makefile.am trunk/users/src/Users.pm trunk/users/src/widgets.ycp Modified: trunk/users/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/Makefile.am?rev=67621&… ============================================================================== --- trunk/users/src/Makefile.am (original) +++ trunk/users/src/Makefile.am Wed Mar 14 09:46:22 2012 @@ -27,6 +27,7 @@ ynclude_DATA = \ complex.ycp \ dialogs.ycp \ + ldap_dialogs.ycp \ helps.ycp \ wizards.ycp \ widgets.ycp \ Modified: trunk/users/src/Users.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/Users.pm?rev=67621&r1=… ============================================================================== --- trunk/users/src/Users.pm (original) +++ trunk/users/src/Users.pm Wed Mar 14 09:46:22 2012 @@ -138,6 +138,8 @@ my $customs_modified = 0; my $defaults_modified = 0; my $security_modified = 0; +my $sysconfig_ldap_modified = 0; +my $ldap_settings_read = 0; # variables describing available users sets: my $nis_available = 1; @@ -4748,6 +4750,10 @@ if ($security_modified) { WriteSecurity(); } + if ($sysconfig_ldap_modified) { + SCR->Write (".sysconfig.ldap.FILE_SERVER", Ldap->file_server? "yes": "no"); + SCR->Write (".sysconfig.ldap", undef); + } my @new_aliases = sort (keys %root_aliases); my @old_aliases = sort (keys %root_aliases_orig); @@ -6582,6 +6588,26 @@ $defaults_modified = $security_modified = $_[0]; } +# Sets modified flag for sysconfig/ldap +BEGIN { $TYPEINFO{SetLdapSysconfigModified} = ["function", "void", "boolean"];} +sub SetLdapSysconfigModified { + my $self = shift; + $sysconfig_ldap_modified = shift; +} + +# Remember reading Ldap client config +BEGIN { $TYPEINFO{SetLdapSettingsRead} = ["function", "void", "boolean"];} +sub SetLdapSettingsRead { + my $self = shift; + $ldap_settings_read = shift; +} + +# Check if Ldap client config was read +BEGIN { $TYPEINFO{LdapSettingsRead} = ["function", "boolean"];} +sub LdapSettingsRead { + return $ldap_settings_read; +} + BEGIN { $TYPEINFO{SetExportAll} = ["function", "void", "boolean"];} sub SetExportAll { my $self = shift; Added: trunk/users/src/ldap_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/ldap_dialogs.ycp?rev=6… ============================================================================== --- trunk/users/src/ldap_dialogs.ycp (added) +++ trunk/users/src/ldap_dialogs.ycp Wed Mar 14 09:46:22 2012 @@ -0,0 +1,712 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + +/** + * File: include/users/widgets.ycp + * Package: Configuration of users and groups + * Summary: Widgets definitions and helper functions + * Authors: Jiri Suchomel <jsuchome(a)suse.cz> + * + * $Id$ + */ +{ + +import "Label"; +import "Ldap"; +import "Popup"; +import "Users"; +import "Wizard"; + +include "ldap/routines.ycp"; + +textdomain "users"; + +/** + * dialog for Password Policy configuration object + * @param ppolicy data with Password Policy object to be edited (as obtained from LDAP search) + * @return map with modifications of ppolicy object, nil in case of `cancel + */ +define map PasswordPolicyDialog (map ppolicy) { + + // reduce the list values to single ones + ppolicy = mapmap (string a, any val, (map<string,any>)ppolicy, { + if (is (val, list) && (Ldap::SingleValued (a) || size ((list)val) == 1)) + val = ((list)val)[0]:nil; + if (val == "TRUE" || val == "FALSE") + val = (val == "TRUE"); + return $[ a: val ]; + }); + map ppolicy_orig = ppolicy; + + // help text for Password Policy Dialog + string help_text = _("Select the Password Change Policies, Password Aging Policies, and Lockout Policies tabs to choose LDAP password policy groups of attributes to configure."); + + + // tab-specific help texts + map tabs_help_text = $[ + // help text for pwdInHistory attribute + `pwchange : _("Specify the Maximum Number of Passwords Stored in History to set how many previously used passwords should be saved. Saved passwords may not be used.") + + + // help text for pwdMustChange attribute + _("Check User Must Change Password after Reset to force users to change their passwords after the the password is reset or changed by an administrator.") + + + // help text for pwdAllowUserChange attribute + _("Check User Can Change Password to allow users to change their passwords.") + + + // help text for pwdSafeModify attribute + _("If the existing password must be provided along with the new password, check Old Password Required for Password Change.") + + + // help text for pwdCheckQuality attribute + _("Select whether the password quality should be verified while passwords are modified or added. Select No Checking if passwords should not be checked at all. With Accept Uncheckable Passwords, passwords are accepted even if the check cannot be performed, for example, if the user has provided an encrypted password. With Only Accept Checked Passwords passwords are refused if the quality test fails or the password cannot be checked.") + + + // help text for pwdMinLength attribute + _("Set the minimum number of characters that must be used in a password in Minimum Password Length."), + + // help text for pwdMinAge attribute + `aging : _("Minimum Password Age sets how much time must pass between modifications to the password.") + + + // help text for pwdMaxAge attribute + _("Maximum Password Age sets how long after modification a password expires.") + + + // help text for pwdExpireWarning attribute + _("In Time before Password Expiration to Issue Warning set how long before a password is due to expire that an expiration warning messages should be given to an authenticating user.") + + + // help text for pwdGraceAuthNLimit attribute + _("Set the number of times an expired password can be used to authenticate in Allowed Uses of an Expired Password."), + + // help text for pwdLockout attribute + `lockout : _("Check Enable Password Locking to forbid use of a password after a specified number of consecutive failed bind attempts.") + + + // help text for pwdMaxFailure attribute + _("Set the number of consecutive failed bind attempts after which the password may not be used to authenticate in Bind Failures to Lock the Password.") + + + // help text for pwdLockoutDuration attribute + _("Set how long the password cannot be used in Password Lock Duration.") + + + // help text for pwdFailureCountInterval attribute + _("Bind Failures Cache Duration sets how long before password failures are purged from the failure counter even though no successful authentication has occurred."), + ]; + + // map of attribute names for each tab + map attributes = $[ + `pwchange : [ + "pwdInHistory", "pwdMustChange", "pwdAllowUserChange", + "pwdSafeModify", "pwdCheckQuality", "pwdMinLength" + ], + `aging : [ + "pwdMinAge", "pwdMaxAge", "pwdExpireWarning", "pwdGraceAuthNLimit" + ], + `lockout : [ + "pwdLockout", "pwdLockoutDuration", "pwdMaxFailure", + "pwdFailureCountInterval" + ], + ]; + + list time_attributes = [ + "pwdMinAge", "pwdMaxAge", "pwdExpireWarning", "pwdLockoutDuration", + "pwdFailureCountInterval" + ]; + + map default_values = $[ + "pwdMustChange" : false, + "pwdAllowUserChange" : true, + "pwdSafeModify" : false, + "pwdLockout" : false, + ]; + + // maximal value of IntFields + integer max = 99999; + + list<term> tabs = [ + // tab label + `item(`id(`pwchange), _("&Password Change Policies"), true), + // tab label + `item(`id(`aging), _("Pa&ssword Aging Policies")), + // tab label + `item(`id(`lockout), _("&Lockout Policies")), + ]; + term tabs_term = `VBox ( + `DumbTab (`id(`tabs), tabs, + `ReplacePoint(`id(`tabContents ), `VBox (`Empty ()))) + ); + boolean has_tabs = true; + if (!UI::HasSpecialWidget (`DumbTab)) + { + has_tabs = false; + term tabbar = `HBox (); + foreach (term it, tabs, { + string label = it[1]:""; + tabbar = add (tabbar,`PushButton (it[0]:`id(label), label)); + }); + tabs_term = `VBox (`Left(tabbar), + `Frame ("", `ReplacePoint(`id(`tabContents), `Empty ())) + ); + } + + term contents = tabs_term; + + // generate the term of password policy tab and update the help text + void set_password_policies_term () { + integer pwdcheckquality = tointeger (ppolicy["pwdCheckQuality"]:"0"); + term tab_cont = `Top (`HBox (`HSpacing (0.5), `VBox ( + `VSpacing (0.8), + `IntField (`id ("pwdInHistory"), + // IntField label + _("Ma&ximum Number of Passwords Stored in History"), + 0, max, tointeger (ppolicy["pwdInHistory"]:"0")), + `VSpacing (0.4), + `Left (`CheckBox (`id ("pwdMustChange"), + // checkbox label + _("U&ser Must Change Password after Reset"), + ppolicy["pwdMustChange"]:true)), + `VSpacing (0.2), + `Left (`CheckBox (`id ("pwdAllowUserChange"), + // checkbox label + _("&User Can Change Password"), + ppolicy["pwdAllowUserChange"]:true)), + `VSpacing (0.2), + `Left (`CheckBox (`id ("pwdSafeModify"), + // checkbox label + _("&Old Password Required for Password Change"), + ppolicy["pwdSafeModify"]:false)), + `VSpacing (0.4), + // frame label + `HBox (`HSpacing (2), `Frame (_("Password Quality Checking"), `VBox( + `VSpacing (0.5), + `RadioButtonGroup (`id("pwdCheckQuality"), `VBox ( + `Left (`RadioButton (`id(0), `opt (`notify), + _("&No Checking"), pwdcheckquality == 0)), + `Left (`RadioButton(`id(1), `opt (`notify), + _("Acc&ept Uncheckable Passwords"), + pwdcheckquality == 1)), + `Left (`RadioButton(`id(2), `opt (`notify), + _("&Only Accept Checked Passwords"), + pwdcheckquality == 2)) + )), + `VSpacing (0.4), + // IntField label + `IntField (`id ("pwdMinLength"), _("&Minimum Password Length"), + 0, max, tointeger (ppolicy["pwdMinLength"]:"0")) + ))) + ), `HSpacing (0.5))); + + UI::ReplaceWidget (`tabContents, tab_cont); + UI::ChangeWidget (`id ("pwdMinLength"), `Enabled, pwdcheckquality > 0); + return; + } + + term time_dialog (string id, string label) { + + integer value = tointeger (ppolicy[id]:"0"); + integer days = value / (24*60*60); + if (days > 0) value = value - (days * 24*60*60); + integer hours = value / (60*60); + if (hours > 0) value = value - (hours * 60*60); + integer minutes = value / 60; + if (minutes > 0) value = value - (minutes * 60); + return `HBox (`HSpacing (0.3), `Frame (label, `HBox ( + `IntField (`id (id + "d"), _("Days"), 0, max, days), + `IntField (`id (id + "h"), _("Hours"), 0, 23, hours), + `IntField (`id (id + "m"), _("Minutes"), 0, 59, minutes), + `IntField (`id (id + "s"), _("Seconds"), 0, 59, value) + )), `HSpacing (0.3)); + } + + integer get_seconds_value (string attr) { + + integer days = (integer) UI::QueryWidget (`id (attr + "d"), `Value); + integer hours = (integer) UI::QueryWidget (`id (attr + "h"), `Value); + integer minutes = (integer) UI::QueryWidget (`id (attr + "m"), `Value); + integer seconds = (integer) UI::QueryWidget (`id (attr + "s"), `Value); + return (days * 24*60*60) + (hours * 60*60) + (minutes *60) + seconds; + } + + // generate the term of password aging tab + void set_aging_policies_term () { + + term tab_cont = `Top (`HBox (`HSpacing (0.5), `VBox ( + `VSpacing (0.7), + // frame label + time_dialog ("pwdMinAge", _("Minimum Password Age")), + `VSpacing (0.4), + // frame label + time_dialog ("pwdMaxAge", _("Maximum Password Age")), + `VSpacing (0.4), + time_dialog ("pwdExpireWarning", + // frame label + _("Time before Password Expiration to Issue Warning")), + `VSpacing (0.2), + `IntField (`id ("pwdGraceAuthNLimit"), + // IntField label + _("Allowed Uses of an Expired Password"), 0, max, + tointeger (ppolicy["pwdGraceAuthNLimit"]:"0") + ) + ), `HSpacing (0.5))); + UI::ReplaceWidget (`tabContents, tab_cont); + return; + } + + // generate the term of lockout aging tab + void set_lockout_policies_term () { + + boolean pwdlockout = ppolicy["pwdLockout"]:false; + + term tab_cont = `Top (`HBox (`HSpacing (0.5), `VBox ( + `VSpacing (0.8), + `Left (`CheckBox (`id ("pwdLockout"), `opt (`notify), + // check box label + _("Enable Password Locking"), + pwdlockout)), + `VSpacing (0.4), + `IntField (`id ("pwdMaxFailure"), + // intField label + _("Bind Failures to Lock the Password"), + 0, max, tointeger (ppolicy["pwdMaxFailure"]:"0")), + // frame label + time_dialog ("pwdLockoutDuration", _("Password Lock Duration")), + `VSpacing (0.4), + time_dialog ("pwdFailureCountInterval", + // frame label + _("Bind Failures Cache Duration")) + ), `HSpacing (0.5))); + + UI::ReplaceWidget (`tabContents, tab_cont); + UI::ChangeWidget (`id ("pwdMaxFailure"), `Enabled, pwdlockout); + foreach (string suffix, [ "d", "h", "m", "s" ], { + UI::ChangeWidget (`id ("pwdLockoutDuration" + suffix), + `Enabled, pwdlockout); + UI::ChangeWidget (`id ("pwdFailureCountInterval" + suffix), + `Enabled, pwdlockout); + }); + return; + } + + symbol current_tab = `pwchange; + any result = nil; + + Wizard::OpenNextBackDialog (); + + // dialog label + Wizard::SetContentsButtons (_("Password Policy Configuration"), contents, + help_text + tabs_help_text[current_tab]:"", + Label::CancelButton(), Label::OKButton()); + Wizard::HideAbortButton(); + + set_password_policies_term (); + + while (true) + { + result = UI::UserInput (); + + if (is(result,symbol) && + contains ([`back, `cancel, `abort], (symbol)result)) + break; + + // save the values from UI + foreach (string attr, attributes[current_tab]:[], { + if (contains (time_attributes, attr)) + { + ppolicy[attr] = sformat ("%1", get_seconds_value (attr)); + return; + } + any val = UI::QueryWidget (`id (attr), `Value); + if (is (val, integer)) + val = sformat ("%1", val); + ppolicy[attr] = val; + }); + + if ((result == `pwchange || result == `aging || result == `lockout) && + result!= current_tab) + { + if (result == `pwchange) + set_password_policies_term (); + else if (result == `aging) + set_aging_policies_term (); + else if (result == `lockout) + set_lockout_policies_term (); + current_tab = (symbol) result; + if (has_tabs) + UI::ChangeWidget (`id (`tabs), `CurrentItem, current_tab); + Wizard::SetHelpText (help_text + tabs_help_text[current_tab]:""); + continue; + } + if (result == `next) + { + boolean cont = false; + + // check the template required attributes... + foreach (string oc, ppolicy["objectClass"]:[], ``{ + if (cont) return; + foreach (string attr, Ldap::GetRequiredAttributes (oc), ``{ + any val = ppolicy[attr]:nil; + if (!cont && val == nil || val == [] || val == "") { + //error popup, %1 is attribute name + Popup::Error (sformat (_("The \"%1\" attribute is mandatory. +Enter a value."), attr)); + UI::SetFocus (`id(`table)); + cont = true; + } + }); + }); + if (cont) continue; + break; + } + // now solve events inside the tabs + if (current_tab == `pwchange && is (result, integer)) + { + UI::ChangeWidget (`id ("pwdMinLength"), `Enabled, result != 0); + } + if (current_tab == `lockout && result == "pwdLockout") + { + boolean pwdlockout = (boolean) UI::QueryWidget (`id ("pwdLockout"), `Value); + UI::ChangeWidget (`id ("pwdMaxFailure"), `Enabled, pwdlockout); + foreach (string suffix, [ "d", "h", "m", "s" ], { + UI::ChangeWidget (`id ("pwdFailureCountInterval" + suffix), + `Enabled, pwdlockout); + UI::ChangeWidget (`id ("pwdLockoutDuration" + suffix), + `Enabled, pwdlockout); + }); + } + } + Wizard::CloseDialog (); + + map<string,any> ret = $[]; + if (result == `next) + { + foreach (string key, any val, (map<string,any>) ppolicy, { + if (!haskey (ppolicy_orig, key) && + (val == default_values[key]:nil || val == "0")) + return; + if (val != ppolicy_orig[key]:nil) + { + if (is (val, boolean)) + val = (val == true) ? "TRUE" : "FALSE"; + ret[key] = val; + } + }); + } + return (result == `next) ? ret : nil; +} + +/** + * Dialog for administering User & Group specific LDAP settigns + */ +define boolean LdapAdministrationDialog () { + + if (!Users::LdapSettingsRead ()) + { + Users::SetLdapSettingsRead (Ldap::Read ()); + } + + string base_dn = Ldap::GetBaseDN (); + boolean file_server = Ldap::file_server; + boolean modified = true; + + list ppolicy_list = []; + + boolean ppolicies_enabled = false; + map<string,map> ppolicies = $[]; + map<string,map> ppolicies_orig= $[]; + list<string> ppolicies_deleted = []; // list of DN + + // map with modifications of Password Policies objects + map<string,map> write_ppolicies = $[]; + + // read the list of pwdpolicy objects under base_config_dn + void read_ppolicies () { + + if (base_dn == "") return; + + if (Ldap::ldap_initialized && Ldap::tls_when_initialized != Ldap::ldap_tls) + { + Ldap::LDAPClose (); + } + + if (Ldap::ldap_initialized || Ldap::LDAPInit () == "") + { + ppolicies_enabled = (boolean) SCR::Execute (.ldap.ppolicy, $[ + "hostname" : Ldap::GetFirstServer (Ldap::server), + "bind_dn" : Ldap::GetBaseDN () + ]); + + list schemas = (list)SCR::Read (.ldap.search, $[ + "base_dn": "", + "attrs": [ "subschemaSubentry" ], + "scope": 0, + ]); + string schema_dn = schemas[0,"subschemaSubentry",0]:""; + if (schemas != nil && schema_dn != "" && + SCR::Execute (.ldap.schema, $[ "schema_dn": schema_dn ])== true) + { + map<string,map> pp = (map<string,map>) SCR::Read (.ldap.search, + $[ + "base_dn" : base_dn, + "filter" : "objectClass=pwdPolicy", + "scope" : 2, + "map" : true, + "not_found_ok" : true + ]); + if (pp != nil) + { + ppolicies = pp; + ppolicies_orig = ppolicies; + } + } + } + } + + string help_text = // help text caption + _("Home Directories") + + + // help text + _("If home directories of LDAP users should be stored on this machine, +check the appropriate option. Changing this value does not cause any direct +action. It is only information for the YaST users module, which can manage +user home directories. +") + + + // help text + _("Press Configure to configure settings stored on the +LDAP server. You will be asked for the password if you are not connected yet or +have changed your configuration. +") + + + // password policy help text caption + _("Password Policy") + + + // password policy help + _("Configure the selected password policy with Edit. Use Add to add a new password policy. The configuration is only possible,\n if the password policies are already enabled on the LDAP server."); + + term contents = `VBox ( + `VSpacing (0.4), + `Left (`CheckBox (`id(`file_server), + // checkbox label + _("&Home Directories on This Machine"), file_server) + ), + `VSpacing(0.5), + `Right (`PushButton (`id(`configure), + // pushbutton label + _("Configure User Management &Settings..."))), + `VSpacing (), + `Table (`id (`ppolicy_table), `opt(`notify), `header ( + // table header + _("Password Policy")), + maplist (string dn, map pp, ppolicies, ``(`item (`id (dn), dn))) + ), + `HBox ( + `PushButton (`id (`add), Label::AddButton ()), + `PushButton (`id (`edit), Label::EditButton ()), + `PushButton (`id (`delete), Label::DeleteButton ()), + `HStretch () + ), + `VSpacing(0.4) + ); + + read_ppolicies (); + + Wizard::CreateDialog (); + // dialog title + Wizard::SetContentsButtons (_("LDAP Administration Settings"), contents, + help_text, Label::CancelButton(), Label::OKButton()); + Wizard::HideAbortButton (); + + foreach (symbol s, [ `ppolicy_table, `add, `edit, `delete ], { + UI::ChangeWidget (`id (s), `Enabled, ppolicies_enabled); + }); + + symbol ret = (symbol) UI::UserInput (); + + while (true) + { + if (ret == `add) + { + string suffix = base_dn; + UI::OpenDialog ( `opt(`decorated), `HBox( + `HSpacing(1), + `VBox( + // InputField label + `InputField (`id (`cn), `opt (`hstretch), + _("Name of Password Policy Object")), + `ReplacePoint (`id (`rp_suf), `HBox ( + // text label,suffix will follow in next label + `Label (`id (`suffix_label), _("Suffix:")), + `Label (`id (`suffix), base_dn), + // pushbutton label + `PushButton (`id (`br_suf), _("Change Suffix")) + )), + `ButtonBox ( + `PushButton(`id(`ok),`opt(`default,`key_F10),Label::OKButton()), + `PushButton(`id(`cancel),`opt (`key_F9), Label::CancelButton()) + ) + ), + `HSpacing(1) + )); + UI::SetFocus (`id (`cn)); + any ret = nil; + string new_dn = ""; + while (true) + { + ret = UI::UserInput (); + if (ret == `cancel) + break; + if (ret == `br_suf) + { + string suf = LdapPopup::InitAndBrowseTree (base_dn, $[ + "hostname" : Ldap::GetFirstServer (Ldap::server), + "port" : Ldap::GetFirstPort (Ldap::server), + "use_tls" : Ldap::ldap_tls ? "yes" : "no", + "cacertdir" : Ldap::tls_cacertdir, + "cacertfile" : Ldap::tls_cacertfile + ]); + if (suf != "") + UI::ReplaceWidget (`id (`rp_suf), `HBox ( + // text label,suffix will follow in next label + `Label (`id (`suffix_label), _("Suffix:")), + `Label (`id (`suffix), suf), + // pushbutton label + `PushButton (`id (`br_suf), _("Change Suffix")) + )); + } + if (ret == `ok) + { + string cn = (string) UI::QueryWidget (`id (`cn), `Value); + if (cn == "") break; + string suffix = (string) UI::QueryWidget (`id (`suffix), `Value); + new_dn = sformat ("cn=%1,%2", cn, suffix); + if (haskey (ppolicies, new_dn)) + { + Popup::Error (sformat (_("The Policy \'%1\' already exists. +Please select another one."), new_dn)); + continue; + } + break; + } + } + UI::CloseDialog (); + if (ret == `ok && new_dn != "") + { + map new = PasswordPolicyDialog ($["dn": new_dn ]); + if (new != nil) + { + ppolicies[new_dn] = new; + UI::ChangeWidget (`id (`ppolicy_table), `Items, + maplist (string dn, map pp, ppolicies, ``(`item (`id (dn), dn))) + ); + UI::ChangeWidget (`id (`edit), `Enabled, size (ppolicies) > 0); + UI::ChangeWidget (`id (`delete), `Enabled, size (ppolicies) > 0); + } + } + } + if (ret == `edit || ret == `ppolicy_table) + { + string dn = (string) UI::QueryWidget (`id (`ppolicy_table), `CurrentItem); + map changes = PasswordPolicyDialog (ppolicies[dn]:$[]); + if (changes != nil) + { + ppolicies[dn] = union (ppolicies[dn]:$[], changes); + } + } + if (ret == `delete) + { + string dn = (string) UI::QueryWidget (`id (`ppolicy_table), `CurrentItem); + ppolicies = remove (ppolicies, dn); + ppolicies_deleted = (list<string>) union (ppolicies_deleted, [dn]); + UI::ChangeWidget (`id (`ppolicy_table), `Items, + maplist (string dn, map pp, ppolicies, ``(`item (`id (dn), dn))) + ); + UI::ChangeWidget (`id (`edit), `Enabled, size (ppolicies) > 0); + UI::ChangeWidget (`id (`delete), `Enabled, size (ppolicies) > 0); + } + // open "LDAP User objects configuration" + if (ret == `configure) + { + any result = WFM::CallFunction ("ldap_config", ["late_dialog"]); + if (result != nil) + { + ret = (symbol) result; + if (ret == `next) + { + modified = true; + } + } + } + if (ret == `back || ret == `cancel || ret == `abort) + { + break; + } + if (ret == `next) + { + file_server = (boolean) UI::QueryWidget (`id (`file_server), `Value); + if (file_server != Ldap::file_server) + { + Users::SetLdapSysconfigModified (true); + Ldap::file_server = file_server; + } + foreach (string dn, map ppolicy, ppolicies, { + // new ppolicy + if (!haskey (ppolicies_orig, dn)) + { + ppolicy["modified"] = "added"; + ppolicy["pwdAttribute"] = "userPassword"; + ppolicy["objectClass"] = ["pwdPolicy", "namedObject"]; + ppolicy["cn"] = get_cn (dn); + write_ppolicies[dn] = ppolicy; + + } + else + { + map pp = $[]; + foreach (string a, any val, (map<string,any>) ppolicy, { + if (val != ppolicies_orig[dn,a]:nil) + pp[a] = val; + }); + if (pp != $[]) + { + pp["modified"] = "edited"; + write_ppolicies[dn] = pp; + } + } + }); + // deleted ppolicies + foreach (string dn, ppolicies_deleted, { + map pp = write_ppolicies[dn]:$[]; + if (pp["modified"]:"" == "added") + { + write_ppolicies = remove (write_ppolicies, dn); + } + else if (haskey (ppolicies_orig, dn)) + { + pp["modified"] = "deleted"; + write_ppolicies[dn] = pp; + } + }); + if (write_ppolicies != $[]) + { + Ldap::WriteLDAP (write_ppolicies); + write_ppolicies = $[]; + } + break; + } + } + Wizard::CloseDialog (); + return modified || (ret == `next); +} + +}//EOF Modified: trunk/users/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/widgets.ycp?rev=67621&… ============================================================================== --- trunk/users/src/widgets.ycp (original) +++ trunk/users/src/widgets.ycp Wed Mar 14 09:46:22 2012 @@ -49,6 +49,7 @@ include "users/complex.ycp"; include "users/routines.ycp"; +include "users/ldap_dialogs.ycp"; textdomain "users"; @@ -1650,8 +1651,7 @@ } if (ev_id == `ldapconf) { - any ret = WFM::CallFunction ("ldap_config", ["late_dialog"]); - if (ret == `next && Ldap::ldap_modified) + if (LdapAdministrationDialog () && Ldap::ldap_modified) { if (!Users::LDAPNotRead () && // yes/no popup (data were changed) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67620 - /trunk/ldap-client/src/ui.ycp
by jsuchome＠svn2.opensuse.org 14 Mar '12

14 Mar '12

Author: jsuchome Date: Wed Mar 14 09:45:08 2012 New Revision: 67620 URL: http://svn.opensuse.org/viewcvs/yast?rev=67620&view=rev Log: removed user specific settings and texts (fate#313143) Modified: trunk/ldap-client/src/ui.ycp Modified: trunk/ldap-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/ui.ycp?rev=67620… ============================================================================== --- trunk/ldap-client/src/ui.ycp (original) +++ trunk/ldap-client/src/ui.ycp Wed Mar 14 09:45:08 2012 @@ -744,22 +744,12 @@ _("Press Configure to configure settings stored on the LDAP server. You will be asked for the password if you are not connected yet or have changed your configuration. -") + - - // help text caption 3 - _("Home Directories") + - - // help text 1/1 - _("If home directories of users should be stored on this machine, -check the appropriate option. Changing this value does not cause any direct -action. It is only information for the YaST users module, which manages -user home directories. ") + ]; string bind_dn = Ldap::bind_dn; string base_dn = Ldap::GetBaseDN (); - boolean file_server = Ldap::file_server; string member_attribute = Ldap::member_attribute; string base_config_dn = Ldap::GetMainConfigDN(); boolean create_ldap = Ldap::create_ldap; @@ -918,12 +908,6 @@ `Left (`CheckBox (`id(`create_ldap), // checkbox label _("Crea&te Default Configuration Objects"), create_ldap)), - `VSpacing(0.4), - `Left (`CheckBox (`id(`file_server), - // checkbox label - _("&Home Directories on This Machine"), - file_server) - ), `VSpacing(0.5), `Right (`PushButton (`id(`configure), // pushbutton label @@ -984,7 +968,6 @@ { bind_dn = (string) UI::QueryWidget(`id(`bind_dn), `Value); base_config_dn=(string)UI::QueryWidget(`id(`base_config_dn),`Value); - file_server = (boolean)UI::QueryWidget(`id(`file_server), `Value); create_ldap = (boolean) UI::QueryWidget(`id(`create_ldap),`Value); append_base = (boolean) UI::QueryWidget (`id(`append), `Value); if (append_base && ! issubstring (bind_dn, base_dn) && bind_dn != "") @@ -1055,7 +1038,6 @@ if (Ldap::GetMainConfigDN() != base_config_dn || Ldap::bind_dn != bind_dn || - Ldap::file_server != file_server || Ldap::member_attribute != member_attribute || Ldap::create_ldap != create_ldap || Ldap::pam_password != pam_password || @@ -1068,7 +1050,6 @@ { Ldap::bind_dn = bind_dn; Ldap::base_config_dn = base_config_dn; - Ldap::file_server = file_server; Ldap::member_attribute = member_attribute; Ldap::create_ldap = create_ldap; Ldap::pam_password = pam_password; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0