Hello community,
here is the log from the commit of package yast2-samba-client
checked in at Wed Dec 20 19:01:05 CET 2006.
--------
--- yast2-samba-client/yast2-samba-client.changes 2006-12-01 11:52:36.000000000 +0100
+++ /mounts/work_src_done/NOARCH/yast2-samba-client/yast2-samba-client.changes 2006-12-20 14:57:44.000000000 +0100
@@ -1,0 +2,7 @@
+Tue Dec 19 10:15:30 CET 2006 - jsuchome@suse.cz
+
+- Expert Settings Popup for uid and gid ranges (F301518)
+- SambaConfig: export modified entries only in config mode
+- 2.15.0
+
+-------------------------------------------------------------------
Old:
----
yast2-samba-client-2.14.4.tar.bz2
New:
----
yast2-samba-client-2.15.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-samba-client.spec ++++++
--- /var/tmp/diff_new_pack.FKJ9Lm/_old 2006-12-20 19:01:02.000000000 +0100
+++ /var/tmp/diff_new_pack.FKJ9Lm/_new 2006-12-20 19:01:02.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-samba-client (Version 2.14.4)
+# spec file for package yast2-samba-client (Version 2.15.0)
#
# 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.4
+Version: 2.15.0
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-samba-client-2.14.4.tar.bz2
+Source0: yast2-samba-client-2.15.0.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.4
+%setup -n yast2-samba-client-2.15.0
%build
%{prefix}/bin/y2tool y2autoconf
@@ -73,6 +73,10 @@
%doc %{prefix}/share/doc/packages/yast2-samba-client
%changelog -n yast2-samba-client
+* Tue Dec 19 2006 - jsuchome@suse.cz
+- Expert Settings Popup for uid and gid ranges (F301518)
+- SambaConfig: export modified entries only in config mode
+- 2.15.0
* Thu Nov 30 2006 - jsuchome@suse.cz
- install architecture-specific packages (#224418)
- prevent 'net' asking for root's pw (#225224)
++++++ yast2-samba-client-2.14.4.tar.bz2 -> yast2-samba-client-2.15.0.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.14.4/VERSION new/yast2-samba-client-2.15.0/VERSION
--- old/yast2-samba-client-2.14.4/VERSION 2006-12-01 11:13:11.000000000 +0100
+++ new/yast2-samba-client-2.15.0/VERSION 2006-12-19 10:18:14.000000000 +0100
@@ -1 +1 @@
-2.14.4
+2.15.0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.14.4/src/Samba.ycp new/yast2-samba-client-2.15.0/src/Samba.ycp
--- old/yast2-samba-client-2.14.4/src/Samba.ycp 2006-11-30 13:45:02.000000000 +0100
+++ new/yast2-samba-client-2.15.0/src/Samba.ycp 2006-12-01 13:22:49.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Data for configuration of samba-client, input and output functions.
* Authors: Stanislav Visnovsky
*
- * $Id: Samba.ycp 33836 2006-10-30 12:41:57Z jsuchome $
+ * $Id: Samba.ycp 34693 2006-12-01 12:22:46Z jsuchome $
*
* Representation of the configuration of samba-client.
* Input and output routines.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.14.4/src/SambaAD.pm new/yast2-samba-client-2.15.0/src/SambaAD.pm
--- old/yast2-samba-client-2.14.4/src/SambaAD.pm 2006-12-01 11:46:59.000000000 +0100
+++ new/yast2-samba-client-2.15.0/src/SambaAD.pm 2006-12-01 13:22:49.000000000 +0100
@@ -4,7 +4,7 @@
# Summary: Manage AD issues for samba-client
# Authors: Jiri Suchomel
#
-# $Id: SambaAD.pm 31398 2006-06-08 14:33:25Z jsuchome $
+# $Id: SambaAD.pm 34693 2006-12-01 12:22:46Z jsuchome $
#
package SambaAD;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.14.4/src/SambaConfig.pm new/yast2-samba-client-2.15.0/src/SambaConfig.pm
--- old/yast2-samba-client-2.14.4/src/SambaConfig.pm 2006-10-30 13:42:02.000000000 +0100
+++ new/yast2-samba-client-2.15.0/src/SambaConfig.pm 2006-12-12 09:34:35.000000000 +0100
@@ -24,6 +24,7 @@
our %TYPEINFO;
YaST::YCP::Import("SCR");
+YaST::YCP::Import("Mode");
###########################################################################
@@ -435,7 +436,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
+ next if Mode->config () && 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.4/src/dialogs.ycp new/yast2-samba-client-2.15.0/src/dialogs.ycp
--- old/yast2-samba-client-2.14.4/src/dialogs.ycp 2006-11-30 13:46:06.000000000 +0100
+++ new/yast2-samba-client-2.15.0/src/dialogs.ycp 2006-12-20 14:41:23.000000000 +0100
@@ -3,7 +3,7 @@
* Summary: Dialogs definitions
* Authors: Stanislav Visnovsky
*
- * $Id: dialogs.ycp 34057 2006-11-06 10:17:24Z jsuchome $
+ * $Id: dialogs.ycp 34693 2006-12-01 12:22:46Z jsuchome $
*/
{
@@ -14,6 +14,7 @@
import "Mode";
import "Stage";
import "Samba";
+import "SambaConfig";
import "Label";
import "Package";
import "Popup";
@@ -24,6 +25,89 @@
include "samba-client/routines.ycp";
/**
+ * popup for setting various expert settings, like winbind uid/gid keys (F301518)
+ */
+symbol ExpertSettingsPopup () {
+
+ string winbind_uid = SambaConfig::GlobalGetStr ("winbind uid","10000-20000");
+ list l = splitstring (winbind_uid, "-");
+ integer uid_min = tointeger (l[0]:"10000");
+ if (uid_min == nil) uid_min = 10000;
+ integer uid_max = tointeger (l[1]:"20000");
+ if (uid_max == nil) uid_max = 20000;
+
+ string winbind_gid = SambaConfig::GlobalGetStr ("winbind gid","10000-20000");
+ l = splitstring (winbind_gid, "-");
+ integer gid_min = tointeger (l[0]:"10000");
+ if (gid_min == nil) gid_min = 10000;
+ integer gid_max = tointeger (l[1]:"20000");
+ if (gid_max == nil) gid_max = 20000;
+
+ // help text, do not translate 'winbind uid', 'winbind gid'
+ string help_text = _("Specify the range for Samba user and group IDs (<tt>winbind uid</tt> and <tt>winbind gid</tt> values).");
+
+ UI::OpenDialog (`opt (`decorated), `HBox (
+ `HWeight (1, `RichText (`id (`help), help_text)),
+ `HSpacing (),
+ `HWeight (3, `VBox (
+ `VSpacing (0.5),
+ // frame label
+ `Frame (_("&UID Range"), `HBox (
+ // int field label
+ `IntField (`id (`uid_min), _("&Minimum"), 0, 99999, uid_min),
+ // int field label
+ `IntField (`id (`uid_max), _("Ma&ximum"), 0, 99999, uid_max)
+ )),
+ `VSpacing (0.5),
+ // frame label
+ `Frame (_("&GID Range"), `HBox (
+ // int field label
+ `IntField (`id (`gid_min), _("M&inimum"), 0, 99999, gid_min),
+ // int field label
+ `IntField (`id (`gid_max), _("M&aximum"), 0, 99999, gid_max)
+ )),
+ `VSpacing (),
+ `HBox (
+ `PushButton (`id(`ok), Label::OKButton()),
+ `PushButton (`id(`cancel), Label::CancelButton())
+ )
+ )),
+ `HSpacing ()
+ ));
+
+ any ret = `cancel;
+ while (true)
+ {
+ any ret = UI::UserInput ();
+ if (ret == `cancel)
+ break;
+ if (ret == `ok)
+ {
+ uid_min = (integer) UI::QueryWidget (`id (`uid_min),`Value);
+ uid_max = (integer) UI::QueryWidget (`id (`uid_max),`Value);
+ gid_min = (integer) UI::QueryWidget (`id (`gid_min),`Value);
+ gid_max = (integer) UI::QueryWidget (`id (`gid_max),`Value);
+ if (uid_min >= uid_max || gid_min >= gid_max)
+ {
+ // error popup: min >= max
+ Popup::Error (_("The minimal value in the range cannot be be
+larger than maximal one."));
+ continue;
+ }
+ string winbind_uid_new = sformat ("%1-%2", uid_min, uid_max);
+ string winbind_gid_new = sformat ("%1-%2", gid_min, gid_max);
+ if (winbind_uid_new != winbind_uid)
+ SambaConfig::GlobalSetStr ("winbind uid", winbind_uid_new);
+ if (winbind_gid_new != winbind_gid)
+ SambaConfig::GlobalSetStr ("winbind gid", winbind_gid_new);
+ break;
+ }
+ }
+ UI::CloseDialog ();
+ return (symbol) ret;
+}
+
+/**
* Samba memberhip dialog
* @return dialog result
*/
@@ -106,7 +190,7 @@
) : `Empty ();
term ntp_term = Mode::config () ? `Empty () : `VBox (
- `VSpacing (),
+ `VSpacing (0.5),
// button label (run YaST client for NTP)
`Right (`PushButton (`id(`ntp), _("&NTP Configuration...")))
);
@@ -129,7 +213,7 @@
`VBox (
`Label(""),
// translators: push button label
- `PushButton(`id(`browse), _("&Browse..."))
+ `PushButton(`id(`browse), _("Br&owse..."))
)
),
status_term,
@@ -148,6 +232,9 @@
)
)
),
+ `VSpacing (0.5),
+ // button label
+ `Right (`PushButton (`id(`expert), _("&Expert Settings..."))),
SharesTerm ($[
"allow_share" : allow_share,
"group" : shares_group,
@@ -203,6 +290,10 @@
);
});
}
+ else if (ret == `expert)
+ {
+ ExpertSettingsPopup ();
+ }
else if (ret == `ntp)
{
if (Package::InstallAll ( ["yast2-ntp-client"]))
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org