Hello community,
here is the log from the commit of package yast2-samba-client for
openSUSE:Factory checked in at 2015-01-23 16:18:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-samba-client (Old)
and /work/SRC/openSUSE:Factory/.yast2-samba-client.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-samba-client"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-samba-client/yast2-samba-client.changes
2014-12-05 21:03:21.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.yast2-samba-client.new/yast2-samba-client.changes
2015-01-23 16:18:12.000000000 +0100
@@ -1,0 +2,7 @@
+Mon Jan 12 16:53:48 UTC 2015 - [email protected]
+
+- When joining domain provide osName & osVer arguments to "net ads join"
+ (bnc#873922).
+- 3.1.15
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-samba-client.spec ++++++
--- /var/tmp/diff_new_pack.q1qzfI/_old 2015-01-23 16:18:13.000000000 +0100
+++ /var/tmp/diff_new_pack.q1qzfI/_new 2015-01-23 16:18:13.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package yast2-samba-client
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
++++++ yast2-samba-client-3.1.15.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-samba-client-3.1.15/package/yast2-samba-client.changes
new/yast2-samba-client-3.1.15/package/yast2-samba-client.changes
--- old/yast2-samba-client-3.1.15/package/yast2-samba-client.changes
2014-12-04 11:30:52.000000000 +0100
+++ new/yast2-samba-client-3.1.15/package/yast2-samba-client.changes
2015-01-19 12:43:32.000000000 +0100
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Mon Jan 12 16:53:48 UTC 2015 - [email protected]
+
+- When joining domain provide osName & osVer arguments to "net ads join"
+ (bnc#873922).
+- 3.1.15
+
+-------------------------------------------------------------------
Thu Dec 4 09:51:30 UTC 2014 - [email protected]
- remove X-KDE-Library from desktop file (bnc#899104)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-samba-client-3.1.15/src/clients/samba-client.rb
new/yast2-samba-client-3.1.15/src/clients/samba-client.rb
--- old/yast2-samba-client-3.1.15/src/clients/samba-client.rb 2014-12-04
11:30:52.000000000 +0100
+++ new/yast2-samba-client-3.1.15/src/clients/samba-client.rb 2015-01-19
12:43:32.000000000 +0100
@@ -44,6 +44,7 @@
Yast.import "Samba"
Yast.import "SambaAD"
Yast.import "SambaNetJoin"
+ Yast.import "OSRelease"
# The main ()
Builtins.y2milestone("----------------------------------------")
@@ -260,13 +261,16 @@
domain = SambaAD.GetWorkgroup(domain)
SambaAD.ReadRealm
end
-
+ relname = OSRelease.ReleaseName
+ relver = OSRelease.ReleaseVersion
result = SambaNetJoin.Join(
domain,
"member",
Ops.get_string(options, "user"),
Ops.get_string(options, "password", ""),
- Ops.get_string(options, "machine")
+ Ops.get_string(options, "machine"),
+ relname,
+ relver
)
if result == nil
# translators: result message for joindomain command line action
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-samba-client-3.1.15/src/include/samba-client/routines.rb
new/yast2-samba-client-3.1.15/src/include/samba-client/routines.rb
--- old/yast2-samba-client-3.1.15/src/include/samba-client/routines.rb
2014-12-04 11:30:52.000000000 +0100
+++ new/yast2-samba-client-3.1.15/src/include/samba-client/routines.rb
2015-01-19 12:43:32.000000000 +0100
@@ -45,6 +45,8 @@
Yast.import "SambaNetJoin"
Yast.import "SambaNmbLookup"
Yast.import "SambaAD"
+ Yast.import "OSRelease"
+
end
# Allow user to type in a user/password pair in a popup.
@@ -255,13 +257,17 @@
# cancelled the domain joining
return :fail if passwd == nil
+ relname = OSRelease.ReleaseName
+ relver = OSRelease.ReleaseVersion
# try to join the domain
error = SambaNetJoin.Join(
workgroup,
"member",
Ops.get(passwd, "user"),
Ops.get(passwd, "password", ""),
- Ops.get(passwd, "machine")
+ Ops.get(passwd, "machine"),
+ relname,
+ relver
)
if error != nil
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-samba-client-3.1.15/src/modules/Samba.rb
new/yast2-samba-client-3.1.15/src/modules/Samba.rb
--- old/yast2-samba-client-3.1.15/src/modules/Samba.rb 2014-12-04
11:30:52.000000000 +0100
+++ new/yast2-samba-client-3.1.15/src/modules/Samba.rb 2015-01-19
12:43:32.000000000 +0100
@@ -53,6 +53,7 @@
Yast.import "String"
Yast.import "Summary"
Yast.import "SuSEFirewall"
+ Yast.import "OSRelease"
# Data was modified?
@@ -803,6 +804,8 @@
end
# join the domain during autoinstallation
if @password_data != {}
+ relname = OSRelease.ReleaseName
+ relver = OSRelease.ReleaseVersion
SambaNetJoin.Join(
SambaConfig.GlobalGetStr("workgroup", ""),
"member",
@@ -816,7 +819,9 @@
"password",
Ops.get(@password_data, "passwd", "")
),
- Ops.get(@password_data, "machine")
+ Ops.get(@password_data, "machine"),
+ relname,
+ relver
)
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-samba-client-3.1.15/src/modules/SambaNetJoin.pm
new/yast2-samba-client-3.1.15/src/modules/SambaNetJoin.pm
--- old/yast2-samba-client-3.1.15/src/modules/SambaNetJoin.pm 2014-12-04
11:30:52.000000000 +0100
+++ new/yast2-samba-client-3.1.15/src/modules/SambaNetJoin.pm 2015-01-19
12:43:32.000000000 +0100
@@ -279,9 +279,10 @@
# @param machine machine account to join into (fate 301320)
# @return string an error message or nil if successful
BEGIN{$TYPEINFO{Join}=[
- "function","string","string","string","string","string","string"]}
+ "function","string","string","string","string","string","string",
"string", "string"]}
sub Join {
- my ($self, $domain, $join_level, $user, $passwd, $machine) = @_;
+ my ($self, $domain, $join_level, $user, $passwd, $machine, $release_name,
+ $release_version) = @_;
my $netbios_name = SambaConfig->GlobalGetStr("netbios name", undef);
my $server = SambaAD->ADS ();
@@ -336,7 +337,9 @@
# . (($protocol ne "ads" && $netbios_name)?" -n '$netbios_name'":"")
# FIXME check if netbios name can be used with AD
. ($netbios_name ? " -n '$netbios_name'" : "")
- . " -U '" . String->Quote ($user) . "%" . String->Quote ($passwd) . "'";
+ . " -U '" . String->Quote ($user) . "%" . String->Quote ($passwd) . "'"
+ . " osVer='" . String->Quote ($release_version) . "'"
+ . " osName='" . String->Quote ($release_name) . "'";
if ($machine) {
$machine =~ s/dc=([^,]*)//gi; # remove DC=* parts
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
