Mailinglist Archive: opensuse-commit (1828 mails)

< Previous Next >
commit yast2-nis-client
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Sat, 06 Sep 2008 05:07:12 +0200
  • Message-id: <20080906030712.BFB5A678171@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package yast2-nis-client
checked in at Sat Sep 6 05:07:12 CEST 2008.


--------
--- yast2-nis-client/yast2-nis-client.changes 2008-08-26 15:20:36.000000000
+0200
+++ yast2-nis-client/yast2-nis-client.changes 2008-09-04 14:52:23.568609000
+0200
@@ -1,0 +2,7 @@
+Thu Sep 4 14:43:20 CEST 2008 - jsuchome@xxxxxxx
+
+- rpcbind is default instead of portmap (bnc#423026)
+- DHCLIENT_SET_DOMAINNAME replaced by NETCONFIG_NIS_SETDOMAINNAME
+- 2.17.1
+
+-------------------------------------------------------------------



Old:
----
yast2-nis-client-2.17.0.tar.bz2

New:
----
yast2-nis-client-2.17.1.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-nis-client.spec ++++++
--- /var/tmp/diff_new_pack.L30279/_old 2008-09-06 05:05:17.000000000 +0200
+++ /var/tmp/diff_new_pack.L30279/_new 2008-09-06 05:05:17.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-nis-client (Version 2.17.0)
+# spec file for package yast2-nis-client (Version 2.17.1)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@


Name: yast2-nis-client
-Version: 2.17.0
+Version: 2.17.1
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-nis-client-2.17.0.tar.bz2
+Source0: yast2-nis-client-2.17.1.tar.bz2
Prefix: /usr
BuildRequires: doxygen gcc-c++ perl-XML-Writer update-desktop-files yast2
yast2-core-devel yast2-devtools yast2-pam yast2-testsuite
Requires: yast2 yast2-pam
@@ -50,7 +50,7 @@
Jiri Suchomel <jsuchome@xxxxxxx>

%prep
-%setup -n yast2-nis-client-2.17.0
+%setup -n yast2-nis-client-2.17.1

%build
%{prefix}/bin/y2tool y2autoconf
@@ -92,6 +92,10 @@
/usr/share/YaST2/schema/autoyast/rnc/nis.rnc
%doc %{prefix}/share/doc/packages/yast2-nis-client
%changelog
+* Thu Sep 04 2008 jsuchome@xxxxxxx
+- rpcbind is default instead of portmap (bnc#423026)
+- DHCLIENT_SET_DOMAINNAME replaced by NETCONFIG_NIS_SETDOMAINNAME
+- 2.17.1
* Tue Aug 26 2008 mc@xxxxxxx
- 2.17.0
- Netconfig patch for fine-grained merging of static and

++++++ yast2-nis-client-2.17.0.tar.bz2 -> yast2-nis-client-2.17.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-nis-client-2.17.0/configure
new/yast2-nis-client-2.17.1/configure
--- old/yast2-nis-client-2.17.0/configure 2008-08-26 14:22:44.000000000
+0200
+++ new/yast2-nis-client-2.17.1/configure 2008-05-20 15:28:55.000000000
+0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-nis-client 2.17.0.
+# Generated by GNU Autoconf 2.61 for yast2-nis-client 2.16.3.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-nis-client'
PACKAGE_TARNAME='yast2-nis-client'
-PACKAGE_VERSION='2.17.0'
-PACKAGE_STRING='yast2-nis-client 2.17.0'
+PACKAGE_VERSION='2.16.3'
+PACKAGE_STRING='yast2-nis-client 2.16.3'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'

ac_unique_file="RPMNAME"
@@ -1440,7 +1440,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-nis-client 2.17.0 to adapt to many kinds of
systems.
+\`configure' configures yast2-nis-client 2.16.3 to adapt to many kinds of
systems.

Usage: $0 [OPTION]... [VAR=VALUE]...

@@ -1511,7 +1511,7 @@

if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-nis-client 2.17.0:";;
+ short | recursive ) echo "Configuration of yast2-nis-client 2.16.3:";;
esac
cat <<\_ACEOF

@@ -1617,7 +1617,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-nis-client configure 2.17.0
+yast2-nis-client configure 2.16.3
generated by GNU Autoconf 2.61

Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1631,7 +1631,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.

-It was created by yast2-nis-client $as_me 2.17.0, which was
+It was created by yast2-nis-client $as_me 2.16.3, which was
generated by GNU Autoconf 2.61. Invocation command line was

$ $0 $@
@@ -2452,7 +2452,7 @@

# Define the identity of the package.
PACKAGE='yast2-nis-client'
- VERSION='2.17.0'
+ VERSION='2.16.3'


cat >>confdefs.h <<_ACEOF
@@ -2680,7 +2680,7 @@



-VERSION="2.17.0"
+VERSION="2.16.3"
RPMNAME="yast2-nis-client"
MAINTAINER="Jiri Suchomel <jsuchome@xxxxxxx>"

@@ -21484,7 +21484,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-nis-client $as_me 2.17.0, which was
+This file was extended by yast2-nis-client $as_me 2.16.3, which was
generated by GNU Autoconf 2.61. Invocation command line was

CONFIG_FILES = $CONFIG_FILES
@@ -21537,7 +21537,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-nis-client config.status 2.17.0
+yast2-nis-client config.status 2.16.3
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`\\"

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-nis-client-2.17.0/configure.in
new/yast2-nis-client-2.17.1/configure.in
--- old/yast2-nis-client-2.17.0/configure.in 2008-08-26 14:22:25.000000000
+0200
+++ new/yast2-nis-client-2.17.1/configure.in 2008-05-20 15:28:39.000000000
+0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-nis-client
dnl
-dnl -- This file is generated by y2autoconf 2.17.0 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)

-AC_INIT(yast2-nis-client, 2.17.0, http://bugs.opensuse.org/, yast2-nis-client)
+AC_INIT(yast2-nis-client, 2.16.3, http://bugs.opensuse.org/, yast2-nis-client)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])

@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)

dnl Important YaST2 variables
-VERSION="2.17.0"
+VERSION="2.16.3"
RPMNAME="yast2-nis-client"
MAINTAINER="Jiri Suchomel <jsuchome@xxxxxxx>"

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-nis-client-2.17.0/src/Nis.ycp
new/yast2-nis-client-2.17.1/src/Nis.ycp
--- old/yast2-nis-client-2.17.0/src/Nis.ycp 2008-08-26 15:19:35.000000000
+0200
+++ new/yast2-nis-client-2.17.1/src/Nis.ycp 2008-09-04 13:42:17.000000000
+0200
@@ -13,7 +13,7 @@
* Dan Vesely <dan@xxxxxxx>
* Martin Vidner <mvidner@xxxxxxx>
*
- * $Id: Nis.ycp 50380 2008-08-26 13:19:34Z mcalmer $
+ * $Id: Nis.ycp 50521 2008-09-01 12:14:17Z jsuchome $
*
*/

@@ -73,7 +73,7 @@
/**
* @return Access the servers as a string
*/
- global define string GetServers () ``{
+ global string GetServers () {
return mergestring (servers, " ");
}

@@ -81,8 +81,8 @@
* Set the servers from a string
* @param servers_s a whitespace separated list
*/
- global define void SetServers (string servers_s) ``{
- servers = filter (string s, splitstring (servers_s, " \t"), ``(s !=
""));
+ global void SetServers (string servers_s) {
+ servers = filter (string s, splitstring (servers_s, " \t"),``(s != ""));
}

/**
@@ -97,7 +97,7 @@
* The domains must be the same as for multidomain_broadcast
* @see multidomain_broadcast
*/
- global map<string,list<string> > multidomain_servers = $[];
+ global map<string,list> multidomain_servers = $[];

/**
* Servers for a multiple-domain configuration.
@@ -107,254 +107,262 @@
* @see multidomain_servers
* @see global_broadcast
*/
- global map multidomain_broadcast = $[];
+ global map<string,boolean> multidomain_broadcast = $[];

global map slp_domain = $[];

- global boolean manual = false;
+ global boolean manual = false;
+
+ // netconfig policy
+ global string policy = "auto";
+
+ // which service mapper is used (rpcbind/portmap)
+ string rpc_mapper = "rpcbind";

- global string policy = "auto";
-
string domain = "";
string old_domain = nil;
boolean domain_changed = false;

- list<string> static_keylist = [];
-
- global define void getNetconfigValues() ``{
-
- y2milestone("getNetconfigValues called");
-
- policy =
(string)SCR::Read(.sysconfig.network.config.NETCONFIG_NIS_POLICY);
-
- map<string, map<string, string> > staticVals = $[];
-
- list<string> keylist = SCR::Dir(.sysconfig.network.config);
-
- y2milestone("KEYLIST: %1", keylist);
-
- foreach (string key, keylist, ``{
-
if (!issubstring(key, "NETCONFIG_NIS_STATIC_DOMAIN") &&
-
!issubstring(key, "NETCONFIG_NIS_STATIC_SERVERS"))
-
continue;
-
-

-
string value = (string)SCR::Read(add(.sysconfig.network.config, key));
-
-
y2milestone("Found %1 = %2", key, value);
-

-
string num = "";
-

-
if(key == "NETCONFIG_NIS_STATIC_DOMAIN")
-
{
-
staticVals["0"] = add(staticVals["0"]:$[], "DOMAIN", value );
-
}
-
else if (key == "NETCONFIG_NIS_STATIC_SERVERS")
-
{
-
staticVals["0"] = add(staticVals["0"]:$[], "SERVERS", value );
-
}
-
else
-
{
-
static_keylist = add(static_keylist, key);
-

-
num = regexpsub(key,
"^NETCONFIG_STATIC_NIS_(DOMAIN|SERVERS)_(.*)", "\\2");
-
-
y2milestone("try to get the number: %1", num);
-

-
if( issubstring(key, "NETCONFIG_NIS_STATIC_DOMAIN"))
-
{
-
staticVals[num] = add(staticVals[num]:$[], "DOMAIN",
value );
-
}
-
else if( issubstring(key, "NETCONFIG_NIS_STATIC_SERVERS"))
-
{
-
staticVals[num] = add(staticVals[num]:$[], "SERVERS",
value );
-
}
-
}
-
});
-
- y2milestone("STATIC VALS: %1", staticVals);
-
- foreach (string key, map<string, string> value, staticVals, ``{
-

if(value["DOMAIN"]:nil == "")
-
{
-

if(value["SERVERS"]:"" != "")
-
{
-

string sr = GetServers()+" "+value["SERVERS"]:"" ;
-

SetServers(sr);
-
}
-
}
-
else
if(value["DOMAIN"]:nil == "broadcast")
-
{
-

default_broadcast = true;
-
}
-
else
if(value["DOMAIN"]:"" != "")
-
{
-

if(value["SERVERS"]:nil == "broadcast")
-
{
-

multidomain_broadcast = add(multidomain_broadcast, value["DOMAIN"]:"", true);
-
}
-
else
if(value["SERVERS"]:nil == "slp")
-
{
-

slp_domain = add(slp_domain, value["DOMAIN"]:"", true);
-
}
-
else
if(value["SERVERS"]:"" != "")
-
{
-

multidomain_servers = add(multidomain_servers, value["DOMAIN"]:"",
-


splitstring(value["SERVERS"]:"", " "));
-
}
-
}
-
});
- foreach (string domain, list<string> value,
multidomain_servers, ``{
-

if(!haskey(multidomain_broadcast, domain))
-
{
-

multidomain_broadcast = add(multidomain_broadcast, domain, false);
-
}
-
});
-
- foreach (string domain, any value,
(map<string,any>)multidomain_broadcast, ``{
-

if(!haskey(multidomain_servers, domain))
-
{
-

multidomain_servers = add(multidomain_servers, domain, []);
-
}
-
});
-
- foreach (string domain, any value, (map<string,any>)slp_domain,
``{
-
if(!haskey(multidomain_servers, domain))
-
{
-
multidomain_servers =
add(multidomain_servers, domain, []);
-
}
-
});
-
- y2milestone("Servers: %1", servers);
- y2milestone("multidomain_servers: %1", multidomain_servers);
- y2milestone("multidomain_broadcast: %1", multidomain_broadcast);
- y2milestone("slp_domain: %1", slp_domain);
- y2milestone("default_broadcast: %1", default_broadcast);
-
- }
-
-
- global define void setNetconfigValues() ``{
-
- SCR::Write(.sysconfig.network.config.NETCONFIG_NIS_POLICY,
policy);
-
- foreach (string domain, list value, (map<string,
list>)multidomain_servers, ``{
-

if(!haskey(multidomain_broadcast, domain))
-
{
-

multidomain_broadcast = add(multidomain_broadcast, domain, false);
-
}
-
});
-
- foreach (string domain, boolean value, (map<string,
boolean>)multidomain_broadcast, ``{
-

if(!haskey(multidomain_servers, domain))
-
{
-

multidomain_servers = add(multidomain_servers, domain, []);
-
}
-
});
-
- foreach (string domain, boolean value, (map<string,
boolean>)slp_domain, ``{
-
if(!haskey(multidomain_servers, domain))
-
{
-
multidomain_servers =
add(multidomain_servers, domain, []);
-
}
-
});
-
- foreach(string key, static_keylist, ``{
-
y2milestone("Remove : %1", key);
-
SCR::Write(add(.sysconfig.network.config, key), nil);
-
});
- /* remove the content of this */
-
SCR::Write(.sysconfig.network.config.NETCONFIG_NIS_STATIC_DOMAIN, "");
-
SCR::Write(.sysconfig.network.config.NETCONFIG_NIS_STATIC_SERVERS, "");
+ list<string> static_keylist = [];
+
+ /**
+ * Read Netconfig conmfiguration
+ */
+ global void getNetconfigValues() {
+
+ y2milestone("getNetconfigValues called");
+
+ policy =
(string)SCR::Read(.sysconfig.network.config.NETCONFIG_NIS_POLICY);
+ y2milestone("policy : %1", policy);
+ if (policy == nil) policy = "";

- integer cnt = 0;
+ map<string, map<string, string> > staticVals = $[];
+ list<string> keylist = SCR::Dir (.sysconfig.network.config);

- y2milestone("Servers: %1", servers);
- y2milestone("multidomain_servers: %1", multidomain_servers);
- y2milestone("multidomain_broadcast: %1", multidomain_broadcast);
- y2milestone("slp_domain: %1", slp_domain);
- y2milestone("default_broadcast: %1", default_broadcast);
-
- if(size(servers) > 0)
+ y2milestone("KEYLIST: %1", keylist);
+
+ if (keylist == nil) keylist = [];
+
+ foreach (string key, keylist, {
+
+ if (!issubstring(key, "NETCONFIG_NIS_STATIC_DOMAIN") &&
+ !issubstring(key, "NETCONFIG_NIS_STATIC_SERVERS"))
+ continue;
+
+ string value =(string)SCR::Read(add(.sysconfig.network.config,key));
+
+ y2milestone("Found %1 = %2", key, value);
+ string num = "";
+
+ if (key == "NETCONFIG_NIS_STATIC_DOMAIN")
+ {
+ staticVals["0"] = add (staticVals["0"]:$[], "DOMAIN", value);
+ }
+ else if (key == "NETCONFIG_NIS_STATIC_SERVERS")
+ {
+ staticVals["0"] = add (staticVals["0"]:$[], "SERVERS", value);
+ }
+ else
+ {
+ static_keylist = add (static_keylist, key);
+ num = regexpsub(key,
"^NETCONFIG_STATIC_NIS_(DOMAIN|SERVERS)_(.*)", "\\2");
+ y2milestone("try to get the number: %1", num);
+ if (issubstring(key, "NETCONFIG_NIS_STATIC_DOMAIN"))
+ {
+ staticVals[num] = add(staticVals[num]:$[], "DOMAIN",
value); }
+ else if (issubstring(key, "NETCONFIG_NIS_STATIC_SERVERS"))
{
-
SCR::Write(.sysconfig.network.config.NETCONFIG_NIS_STATIC_DOMAIN, "");
-
SCR::Write(.sysconfig.network.config.NETCONFIG_NIS_STATIC_SERVERS,
mergestring(servers, " "));
- cnt = cnt + 1;
+ staticVals[num] = add(staticVals[num]:$[], "SERVERS",value);
}
-
- foreach( string dom, list<string> srvs, multidomain_servers, ``{
-
if(dom
== "")
-

continue;
-
-

if(size(srvs) > 0)
-
{
-

if(cnt == 0)
-

{
-

SCR::Write(.sysconfig.network.config.NETCONFIG_NIS_STATIC_DOMAIN, dom);
-

SCR::Write(.sysconfig.network.config.NETCONFIG_NIS_STATIC_SERVERS,
mergestring(srvs, " "));
-

}
-

else
-

{
-

SCR::Write(add(.sysconfig.network.config,
"NETCONFIG_NIS_STATIC_DOMAIN_"+cnt), dom);
-

SCR::Write(add(.sysconfig.network.config,
"NETCONFIG_NIS_STATIC_SERVERS_"+cnt), mergestring(srvs, " "));
-

}
-

cnt = cnt + 1;
-
}
-
-

if(multidomain_broadcast[dom]:false == true)
-
{
-

if(cnt == 0)
-

{
-

SCR::Write(.sysconfig.network.config.NETCONFIG_NIS_STATIC_DOMAIN, dom);
-

SCR::Write(.sysconfig.network.config.NETCONFIG_NIS_STATIC_SERVERS,
"broadcast");
-

}
-

else
-

{
-

SCR::Write(add(.sysconfig.network.config,
"NETCONFIG_NIS_STATIC_DOMAIN_"+cnt), dom);
-

SCR::Write(add(.sysconfig.network.config,
"NETCONFIG_NIS_STATIC_SERVERS_"+cnt), "broadcast");
-

}
-

cnt = cnt + 1;
-
}
-

-

if(slp_domain[dom]:false == true)
-
{
-

if(cnt == 0)
-

{
-

SCR::Write(.sysconfig.network.config.NETCONFIG_NIS_STATIC_DOMAIN, dom);
-

SCR::Write(.sysconfig.network.config.NETCONFIG_NIS_STATIC_SERVERS,
"slp");
-

}
-

else
-

{
-

SCR::Write(add(.sysconfig.network.config,
"NETCONFIG_NIS_STATIC_DOMAIN_"+cnt), dom);
-

SCR::Write(add(.sysconfig.network.config,
"NETCONFIG_NIS_STATIC_SERVERS_"+cnt), "slp");
-

}
-

cnt = cnt + 1;
-
}
+ }
+ });

-
});
- if(default_broadcast == true)
+ y2milestone("STATIC VALS: %1", staticVals);
+
+ foreach (string key, map<string, string> value, staticVals, {
+ if (value["DOMAIN"]:nil == "")
+ {
+ if (value["SERVERS"]:"" != "")
{
- if(cnt == 0)
- {
-
SCR::Write(.sysconfig.network.config.NETCONFIG_NIS_STATIC_DOMAIN, "broadcast");
-
SCR::Write(.sysconfig.network.config.NETCONFIG_NIS_STATIC_SERVERS, "");
- }
- else
- {
- SCR::Write(add(.sysconfig.network.config,
"NETCONFIG_NIS_STATIC_DOMAIN_"+cnt), "broadcast");
- SCR::Write(add(.sysconfig.network.config,
"NETCONFIG_NIS_STATIC_SERVERS_"+cnt), "");
- }
- cnt = cnt + 1;
+ string sr = GetServers() + " " + value["SERVERS"]:"";
+ SetServers (sr);
+ }
+ }
+ else if (value["DOMAIN"]:nil == "broadcast")
+ {
+ default_broadcast = true;
+ }
+ else if (value["DOMAIN"]:"" != "")
+ {
+ if (value["SERVERS"]:nil == "broadcast")
+ {
+ multidomain_broadcast[value["DOMAIN"]:""] = true;
}
-
- if (! SCR::Write(.sysconfig.network.config, nil))
+ else if (value["SERVERS"]:nil == "slp")
{
- Report::Error (Message::ErrorWritingFile
("/etc/sysconfig/network/config"));
+ slp_domain[value["DOMAIN"]:""] = true;
}
+ else if (value["SERVERS"]:"" != "")
+ {
+ multidomain_servers[value["DOMAIN"]:""] =
+ splitstring (value["SERVERS"]:"", " ");
+ }
+ }
+ });
+
+ foreach (string domain, list value, multidomain_servers, {
+ if (!haskey (multidomain_broadcast, domain))
+ {
+ multidomain_broadcast[domain] = false;
+ }
+ });
+
+ foreach (string domain, boolean value, multidomain_broadcast, {
+ if (!haskey(multidomain_servers, domain))
+ {
+ multidomain_servers [domain] = [];
+ }
+ });
+
+ foreach (string domain, any value, (map<string,any>) slp_domain, {
+ if (!haskey (multidomain_servers, domain))
+ {
+ multidomain_servers[domain] = [];
+ }
+ });
+
+ y2milestone("Servers: %1", servers);
+ y2milestone("multidomain_servers: %1", multidomain_servers);
+ y2milestone("multidomain_broadcast: %1", multidomain_broadcast);
+ y2milestone("slp_domain: %1", slp_domain);
+ y2milestone("default_broadcast: %1", default_broadcast);
+ }
+
+ /**
+ * Write the netconfig configuration
+ */
+ global boolean setNetconfigValues() {
+
+ SCR::Write(.sysconfig.network.config.NETCONFIG_NIS_POLICY, policy);
+
+ foreach (string domain, list value, multidomain_servers, {
+ if (!haskey (multidomain_broadcast, domain))
+ {
+ multidomain_broadcast[domain] = false;
+ }
+ });
+
+ foreach (string domain, boolean value, multidomain_broadcast, {
+ if (!haskey (multidomain_servers, domain))
+ {
+ multidomain_servers[domain] = [];
+ }
+ });
+
+ foreach (string domain, any value, (map<string, any>) slp_domain, {
+ if (!haskey (multidomain_servers, domain))
+ {
+ multidomain_servers[domain] = [];
+ }
+ });
+
+ foreach (string key, static_keylist, {
+ y2milestone("Remove : %1", key);
+ SCR::Write (add (.sysconfig.network.config, key), nil);
+ });
+
+ /* remove the content of this */
+ SCR::Write (.sysconfig.network.config.NETCONFIG_NIS_STATIC_DOMAIN, "");
+ SCR::Write (.sysconfig.network.config.NETCONFIG_NIS_STATIC_SERVERS, "");
+
+
+ y2milestone("Servers: %1", servers);
+ y2milestone("multidomain_servers: %1", multidomain_servers);
+ y2milestone("multidomain_broadcast: %1", multidomain_broadcast);
+ y2milestone("slp_domain: %1", slp_domain);
+ y2milestone("default_broadcast: %1", default_broadcast);
+
+ integer cnt = 0;
+ if (size (servers) > 0)
+ {
+ SCR::Write (.sysconfig.network.config.NETCONFIG_NIS_STATIC_DOMAIN,
+ "");
+ SCR::Write (.sysconfig.network.config.NETCONFIG_NIS_STATIC_SERVERS,
+ mergestring (servers, " "));
+ cnt = cnt + 1;
+ }
+
+ foreach (string dom, list<string> srvs, (map<string,list<string> >)
+ multidomain_servers,
+ {
+ if (dom == "") continue;
+ if (size(srvs) > 0)
+ {
+ if (cnt == 0)
+ {
+ SCR::Write
(.sysconfig.network.config.NETCONFIG_NIS_STATIC_DOMAIN, dom);
+ SCR::Write
(.sysconfig.network.config.NETCONFIG_NIS_STATIC_SERVERS, mergestring (srvs, "
"));
+ }
+ else
+ {
+ SCR::Write (add (.sysconfig.network.config,
"NETCONFIG_NIS_STATIC_DOMAIN_"+cnt), dom);
+ SCR::Write (add (.sysconfig.network.config,
"NETCONFIG_NIS_STATIC_SERVERS_"+cnt), mergestring(srvs, " "));
+ }
+ cnt = cnt + 1;
+ }
+ if (multidomain_broadcast[dom]:false == true)
+ {
+ if (cnt == 0)
+ {
+ SCR::Write
(.sysconfig.network.config.NETCONFIG_NIS_STATIC_DOMAIN, dom);
+ SCR::Write
(.sysconfig.network.config.NETCONFIG_NIS_STATIC_SERVERS, "broadcast");
+ }
+ else
+ {
+ SCR::Write (add (.sysconfig.network.config,
"NETCONFIG_NIS_STATIC_DOMAIN_"+cnt), dom);
+ SCR::Write (add (.sysconfig.network.config,
"NETCONFIG_NIS_STATIC_SERVERS_"+cnt), "broadcast");
+ }
+ cnt = cnt + 1;
+ }
+ if (slp_domain[dom]:false == true)
+ {
+ if (cnt == 0)
+ {
+ SCR::Write
(.sysconfig.network.config.NETCONFIG_NIS_STATIC_DOMAIN, dom);
+
SCR::Write(.sysconfig.network.config.NETCONFIG_NIS_STATIC_SERVERS, "slp");
+ }
+ else
+ {
+ SCR::Write(add(.sysconfig.network.config,
"NETCONFIG_NIS_STATIC_DOMAIN_"+cnt), dom);
+ SCR::Write(add(.sysconfig.network.config,
"NETCONFIG_NIS_STATIC_SERVERS_"+cnt), "slp");
+ }
+ cnt = cnt + 1;
+ }
+ });
+
+ if (default_broadcast == true)
+ {
+ if (cnt == 0)
+ {
+
SCR::Write(.sysconfig.network.config.NETCONFIG_NIS_STATIC_DOMAIN, "broadcast");
+
SCR::Write(.sysconfig.network.config.NETCONFIG_NIS_STATIC_SERVERS, "");
+ }
+ else
+ {
+ SCR::Write(add(.sysconfig.network.config,
"NETCONFIG_NIS_STATIC_DOMAIN_"+cnt), "broadcast");
+ SCR::Write(add(.sysconfig.network.config,
"NETCONFIG_NIS_STATIC_SERVERS_"+cnt), "");
+ }
+ cnt = cnt + 1;
}

-
-
+ if (! SCR::Write(.sysconfig.network.config, nil))
+ {
+ Report::Error (Message::ErrorWritingFile
("/etc/sysconfig/network/config"));
+ return false;
+ }
+ return true;
+ }
+
/**
* If the domain has changed from a nonempty one, it may only be
* changed at boot time. Use this to warn the user.
@@ -386,28 +394,12 @@
// DHCP cooperation

/**
- * Whether sysconfig/network/dhcp says
- * to get the domain AND yp.conf by DHCP.
- * It will be turned off if dhcp_possible is off
- * (the user can override it)
- */
- /* global boolean dhcp_wanted = false; */
-
- /**
* #35654: if the server is running and sysconfig wants NIS data,
* it's ok to FitIntoSingle
*/
global boolean dhcpcd_running = false;

/**
- * Is the domain AND yp.conf served by DHCP?
- * This is independent of dhcp_wanted:
- * dhcpcd*.pid exists and dhcpcd*.info contains NISSERVERS and NISDOMAIN.
- * It is used to warn the user if he wants to turn DHCP on but the config
- * is not provided.
- */
- global boolean dhcp_possible = false;
- /**
* If dhcp_wanted changes, we need to restart the DHCP client
*/
global boolean dhcp_restart = false;
@@ -607,19 +599,16 @@
domain = settings["nis_domain"]:"";
old_domain = domain;

- //dhcp_wanted = settings["nis_by_dhcp"]:false;
- // we have to hope the config will be available
- dhcp_possible = true;
// we don't know what the state will be before Write, so restart it
dhcp_restart = true;

list<map> other_domains = settings["nis_other_domains"]:[];
foreach (map other_domain, other_domains, ``{
- string d = other_domain["nis_domain"]:"";
- list<string> s = other_domain["nis_servers"]:[];
+ string domain = other_domain["nis_domain"]:"";
+ list<string> servers = other_domain["nis_servers"]:[];
boolean b = other_domain["nis_broadcast"]:false;
- multidomain_servers = add (multidomain_servers, d, s);
- multidomain_broadcast = add (multidomain_broadcast, d, b);
+ multidomain_servers[domain] = servers;
+ multidomain_broadcast[domain] = b;
});

local_only = settings["nis_local_only"]:false;
@@ -685,8 +674,8 @@
* Dump the NIS settings to a map, for autoinstallation use.
* @return $["start":, "servers":[...], "domain":]
*/
- global define map Export () ``{
- list other_domains = maplist (string d, list s, multidomain_servers, ``{
+ global define map Export () {
+ list other_domains = maplist (string d, list s, multidomain_servers, {
return $[
"nis_domain": d,
"nis_servers": s,
@@ -776,9 +765,7 @@
// summary header
summary = Summary::AddHeader(summary, _("NIS Domain"));
summary = Summary::AddLine(summary,((domain != "") ? domain : nc));
-
-
- // summary header
+ // summary header
summary = Summary::AddHeader(summary, _("NIS Servers"));
summary = Summary::AddLine(summary, ((servers !=[]) ?
mergestring(servers,"<br>") : nc));
// summary header
@@ -858,31 +845,9 @@
domain = deletechars (out["stdout"]:"", "\n");
old_domain = domain;

-
- boolean servers_by_dhcp_wanted = SCR::Read (
- .sysconfig.network.dhcp.DHCLIENT_MODIFY_NIS_CONF) == "yes";
- boolean domain_by_dhcp_wanted = SCR::Read (
- .sysconfig.network.dhcp.DHCLIENT_SET_DOMAINNAME) == "yes";
- //dhcp_wanted = servers_by_dhcp_wanted && domain_by_dhcp_wanted;
-
dhcpcd_running =
SCR::Execute (.target.bash, "ls /var/run/dhcpcd-*.pid") == 0;
- string di = "/var/lib/dhcpcd/dhcpcd-*.info";
- boolean servers_by_dhcp_possible = dhcpcd_running && SCR::Execute (
- .target.bash, "/bin/grep -qs '^NISSERVERS' " + di) == 0;
- boolean domain_by_dhcp_possible = dhcpcd_running && SCR::Execute (
- .target.bash, "/bin/grep -qs '^NISDOMAIN' " + di) == 0;
- dhcp_possible = servers_by_dhcp_possible && domain_by_dhcp_possible;
- // we do it here instead of in the ui so that the user can override it
- // in the ui or switch single/multiple domains
- /*
- if (dhcp_wanted && !dhcp_possible)
- {
- dhcp_wanted = false;
- Touch (true);
- }
- */
-
+
local_only = SCR::Read (.sysconfig.ypbind.YPBIND_LOCAL_ONLY) == "yes";
global_broadcast = SCR::Read (.sysconfig.ypbind.YPBIND_BROADCAST) ==
"yes";
broken_server = SCR::Read (.sysconfig.ypbind.YPBIND_BROKEN_SERVER) ==
"yes";
@@ -927,8 +892,6 @@
];
domain = "example.com";
old_domain = domain;
- //dhcp_wanted = false;
- dhcp_possible = false; // to see the warning popup
local_only = false;
global_broadcast = false;
broken_server = false;
@@ -1106,28 +1069,27 @@
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 (!dhcp_wanted)
+ if (!SCR::Write (.etc.defaultdomain, domain))
{
- */
- if (!SCR::Write (.etc.defaultdomain, domain))
- {
- Report::Error (
- Message::ErrorWritingFile ("/etc/defaultdomain"));
- return false;
- }
+ Report::Error (Message::ErrorWritingFile("/etc/defaultdomain"));
+ return false;
+ }

- // so that dhcpcd cannot restore it
- SCR::Execute (.target.remove, "/etc/yp.conf.sv");
+ // so that dhcpcd cannot restore it
+ SCR::Execute (.target.remove, "/etc/yp.conf.sv");

- setNetconfigValues();
+ setNetconfigValues();
+
+ SCR::Execute(.target.bash, "/sbin/netconfig update");

- SCR::Execute(.target.bash, "/sbin/netconfig update");
-
- //}
SCR::Write (.sysconfig.ypbind.YPBIND_LOCAL_ONLY, local_only?
"yes":"no");
SCR::Write (.sysconfig.ypbind.YPBIND_BROADCAST, global_broadcast?
"yes":"no");
SCR::Write (.sysconfig.ypbind.YPBIND_BROKEN_SERVER, broken_server?
"yes":"no");
@@ -1139,8 +1101,8 @@
return false;
}

- SCR::Write (.sysconfig.network.dhcp.DHCLIENT_SET_DOMAINNAME,
- !manual? "yes":"no");
+ SCR::Write (.sysconfig.network.config.NETCONFIG_NIS_SETDOMAINNAME,
+ manual? "no" : "yes");
SCR::Write (.sysconfig.network.dhcp.DHCLIENT_MODIFY_NIS_CONF, "no");

if (! SCR::Write (.sysconfig.network.dhcp, nil))
@@ -1227,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;
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-nis-client-2.17.0/src/ui.ycp
new/yast2-nis-client-2.17.1/src/ui.ycp
--- old/yast2-nis-client-2.17.0/src/ui.ycp 2008-08-26 15:19:35.000000000
+0200
+++ new/yast2-nis-client-2.17.1/src/ui.ycp 2008-09-01 14:14:17.000000000
+0200
@@ -11,7 +11,7 @@
* Authors:
* Martin Vidner <mvidner@xxxxxxx>
*
- * $Id: ui.ycp 50380 2008-08-26 13:19:34Z mcalmer $
+ * $Id: ui.ycp 50521 2008-09-01 12:14:17Z jsuchome $
*
* All user interface functions.
*
@@ -75,20 +75,6 @@
}

/**
- * Pop up a warning if dhcp does not provide nis configuration
- */
- define void WarnIfDhcpNotServed () ``{
- // do not error message for NM (#152262)
- if (!Nis::dhcp_possible && !NetworkService::IsManaged ())
- {
- // Translators: warning popup
- Report::Warning (_("NIS configuration is not currently provided by
DHCP.
-Change the DHCP server configuration to provide it.
-"));
- }
- }
-
- /**
* Let the user choose some of a list of items
* @param title selectionbox title
* @param items a list of items
@@ -226,7 +212,7 @@

help_text = help_text + broadcast_help;

- help_text = help_text + dhcp_help;
+// help_text = help_text + dhcp_help;

// help text
help_text = help_text + _("<p>Automounter is a daemon that mounts
directories automatically,
@@ -238,7 +224,6 @@
help_text = help_text + firewall_widget["help"]:"";


- //boolean dhcp_wanted = Nis::dhcp_wanted ||
NetworkService::IsManaged ();
string domain = Nis::GetDomain ();
string servers = Nis::GetServers ();

@@ -288,28 +273,24 @@
`VBox (
`VSpacing (0.2),
`HBox (
- `ComboBox(`id(`policy), `opt (`notify), _("Nis
&Policy"),
- [`item(`id(`nomodify),
"manual"),
- `item(`id(`auto), "auto"),
- `item(`id(`custom),
"custom")]),
- `TextEntry(`id(`custompolicy), `opt(`hstrech),
_("C&ustom Policy"), "")
- ),
-
-
-// `RadioButtonGroup (`id (`dhcpg), `VBox (
-// `Left (`RadioButton (`id (`dhcpyes), `opt (`notify),
-// automatic_label, dhcp_wanted)),
-// radio button label
-// `Left (`RadioButton (`id (`dhcpno), `opt (`notify),
_("&Static Setup"), !dhcp_wanted))
-// )),
-
-
+ // combo box label
+ `ComboBox(`id(`policy), `opt (`notify), _("Nis &Policy"), [
+ `item(`id(`nomodify), "manual"),
+ `item(`id(`auto), "auto"),
+ `item(`id(`custom), "custom")
+ ]),
+ `InputField (`id(`custompolicy), `opt (`hstretch),
+ // text entry label
+ _("C&ustom Policy"), "")
+ ),
`VSpacing (0.2),
// text entry label
- `TextEntry (`id (`domain), _("N&IS Domain"), domain),
+ `InputField (`id (`domain), `opt (`hstretch), _("N&IS Domain"),
+ domain),
`VSpacing (0.2),
- // text entry label
- `TextEntry (`id (`servers), _("&Addresses of NIS servers"),
servers),
+ `InputField (`id (`servers), `opt (`hstretch),
+ // text entry label
+ _("&Addresses of NIS servers"), servers),
`HBox (
// check box label
`Left (`CheckBox (`id (`broadcast), `opt (`notify),
_("Br&oadcast"), default_broadcast)),
@@ -339,16 +320,16 @@
con = `HBox (`HSpacing (0.5), `VCenter (
`VBox (
`VSpacing (0.4),
- `RadioButtonGroup (
- `id (`rd),
- `Left (
- `HVSquash (
- `VBox (
- // radio button label
- `Left (`RadioButton (`id (`nisno), `opt
(`notify), _("Do &not use NIS"), !yp_client)),
- // radio button label
- `Left (`RadioButton (`id (`nisyes), `opt
(`notify), _("&Use NIS"), yp_client))
- )))),
+ `RadioButtonGroup (`id (`rd), `Left ( `HVSquash (`VBox (
+ `Left (`RadioButton (`id (`nisno), `opt (`notify),
+ // radio button label
+ _("Do &not use NIS"), !yp_client)
+ ),
+ `Left (`RadioButton (`id (`nisyes), `opt (`notify),
+ // radio button label
+ _("&Use NIS"), yp_client)
+ )
+ )))),
`VSpacing (1.2),
nis_frame,
`VSpacing (0.4),
@@ -375,38 +356,34 @@

UI::ChangeWidget (`id (`autofs), `Enabled, Nis::_autofs_allowed);

- if(Nis::policy == "")
+ if (Nis::policy == "")
{
- UI::ChangeWidget (`id (`policy), `Value, `id(`nomodify));
- UI::ChangeWidget (`id (`custompolicy), `Enabled, false);
+ UI::ChangeWidget (`id (`policy), `Value, `id(`nomodify));
+ UI::ChangeWidget (`id (`custompolicy), `Enabled, false);
}
else if(Nis::policy == "auto" || Nis::policy == "STATIC *")
{
- UI::ChangeWidget (`id (`policy), `Value, `id(`auto));
- UI::ChangeWidget (`id (`custompolicy), `Enabled, false);
+ UI::ChangeWidget (`id (`policy), `Value, `id(`auto));
+ UI::ChangeWidget (`id (`custompolicy), `Enabled, false);
}
else
{
- UI::ChangeWidget (`id (`policy), `Value, `id(`custom));
- UI::ChangeWidget (`id (`custompolicy), `Enabled, true);
- UI::ChangeWidget (`id (`custompolicy), `Value, Nis::policy);
+ UI::ChangeWidget (`id (`policy), `Value, `id(`custom));
+ UI::ChangeWidget (`id (`custompolicy), `Enabled, true);
+ UI::ChangeWidget (`id (`custompolicy), `Value, Nis::policy);
}
-
map event = $[];
symbol result = nil;
repeat
{
- y2milestone("LOOP: %1", result);
-
- yp_client = ((symbol) UI::QueryWidget (`id (`rd), `CurrentButton)
!= `nisno);
+ y2milestone("LOOP: %1", result);
+ yp_client = (UI::QueryWidget (`id (`rd), `CurrentButton) != `nisno);
UI::ChangeWidget (`id (`expert), `Enabled, yp_client);
UI::ChangeWidget (`id (`policy), `Enabled, yp_client);
//UI::ChangeWidget (`id (`custompolicy), `Enabled, yp_client);
UI::ChangeWidget (`id (`autofs), `Enabled, yp_client);

- //dhcp_wanted = ((symbol) UI::QueryWidget (`id (`dhcpg),
`CurrentButton) == `dhcpyes);
-
- Nis::manual = ((symbol) UI::QueryWidget (`id (`policy), `Value)
== `nomodify);
+ Nis::manual = ((symbol) UI::QueryWidget (`id (`policy), `Value) ==
`nomodify);
UI::ChangeWidget (`id (`domain), `Enabled, !Nis::manual &&
yp_client);
UI::ChangeWidget (`id (`servers), `Enabled, !Nis::manual &&
yp_client);
UI::ChangeWidget (`id (`broadcast), `Enabled, !Nis::manual &&
yp_client);
@@ -431,25 +408,16 @@
UI::ChangeWidget (`id (`custompolicy),
`Enabled, (true && yp_client));
}
}
-
event = UI::WaitForEvent ();
result = (symbol) event["ID"]:nil;
CWMFirewallInterfaces::OpenFirewallHandle(firewall_widget,"",event);

- if (result == `cancel)
+ if (result == `cancel)
{
result = `abort;
}

- /*
- if (result == `dhcpyes)
- {
- WarnIfDhcpNotServed ();
- }
- else
- */
-
- if (result == `find)
+ if (result == `find)
{
domain = (string) UI::QueryWidget (`id (`domain), `Value);
if (domain == "")
@@ -537,15 +505,7 @@
{
Nis::Touch (Nis::start != yp_client);
Nis::start = yp_client;
-
- Nis::dhcp_restart = false;
- /*
- Nis::dhcp_restart = Nis::dhcp_restart ||
- (Nis::dhcp_wanted != dhcp_wanted);
- Nis::Touch (Nis::dhcp_restart);
- Nis::dhcp_wanted = dhcp_wanted;
- */
-
+ Nis::dhcp_restart = false;
Nis::SetDomain (domain);
Nis::SetServers (servers);
Nis::Touch (Nis::default_broadcast != default_broadcast);
@@ -596,9 +556,9 @@
// check box label
`Left (`CheckBox (`id (`broken_server), _("Br&oken
server"), broken_server)),
`VSpacing (0.2),
- // text entry label
- // ypbind is the daemon name
- `TextEntry (`id (`options), _("Other &ypbind options"),
options),
+ `InputField (`id (`options), `opt (`hstretch),
+ // text entry label (do not translate 'ypbind')
+ _("Other &ypbind options"), options),
`VSpacing (0.2)
)
),
@@ -750,7 +710,7 @@
`Heading (_("Domain Settings")),
// Add a domain, Adding a domain? Edit...
// Translators: text entry label
- `Left (`TextEntry (`id (`domain), _("&Domain name"),
domain)),
+ `Left (`InputField (`id (`domain), _("&Domain name"),
domain)),
`VSpacing(0.5),
t_servers,
`VSpacing(0.2),
@@ -1118,7 +1078,7 @@
string d = Nis::GetDomain ();
if (size (Nis::multidomain_servers) == 1)
{
- list<string> s = Nis::multidomain_servers[d]:[];
+ list<string> s = (list<string>) Nis::multidomain_servers[d]:[];
// if there's only one entry, for the correct domain
if (size (s) > 0)
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-nis-client-2.17.0/testsuite/tests/readwrite.out
new/yast2-nis-client-2.17.1/testsuite/tests/readwrite.out
--- old/yast2-nis-client-2.17.0/testsuite/tests/readwrite.out 2008-08-26
15:15:22.000000000 +0200
+++ new/yast2-nis-client-2.17.1/testsuite/tests/readwrite.out 2008-09-04
14:43:02.000000000 +0200
@@ -1,20 +1,16 @@
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"]
-Read .sysconfig.network.dhcp.DHCLIENT_MODIFY_NIS_CONF "no"
-Read .sysconfig.network.dhcp.DHCLIENT_SET_DOMAINNAME "no"
Execute .target.bash "ls /var/run/dhcpcd-*.pid" 0
-Execute .target.bash "/bin/grep -qs '^NISSERVERS'
/var/lib/dhcpcd/dhcpcd-*.info" 0
-Execute .target.bash "/bin/grep -qs '^NISDOMAIN'
/var/lib/dhcpcd/dhcpcd-*.info" 0
Read .sysconfig.ypbind.YPBIND_LOCAL_ONLY "no"
Read .sysconfig.ypbind.YPBIND_BROADCAST "no"
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
@@ -23,23 +19,23 @@
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 nil true
+Write .sysconfig.network.config.NETCONFIG_NIS_POLICY "" true
Write .sysconfig.network.config.NETCONFIG_NIS_STATIC_DOMAIN "" true
Write .sysconfig.network.config.NETCONFIG_NIS_STATIC_SERVERS "" true
Write .sysconfig.network.config nil true
@@ -49,7 +45,7 @@
Write .sysconfig.ypbind.YPBIND_BROKEN_SERVER "no" true
Write .sysconfig.ypbind.YPBIND_OPTIONS "" true
Write .sysconfig.ypbind nil true
-Write .sysconfig.network.dhcp.DHCLIENT_SET_DOMAINNAME "yes" true
+Write .sysconfig.network.config.NETCONFIG_NIS_SETDOMAINNAME "yes" true
Write .sysconfig.network.dhcp.DHCLIENT_MODIFY_NIS_CONF "no" true
Write .sysconfig.network.dhcp nil true
Read .etc.nsswitch_conf."passwd" "compat"
@@ -81,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
@@ -94,21 +90,17 @@
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"]
-Read .sysconfig.network.dhcp.DHCLIENT_MODIFY_NIS_CONF "yes"
-Read .sysconfig.network.dhcp.DHCLIENT_SET_DOMAINNAME "yes"
Execute .target.bash "ls /var/run/dhcpcd-*.pid" 0
-Execute .target.bash "/bin/grep -qs '^NISSERVERS'
/var/lib/dhcpcd/dhcpcd-*.info" 0
-Execute .target.bash "/bin/grep -qs '^NISDOMAIN'
/var/lib/dhcpcd/dhcpcd-*.info" 0
Read .sysconfig.ypbind.YPBIND_LOCAL_ONLY "no"
Read .sysconfig.ypbind.YPBIND_BROADCAST "no"
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
@@ -118,19 +110,19 @@
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 nil true
+Write .sysconfig.network.config.NETCONFIG_NIS_POLICY "" true
Write .sysconfig.network.config.NETCONFIG_NIS_STATIC_DOMAIN "" true
Write .sysconfig.network.config.NETCONFIG_NIS_STATIC_SERVERS "" true
Write .sysconfig.network.config nil true
@@ -140,7 +132,7 @@
Write .sysconfig.ypbind.YPBIND_BROKEN_SERVER "no" true
Write .sysconfig.ypbind.YPBIND_OPTIONS "" true
Write .sysconfig.ypbind nil true
-Write .sysconfig.network.dhcp.DHCLIENT_SET_DOMAINNAME "yes" true
+Write .sysconfig.network.config.NETCONFIG_NIS_SETDOMAINNAME "yes" true
Write .sysconfig.network.dhcp.DHCLIENT_MODIFY_NIS_CONF "no" true
Write .sysconfig.network.dhcp nil true
Read .etc.nsswitch_conf."passwd" "compat"
@@ -172,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
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-nis-client-2.17.0/testsuite/tests/readwrite.ycp
new/yast2-nis-client-2.17.1/testsuite/tests/readwrite.ycp
--- old/yast2-nis-client-2.17.0/testsuite/tests/readwrite.ycp 2007-05-31
15:16:43.000000000 +0200
+++ new/yast2-nis-client-2.17.1/testsuite/tests/readwrite.ycp 2008-09-04
14:42:43.000000000 +0200
@@ -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": $[],
],
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-nis-client-2.17.0/VERSION
new/yast2-nis-client-2.17.1/VERSION
--- old/yast2-nis-client-2.17.0/VERSION 2008-08-26 14:19:39.000000000 +0200
+++ new/yast2-nis-client-2.17.1/VERSION 2008-09-04 14:44:43.000000000 +0200
@@ -1 +1 @@
-2.17.0
+2.17.1


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread