Skip to content

Commit

Permalink
pass osVersion and osName (and empty osServicePack) to join command
Browse files Browse the repository at this point in the history
The yast2-samab-client changes to ensure osVersion and osName are
passed to 'net ads join' have changed the SambaJoinNet:Join api so we
need accompaning changes to adjust to the new api
  • Loading branch information
noelpower committed Jan 13, 2015
1 parent 1c34500 commit 50d3b74
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 3 deletions.
7 changes: 7 additions & 0 deletions package/yast2-samba-server.changes
@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Jan 13 11:54:52 UTC 2015 - nopower@suse.com

- When joining domain provide osName & osVer arguments to "net ads join"
(bnc#873922).
- 3.1.12

-------------------------------------------------------------------
Wed Nov 12 13:11:35 UTC 2014 - nopower@suse.com

Expand Down
4 changes: 2 additions & 2 deletions package/yast2-samba-server.spec
Expand Up @@ -17,7 +17,7 @@


Name: yast2-samba-server
Version: 3.1.11
Version: 3.1.12
Release: 0

BuildRoot: %{_tmppath}/%{name}-%{version}-build
Expand All @@ -38,7 +38,7 @@ Requires: yast2-ldap >= 3.1.2
Requires: yast2-perl-bindings
Requires: yast2-network
# samba-client/routines.rb
Requires: yast2-samba-client >= 3.1.2
Requires: yast2-samba-client >= 3.1.15
Requires: yast2-users

# bnc #386473, recommend yast2-samba-server when installaing these packages
Expand Down
7 changes: 6 additions & 1 deletion src/include/samba-server/dialogs.rb
Expand Up @@ -56,6 +56,7 @@ def initialize_samba_server_dialogs(include_target)
Yast.import "CWMTab"
Yast.import "CWMServiceStart"
Yast.import "CWMFirewallInterfaces"
Yast.import "OSRelease"

Yast.include include_target, "samba-server/helps.rb"
Yast.include include_target, "samba-server/dialogs-items.rb"
Expand Down Expand Up @@ -1738,13 +1739,17 @@ def AskJoinDomainDialog
return :skip if ret == :skip
return :cancel if ret != :ok

relname = OSRelease.ReleaseName
relver = OSRelease.ReleaseVersion
# try to join the domain
error = SambaNetJoin.Join(
workgroup,
Builtins.tolower(role),
user,
passwd,
""
"",
relname,
relver
)
if error != nil
Popup.Error(error)
Expand Down

0 comments on commit 50d3b74

Please sign in to comment.