Hello community,
here is the log from the commit of package yast2-samba-client
checked in at Wed Apr 9 21:10:52 CEST 2008.
--------
--- yast2-samba-client/yast2-samba-client.changes 2008-03-28 12:58:43.000000000 +0100
+++ yast2-samba-client/yast2-samba-client.changes 2008-04-09 16:02:55.307214000 +0200
@@ -1,0 +2,11 @@
+Wed Apr 9 15:27:32 CEST 2008 - jsuchome@suse.cz
+
+- enable specifying of the machine account (fate#301320)
+- 2.16.4
+
+-------------------------------------------------------------------
+Wed Apr 2 11:28:21 CEST 2008 - jsuchome@suse.cz
+
+- enable single sign-on for SSH (fate #303415)
+
+-------------------------------------------------------------------
Old:
----
yast2-samba-client-2.16.3.tar.bz2
New:
----
yast2-samba-client-2.16.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-samba-client.spec ++++++
--- /var/tmp/diff_new_pack.I15376/_old 2008-04-09 21:10:27.000000000 +0200
+++ /var/tmp/diff_new_pack.I15376/_new 2008-04-09 21:10:27.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-samba-client (Version 2.16.3)
+# spec file for package yast2-samba-client (Version 2.16.4)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,17 +12,19 @@
Name: yast2-samba-client
-Version: 2.16.3
+Version: 2.16.4
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-samba-client-2.16.3.tar.bz2
+Source0: yast2-samba-client-2.16.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
+Requires: yast2-kerberos-client
# new Pam.ycp API
-Requires: yast2 yast2-pam >= 2.14.0
+Requires: yast2-pam >= 2.14.0
+# .etc.ssh.sshd_config
+Requires: yast2 >= 2.16.41
BuildArch: noarch
Summary: YaST2 - Samba Client Configuration
@@ -37,7 +39,7 @@
Stanislav Visnovsky
%prep
-%setup -n yast2-samba-client-2.16.3
+%setup -n yast2-samba-client-2.16.4
%build
%{prefix}/bin/y2tool y2autoconf
@@ -74,6 +76,11 @@
/usr/share/YaST2/schema/autoyast/rnc/samba-client.rnc
%doc %{prefix}/share/doc/packages/yast2-samba-client
%changelog
+* Wed Apr 09 2008 jsuchome@suse.cz
+- enable specifying of the machine account (fate#301320)
+- 2.16.4
+* Wed Apr 02 2008 jsuchome@suse.cz
+- enable single sign-on for SSH (fate #303415)
* Fri Mar 28 2008 jsuchome@suse.cz
- do not check for required packages during Read (bnc#374703)
- SambaConfig: do not create the hash by referencing inside
++++++ yast2-samba-client-2.16.3.tar.bz2 -> yast2-samba-client-2.16.4.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.16.3/src/complex.ycp new/yast2-samba-client-2.16.4/src/complex.ycp
--- old/yast2-samba-client-2.16.3/src/complex.ycp 2008-03-28 10:47:17.000000000 +0100
+++ new/yast2-samba-client-2.16.4/src/complex.ycp 2008-03-28 12:58:54.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Dialogs definitions
* Authors: Stanislav Visnovsky
*
- * $Id: complex.ycp 20250 2004-11-09 10:25:00Z mlazar $
+ * $Id: complex.ycp 45827 2008-03-28 11:58:54Z jsuchome $
*/
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.16.3/src/dialogs.ycp new/yast2-samba-client-2.16.4/src/dialogs.ycp
--- old/yast2-samba-client-2.16.3/src/dialogs.ycp 2007-12-03 15:16:52.000000000 +0100
+++ new/yast2-samba-client-2.16.4/src/dialogs.ycp 2008-04-09 15:04:22.000000000 +0200
@@ -166,7 +166,7 @@
// winbind enabled on start
boolean was_winbind = Samba::GetWinbind();
- term winbind_term = Stage::cont() ? `Empty () : `VBox(
+ term winbind_term = Stage::cont() ? `Empty () : `VBox (
`VSpacing (0.5),
`Left(`CheckBox(`id(`winbind), `opt (`notify),
// translators: checkbox label to enable winbind
@@ -214,10 +214,12 @@
`VBox (
`HBox(
`HSpacing (0.2),
- `TextEntry(`id(`workgroup), (Stage::cont() ?
+ `InputField (`id(`workgroup), `opt (`hstretch),
+ (Stage::cont() ?
_("&Domain") :
// translators: text entry label
- _("&Domain or Workgroup")), Samba::GetWorkgroupOrRealm())
+ _("&Domain or Workgroup")), Samba::GetWorkgroupOrRealm()
+ )
),
status_term,
winbind_term,
@@ -230,6 +232,11 @@
`CheckBox(`id(`caching),_("Off&line Authentication"),
Samba::GetWinbindCaching ())
),
+ `Left (
+ // checkbox label
+ `CheckBox (`id(`ssh),_("&Single Sign-On for SSH"),
+ Samba::GetSSHSupport ())
+ ),
`VSpacing (0.2)
)
)
@@ -255,7 +262,7 @@
HELPS["MembershipDialog_NTP"]:""),
Label::BackButton(), Stage::cont() ? Label::NextButton() : Label::FinishButton()
);
- foreach (symbol t, [`mkhomedir, `caching], {
+ foreach (symbol t, [`mkhomedir, `caching, `ssh], {
UI::ChangeWidget (`id(t), `Enabled, Samba::GetWinbind() || Stage::cont());
});
foreach (symbol t, [`group, `max_shares, `guest_ch], {
@@ -282,6 +289,7 @@
else if (ret == `winbind) {
UI::ChangeWidget (`id(`mkhomedir), `Enabled, use_winbind);
UI::ChangeWidget (`id(`caching), `Enabled, use_winbind);
+ UI::ChangeWidget (`id(`ssh), `Enabled, use_winbind);
}
else if (ret == `share_ch) {
foreach (symbol t, [`group, `max_shares, `guest_ch], {
@@ -417,6 +425,8 @@
(boolean)UI::QueryWidget(`id(`mkhomedir), `Value));
Samba::SetWinbindCaching (use_winbind &&
(boolean)UI::QueryWidget(`id(`caching), `Value));
+ Samba::SetSSHSupport (use_winbind &&
+ (boolean)UI::QueryWidget (`id(`ssh), `Value));
boolean new_share = (boolean)UI::QueryWidget(`id(`share_ch),`Value);
if (new_share && ! allow_share && SharesExist (Samba::shares_dir))
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.16.3/src/routines.ycp new/yast2-samba-client-2.16.4/src/routines.ycp
--- old/yast2-samba-client-2.16.3/src/routines.ycp 2008-01-21 11:01:32.000000000 +0100
+++ new/yast2-samba-client-2.16.4/src/routines.ycp 2008-04-09 15:46:09.000000000 +0200
@@ -30,34 +30,92 @@
* Allow user to type in a user/password pair in a popup.
*
* @param message a text to be displayed above the password text entry
- * @param defaultuser a pre-filled user name
+ * @param defaultuser a pre-filled user name
* @return map $["user": string, "password": string] with information
* provided by the user or nil on cancel
*/
-define map passwordUserPopup( string message, string defaultuser ) ``{
- UI::OpenDialog(
- `VBox(
- `Label( message ),
- // text entry label
- `TextEntry(`id(`user), _("&Username"), defaultuser ),
- // text entry label
- `Password(`id(`passwd), _("&Password") ),
- `HBox(
- `PushButton(`id(`ok), `opt(`default), Label::OKButton() ),
- `PushButton(`id(`cancel), Label::CancelButton() )
+map passwordUserPopup( string message, string defaultuser, string domain)
+{
+ term machine_term = `Empty ();
+ // default value of Machine Account
+ string default_entry= _("(default)");
+ if (SambaAD::ADS () != "")
+ {
+ list machines = [ default_entry ];
+ machine_term = `HBox (
+ `ReplacePoint (`id (`rpcombo),
+ `Left (`ComboBox (`id (`machines), `opt (`hstretch),
+ // combo box label
+ _("&Machine Account"), machines)
)
- )
- );
-
- any ret = UI::UserInput();
-
- map result = ret == `ok ? $[
- "user":(string)UI::QueryWidget(`id(`user), `Value),
- "password":(string)UI::QueryWidget(`id(`passwd), `Value) ]
- : nil;
+ ),
+ `VBox (
+ `Label (""),
+ `PushButton (`id (`acquire), _("&Acquire"))
+ )
+ );
+ }
+ UI::OpenDialog (`opt (`decorated), `HBox (`HSpacing (0.7), `VBox (
+ `HSpacing (25),
+ `VSpacing (0.2),
+ `Left (`Label (message)),
+ // text entry label
+ `InputField (`id (`user), `opt (`hstretch), _("&Username"),defaultuser),
+ `Password (`id(`passwd), `opt (`hstretch), Label::Password()),
+ machine_term,
+ `VSpacing (0.2),
+ `HBox (
+ `PushButton(`id(`ok), `opt(`default), Label::OKButton()),
+ `PushButton(`id(`cancel), Label::CancelButton())
+ ),
+ `VSpacing (0.2)
+ ), `HSpacing (0.7)));
+
+ if (SambaAD::ADS () != "")
+ {
+ UI::ChangeWidget (`id (`machines), `Enabled, false);
+ }
+ any ret = nil;
+ string user = "";
+ string pass = "";
+ while (true)
+ {
+ ret = UI::UserInput();
+ user = (string)UI::QueryWidget(`id(`user), `Value);
+ pass = (string)UI::QueryWidget(`id(`passwd), `Value);
+
+ if (ret == `ok || ret == `cancel)
+ break;
+ if (ret == `acquire)
+ {
+ if (user == "" || pass == "")
+ {
+ // error popup
+ Popup::Error (_("User name and password are required
+for listing the machine accounts."));
+ continue;
+ }
+ list machines = SambaAD::GetMachines (domain, user, pass);
+ if (machines != nil)
+ {
+ machines = prepend (machines, default_entry);
+ UI::ReplaceWidget (`id (`rpcombo), `Left (
+ `ComboBox (`id (`machines), `opt (`hstretch),
+ _("&Machine Account"), machines)
+ ));
+ UI::ChangeWidget (`id (`machines), `Enabled, true);
+ }
+ }
+ }
+ map result = (ret == `ok) ? $[
+ "user" : user,
+ "password" : pass
+ ] : nil;
+ if (SambaAD::ADS () != "" && ret == `ok)
+ result["machine"]= (string)UI::QueryWidget (`id (`machines), `Value);
UI::CloseDialog();
-
+
return result;
}
@@ -110,21 +168,22 @@
define symbol JoinDomain(string workgroup)
{
- // translators: popup to fill in the domain joining info; %1 is the domain name
- map passwd = passwordUserPopup(sformat(_("Enter the username and the password\nfor joining the domain %1."), workgroup)
- + "\n\n"
- + _("To join the domain anonymously, leave the\ntext entries empty.") + "\n", "Administrator");
+ // popup to fill in the domain joining info; %1 is the domain name
+ map passwd = passwordUserPopup(sformat(_("Enter the username and the password for joining the domain %1."), workgroup)
+ + "\n\n"
+ + _("To join the domain anonymously, leave the text entries empty.") + "\n", "Administrator", workgroup);
// cancelled the domain joining
if( passwd == nil ) return `fail;
-
// try to join the domain
- string error = SambaNetJoin::Join(workgroup, "member", passwd["user"]:nil, passwd["password"]:"" );
+ string error = SambaNetJoin::Join (
+ workgroup, "member",
+ passwd["user"]:nil, passwd["password"]:"", passwd["machine"]:nil);
+
if (error != nil) {
Popup::Error(error);
return `fail;
}
-
// Translators: Information popup, %1 is the name of the domain
Popup::Message(sformat(_("Domain %1 joined successfully."), Samba::GetWorkgroup()));
return `ok;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.16.3/src/SambaAD.pm new/yast2-samba-client-2.16.4/src/SambaAD.pm
--- old/yast2-samba-client-2.16.3/src/SambaAD.pm 2007-06-22 16:32:21.000000000 +0200
+++ new/yast2-samba-client-2.16.4/src/SambaAD.pm 2008-04-09 15:57:10.000000000 +0200
@@ -36,6 +36,43 @@
# Kerberos realm for AD
my $realm = "";
+# Read the list of available machine accounts in the current domain
+#
+# @param domain AD domain
+# @param user user name
+# @param password password
+# @return list
+BEGIN{$TYPEINFO{GetMachines}= [
+ "function", ["list","string"], "string", "string", "string"]}
+sub GetMachines {
+
+ my ($self, $domain, $user, $passwd) = @_;
+ my @ret = ();
+
+ my $tmpdir = SCR->Read (".target.tmpdir");
+ my $conf_file = $tmpdir."/smb.conf";
+ my $cmd = "net ads search \"(objectclass=organizationalUnit)\" distinguishedName -s $conf_file -U '$user%". ($passwd||"") . "'";
+
+ SCR->Write (".target.string", $conf_file, "[global]\n\trealm = $realm\n\tsecurity = ADS\n\tworkgroup = $domain\n");
+
+ my $result = SCR->Execute(".target.bash_output", $cmd);
+
+ if ($result->{"exit"} eq 0) {
+ foreach my $line (split (/\n/,$result->{"stdout"} || "")) {
+ if ($line =~ m/^distinguishedName:/) {
+ my $dn = $line;
+ $dn =~ s/^distinguishedName:([\t ]*)//g;
+ push @ret, $dn if $dn;
+ }
+ }
+ }
+ else {
+ $cmd =~ s/(-U '[^%]*)%[^']*'/$1'/; # hide password in the log
+ y2warning ("$cmd failed: ".Dumper($result));
+ return undef;
+ }
+ return \@ret;
+}
# Check if a given workgroup is a Active Directory domain and return the name
# of AD domain controler
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.16.3/src/samba-client.ycp new/yast2-samba-client-2.16.4/src/samba-client.ycp
--- old/yast2-samba-client-2.16.3/src/samba-client.ycp 2006-10-30 13:42:02.000000000 +0100
+++ new/yast2-samba-client-2.16.4/src/samba-client.ycp 2008-04-09 15:29:11.000000000 +0200
@@ -106,7 +106,7 @@
SambaAD::ReadRealm ();
}
- string result = SambaNetJoin::Join(domain, "member", (string)(options["user"]:nil), (string) (options["password"]:""));
+ string result = SambaNetJoin::Join(domain, "member", (string)(options["user"]:nil), (string) (options["password"]:""), (string) (options["machine"]:nil));
if( result == nil ) {
// translators: result message for joindomain command line action
CommandLine::Print( sformat( _("Domain %1 joined successfully."), domain ) );
@@ -202,6 +202,11 @@
"help" : _("The password used for the user when joining the domain"),
"type" : "string"
],
+ "machine" :$[
+ // command line help text for machine optioa
+ "help" : _("The machine account"),
+ "type" : "string"
+ ],
"workgroup" :$[
// translators: command line help text for the workgroup name option
"help" : _("The name of a workgroup"),
@@ -211,7 +216,7 @@
"mappings" : $[
"winbind" : [ "enable", "disable" ],
"isdomainmember": [ "domain" ],
- "joindomain" : [ "domain", "user", "password" ],
+ "joindomain" : [ "domain", "user", "password", "machine" ],
"configure" : [ "workgroup" ]
]
];
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.16.3/src/SambaConfig.pm new/yast2-samba-client-2.16.4/src/SambaConfig.pm
--- old/yast2-samba-client-2.16.3/src/SambaConfig.pm 2008-03-28 12:50:10.000000000 +0100
+++ new/yast2-samba-client-2.16.4/src/SambaConfig.pm 2008-03-28 12:58:54.000000000 +0100
@@ -4,7 +4,7 @@
# Summary: Manage samba configuration data (smb.conf).
# Authors: Martin Lazar
#
-# $Id: SambaConfig.pm 38016 2007-05-17 11:52:37Z jsuchome $
+# $Id: SambaConfig.pm 45827 2008-03-28 11:58:54Z 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.16.3/src/SambaNetJoin.pm new/yast2-samba-client-2.16.4/src/SambaNetJoin.pm
--- old/yast2-samba-client-2.16.3/src/SambaNetJoin.pm 2007-05-17 11:18:55.000000000 +0200
+++ new/yast2-samba-client-2.16.4/src/SambaNetJoin.pm 2008-04-09 15:27:18.000000000 +0200
@@ -66,11 +66,13 @@
# @param domain a name of a domain to be joined
# @param join_level level of a domain membership when joining ("member", "bdc" or "pdc")
# @param user username to be used for joining, or nil for anonymous
-# @param passwd password for the user
+# @param passwd password for the user
+# @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"]}
+BEGIN{$TYPEINFO{Join}=[
+ "function","string","string","string","string","string","string"]}
sub Join {
- my ($self, $domain, $join_level, $user, $passwd) = @_;
+ my ($self, $domain, $join_level, $user, $passwd, $machine) = @_;
my $netbios_name = SambaConfig->GlobalGetStr("netbios name", undef);
my $server = SambaAD->ADS ();
@@ -97,6 +99,8 @@
. (($protocol ne "ads" && $netbios_name)?" -n '$netbios_name'":"")
. " -U '" . ($user||"") . "%" . ($passwd||"") . "'";
+ $cmd = $cmd. " -createcomputer=\"$machine\"" if $machine;
+
my $result = SCR->Execute(".target.bash_output", $cmd);
$cmd =~ s/(-U '[^%]*)%[^']*'/$1'/; # hide password in debug
y2internal("$cmd => ".Dumper($result));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.16.3/src/Samba.ycp new/yast2-samba-client-2.16.4/src/Samba.ycp
--- old/yast2-samba-client-2.16.3/src/Samba.ycp 2008-03-28 11:25:08.000000000 +0100
+++ new/yast2-samba-client-2.16.4/src/Samba.ycp 2008-04-09 13:35:59.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Data for configuration of samba-client, input and output functions.
* Authors: Stanislav Visnovsky
*
- * $Id: Samba.ycp 39556 2007-07-20 05:46:37Z jsuchome $
+ * $Id: Samba.ycp 45827 2008-03-28 11:58:54Z jsuchome $
*
* Representation of the configuration of samba-client.
* Input and output routines.
@@ -98,6 +98,21 @@
// if changing hostname by DHCP should be disabled (#169260)
global boolean disable_dhcp_hostname = false;
+// support for SSH single-sign-on (fate #303415)
+global boolean ssh_support = false;
+
+// initial status of single-sign-on suport in ssh_config
+boolean ssh_was_enabled = false;
+
+// initial status of single-sign-on suport in sshd_config
+boolean sshd_was_enabled = false;
+
+// if it ssh support was modified
+boolean ssh_modified = false;
+
+// section in /etc/ssh/ssh_config file for storing single-sign-on settings
+string ssh_section = "*";
+
// packages to install for specific arhitectures (#224418)
global map arch_packages = $[
"krb5" : $[
@@ -145,7 +160,7 @@
*/
global boolean GetModified() {
y2debug("modified=%1",modified);
- return modified || mkhomedir_modified || shares_modified || SambaConfig::GetModified();
+ return modified || mkhomedir_modified || shares_modified || SambaConfig::GetModified() || ssh_modified;
};
/**
@@ -286,6 +301,96 @@
}
/**
+ * Read the current status of ssh single-sign-on support (fate #303415)
+ */
+global define boolean ReadSSHSupport () {
+
+ boolean ssh = nil;
+ boolean sshd = false;
+
+ if (FileUtils::Exists ("/etc/ssh/ssh_config") &&
+ FileUtils::Exists ("/etc/ssh/sshd_config"))
+ {
+ string hostname = "*";
+ map out = (map)SCR::Execute(.target.bash_output,"LANG=C /bin/hostname");
+ if (out["stderr"]:nil == "")
+ hostname = deletechars(out["stdout"]:"", "\n");
+ foreach (string sec, SCR::Dir (.etc.ssh.ssh_config.s), {
+ if (ssh != nil) return;
+ list cont = SCR::Dir (add(.etc.ssh.ssh_config.v, sec));
+ y2debug ("section %1 contains: %2", sec, cont);
+
+ if ((sec == "*" || sec == hostname) &&
+ (contains (cont, "GSSAPIAuthentication") &&
+ contains (cont, "GSSAPIDelegateCredentials")))
+ {
+ ssh =
+ (SCR::Read (add (add (.etc.ssh.ssh_config.v, sec),
+ "GSSAPIAuthentication")) == "yes") &&
+ (SCR::Read (add (add (.etc.ssh.ssh_config.v, sec),
+ "GSSAPIDelegateCredentials")) == "yes");
+ ssh_section = sec;
+ }
+ });
+ sshd = true;
+ foreach (string key, ["GSSAPIAuthentication","GSSAPICleanupCredentials",
+ "ChallengeResponseAuthentication", "UsePAM" ], {
+ sshd = sshd && contains (
+ (list)SCR::Read (add (.etc.ssh.sshd_config, key)), "yes");
+ });
+ }
+ ssh_was_enabled = (ssh == true);
+ sshd_was_enabled = sshd;
+ ssh_support = ssh_was_enabled && sshd_was_enabled;
+ return ssh_support;
+}
+
+/**
+ * Get the current status of ssh single-sign-on support
+ */
+global define boolean GetSSHSupport () {
+ return ssh_support;
+}
+
+/**
+ * Set the new value for sh single-sign-on support
+ */
+global define boolean SetSSHSupport (boolean enable) {
+ ssh_support = enable;
+ ssh_modified = (enable != (ssh_was_enabled && sshd_was_enabled));
+ return enable;
+}
+
+/**
+ * Write the new value for sh single-sign-on support (fate #303415)
+ */
+global define boolean WriteSSHSupport (boolean enable) {
+
+ string write = enable ? "yes": "no";
+
+ // do not write "no" everywhere, there might be some user setting...
+ if (enable || ssh_was_enabled)
+ {
+ SCR::Write (add (add (.etc.ssh.ssh_config.v, ssh_section),
+ "GSSAPIAuthentication"), write);
+ SCR::Write (add (add (.etc.ssh.ssh_config.v, ssh_section),
+ "GSSAPIDelegateCredentials"), write);
+ SCR::Write (.etc.ssh.ssh_config, nil);
+ y2milestone ("/etc/ssh/ssh_config modified");
+ }
+ if (enable || sshd_was_enabled)
+ {
+ foreach (string key, ["GSSAPIAuthentication","GSSAPICleanupCredentials",
+ "ChallengeResponseAuthentication", "UsePAM" ], {
+ SCR::Write (add (.etc.ssh.sshd_config, key), [write]);
+ });
+ SCR::Write (.etc.ssh.sshd_config, nil);
+ y2milestone ("/etc/ssh/sshd_config modified");
+ }
+ return enable;
+}
+
+/**
* Start/Stop and FAM service according to current settings
* @param write_only do not start/stop services
* @return success
@@ -439,6 +544,8 @@
ReadSharesSetting ();
+ ReadSSHSupport ();
+
Autologin::Read();
// read network settings
@@ -539,7 +646,8 @@
SambaNetJoin::Join (SambaConfig::GlobalGetStr("workgroup",""),
"member",
password_data["user"]:password_data["username"]:"",
- password_data["password"]:password_data["passwd"]:""
+ password_data["password"]:password_data["passwd"]:"",
+ password_data["machine"]:nil
);
}
}
@@ -608,6 +716,8 @@
WriteShares ();
AdjustSharesServices (write_only);
+ WriteSSHSupport (ssh_support);
+
// finished
Progress::NextStage();
modified = false;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.16.3/VERSION new/yast2-samba-client-2.16.4/VERSION
--- old/yast2-samba-client-2.16.3/VERSION 2008-03-19 08:53:18.000000000 +0100
+++ new/yast2-samba-client-2.16.4/VERSION 2008-04-02 11:29:30.000000000 +0200
@@ -1 +1 @@
-2.16.3
+2.16.4
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org