Author: jsuchome Date: Thu Sep 4 14:52:34 2008 New Revision: 50670 URL: http://svn.opensuse.org/viewcvs/yast?rev=50670&view=rev Log: - rpcbind is default instead of portmap (bnc#423026) - DHCLIENT_SET_DOMAINNAME replaced by NETCONFIG_NIS_SETDOMAINNAME - 2.17.1 Modified: trunk/nis-client/VERSION trunk/nis-client/package/yast2-nis-client.changes trunk/nis-client/src/Nis.ycp trunk/nis-client/testsuite/tests/readwrite.out trunk/nis-client/testsuite/tests/readwrite.ycp Modified: trunk/nis-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/nis-client/VERSION?rev=50670&r1=50669&r2=50670&view=diff ============================================================================== --- trunk/nis-client/VERSION (original) +++ trunk/nis-client/VERSION Thu Sep 4 14:52:34 2008 @@ -1 +1 @@ -2.17.0 +2.17.1 Modified: trunk/nis-client/package/yast2-nis-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/nis-client/package/yast2-nis-client.changes?rev=50670&r1=50669&r2=50670&view=diff ============================================================================== --- trunk/nis-client/package/yast2-nis-client.changes (original) +++ trunk/nis-client/package/yast2-nis-client.changes Thu Sep 4 14:52:34 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Sep 4 14:43:20 CEST 2008 - jsuchome@suse.cz + +- rpcbind is default instead of portmap (bnc#423026) +- DHCLIENT_SET_DOMAINNAME replaced by NETCONFIG_NIS_SETDOMAINNAME +- 2.17.1 + +------------------------------------------------------------------- Tue Aug 26 14:21:23 CEST 2008 - mc@suse.de - 2.17.0 Modified: trunk/nis-client/src/Nis.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nis-client/src/Nis.ycp?rev=50670&r1=50669&r2=50670&view=diff ============================================================================== --- trunk/nis-client/src/Nis.ycp (original) +++ trunk/nis-client/src/Nis.ycp Thu Sep 4 14:52:34 2008 @@ -116,6 +116,9 @@ // netconfig policy global string policy = "auto"; + // which service mapper is used (rpcbind/portmap) + string rpc_mapper = "rpcbind"; + string domain = ""; string old_domain = nil; boolean domain_changed = false; @@ -1066,7 +1069,12 @@ global define boolean WriteOnly()``{ if (start) { - Service::Enable("portmap"); + if (Package::Installed ("rpcbind")) + rpc_mapper = "rpcbind"; + else + rpc_mapper = "portmap"; + + Service::Enable (rpc_mapper); Service::Enable("ypbind"); if (!SCR::Write (.etc.defaultdomain, domain)) @@ -1181,13 +1189,11 @@ if (start) { - if (Service::Status("portmap") != 0 ) + if (Service::Status (rpc_mapper) != 0 ) { - // portmap must not be started if it is running already (see bug # 9999) - if (Service::Start("portmap") == false) + if (Service::Start (rpc_mapper) == false) { - // error popup message - Report::Error (_("Error while running portmapper.")); + Message::CannotStartService (rpc_mapper); return false; } } Modified: trunk/nis-client/testsuite/tests/readwrite.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/nis-client/testsuite/tests/readwrite.out?rev=50670&r1=50669&r2=50670&view=diff ============================================================================== --- trunk/nis-client/testsuite/tests/readwrite.out (original) +++ trunk/nis-client/testsuite/tests/readwrite.out Thu Sep 4 14:52:34 2008 @@ -1,6 +1,6 @@ Dump DHCP off Read .init.scripts.exists "ypbind" true -Read .init.scripts.runlevel "ypbind" $["autofs":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]], "ypbind":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.runlevel "ypbind" $["autofs":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]], "ypbind":$["start":["3", "5"], "stop":["3", "5"]]] Read .sysconfig.network.config.NETCONFIG_NIS_POLICY nil Dir .sysconfig.network.config: [] Execute .target.bash_output "/bin/ypdomainname" $["exit":0, "stderr":"", "stdout":"mydomain\n"] @@ -10,7 +10,7 @@ Read .sysconfig.ypbind.YPBIND_BROKEN_SERVER "no" Read .sysconfig.ypbind.YPBIND_OPTIONS "" Read .init.scripts.exists "autofs" true -Read .init.scripts.runlevel "autofs" $["autofs":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]], "ypbind":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.runlevel "autofs" $["autofs":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]], "ypbind":$["start":["3", "5"], "stop":["3", "5"]]] Read .etc.nsswitch_conf."hosts" "files dns6" Read .etc.nsswitch_conf."passwd" "compat" Read .etc.nsswitch_conf."passwd_compat" nil @@ -19,20 +19,20 @@ Read .sysconfig.displaymanager.DISPLAYMANAGER_AUTOLOGIN "no" Read .sysconfig.displaymanager.DISPLAYMANAGER_PASSWORD_LESS_LOGIN "no" Read .init.scripts.exists "SuSEfirewall2_init" true -Read .init.scripts.runlevel "SuSEfirewall2_init" $["autofs":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]], "ypbind":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.runlevel "SuSEfirewall2_init" $["autofs":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]], "ypbind":$["start":["3", "5"], "stop":["3", "5"]]] Read .init.scripts.exists "SuSEfirewall2_init" true Execute .target.bash "/etc/init.d/SuSEfirewall2_init status" $["TERM":"raw"] 0 Return true -Read .init.scripts.exists "portmap" true -Read .init.scripts.exists "portmap" true -Read .init.scripts.exists "portmap" true -Read .init.scripts.runlevel "portmap" $["autofs":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]], "ypbind":$["start":["3", "5"], "stop":["3", "5"]]] -Read .init.scripts.comment "portmap" $["autofs":$[], "portmap":$[], "ypbind":$[]] +Read .init.scripts.exists "rpcbind" true +Read .init.scripts.exists "rpcbind" true +Read .init.scripts.exists "rpcbind" true +Read .init.scripts.runlevel "rpcbind" $["autofs":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]], "ypbind":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.comment "rpcbind" $["autofs":$[], "rpcbind":$[], "ypbind":$[]] Read .init.scripts.exists "ypbind" true Read .init.scripts.exists "ypbind" true Read .init.scripts.exists "ypbind" true -Read .init.scripts.runlevel "ypbind" $["autofs":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]], "ypbind":$["start":["3", "5"], "stop":["3", "5"]]] -Read .init.scripts.comment "ypbind" $["autofs":$[], "portmap":$[], "ypbind":$[]] +Read .init.scripts.runlevel "ypbind" $["autofs":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]], "ypbind":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.comment "ypbind" $["autofs":$[], "rpcbind":$[], "ypbind":$[]] Write .etc.defaultdomain "mydomain" true Execute .target.remove "/etc/yp.conf.sv" true Write .sysconfig.network.config.NETCONFIG_NIS_POLICY "" true @@ -77,12 +77,12 @@ Read .init.scripts.exists "autofs" true Read .init.scripts.exists "autofs" true Read .init.scripts.exists "autofs" true -Read .init.scripts.runlevel "autofs" $["autofs":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]], "ypbind":$["start":["3", "5"], "stop":["3", "5"]]] -Read .init.scripts.comment "autofs" $["autofs":$[], "portmap":$[], "ypbind":$[]] +Read .init.scripts.runlevel "autofs" $["autofs":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]], "ypbind":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.comment "autofs" $["autofs":$[], "rpcbind":$[], "ypbind":$[]] Read .init.scripts.exists "ypbind" true Execute .target.bash "/etc/init.d/ypbind stop" $["TERM":"raw"] 0 -Read .init.scripts.exists "portmap" true -Execute .target.bash "/etc/init.d/portmap status" $["TERM":"raw"] 0 +Read .init.scripts.exists "rpcbind" true +Execute .target.bash "/etc/init.d/rpcbind status" $["TERM":"raw"] 0 Execute .target.bash_output "/etc/init.d/ypbind start" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":"mydomain\n"] Execute .target.bash "/usr/bin/ypwhich >/dev/null" 0 Read .init.scripts.exists "SuSEfirewall2_init" true @@ -90,7 +90,7 @@ Return true Dump DHCP on Read .init.scripts.exists "ypbind" true -Read .init.scripts.runlevel "ypbind" $["autofs":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]], "ypbind":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.runlevel "ypbind" $["autofs":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]], "ypbind":$["start":["3", "5"], "stop":["3", "5"]]] Read .sysconfig.network.config.NETCONFIG_NIS_POLICY nil Dir .sysconfig.network.config: [] Execute .target.bash_output "/bin/ypdomainname" $["exit":0, "stderr":"", "stdout":"mydomain\n"] @@ -100,7 +100,7 @@ Read .sysconfig.ypbind.YPBIND_BROKEN_SERVER "no" Read .sysconfig.ypbind.YPBIND_OPTIONS "" Read .init.scripts.exists "autofs" true -Read .init.scripts.runlevel "autofs" $["autofs":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]], "ypbind":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.runlevel "autofs" $["autofs":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]], "ypbind":$["start":["3", "5"], "stop":["3", "5"]]] Read .etc.nsswitch_conf."hosts" "files dns6" Read .etc.nsswitch_conf."passwd" "compat" Read .etc.nsswitch_conf."passwd_compat" nil @@ -110,16 +110,16 @@ Read .sysconfig.displaymanager.DISPLAYMANAGER_PASSWORD_LESS_LOGIN "no" Return true Return nil -Read .init.scripts.exists "portmap" true -Read .init.scripts.exists "portmap" true -Read .init.scripts.exists "portmap" true -Read .init.scripts.runlevel "portmap" $["autofs":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]], "ypbind":$["start":["3", "5"], "stop":["3", "5"]]] -Read .init.scripts.comment "portmap" $["autofs":$[], "portmap":$[], "ypbind":$[]] +Read .init.scripts.exists "rpcbind" true +Read .init.scripts.exists "rpcbind" true +Read .init.scripts.exists "rpcbind" true +Read .init.scripts.runlevel "rpcbind" $["autofs":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]], "ypbind":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.comment "rpcbind" $["autofs":$[], "rpcbind":$[], "ypbind":$[]] Read .init.scripts.exists "ypbind" true Read .init.scripts.exists "ypbind" true Read .init.scripts.exists "ypbind" true -Read .init.scripts.runlevel "ypbind" $["autofs":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]], "ypbind":$["start":["3", "5"], "stop":["3", "5"]]] -Read .init.scripts.comment "ypbind" $["autofs":$[], "portmap":$[], "ypbind":$[]] +Read .init.scripts.runlevel "ypbind" $["autofs":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]], "ypbind":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.comment "ypbind" $["autofs":$[], "rpcbind":$[], "ypbind":$[]] Write .etc.defaultdomain "mydomain" true Execute .target.remove "/etc/yp.conf.sv" true Write .sysconfig.network.config.NETCONFIG_NIS_POLICY "" true @@ -164,12 +164,12 @@ Read .init.scripts.exists "autofs" true Read .init.scripts.exists "autofs" true Read .init.scripts.exists "autofs" true -Read .init.scripts.runlevel "autofs" $["autofs":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]], "ypbind":$["start":["3", "5"], "stop":["3", "5"]]] -Read .init.scripts.comment "autofs" $["autofs":$[], "portmap":$[], "ypbind":$[]] +Read .init.scripts.runlevel "autofs" $["autofs":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]], "ypbind":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.comment "autofs" $["autofs":$[], "rpcbind":$[], "ypbind":$[]] Read .init.scripts.exists "ypbind" true Execute .target.bash "/etc/init.d/ypbind stop" $["TERM":"raw"] 0 -Read .init.scripts.exists "portmap" true -Execute .target.bash "/etc/init.d/portmap status" $["TERM":"raw"] 0 +Read .init.scripts.exists "rpcbind" true +Execute .target.bash "/etc/init.d/rpcbind status" $["TERM":"raw"] 0 Execute .target.bash_output "/etc/init.d/ypbind start" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":"mydomain\n"] Execute .target.bash "/usr/bin/ypwhich >/dev/null" 0 Read .init.scripts.exists "autofs" true Modified: trunk/nis-client/testsuite/tests/readwrite.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nis-client/testsuite/tests/readwrite.ycp?rev=50670&r1=50669&r2=50670&view=diff ============================================================================== --- trunk/nis-client/testsuite/tests/readwrite.ycp (original) +++ trunk/nis-client/testsuite/tests/readwrite.ycp Thu Sep 4 14:52:34 2008 @@ -48,7 +48,7 @@ "scripts": $[ "exists": true, "runlevel": $[ - "portmap": $[ + "rpcbind": $[ "start": [ "3", "5"], "stop": [ "3", "5"], ], @@ -63,7 +63,7 @@ ], // their contents is not important for ServiceAdjust "comment": $[ - "portmap": $[], + "rpcbind": $[], "ypbind": $[], "autofs": $[], ], -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org