Hello community,
here is the log from the commit of package yast2-samba-client
checked in at Mon Oct 30 17:54:37 CET 2006.
--------
--- yast2-samba-client/yast2-samba-client.changes 2006-08-25 15:15:24.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-samba-client/yast2-samba-client.changes 2006-10-30 16:33:22.000000000 +0100
@@ -1,0 +2,15 @@
+Mon Oct 30 16:26:18 CET 2006 - jsuchome@suse.cz
+
+- offer the option to run NTP confiuration (#215645)
+- 2.14.2
+
+-------------------------------------------------------------------
+Mon Oct 30 13:14:21 CET 2006 - jsuchome@suse.cz
+
+- save smb.conf during autoinstallation (#188864)
+- read realm during write instead of import
+- export all modified shares from SambaConfig
+- fixed writing in command line mode (#207268)
+- 2.14.1
+
+-------------------------------------------------------------------
Old:
----
yast2-samba-client-2.14.0.tar.bz2
New:
----
yast2-samba-client-2.14.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-samba-client.spec ++++++
--- /var/tmp/diff_new_pack.yfWPs1/_old 2006-10-30 17:54:21.000000000 +0100
+++ /var/tmp/diff_new_pack.yfWPs1/_new 2006-10-30 17:54:21.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-samba-client (Version 2.14.0)
+# spec file for package yast2-samba-client (Version 2.14.2)
#
# 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.14.0
+Version: 2.14.2
Release: 1
-License: GPL
+License: GNU General Public License (GPL) - all versions
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-samba-client-2.14.0.tar.bz2
+Source0: yast2-samba-client-2.14.2.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.14.0
+%setup -n yast2-samba-client-2.14.2
%build
%{prefix}/bin/y2tool y2autoconf
@@ -73,6 +73,15 @@
%doc %{prefix}/share/doc/packages/yast2-samba-client
%changelog -n yast2-samba-client
+* Mon Oct 30 2006 - jsuchome@suse.cz
+- offer the option to run NTP confiuration (#215645)
+- 2.14.2
+* Mon Oct 30 2006 - jsuchome@suse.cz
+- save smb.conf during autoinstallation (#188864)
+- read realm during write instead of import
+- export all modified shares from SambaConfig
+- fixed writing in command line mode (#207268)
+- 2.14.1
* Fri Aug 25 2006 - jsuchome@suse.cz
- adapted for pam-config usage (F300956)
- API of PamSettings module is obsolete
++++++ yast2-samba-client-2.14.0.tar.bz2 -> yast2-samba-client-2.14.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.14.0/VERSION new/yast2-samba-client-2.14.2/VERSION
--- old/yast2-samba-client-2.14.0/VERSION 2006-08-25 13:52:59.000000000 +0200
+++ new/yast2-samba-client-2.14.2/VERSION 2006-10-30 16:26:42.000000000 +0100
@@ -1 +1 @@
-2.14.0
+2.14.2
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.14.0/src/Samba.ycp new/yast2-samba-client-2.14.2/src/Samba.ycp
--- old/yast2-samba-client-2.14.0/src/Samba.ycp 2006-08-25 13:55:29.000000000 +0200
+++ new/yast2-samba-client-2.14.2/src/Samba.ycp 2006-10-30 13:42:02.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Data for configuration of samba-client, input and output functions.
* Authors: Stanislav Visnovsky
*
- * $Id: Samba.ycp 32553 2006-08-24 13:55:17Z jsuchome $
+ * $Id: Samba.ycp 33836 2006-10-30 12:41:57Z jsuchome $
*
* Representation of the configuration of samba-client.
* Input and output routines.
@@ -375,6 +375,20 @@
}
/**
+ * Set a windind status
+ *
+ * @param group a new winbind status
+ */
+global define void SetWinbind(boolean status) ``{
+ if (status != winbind_enabled) {
+ modified = true;
+ winbind_enabled = status;
+ }
+ SambaAD::AdjustSambaConfig(status);
+ SambaWinbind::AdjustSambaConfig(status);
+}
+
+/**
* Write all samba-client settings
* @return true on success
*/
@@ -419,14 +433,23 @@
// if nothing to write, quit (but show at least the progress bar :-)
if (!GetModified()) return true;
- // join the domain during autoinstallation
- if (Mode::autoinst () && password_data != $[])
+ if (Mode::autoinst ())
{
- SambaNetJoin::Join (SambaConfig::GlobalGetStr("workgroup",""),
- "member",
- password_data["user"]:password_data["username"]:"",
- password_data["password"]:password_data["passwd"]:""
- );
+ if (SambaAD::ADS () != "")
+ {
+ SambaConfig::GlobalSetStr("workgroup",
+ SambaAD::GetWorkgroup(SambaConfig::GlobalGetStr("workgroup","")));
+ SambaAD::ReadRealm ();
+ }
+ // join the domain during autoinstallation
+ if (password_data != $[])
+ {
+ SambaNetJoin::Join (SambaConfig::GlobalGetStr("workgroup",""),
+ "member",
+ password_data["user"]:password_data["username"]:"",
+ password_data["password"]:password_data["passwd"]:""
+ );
+ }
}
if (!SambaConfig::Write(write_only)) {
@@ -507,35 +530,49 @@
* @return boolean True on success
*/
global boolean Import (map settings) {
+
if (haskey(settings, "global")) {
map globals = settings["global"]:$[];
SambaConfig::GlobalSetStr("workgroup",globals["workgroup"]:"WORKGROUP");
- winbind_enabled = globals["winbind"]:false;
- SetMkHomeDir (globals["mkhomedir"]:mkhomedir);
- if (haskey (globals, "winbind_caching"))
- SetWinbindCaching (globals["winbind_caching"]:false);
- if (haskey (globals, "guest_access"))
- SetGuessAccess (globals["guest_access"]:false);
- SetShares(globals["max_shares"]:0,globals["shares_group"]:shares_group);
+
+ if (tolower (globals["winbind_offline_logon"]:"") == "yes" &&
+ tolower (globals["cached_login"]:"") == "yes")
+ SetWinbindCaching (true);
+
+ if (haskey (globals, "usershare_max_shares") ||
+ haskey (settings, "shares_group"))
+ SetShares (tointeger (globals["usershare_max_shares"]:"0"),
+ settings["shares_group"]:shares_group);
+
+ if (tolower (globals["usershare_allow_guests"]:"") == "yes")
+ SetGuessAccess (true);
+
globals_configured = true;
modified = true;
} else {
globals_configured = false;
}
+ if (haskey (settings, "shares_group"))
+ shares_group = settings["shares_group"]:shares_group;
+
if (haskey(settings, "active_directory"))
{
SambaAD::SetADS (settings["active_directory","kdc"]:"");
- if (!Mode::config ())
- {
- SambaConfig::GlobalSetStr("workgroup",
- SambaAD::GetWorkgroup(SambaConfig::GlobalGetStr("workgroup","")));
- SambaAD::ReadRealm ();
- }
+ }
+ // call this _after_ evaluation if AD is used
+ boolean winbind = settings["winbind"]:settings["global","winbind"]:false;
+ if (winbind != nil)
+ {
+ SetWinbind (winbind);
}
if (haskey(settings, "join"))
{
password_data = settings["join"]:$[];
}
+ if (haskey (settings, "mkhomedir"))
+ {
+ SetMkHomeDir (settings["mkhomedir"]:mkhomedir);
+ }
return true;
}
@@ -550,25 +587,20 @@
if (!globals_configured) {
return $[];
}
-
- map globals = $[
- "workgroup" : SambaConfig::GlobalGetStr("workgroup", ""),
- "winbind" : winbind_enabled,
+ map ret = $[
+ "winbind" : winbind_enabled
];
if (mkhomedir_modified)
- globals["mkhomedir"] = mkhomedir;
- if (winbind_enabled)
- globals["winbind_caching"] = GetWinbindCaching ();
+ ret["mkhomedir"] = mkhomedir;
- if (GetMaxShares () > 0)
- {
- globals["max_shares"] = GetMaxShares ();
- globals["shares_group"] = shares_group;
- if (GetGuessAccess ())
- globals["guest_access"] = true;
- }
+ if (shares_modified && shares_group != "")
+ ret["shares_group"] = shares_group;
+
+ foreach (map sect, (list<map>) SambaConfig::Export (), {
+ string name = sect["name"]:"";
+ ret[name] = sect["parameters"]:$[];
+ });
- map ret = $[ "global": globals ];
if (SambaAD::ADS() != "")
{
ret["active_directory"] = $[
@@ -686,20 +718,6 @@
/**
- * Set a windind status
- *
- * @param group a new winbind status
- */
-global define void SetWinbind(boolean status) ``{
- if (status != winbind_enabled) {
- modified = true;
- winbind_enabled = status;
- }
- SambaAD::AdjustSambaConfig(status);
- SambaWinbind::AdjustSambaConfig(status);
-}
-
-/**
* Get a winbind status
*
* @return booleand a winbind status
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.14.0/src/SambaConfig.pm new/yast2-samba-client-2.14.2/src/SambaConfig.pm
--- old/yast2-samba-client-2.14.0/src/SambaConfig.pm 2006-08-07 14:57:11.000000000 +0200
+++ new/yast2-samba-client-2.14.2/src/SambaConfig.pm 2006-10-30 13:42:02.000000000 +0100
@@ -4,7 +4,7 @@
# Summary: Manage samba configuration data (smb.conf).
# Authors: Martin Lazar
#
-# $Id: SambaConfig.pm 30253 2006-04-19 14:39:32Z jsuchome $
+# $Id: SambaConfig.pm 33836 2006-10-30 12:41:57Z jsuchome $
#
# Functions for acess to samba configuration file. It provide
# unified acces to configuration keys including aliases and other
@@ -435,6 +435,7 @@
foreach my $share (keys %Config) {
next unless $Config{$share}; # skip removed shares
next if $share =~ /^_/; # skip internal shares
+ next if not $Config{$share}{_modified}; # skip untouched shares
my %section;
$section{name} = $share;
$section{comment} = $Config{$share}{_comment} if $Config{$share}{_comment};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.14.0/src/SambaWinbind.pm new/yast2-samba-client-2.14.2/src/SambaWinbind.pm
--- old/yast2-samba-client-2.14.0/src/SambaWinbind.pm 2006-08-25 14:49:07.000000000 +0200
+++ new/yast2-samba-client-2.14.2/src/SambaWinbind.pm 2006-08-25 15:31:22.000000000 +0200
@@ -4,7 +4,7 @@
# Authors: Stanislav Visnovsky
# Martin Lazar
#
-# $Id: SambaWinbind.pm 31620 2006-06-22 12:35:33Z jsuchome $
+# $Id: SambaWinbind.pm 32569 2006-08-25 13:32:57Z jsuchome $
package SambaWinbind;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.14.0/src/dialogs.ycp new/yast2-samba-client-2.14.2/src/dialogs.ycp
--- old/yast2-samba-client-2.14.0/src/dialogs.ycp 2006-08-24 15:53:43.000000000 +0200
+++ new/yast2-samba-client-2.14.2/src/dialogs.ycp 2006-10-30 16:23:04.000000000 +0100
@@ -3,7 +3,7 @@
* Summary: Dialogs definitions
* Authors: Stanislav Visnovsky
*
- * $Id: dialogs.ycp 32553 2006-08-24 13:55:17Z jsuchome $
+ * $Id: dialogs.ycp 33836 2006-10-30 12:41:57Z jsuchome $
*/
{
@@ -42,15 +42,16 @@
term status_term = `VBox(
`ReplacePoint (`id(`rpstatus), `Empty())
);
+ map pw_data = Samba::password_data;
// internal function: update the status line
void check_domain_membership (string domain) {
+ Samba::SetWorkgroup(domain);
+
if (Mode::config ())
return;
- Samba::SetWorkgroup(domain);
-
// busy popup text
Popup::ShowFeedback ("",_("Verifying domain membership..."));
SambaAD::ReadADS (domain);
@@ -93,7 +94,8 @@
// frame label
`Frame (_("Join Settings"), `HBox (
// text entry label
- `TextEntry (`id("user"), _("&Username")),
+ `TextEntry (`id("user"), _("&Username"),
+ pw_data["user"]:"" != "" ? pw_data["user"]:"" : ""),
// text entry label
`Password (`id("password"), _("&Password"))
)),
@@ -102,6 +104,12 @@
`TextEntry (`id(`ads), _("Active Directory Server"))
) : `Empty ();
+ term ntp_term = Mode::config () ? `Empty () : `VBox (
+ `VSpacing (),
+ // button label (run YaST client for NTP)
+ `Right (`PushButton (`id(`ntp), _("&NTP Configuration...")))
+ );
+
// checkbox label
string text_nscd = _("Disable Name Service Cache");
// checkbox label
@@ -141,17 +149,19 @@
),
SharesTerm ($[
"allow_share" : allow_share,
- "shares_group" : shares_group,
+ "group" : shares_group,
"max_shares" : max_shares,
"guest_access" : guest
]),
- autoyast_term
+ autoyast_term,
+ ntp_term
)),
(Stage::cont() ? HELPS["MembershipDialog_cont"]:"" :
HELPS["MembershipDialog_nocont"]:"") +
HELPS["MembershipDialog_common"]:"" +
SharesHelp () +
- (Mode::config () ? HELPS["MembershipDialog_config"]:"" : ""),
+ (Mode::config () ? HELPS["MembershipDialog_config"]:"" :
+ HELPS["MembershipDialog_NTP"]:""),
Label::BackButton(), Stage::cont() ? Label::NextButton() : Label::FinishButton()
);
foreach (symbol t, [`mkhomedir, `caching], {
@@ -192,6 +202,13 @@
);
});
}
+ else if (ret == `ntp)
+ {
+ if (Package::InstallAll ( ["yast2-ntp-client"]))
+ {
+ WFM::CallFunction ("ntp-client", []);
+ }
+ }
else if(ret == `next) {
string workgroup = (string)UI::QueryWidget(`id(`workgroup), `Value);
if (workgroup != Samba::GetWorkgroup ())
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.14.0/src/helps.ycp new/yast2-samba-client-2.14.2/src/helps.ycp
--- old/yast2-samba-client-2.14.0/src/helps.ycp 2006-08-24 15:45:07.000000000 +0200
+++ new/yast2-samba-client-2.14.2/src/helps.ycp 2006-10-30 16:20:34.000000000 +0100
@@ -81,7 +81,14 @@
_("<p>Set the <b>Username</b> and <b>Password</b> that should be used for joining selected domain during autoinstallation. Note that the password will be saved to the profile in the cleartext (unencrypted) form.</p>") +
// Samba membership dialog - additional help for autoyast config
- _("<p>Specify the <b>Active Directory Server</b> to use for joining an Active Directory domain. This is also used as the value for KDC in the Kerberos configuration.</p>")
+ _("<p>Specify the <b>Active Directory Server</b> to use for joining an Active Directory domain. This is also used as the value for KDC in the Kerberos configuration.</p>"),
+
+ // Samba membership dialog - additional help for possible NTP configuration
+ "MembershipDialog_NTP" : _("<p>
+To synchronize your time with an NTP server, configure your computer
+as an NTP client. Access the configuration with <b>NTP Configuration</b>.
+</p>
+")
];
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.14.0/src/routines.ycp new/yast2-samba-client-2.14.2/src/routines.ycp
--- old/yast2-samba-client-2.14.0/src/routines.ycp 2006-08-24 15:53:43.000000000 +0200
+++ new/yast2-samba-client-2.14.2/src/routines.ycp 2006-10-30 13:42:02.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Miscelanous functions for configuration of samba-client.
* Authors: Stanislav Visnovsky
*
- * $Id: routines.ycp 32553 2006-08-24 13:55:17Z jsuchome $
+ * $Id: routines.ycp 33836 2006-10-30 12:41:57Z jsuchome $
*/
{
@@ -276,7 +276,7 @@
define term SharesTerm (map settings) {
boolean allow = settings["allow_share"]:false;
- string group = settings["group"]:"";
+ string group = settings["group"]:settings["shares_group"]:"";
integer max = settings["max_shares"]:100;
boolean guest = settings["guest_access"]:false;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.14.0/src/samba-client.ycp new/yast2-samba-client-2.14.2/src/samba-client.ycp
--- old/yast2-samba-client-2.14.0/src/samba-client.ycp 2006-08-24 15:45:07.000000000 +0200
+++ new/yast2-samba-client-2.14.2/src/samba-client.ycp 2006-10-30 13:42:02.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Main file
* Authors: Stanislav Visnovsky
*
- * $Id: samba-client.ycp 26452 2005-12-07 11:38:07Z jsuchome $
+ * $Id: samba-client.ycp 33836 2006-10-30 12:41:57Z jsuchome $
*
* Main file for samba-client configuration. Uses all other files.
*/
@@ -131,6 +131,12 @@
return true;
}
+// command line handler for writing
+boolean SambaWrite () {
+
+ return Samba::Write (true);
+}
+
/* The main () */
y2milestone ("----------------------------------------");
y2milestone ("Samba-client module started");
@@ -148,7 +154,7 @@
See Samba documentation for details."),
"guihandler" : SambaClientSequence,
"initialize" : Samba::Read,
- "finish" : Samba::Write,
+ "finish" : SambaWrite,
"actions" : $[
"winbind" :$[
"handler" : WinbindEnableHandler,
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org