Hello community, here is the log from the commit of package yast2-samba-client for openSUSE:Factory checked in at 2013-04-02 13:39:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-samba-client (Old) and /work/SRC/openSUSE:Factory/.yast2-samba-client.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-samba-client", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-samba-client/yast2-samba-client.changes 2013-02-21 10:47:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-samba-client.new/yast2-samba-client.changes 2013-04-02 13:39:52.000000000 +0200 @@ -1,0 +2,12 @@ +Thu Mar 28 16:08:53 CET 2013 - [email protected] + +- one more csync2 invocation so smb.conf is correctly propagated + to cluster nodes (bnc#802814) +- cluster allows DHCP configuration, but check if IPs are configured + for it (bnc#811008) +- show error message when cluster config is not correct (bnc#809208) +- ensure cluster options are present in smb.conf during join + (bnc#809208) and testjoin (bnc#810592) +- 2.24.0 + +------------------------------------------------------------------- Old: ---- yast2-samba-client-2.23.2.tar.bz2 New: ---- yast2-samba-client-2.24.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-samba-client.spec ++++++ --- /var/tmp/diff_new_pack.iJ5pzN/_old 2013-04-02 13:39:54.000000000 +0200 +++ /var/tmp/diff_new_pack.iJ5pzN/_new 2013-04-02 13:39:54.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-samba-client -Version: 2.23.2 +Version: 2.24.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-samba-client-2.23.2.tar.bz2 -> yast2-samba-client-2.24.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.23.2/VERSION new/yast2-samba-client-2.24.0/VERSION --- old/yast2-samba-client-2.23.2/VERSION 2013-02-20 14:41:33.000000000 +0100 +++ new/yast2-samba-client-2.24.0/VERSION 2013-03-28 16:21:43.000000000 +0100 @@ -1 +1 @@ -2.23.2 +2.24.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.23.2/configure new/yast2-samba-client-2.24.0/configure --- old/yast2-samba-client-2.23.2/configure 2013-02-20 14:41:46.000000000 +0100 +++ new/yast2-samba-client-2.24.0/configure 2013-03-28 16:21:54.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for yast2-samba-client 2.23.2. +# Generated by GNU Autoconf 2.69 for yast2-samba-client 2.24.0. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='yast2-samba-client' PACKAGE_TARNAME='yast2-samba-client' -PACKAGE_VERSION='2.23.2' -PACKAGE_STRING='yast2-samba-client 2.23.2' +PACKAGE_VERSION='2.24.0' +PACKAGE_STRING='yast2-samba-client 2.24.0' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1247,7 +1247,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-samba-client 2.23.2 to adapt to many kinds of systems. +\`configure' configures yast2-samba-client 2.24.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1319,7 +1319,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-samba-client 2.23.2:";; + short | recursive ) echo "Configuration of yast2-samba-client 2.24.0:";; esac cat <<\_ACEOF @@ -1399,7 +1399,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-samba-client configure 2.23.2 +yast2-samba-client configure 2.24.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1416,7 +1416,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-samba-client $as_me 2.23.2, which was +It was created by yast2-samba-client $as_me 2.24.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2355,7 +2355,7 @@ # Define the identity of the package. PACKAGE='yast2-samba-client' - VERSION='2.23.2' + VERSION='2.24.0' cat >>confdefs.h <<_ACEOF @@ -2478,7 +2478,7 @@ -VERSION="2.23.2" +VERSION="2.24.0" RPMNAME="yast2-samba-client" MAINTAINER="Jiri Suchomel <[email protected]>" @@ -3404,7 +3404,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-samba-client $as_me 2.23.2, which was +This file was extended by yast2-samba-client $as_me 2.24.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3457,7 +3457,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-samba-client config.status 2.23.2 +yast2-samba-client config.status 2.24.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.23.2/configure.in new/yast2-samba-client-2.24.0/configure.in --- old/yast2-samba-client-2.23.2/configure.in 2013-02-20 14:41:42.000000000 +0100 +++ new/yast2-samba-client-2.24.0/configure.in 2013-03-28 16:21:50.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.23.2 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-samba-client, 2.23.2, http://bugs.opensuse.org/, yast2-samba-client) +AC_INIT(yast2-samba-client, 2.24.0, http://bugs.opensuse.org/, yast2-samba-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.23.2" +VERSION="2.24.0" RPMNAME="yast2-samba-client" MAINTAINER="Jiri Suchomel <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.23.2/src/Samba.ycp new/yast2-samba-client-2.24.0/src/Samba.ycp --- old/yast2-samba-client-2.23.2/src/Samba.ycp 2013-02-20 14:41:33.000000000 +0100 +++ new/yast2-samba-client-2.24.0/src/Samba.ycp 2013-03-28 16:21:43.000000000 +0100 @@ -741,10 +741,16 @@ if (FileUtils::Exists ("/usr/sbin/csync2")) { // first, force syncing of smb.conf (bnc#802814) - map out = (map) SCR::Execute (.target.bash_output, "/usr/sbin/csync2 -f /etc/samba/smb.conf"); + map out = (map) SCR::Execute (.target.bash_output, "/usr/sbin/csync2 -cr /"); if (out["exit"]:0 != 0) { - y2error ("csync2 failed with %1", out); + y2error ("csync2 -cr failed with %1", out); + return false; + } + out = (map) SCR::Execute (.target.bash_output, "/usr/sbin/csync2 -f /etc/samba/smb.conf"); + if (out["exit"]:0 != 0) + { + y2error ("csync2 -f failed with %1", out); return false; } @@ -752,7 +758,7 @@ out = (map) SCR::Execute (.target.bash_output, "/usr/sbin/csync2 -xv"); if (out["exit"]:0 != 0) { - y2error ("csync2 failed with %1", out); + y2error ("csync2 -x failed with %1", out); return false; } return true; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.23.2/src/SambaNetJoin.pm new/yast2-samba-client-2.24.0/src/SambaNetJoin.pm --- old/yast2-samba-client-2.23.2/src/SambaNetJoin.pm 2013-02-20 14:41:33.000000000 +0100 +++ new/yast2-samba-client-2.24.0/src/SambaNetJoin.pm 2013-03-28 16:21:43.000000000 +0100 @@ -81,8 +81,22 @@ $cluster_present = FALSE; if (SambaAD->IsDHCPClient (FALSE)) { - y2warning ("DHCP client found: Not configuring cluster..."); - return FALSE; + y2milestone ("DHCP client found: checking if IP addresses are configured for CTDB traffic..."); + # Go through IP addresses and check if they are cofigured for CTDB (/etc/ctdb/nodes). + # This is not a perfect solution, but as we cannot find out if IP is statically assigned by + # DHCP server, we have at least a hint that current addresses seem to be configured correctly. + # See bnc#811008 + my $nodes = SCR->Read (".target.string", "/etc/ctdb/nodes"); + my $out = SCR->Execute (".target.bash_output", + "LANG=C /sbin/ifconfig | grep 'inet addr' | cut -d: -f2 | cut -d ' ' -f1"); + my $cluster_ip = TRUE; + foreach my $line (split (/\n/,$out->{"stdout"} || "")) { + if ($nodes !~ /$line/) { + y2warning ("IP address $line is not configured for CTDB"); + $cluster_ip = FALSE; + } + } + return FALSE unless $cluster_ip; } # do we have cluster packages installed? @@ -92,7 +106,7 @@ my $out = SCR->Execute (".target.bash_output", "/usr/sbin/crm_mon -s"); if ($out->{"exit"} != 0) { - y2milestone ("cluster not configured or not online"); + y2warning ("cluster not configured or not online"); return FALSE; } @@ -171,7 +185,7 @@ # 7. Cleanup CTDB: CRMCall ("resource cleanup $clone_id"); - # 8. Wait until the “unhealty” status disappears. + # 8. Wait until the unhealty status disappears. my $start = time; my $wait = 60; # 1 minute timeout @@ -231,7 +245,22 @@ if ($protocol eq "ads") { my $realm = SambaAD->Realm (); - SCR->Write (".target.string", $conf_file, "[global]$include\n\trealm = $realm\n\tsecurity = ADS\n\tworkgroup = $domain\n"); + my $content = "[global]$include\n\trealm = $realm\n\tsecurity = ADS\n\tworkgroup = $domain\n"; + if ($self->ClusterPresent (0)) { + # ensure cluster related options are used from original file + # bnc#809208 + my $clustering = SambaConfig->GlobalGetStr ("clustering", undef); + if (defined $clustering) { + my $ctdbd_socket = SambaConfig->GlobalGetStr ("ctdbd socket", ""); + $content .= "\t" . "clustering = $clustering" . "\n"; + $content .= "\t" . "ctdbd socket =$ctdbd_socket" . "\n"; + } + else { + y2warning ("'clustering' not defined in smb.conf"); + return FALSE; + } + } + SCR->Write (".target.string", $conf_file, $content); } else { SCR->Write (".target.string", $conf_file, "[global]$include\n\tsecurity = domain\n\tworkgroup = $domain\n"); @@ -288,6 +317,20 @@ if ($kerberos_method) { $content = $content."\tkerberos method = $kerberos_method\n"; } + if ($self->ClusterPresent (0)) { + # ensure cluster related options are used from original file + # bnc#809208 + my $clustering = SambaConfig->GlobalGetStr ("clustering", undef); + if (defined $clustering) { + my $ctdbd_socket = SambaConfig->GlobalGetStr ("ctdbd socket", ""); + $content .= "\t" . "clustering = $clustering" . "\n"; + $content .= "\t" . "ctdbd socket =$ctdbd_socket" . "\n"; + } + else { + y2error ("'clustering' not defined in smb.conf, canceling join attempt"); + return __("Unable to proceed with join: Inconsistent cluster state"); + } + } SCR->Write (".target.string", $conf_file, $content); $cmd = "KRB5_CONFIG=$krb_file "; SCR->Write (".target.string", $krb_file, "[realms]\n\t$realm = {\n\tkdc = $server\n\t}\n"); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
