Author: jsuchome Date: Wed Mar 19 09:02:05 2008 New Revision: 45586 URL: http://svn.opensuse.org/viewcvs/yast?rev=45586&view=rev Log: - do not show "*****" for empty root password - added list of system user names to check user name conflicts during 1st stage of installation - updated list of system user names for translation - better installation proposal - 2.16.17 Modified: trunk/users/VERSION trunk/users/package/yast2-users.changes trunk/users/src/UsersSimple.pm trunk/users/src/UsersUI.ycp trunk/users/src/inst_root_first.ycp trunk/users/src/inst_user_first.ycp trunk/users/src/users_proposal.ycp Modified: trunk/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/VERSION?rev=45586&r1=45585&r2=45586&view=diff ============================================================================== --- trunk/users/VERSION (original) +++ trunk/users/VERSION Wed Mar 19 09:02:05 2008 @@ -1 +1 @@ -2.16.16 +2.16.17 Modified: trunk/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/package/yast2-users.changes?rev=45586&r1=45585&r2=45586&view=diff ============================================================================== --- trunk/users/package/yast2-users.changes (original) +++ trunk/users/package/yast2-users.changes Wed Mar 19 09:02:05 2008 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Wed Mar 19 08:32:17 CET 2008 - jsuchome@suse.cz + +- do not show "*****" for empty root password +- added list of system user names to check user name conflicts + during 1st stage of installation +- updated list of system user names for translation +- better installation proposal +- 2.16.17 + +------------------------------------------------------------------- Mon Mar 17 12:43:32 CET 2008 - jsrain@suse.cz - added 'StartupNotify=true' to the desktop file (bnc #304964) Modified: trunk/users/src/UsersSimple.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/UsersSimple.pm?rev=45586&r1=45585&r2=45586&view=diff ============================================================================== --- trunk/users/src/UsersSimple.pm (original) +++ trunk/users/src/UsersSimple.pm Wed Mar 19 09:02:05 2008 @@ -89,6 +89,86 @@ YaST::YCP::Import ("SCR"); YaST::YCP::Import ("UsersUI"); +# known system users (hard-written here to check user name conflicts) +# number may mean the UID (but it don't have to be defined) +my %system_users = ( + "root" => 0, + "bin" => 1, + "uucp" => 10, + "daemon" => 2, + "lp" => 4, + "mail" => 8, + "news" => 9, + "uucp" => 10, + "games" => 12, + "man" => 13, + "at" => 25, + "wwwrun" => 30, + "ftp" => 40, + "named" => 0, + "gdm" => 0, + "postfix" => 51, + "sshd" => 71, + "ntp" => 74, + "ldap" => 76, + "nobody" => 65534, + "amanda" => 0, + "vscan" => 0, + "bigsister" => 0, + "wnn" => 0, + "cyrus" => 0, + "dpbox" => 0, + "gnats" => 0, + "gnump3d" => 0, + "hacluster" => 0, + "irc" => 0, + "mailman" => 0, + "mdom" => 0, + "mysql" => 0, + "oracle" => 0, + "postgres" => 0, + "pop" => 0, + "sapdb" => 0, + "snort" => 0, + "squid" => 31, + "stunnel" => 0, + "zope" => 0, + "radiusd" => 0, + "otrs" => 0, + "privoxy" => 0, + "vdr" => 0, + "icecream" => 0, + "bitlbee" => 0, + "dhcpd" => 0, + "distcc" => 0, + "dovecot" => 0, + "fax" => 0, + "partimag" => 0, + "avahi" => 0, + "beagleindex" => 0, + "casaauth" => 0, + "dvbdaemon" => 0, + "festival" => 0, + "haldaemon" => 0, + "icecast" => 0, + "lighttpd" => 0, + "nagios" => 0, + "pdns" => 0, + "polkituser" => 0, + "pound" => 0, + "pulse" => 0, + "quagga" => 0, + "sabayon-admin" => 0, + "tomcat" => 0, + "pegasus" => 0, + "cimsrvr" => 0, + "ulogd" => 0, + "uuidd" => 0, + "suse-ncc" => 0, + "messagebus" => 0, + "nx" => 0 +); + # check the boolean value, return 0 or 1 sub bool { @@ -169,6 +249,7 @@ BEGIN { $TYPEINFO{AutologinUsed} = ["function", "boolean"]; } sub AutologinUsed { return bool ($autologin_user ne ""); +# FIXME true for the first time... } BEGIN { $TYPEINFO{SetAutologinUser} = ["function", "void", "string"]; } @@ -698,6 +779,8 @@ return ""; } + + ##------------------------------------ # check given user name for a conflict with a (fixed) set of system users # @param user name @@ -707,11 +790,6 @@ my ($self, $username) = @_; - my %system_users = ( - "root" => 0, - "bin" => 1, - "uucp" => 10, #FIXME fill this - ); if (defined $system_users{$username}) { # error popup return __("There is a conflict between the entered @@ -720,6 +798,13 @@ } } +# return the %system_users map = these are NOT the current system users, +# but the names that could be used for system users by packages +BEGIN { $TYPEINFO{GetSystemUserNames} = ["function", ["map", "string", "integer"]];} +sub GetSystemUserNames { + return \%system_users; +} + ##--------------------------------------------------------------------------- ##--------------------------------------------------------------------------- Modified: trunk/users/src/UsersUI.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/UsersUI.ycp?rev=45586&r1=45585&r2=45586&view=diff ============================================================================== --- trunk/users/src/UsersUI.ycp (original) +++ trunk/users/src/UsersUI.ycp Wed Mar 19 09:02:05 2008 @@ -17,8 +17,7 @@ */ global define string SystemUserName (string name) ``{ -// TODO Fo now (9.0), users are added manualy. For future, scripts which goes -// through all rpms would be better +// TODO users are added manualy.... :-( map SystemUsers = $[ /* User name for user: "root" */ @@ -73,7 +72,7 @@ /* User name for user: "dpbox" */ "DpBox account" : _("DpBox Account"), /* User name for user: "gnats" */ - "Gnats Gnu Backtracking System" : _("Gnats Gnu Backtracking System"), + "GNATS GNU Backtracking System" : _("GNATS GNU Backtracking System"), /* User name for user: "gnump3d" */ "GNUMP3 daemon" : _("GNUMP3 Daemon"), /* User name for user: "hacluster" */ @@ -133,6 +132,69 @@ /* User name for user: "partimag" */ "Partimage Daemon User" : _("Partimage Daemon User"), + // User name for user: "avahi" + "User for Avahi" : _("User for Avahi"), + + // User name for user: "beagleindex" + "User for Beagle indexing" : _("User for Beagle indexing"), + + // User name for user: "casaauth" + "casa_atvd System User" : _("casa_atvd System User"), + + // User name for user: "dvbdaemon" + "User for DVB daemon" : _("User for DVB daemon"), + + // User name for user: "festival" + "Festival daemon" : _("Festival daemon"), + + // User name for user: "haldaemon" + "User for haldaemon" : _("User for haldaemon"), + + // User name for user: "icecast" + "Icecast streaming server" : _("Icecast streaming server"), + + // User name for user: "lighttpd" + "user for lighttpd" : _("user for lighttpd"), + + // User name for user: "nagios" + "User for Nagios" : _("User for Nagios"), + + // User name for user: "pdns" + "pdns" : _("User for PowerDNS"), + + // User name for user: "polkituser" + "PolicyKit" : _("PolicyKit"), + + // User name for user: "pound" + "Pound" : _("User for Pound"), + + // User name for user: "pulse" + "PulseAudio daemon" : _("PulseAudio daemon"), + + // User name for user: "quagga" + "Quagga routing daemon" : _("Quagga routing daemon"), + + // User name for user: "sabayon-admin" + "Sabayon user" : _("Sabayon user"), + + // User name for user: "tomcat" + "Tomcat - Apache Servlet/JSP Engine" : _("Tomcat - Apache Servlet/JSP Engine"), + + // User name for user: "tomcat" + "Apache Tomcat" : _("Apache Tomcat"), + + // User name for user: "pegasus" + // User name for user: "cimsrvr" + "tog-pegasus OpenPegasus WBEM/CIM services" : _("tog-pegasus OpenPegasus WBEM/CIM services"), + + // User name for user: "ulogd" + "ulog daemon" : _("ulog daemon"), + + // User name for user: "uuidd" + "User for uuidd" : _("User for uuidd"), + + // User name for user: "suse-ncc" + "Novell Customer Center User" : _("Novell Customer Center User"), ]; return SystemUsers[name]:name; Modified: trunk/users/src/inst_root_first.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/inst_root_first.ycp?rev=45586&r1=45585&r2=45586&view=diff ============================================================================== --- trunk/users/src/inst_root_first.ycp (original) +++ trunk/users/src/inst_root_first.ycp Wed Mar 19 09:02:05 2008 @@ -34,6 +34,8 @@ string title = _("Password for the System Administrator \"root\""); string password = UsersSimple::GetRootPassword (); + if (password == nil) + password = ""; term contents = `VBox ( `VStretch (), @@ -44,12 +46,12 @@ `Password (`id(`pw1), `opt (`hstretch), // Label: get password for user root _("&Password for root User"), - password == nil ? "" : "*****"), + password == "" ? "" : "*****"), `VSpacing(0.8), `Password (`id(`pw2), `opt (`hstretch), // Label: get same password again for verification _("Con&firm Password"), - password == nil ? "" : "*****") + password == "" ? "" : "*****") )), `VStretch () ); @@ -143,6 +145,7 @@ if (pw1 == "") { y2milestone ("root password setting skipped, will occur later"); + UsersSimple::SetRootPassword (pw1); break; } string error = UsersSimple::CheckPassword (pw1, "local"); Modified: trunk/users/src/inst_user_first.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/inst_user_first.ycp?rev=45586&r1=45585&r2=45586&view=diff ============================================================================== --- trunk/users/src/inst_user_first.ycp (original) +++ trunk/users/src/inst_user_first.ycp Wed Mar 19 09:02:05 2008 @@ -389,7 +389,14 @@ main_help (), GetInstArgs::enable_back(), GetInstArgs::enable_next() ); - UI::SetFocus (`id (`cn)); + foreach (symbol w, [`cn, `username, `pw1, `pw2, `root_pw, `root_mail, + `autologin ], { + UI::ChangeWidget (`id (w), `Enabled, auth_method == "users"); + }); + if (auth_method == "users") + UI::SetFocus (`id (`cn)); + else + UI::SetFocus (`id (`change)); boolean login_modified = false; symbol ret = `back; while (true) Modified: trunk/users/src/users_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/users_proposal.ycp?rev=45586&r1=45585&r2=45586&view=diff ============================================================================== --- trunk/users/src/users_proposal.ycp (original) +++ trunk/users/src/users_proposal.ycp Wed Mar 19 09:02:05 2008 @@ -3,7 +3,7 @@ * Author: Jiri Suchomel * Purpose: Proposal for user and root setting * - * $Id:$ + * $Id$ */ { textdomain "users"; @@ -16,27 +16,54 @@ map param = (map) WFM::Args(1); map ret = $[]; + map auth2label = $[ + // authentication type + "ldap": _("LDAP"), + // authentication type + "nis": _("NIS"), + // authentication type + "samba": _("Samba (Windows Domain)"), + // authentication type + "edir_ldap": _("eDirectory LDAP"), + ]; + if ( func == "MakeProposal" ) { boolean force_reset = param["force_reset" ]:false; string root_proposal = UsersSimple::GetRootPassword () != "" ? // summary label <%1>-<%2> are HTML tags, leave untouched - sformat (_("<%1>Root Password<%2> is set"), + sformat (_("<%1>Root Password<%2> set"), "a href=\"users--root\"", "/a") : - sformat (_("<%1>Root Password<%2> is not set"), + sformat (_("<%1>Root Password<%2> not set"), "a href=\"users--root\"", "/a"); - // FIXME - list<string> proposal = [ - // summary label <%1>-<%2> are HTML tags, leave untouched - sformat (_("<%1>Authentication<%2>: %3"), - "a href=\"users--user\"", "/a", UsersSimple::AfterAuth () - ) - ]; - + string ahref = "a href=\"users--user\""; + // summary label <%1>-<%2> are HTML tags, leave untouched + string prop = sformat (_("No <%1>user<%2> configured"),ahref, "/a"); + string auth_method = UsersSimple::AfterAuth (); + map user = UsersSimple::GetUser (); + if (auth_method != "users") + { + // summary line: <%1>-<%2> are HTML tags, leave untouched, + // % is LDAP/NIS etc. + prop = sformat (_("<%1>Authentication method<%2>: %3"), + ahref, "/a", auth2label[auth_method]:auth_method); + if (UsersSimple::KerberosConfiguration ()) + // summary line: <%1>-<%2> are HTML tags, leave untouched, + // % is LDAP/NIS etc. + prop = sformat (_("<%1>Authentication method<%2>: %3 and Kerberos."), + ahref, "/a", auth2label[auth_method]:auth_method); + } + else if (user["uid"]:"" != "") + { + // summary line: <%1>-<%2> are HTML tags, leave untouched, + // %3 is user name + prop = sformat (_("<%1>User<%2> %3 configured"), + ahref, "/a", user["uid"]:""); + } ret = $[ - "preformatted_proposal" : HTML::List (add (proposal,root_proposal)), + "preformatted_proposal" : HTML::List ([ prop, root_proposal ]), "language_changed" : false, "links" : [ "users--user", "users--root" ], ]; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org