Hello community,
here is the log from the commit of package yast2-samba-client
checked in at Thu Mar 15 01:44:14 CET 2007.
--------
--- yast2-samba-client/yast2-samba-client.changes 2007-03-08 11:05:39.000000000 +0100
+++ /mounts/work_src_done/NOARCH/yast2-samba-client/yast2-samba-client.changes 2007-03-13 11:14:10.115576000 +0100
@@ -1,0 +2,6 @@
+Tue Mar 13 11:07:54 CET 2007 - jsuchome@suse.cz
+
+- added site-aware search for AD controllers (#253609)
+- 2.15.4
+
+-------------------------------------------------------------------
Old:
----
yast2-samba-client-2.15.3.tar.bz2
New:
----
yast2-samba-client-2.15.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-samba-client.spec ++++++
--- /var/tmp/diff_new_pack.wr6696/_old 2007-03-15 01:43:26.000000000 +0100
+++ /var/tmp/diff_new_pack.wr6696/_new 2007-03-15 01:43:26.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-samba-client (Version 2.15.3)
+# spec file for package yast2-samba-client (Version 2.15.4)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-samba-client
-Version: 2.15.3
+Version: 2.15.4
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-samba-client-2.15.3.tar.bz2
+Source0: yast2-samba-client-2.15.4.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-pam yast2-perl-bindings yast2-testsuite
Requires: yast2 yast2-kerberos-client
@@ -36,7 +36,7 @@
Stanislav Visnovsky
%prep
-%setup -n yast2-samba-client-2.15.3
+%setup -n yast2-samba-client-2.15.4
%build
%{prefix}/bin/y2tool y2autoconf
@@ -74,6 +74,9 @@
%doc %{prefix}/share/doc/packages/yast2-samba-client
%changelog
+* Tue Mar 13 2007 - jsuchome@suse.cz
+- added site-aware search for AD controllers (#253609)
+- 2.15.4
* Thu Mar 08 2007 - jsuchome@suse.cz
- added support for DHCP (F120090)
- 2.15.3
++++++ yast2-samba-client-2.15.3.tar.bz2 -> yast2-samba-client-2.15.4.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.15.3/src/dialogs.ycp new/yast2-samba-client-2.15.4/src/dialogs.ycp
--- old/yast2-samba-client-2.15.3/src/dialogs.ycp 2007-02-26 16:14:41.000000000 +0100
+++ new/yast2-samba-client-2.15.4/src/dialogs.ycp 2007-03-08 11:06:05.000000000 +0100
@@ -3,7 +3,7 @@
* Summary: Dialogs definitions
* Authors: Stanislav Visnovsky
*
- * $Id: dialogs.ycp 34993 2006-12-20 13:58:50Z jsuchome $
+ * $Id: dialogs.ycp 36773 2007-03-08 10:06:02Z jsuchome $
*/
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.15.3/src/routines.ycp new/yast2-samba-client-2.15.4/src/routines.ycp
--- old/yast2-samba-client-2.15.3/src/routines.ycp 2007-02-26 16:14:26.000000000 +0100
+++ new/yast2-samba-client-2.15.4/src/routines.ycp 2007-03-08 11:06:05.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Miscelanous functions for configuration of samba-client.
* Authors: Stanislav Visnovsky
*
- * $Id: routines.ycp 33836 2006-10-30 12:41:57Z jsuchome $
+ * $Id: routines.ycp 36773 2007-03-08 10:06:02Z jsuchome $
*/
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.15.3/src/SambaAD.pm new/yast2-samba-client-2.15.4/src/SambaAD.pm
--- old/yast2-samba-client-2.15.3/src/SambaAD.pm 2006-12-01 13:22:49.000000000 +0100
+++ new/yast2-samba-client-2.15.4/src/SambaAD.pm 2007-03-13 11:07:24.000000000 +0100
@@ -57,15 +57,55 @@
# use DNS for finding DC
if (FileUtils->Exists ("/usr/bin/dig")) {
- my $out = SCR->Execute (".target.bash_output", "dig -t srv _ldap._tcp.pdc._msdcs.$workgroup +noall +answer");
+ # we have to select server from correct site - see bug #238249.
+ my $out = SCR->Execute (".target.bash_output", "dig -t srv _ldap._tcp.dc._msdcs.$workgroup +noall +answer");
y2debug ("dig output: ", Dumper ($out));
+ my $tmpserver = "";
+ my @sites = ();
foreach my $line (split (/\n/,$out->{"stdout"} || "")) {
y2debug ("line: $line");
next if $server ne "";
if ($line =~ m/$workgroup/) {
- $server = (split (/[ \t]/, $line))[7] || ".";
- chop $server;
+ $tmpserver = "";
+ $tmpserver = (split (/[ \t]/, $line))[7] || ".";
+ chop $tmpserver;
+ }
+ if ($tmpserver) {
+ my $cmd = "LANG=C net ads lookup -S $tmpserver";
+ $out = SCR->Execute (".target.bash_output", $cmd);
+ if ($out->{"exit"} eq 0) {
+ foreach my $line (split (/\n/,$out->{"stdout"} || "")) {
+ next if $server;
+ $server = $tmpserver if ($line =~ m/Is the closest DC/ && $line =~ m/yes/);
+ if ($line =~ m/Client Site Name/ && $line !~ m/Default-First-Site-Name/) {
+ my $site = $line;
+ $site =~ s/^Client Site Name:([\t ]*)//g;
+ }
+ }
+ }
+ }
+ }
+ y2debug ("server: $server");
+ # there were no sites not "closest DC" -> take the only one result
+ if (!$server && $tmpserver && not @sites) {
+ $server = $tmpserver;
+ }
+ # we still don't know which server to choose, but we know list of sites
+ elsif ($server eq "" && @sites) {
+ foreach my $site (@sites) {
+ next if $server;
+ $out = SCR->Execute (".target.bash_output", "dig -t _ldap._tcp.$site._sites.dc._msdcs.$workgroup +noall +answer");
+ y2debug ("dig output: ", Dumper ($out));
+ if ($out->{"exit"} eq 0) {
+ foreach my $line (split (/\n/,$out->{"stdout"} || "")) {
+ next if $server;
+ if ($line =~ m/$workgroup/) {
+ $server = (split (/[ \t]/, $line))[7] || ".";
+ chop $server;
+ }
+ }
+ }
}
}
y2debug ("server: $server");
@@ -124,6 +164,7 @@
SCR->Execute (".target.bash", "net ads lookup -U% -S $server") ne 0) {
$server = "";
}
+ y2milestone ("returning server: $server");
return $server;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.15.3/src/SambaConfig.pm new/yast2-samba-client-2.15.4/src/SambaConfig.pm
--- old/yast2-samba-client-2.15.3/src/SambaConfig.pm 2007-02-26 15:39:01.000000000 +0100
+++ new/yast2-samba-client-2.15.4/src/SambaConfig.pm 2007-03-08 11:06:05.000000000 +0100
@@ -4,7 +4,7 @@
# Summary: Manage samba configuration data (smb.conf).
# Authors: Martin Lazar
#
-# $Id: SambaConfig.pm 34993 2006-12-20 13:58:50Z jsuchome $
+# $Id: SambaConfig.pm 36773 2007-03-08 10:06:02Z jsuchome $
#
# Functions for acess to samba configuration file. It provide
# unified acces to configuration keys including aliases and other
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.15.3/src/Samba.ycp new/yast2-samba-client-2.15.4/src/Samba.ycp
--- old/yast2-samba-client-2.15.3/src/Samba.ycp 2007-02-26 15:37:55.000000000 +0100
+++ new/yast2-samba-client-2.15.4/src/Samba.ycp 2007-03-08 11:06:05.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Data for configuration of samba-client, input and output functions.
* Authors: Stanislav Visnovsky
*
- * $Id: Samba.ycp 35182 2007-01-09 15:36:39Z jsuchome $
+ * $Id: Samba.ycp 36773 2007-03-08 10:06:02Z jsuchome $
*
* Representation of the configuration of samba-client.
* Input and output routines.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.15.3/VERSION new/yast2-samba-client-2.15.4/VERSION
--- old/yast2-samba-client-2.15.3/VERSION 2007-03-08 10:49:12.000000000 +0100
+++ new/yast2-samba-client-2.15.4/VERSION 2007-03-13 11:08:05.000000000 +0100
@@ -1 +1 @@
-2.15.3
+2.15.4
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org