Author: jsuchome Date: Thu Jul 19 12:53:29 2007 New Revision: 39520 URL: http://svn.opensuse.org/viewcvs/yast?rev=39520&view=rev Log: - do not mention /etc/gshadow (#292299) - 2.15.0 Modified: trunk/nis-server/VERSION trunk/nis-server/package/yast2-nis-server.changes trunk/nis-server/src/NisServer.ycp trunk/nis-server/src/details.ycp trunk/nis-server/testsuite/tests/SaveVariables.out Modified: trunk/nis-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/nis-server/VERSION?rev=39520&... ============================================================================== --- trunk/nis-server/VERSION (original) +++ trunk/nis-server/VERSION Thu Jul 19 12:53:29 2007 @@ -1 +1 @@ -2.14.1 +2.15.0 Modified: trunk/nis-server/package/yast2-nis-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/nis-server/package/yast2-nis-serv... ============================================================================== --- trunk/nis-server/package/yast2-nis-server.changes (original) +++ trunk/nis-server/package/yast2-nis-server.changes Thu Jul 19 12:53:29 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jul 19 08:39:41 CEST 2007 - jsuchome@suse.cz + +- do not mention /etc/gshadow (#292299) +- 2.15.0 + +------------------------------------------------------------------- Fri May 25 13:30:04 CEST 2007 - jsrain@suse.cz - removed outdated translations from .desktop-files (#271209) Modified: trunk/nis-server/src/NisServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nis-server/src/NisServer.ycp?rev=... ============================================================================== --- trunk/nis-server/src/NisServer.ycp (original) +++ trunk/nis-server/src/NisServer.ycp Thu Jul 19 12:53:29 2007 @@ -101,12 +101,6 @@ global boolean merge_passwd = false; /** - * Merge group and gshadow to one map? - * Makefile: string true|false - */ -global boolean merge_group = false; - -/** * Don't push the changes to slave servers. (useful if there aren't any) * Makefile: string true|false */ @@ -356,7 +350,6 @@ minuid = SCRGetInt (.var.yp.makefile.MINUID, 100); mingid = SCRGetInt (.var.yp.makefile.MINGID, 100); merge_passwd = (string) SCRGet (.var.yp.makefile.MERGE_PASSWD, "true") == "true"; - merge_group = (string) SCRGet (.var.yp.makefile.MERGE_GROUP, "true") == "true"; nopush = (string) SCRGet (.var.yp.makefile.NOPUSH, "true") == "true"; } @@ -727,7 +720,6 @@ ".var.yp.makefile.MINUID": sformat ("%1", minuid), ".var.yp.makefile.MINGID": sformat ("%1", mingid), ".var.yp.makefile.MERGE_PASSWD": (merge_passwd? "true": "false"), - ".var.yp.makefile.MERGE_GROUP": (merge_group? "true": "false"), ".var.yp.makefile.NOPUSH": (nopush? "true": "false"), ]; @@ -1080,7 +1072,6 @@ mingid = settings["mingid"]:0; merge_passwd = settings["merge_passwd"]:false; - merge_group = settings["merge_group"]:false; ypservers = settings["slaves"]:[]; if (ypservers == []) @@ -1130,8 +1121,6 @@ settings["mingid"]= mingid; settings["merge_passwd"] = merge_passwd; - settings["merge_group"] = merge_group; - list slaves = []; slaves = ypservers; Modified: trunk/nis-server/src/details.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nis-server/src/details.ycp?rev=39... ============================================================================== --- trunk/nis-server/src/details.ycp (original) +++ trunk/nis-server/src/details.ycp Thu Jul 19 12:53:29 2007 @@ -45,44 +45,18 @@ // help text 2/3 helptext = helptext + _("<p>Select if your <i>passwd</i> file should be merged with the <i>shadow</i> -file and if the <i>group</i> file should be merged with the <i>gshadow</i> -file -(only possible if the <i>shadow</i> or <i>gshadow</i> files exist).</p> +file (only possible if the <i>shadow</i> file exists).</p> "); // help text 3/3 helptext = helptext + _("<p>You can also adjust the minimum user and group id.</p>"); boolean merge_passwd = NisServer::merge_passwd; - boolean merge_group = NisServer::merge_group; - term merge_pass_buttons = `VBox (); - merge_pass_buttons = add (merge_pass_buttons, `VSpacing (0.1)); - // To translators: button label - merge_pass_buttons = add (merge_pass_buttons, `Left (`RadioButton (`id(`no), _("No"), !merge_passwd))); - merge_pass_buttons = add (merge_pass_buttons, `VSpacing (0.3)); - // To translators: button label - merge_pass_buttons = add (merge_pass_buttons, `Left (`RadioButton (`id(`yes), _("Yes"), merge_passwd))); - merge_pass_buttons = add (merge_pass_buttons, `VSpacing (0.1)); - merge_pass_buttons = `RadioButtonGroup (`id (`pass_rb), merge_pass_buttons); - - term merge_group_buttons = `VBox (); - merge_group_buttons = add (merge_group_buttons, `VSpacing (0.1)); - // To translators: button label - merge_group_buttons = add (merge_group_buttons, `Left (`RadioButton (`id(`no), _("No"), !merge_group))); - merge_group_buttons = add (merge_group_buttons, `VSpacing (0.3)); - // To translators: button label - merge_group_buttons = add (merge_group_buttons, `Left (`RadioButton (`id(`yes), _("Yes"), merge_group))); - merge_group_buttons = add (merge_group_buttons, `VSpacing (0.1)); - merge_group_buttons = `RadioButtonGroup (`id (`group_rb), merge_group_buttons); - - - term merge_all = `HBox (); - // To translators: frame label - merge_all = add (merge_all, `HWeight (1, `Frame (`id (`pass_frame), _("Merge pa&sswords"), `MinWidth (20, merge_pass_buttons)))); - merge_all = add (merge_all, `HSpacing ()); - // To translators: frame label - merge_all = add (merge_all, `HWeight (1, `Frame (`id (`group_frame), _("Merge g&roups"), `MinWidth (20, merge_group_buttons)))); + term merge_pass_buttons = `VBox (`Left ( + // check box label + `CheckBox (`id (`merge_passwd), _("Merge pa&sswords"), merge_passwd) + )); term minimals = `HBox (); @@ -100,7 +74,7 @@ contents = add (contents, `TextEntry (`id (`srcdir), `opt(`notify), _("&YP Source directory"), srcdir)); contents = add (contents, `VSpacing (0.5)); - contents = add (contents, merge_all); + contents = add (contents, merge_pass_buttons); contents = add (contents, `VSpacing (0.5)); contents = add (contents, minimals); @@ -112,13 +86,12 @@ Wizard::SetNextButton(`next, Label::OKButton() ); // If the source directory does not exist, it will be created - // with empty passwd, group, shadow, gshadow. - // If it already exists, check whether shadow, gshadow exist + // with empty passwd, group, shadow + // If it already exists, check whether shadow exist // and disable some options accordingly. // (#15624) boolean srcdir_exists = nil; boolean shadow_exists = nil; - boolean gshadow_exists = nil; boolean change_enabled = true; symbol ui = `again; @@ -130,9 +103,7 @@ // srcdir now has an up-to-date value srcdir_exists = SCR::Read (.target.dir, srcdir) != nil; shadow_exists = !srcdir_exists || SCR::Read (.target.size, sformat ("%1/shadow", srcdir)) != -1; - gshadow_exists = !srcdir_exists || SCR::Read (.target.size, sformat ("%1/gshadow", srcdir)) != -1; - UI::ChangeWidget (`id (`pass_frame), `Enabled, shadow_exists); - UI::ChangeWidget (`id (`group_frame), `Enabled, gshadow_exists); + UI::ChangeWidget (`id (`merge_passwd), `Enabled, shadow_exists); } ui = (symbol) UI::UserInput (); @@ -159,8 +130,8 @@ NisServer::minuid = (integer) UI::QueryWidget (`id (`minuid), `Value); NisServer::mingid = (integer) UI::QueryWidget (`id (`mingid), `Value); - NisServer::merge_passwd = UI::QueryWidget (`id (`pass_rb), `CurrentButton) == `yes; - NisServer::merge_group = UI::QueryWidget (`id (`group_rb), `CurrentButton) == `yes; + NisServer::merge_passwd = + (boolean) UI::QueryWidget (`id (`merge_passwd), `Value); NisServer::pwd_srcdir = srcdir; Wizard::RestoreNextButton(); Modified: trunk/nis-server/testsuite/tests/SaveVariables.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/nis-server/testsuite/tests/SaveVa... ============================================================================== --- trunk/nis-server/testsuite/tests/SaveVariables.out (original) +++ trunk/nis-server/testsuite/tests/SaveVariables.out Thu Jul 19 12:53:29 2007 @@ -6,7 +6,6 @@ Write .sysconfig.ypserv.YPPWD_CHFN "no" true Write .sysconfig.ypserv.YPPWD_CHSH "no" true Write .sysconfig.ypserv.YPPWD_SRCDIR "/etc" true -Write .var.yp.makefile.MERGE_GROUP "false" true Write .var.yp.makefile.MERGE_PASSWD "true" true Write .var.yp.makefile.MINGID "0" true Write .var.yp.makefile.MINUID "0" true -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org