Hello community,
here is the log from the commit of package yast2-samba-client
checked in at Fri Apr 28 21:09:16 CEST 2006.
--------
--- yast2-samba-client/yast2-samba-client.changes 2006-04-19 16:39:13.000000000 +0200
+++ NOARCH/yast2-samba-client/yast2-samba-client.changes 2006-04-28 07:57:15.000000000 +0200
@@ -1,0 +2,8 @@
+Wed Apr 26 14:59:30 CEST 2006 - jsuchome@suse.cz
+
+- use tmp samba config file for joining as workaround for #168300
+- do not remove workgroup key when AD is not used
+- use "domain" value for "security" key for non-AD setups (#168300)
+- 2.13.18
+
+-------------------------------------------------------------------
Old:
----
yast2-samba-client-2.13.17.tar.bz2
New:
----
yast2-samba-client-2.13.18.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-samba-client.spec ++++++
--- /var/tmp/diff_new_pack.ZMJwgp/_old 2006-04-28 21:09:12.000000000 +0200
+++ /var/tmp/diff_new_pack.ZMJwgp/_new 2006-04-28 21:09:12.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-samba-client (Version 2.13.17)
+# spec file for package yast2-samba-client (Version 2.13.18)
#
# Copyright (c) 2006 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.13.17
+Version: 2.13.18
Release: 2
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-samba-client-2.13.17.tar.bz2
+Source0: yast2-samba-client-2.13.18.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-pam yast2-perl-bindings yast2-testsuite
Requires: yast2 yast2-pam yast2-kerberos-client
@@ -34,7 +34,7 @@
Stanislav Visnovsky
%prep
-%setup -n yast2-samba-client-2.13.17
+%setup -n yast2-samba-client-2.13.18
%build
%{prefix}/bin/y2tool y2autoconf
@@ -71,6 +71,11 @@
%doc %{prefix}/share/doc/packages/yast2-samba-client
%changelog -n yast2-samba-client
+* Wed Apr 26 2006 - jsuchome@suse.cz
+- use tmp samba config file for joining as workaround for #168300
+- do not remove workgroup key when AD is not used
+- use "domain" value for "security" key for non-AD setups (#168300)
+- 2.13.18
* Wed Apr 19 2006 - jsuchome@suse.cz
- fixed Import/Export for keys in /etc/security/pam_winbind.conf
- 2.13.17
++++++ yast2-samba-client-2.13.17.tar.bz2 -> yast2-samba-client-2.13.18.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.13.17/VERSION new/yast2-samba-client-2.13.18/VERSION
--- old/yast2-samba-client-2.13.17/VERSION 2006-04-19 16:28:42.000000000 +0200
+++ new/yast2-samba-client-2.13.18/VERSION 2006-04-26 15:00:09.000000000 +0200
@@ -1 +1 @@
-2.13.17
+2.13.18
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.13.17/src/SambaAD.pm new/yast2-samba-client-2.13.18/src/SambaAD.pm
--- old/yast2-samba-client-2.13.17/src/SambaAD.pm 2006-04-18 17:10:25.000000000 +0200
+++ new/yast2-samba-client-2.13.18/src/SambaAD.pm 2006-04-27 16:52:56.000000000 +0200
@@ -246,11 +246,10 @@
# remove special AD values if AD is not used
my $remove = (($ads || "") eq "");
SambaConfig->GlobalSetMap({
- "security" => $remove ? undef : "ADS",
+ "security" => $remove ? "domain" : "ADS",
"realm" => $remove ? undef : $realm,
"template shell" => $remove ? undef : "/bin/bash",
"template homedir" => $remove ? undef : "/home/%D/%U",
- "workgroup" => $remove ? undef : $workgroup,
"winbind refresh tickets" => $remove ? undef : "yes"
});
SambaConfig->WinbindGlobalSetMap({
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.13.17/src/SambaConfig.pm new/yast2-samba-client-2.13.18/src/SambaConfig.pm
--- old/yast2-samba-client-2.13.17/src/SambaConfig.pm 2006-04-19 16:24:35.000000000 +0200
+++ new/yast2-samba-client-2.13.18/src/SambaConfig.pm 2006-04-19 16:39:35.000000000 +0200
@@ -4,7 +4,7 @@
# Summary: Manage samba configuration data (smb.conf).
# Authors: Martin Lazar
#
-# $Id: SambaConfig.pm 30222 2006-04-19 08:42:27Z jsuchome $
+# $Id: SambaConfig.pm 30253 2006-04-19 14:39:32Z 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.13.17/src/SambaNetJoin.pm new/yast2-samba-client-2.13.18/src/SambaNetJoin.pm
--- old/yast2-samba-client-2.13.17/src/SambaNetJoin.pm 2006-03-16 17:56:53.000000000 +0100
+++ new/yast2-samba-client-2.13.18/src/SambaNetJoin.pm 2006-04-27 16:47:57.000000000 +0200
@@ -37,14 +37,15 @@
my $protocol = SambaAD->ADS () ne "" ? "ads" : "rpc";
my $netbios_name = SambaConfig->GlobalGetStr("netbios name", undef);
- my $conf_file = "/dev/zero";
+ my $conf_file = SCR->Read (".target.tmpdir")."/smb.conf";
if ($protocol eq "ads") {
- $conf_file = SCR->Read (".target.tmpdir")."/smb.conf";
my $realm = SambaAD->Realm ();
-# SCR->Write (".target.string", $conf_file, "[global]\n\trealm = $realm\n\tsecurity = ADS\n\tworkgroup = $domain\n\tuse kerberos keytab = Yes\n");
SCR->Write (".target.string", $conf_file, "[global]\n\trealm = $realm\n\tsecurity = ADS\n\tworkgroup = $domain\n");
}
+ else {
+ SCR->Write (".target.string", $conf_file, "[global]\n\tsecurity = domain\n\tworkgroup = $domain\n");
+ }
# FIXME -P is probably wrong, but suppresses password prompt
my $cmd = "LANG=C net $protocol testjoin -s $conf_file -P";
@@ -74,18 +75,21 @@
my $netbios_name = SambaConfig->GlobalGetStr("netbios name", undef);
my $server = SambaAD->ADS ();
my $protocol = $server ne "" ? "ads" : "rpc";
- my $conf_file = "/dev/zero";
+ my $tmpdir = SCR->Read (".target.tmpdir");
+ my $conf_file = $tmpdir."/smb.conf";
my $cmd = "";
+
if ($protocol eq "ads") {
- my $tmpdir = SCR->Read (".target.tmpdir");
- $conf_file = $tmpdir."/smb.conf";
my $krb_file = $tmpdir."/krb5.conf";
my $realm = SambaAD->Realm ();
-# SCR->Write (".target.string", $conf_file, "[global]\n\trealm = $realm\n\tsecurity = ADS\n\tworkgroup = $domain\n\tuse kerberos keytab = Yes\n");
SCR->Write (".target.string", $conf_file, "[global]\n\trealm = $realm\n\tsecurity = ADS\n\tworkgroup = $domain\n");
$cmd = "KRB5_CONFIG=$krb_file ";
SCR->Write (".target.string", $krb_file, "[realms]\n\t$realm = {\n\tkdc = $server\n\t}\n");
}
+ else {
+ SCR->Write (".target.string", $conf_file, "[global]\n\tsecurity = domain\n\tworkgroup = $domain\n");
+ }
+
$cmd = $cmd."net $protocol join "
. ($protocol ne "ads" ? lc($join_level||"") : "")
. ($protocol ne "ads" ? " -w '$domain'" : "")
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.13.17/src/SambaWinbind.pm new/yast2-samba-client-2.13.18/src/SambaWinbind.pm
--- old/yast2-samba-client-2.13.17/src/SambaWinbind.pm 2006-03-16 14:51:46.000000000 +0100
+++ new/yast2-samba-client-2.13.18/src/SambaWinbind.pm 2006-04-27 16:52:47.000000000 +0200
@@ -58,7 +58,6 @@
"idmap uid" => "10000-20000",
"idmap gid" => "10000-20000"
});
-# SambaConfig::GlobalSetStr("security", "domain");
}
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...