Hello community,
here is the log from the commit of package yast2-samba-client
checked in at Thu Sep 25 01:09:39 CEST 2008.
--------
--- yast2-samba-client/yast2-samba-client.changes 2008-09-12 12:22:52.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-samba-client/yast2-samba-client.changes 2008-09-18 11:50:57.820386000 +0200
@@ -1,0 +2,13 @@
+Thu Sep 18 11:42:18 CEST 2008 - jsuchome@suse.cz
+
+- added help text for pam_mount table
+- use correct, not temporary pam_mount.conf.xml file
+- 2.17.6
+
+-------------------------------------------------------------------
+Tue Sep 16 15:35:09 CEST 2008 - jsuchome@suse.cz
+
+- install pam_mount package (for fate#300967)
+- 2.17.5
+
+-------------------------------------------------------------------
Old:
----
yast2-samba-client-2.17.4.tar.bz2
New:
----
yast2-samba-client-2.17.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-samba-client.spec ++++++
--- /var/tmp/diff_new_pack.mNZ379/_old 2008-09-25 01:09:31.000000000 +0200
+++ /var/tmp/diff_new_pack.mNZ379/_new 2008-09-25 01:09:31.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-samba-client (Version 2.17.4)
+# spec file for package yast2-samba-client (Version 2.17.6)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-samba-client
-Version: 2.17.4
+Version: 2.17.6
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-samba-client-2.17.4.tar.bz2
+Source0: yast2-samba-client-2.17.6.tar.bz2
Prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-pam yast2-perl-bindings yast2-testsuite
Requires: yast2-kerberos-client perl-XML-LibXML
@@ -46,7 +46,7 @@
Stanislav Visnovsky
%prep
-%setup -n yast2-samba-client-2.17.4
+%setup -n yast2-samba-client-2.17.6
%build
%{prefix}/bin/y2tool y2autoconf
@@ -84,6 +84,13 @@
/usr/share/YaST2/schema/autoyast/rnc/samba-client.rnc
%doc %{prefix}/share/doc/packages/yast2-samba-client
%changelog
+* Thu Sep 18 2008 jsuchome@suse.cz
+- added help text for pam_mount table
+- use correct, not temporary pam_mount.conf.xml file
+- 2.17.6
+* Tue Sep 16 2008 jsuchome@suse.cz
+- install pam_mount package (for fate#300967)
+- 2.17.5
* Fri Sep 12 2008 jsuchome@suse.cz
- added generic dialog for editing 'volume' entries of
pam_mount.conf.xml (fate#300967)
++++++ yast2-samba-client-2.17.4.tar.bz2 -> yast2-samba-client-2.17.6.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.17.4/src/dialogs.ycp new/yast2-samba-client-2.17.6/src/dialogs.ycp
--- old/yast2-samba-client-2.17.4/src/dialogs.ycp 2008-09-12 11:01:09.000000000 +0200
+++ new/yast2-samba-client-2.17.6/src/dialogs.ycp 2008-09-18 10:42:13.000000000 +0200
@@ -3,7 +3,7 @@
* Summary: Dialogs definitions
* Authors: Stanislav Visnovsky
*
- * $Id: dialogs.ycp 50874 2008-09-09 09:24:41Z jsuchome $
+ * $Id: dialogs.ycp 51085 2008-09-12 10:23:02Z jsuchome $
*/
{
@@ -35,8 +35,6 @@
// volume entry (manualy added to congig file)
map key2label = $[
// text entry label
- "user" : _("&User Name"),
- // text entry label
"uid" : _("U&ID"),
// text entry label
"pgrp" : _("&Primary Group Name"),
@@ -56,10 +54,12 @@
// text entry label
`InputField (`id ("mountpoint"), `opt (`hstretch), _("&Mount Point")),
// text entry label
- `InputField (`id ("options"), `opt (`hstretch), _("O&ptions"))
+ `InputField (`id ("options"), `opt (`hstretch), _("O&ptions")),
+ // text entry label
+ `InputField (`id ("user"), `opt (`hstretch), _("&User Name"))
);
// default keys
- list<string> widgets = [ "server", "path", "mountpoint", "options" ];
+ list<string> widgets = [ "server", "path", "mountpoint", "options", "user"];
foreach (string key, string label, key2label, {
if (haskey (volume, key))
@@ -99,14 +99,15 @@
// filter out default keys without value (but leave the rest, so they
// may appear on next editing)
return filter (string k, string v, (map)volume, ``(
- v != "" || !contains (["server", "path", "mountpoint", "options"], k))
- );
+ v != "" ||
+ !contains (["server", "path", "mountpoint", "options", "user"], k)
+ ));
}
/**
* dialog for setting expert settings, like winbind uid/gid keys (F301518)
*/
-symbol ExpertSettingsDialog () {
+symbol ExpertSettingsDialog (boolean use_winbind) {
string winbind_uid = SambaConfig::GlobalGetStr ("winbind uid","10000-20000");
list l = splitstring (winbind_uid, "-");
@@ -127,7 +128,8 @@
string help_text = _("<p>Specify the <b>Range</b> for Samba user and group IDs (<tt>winbind uid</tt> and <tt>winbind gid</tt> values).</p>")
+ HostsResolutionHelp ()
- + DHCPSupportHelp ();
+ + DHCPSupportHelp ()
+ + PAMMountHelp ();
boolean hosts_resolution = Samba::GetHostsResolution ();
@@ -154,7 +156,8 @@
mount_items = maplist (integer id, map volume, mount_map, {
return `item (`id (id),
volume["server"]:"", volume["path"]:"",
- volume["mountpoint"]:"", volume["options"]:"");
+ volume["mountpoint"]:"", volume["user"]:"",
+ volume["options"]:"");
});
return mount_items;
}
@@ -187,14 +190,14 @@
`Frame (_("Mount Server Directories"), `VBox (
`Table (`id (`table), `opt(`notify), `header (
// table header
-// _("UNC Path"),
- // table header
_("Server Name"),
// table header
_("Remote Path"),
// table header
_("Local Mount Point"),
// table header
+ _("User Name"),
+ // table header
_("Options")),
build_mount_items ()
),
@@ -211,7 +214,7 @@
// dialog title
Wizard::SetContents (_("Expert Settings"), contents, help_text, true, true);
- foreach (symbol s, [`add, `edit, `delete], {
+ foreach (symbol s, [`edit, `delete], {
UI::ChangeWidget (`id (s), `Enabled, size (mount_items) > 0);
});
@@ -232,7 +235,7 @@
{
mount_map = remove (mount_map, selected);
UI::ChangeWidget (`id (`table), `Items, build_mount_items ());
- foreach (symbol s, [`add, `edit, `delete], {
+ foreach (symbol s, [`edit, `delete], {
UI::ChangeWidget (`id (s), `Enabled, size (mount_items) > 0);
});
}
@@ -247,7 +250,7 @@
integer id = ret == `edit ? selected : size (mount_map);
mount_map[id] = volume;
UI::ChangeWidget (`id (`table), `Items, build_mount_items ());
- foreach (symbol s, [`add, `edit, `delete], {
+ foreach (symbol s, [ `edit, `delete], {
UI::ChangeWidget (`id (s), `Enabled, size (mount_items) > 0);
});
}
@@ -279,7 +282,6 @@
updated_volumes = add (updated_volumes, volume);
});
Samba::SetPAMMountVolumes (updated_volumes);
-Samba::WritePAMMount ();
break;
}
}
@@ -319,7 +321,7 @@
return;
// busy popup text
- Popup::ShowFeedback ("",_("Verifying domain membership..."));
+ Popup::ShowFeedback ("",_("Verifying AD domain membership..."));
SambaAD::ReadADS (domain);
if (SambaAD::ADS () != "")
{
@@ -504,7 +506,7 @@
}
else if (ret == `expert)
{
- ExpertSettingsDialog ();
+ ExpertSettingsDialog (use_winbind);
}
else if (ret == `ntp)
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.17.4/src/routines.ycp new/yast2-samba-client-2.17.6/src/routines.ycp
--- old/yast2-samba-client-2.17.4/src/routines.ycp 2008-08-13 11:12:26.000000000 +0200
+++ new/yast2-samba-client-2.17.6/src/routines.ycp 2008-09-18 11:42:09.000000000 +0200
@@ -145,14 +145,14 @@
* it is a domain, but the status is not known
*/
define symbol CheckWorkgroup( string workgroup ) ``{
-
+
// for autoyast, skip testing
if( Mode::config() ) return `workgroup;
-
+
symbol ret = nil;
-
+
// translators: text for busy pop-up
- UI::OpenDialog( `VBox( `Label( _("Verifying workgroup membership...") ) ) );
+ Popup::ShowFeedback ("", _("Verifying workgroup membership..."));
if (SambaNmbLookup::IsDomain(workgroup) || SambaAD::ADS () != "") {
@@ -165,11 +165,8 @@
} else {
ret = `workgroup;
}
-
- UI::CloseDialog();
-
+ Popup::ClearFeedback ();
y2debug( "Check workgroup result: %1", ret );
-
return ret;
}
@@ -421,7 +418,14 @@
_("<p>To permit access to user shares without authentication, enable <b>Allow Guest Access</b>.</p>");
}
+/**
+ * return the help text for PAM Mount table
+ */
+string PAMMountHelp () {
+ // help text for PAM Mount table
+ return _("<p>In the table <b>Mount Server Directories</b>, you can specify server directories (such as home directory) which should be localy mounted when the user is logged in. If mounting should be user-specific, specify <b>User Name</b> for selected rule. Otherwise, the directory is mounted for each user. For more information, see pam_mount.conf manual page.</p>");
+}
/* EOF */
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.17.4/src/Samba.ycp new/yast2-samba-client-2.17.6/src/Samba.ycp
--- old/yast2-samba-client-2.17.4/src/Samba.ycp 2008-09-12 12:18:17.000000000 +0200
+++ new/yast2-samba-client-2.17.6/src/Samba.ycp 2008-09-18 10:31:59.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Data for configuration of samba-client, input and output functions.
* Authors: Stanislav Visnovsky
*
- * $Id: Samba.ycp 50764 2008-09-05 14:32:29Z jsuchome $
+ * $Id: Samba.ycp 51205 2008-09-17 09:39:41Z jsuchome $
*
* Representation of the configuration of samba-client.
* Input and output routines.
@@ -131,7 +131,7 @@
list<map> pam_mount_volumes = [];
// original value of pam_mount_volumes, for detecting changes
-list<map> pam_mount_volumes_orig = [];
+list<map> pam_mount_volumes_orig = nil;
// packages to install for specific arhitectures (#224418)
global map arch_packages = $[
@@ -153,6 +153,12 @@
"s390_64" : [ "samba-winbind-32bit" ],
"x86_64" : [ "samba-winbind-32bit" ],
],
+ "pam_mount" : $[
+ "ia64" : [ "pam_mount-x86" ],
+ "ppc64" : [ "pam_mount-64bit" ],
+ "s390_64" : [ "pam_mount-32bit" ],
+ "x86_64" : [ "pam_mount-32bit" ],
+ ],
];
// network configuration (to be read from NetworkConfig module)
@@ -173,6 +179,15 @@
return ret;
}
+boolean PAMMountModified () {
+
+ return
+ (pam_mount_volumes_orig == nil && pam_mount_volumes != [])
+ ||
+ (pam_mount_volumes_orig != nil &&
+ (sort (pam_mount_volumes) != sort (pam_mount_volumes_orig)));
+}
+
/**
* Data was modified?
@@ -180,7 +195,7 @@
*/
global boolean GetModified() {
y2debug("modified=%1",modified);
- return modified || mkhomedir_modified || shares_modified || SambaConfig::GetModified() || ssh_modified;
+ return modified || mkhomedir_modified || shares_modified || SambaConfig::GetModified() || ssh_modified || PAMMountModified ();
};
/**
@@ -195,7 +210,7 @@
return false;
}
// initially, parse the whole file and let the agent build data map
- if (SCR::Read (.pam_mount, "/tmp/pam_mount.xml") != true)
+ if (SCR::Read (.pam_mount, pam_mount_path) != true)
{
y2warning ("reading %1 failed", pam_mount_path);
return false;
@@ -232,11 +247,26 @@
*/
global boolean WritePAMMount () {
- if (sort (pam_mount_volumes) == sort (pam_mount_volumes_orig))
+ if (!FileUtils::Exists (pam_mount_path))
+ {
+ y2warning ("%1 does not exist, no writing", pam_mount_path);
+ return false;
+ }
+ if (pam_mount_volumes_orig == nil)
+ {
+ y2milestone ("%1 not read yet, reading now...", pam_mount_path);
+ if (SCR::Read (.pam_mount, pam_mount_path) != true)
+ {
+ y2error ("reading %1 failed", pam_mount_path);
+ return false;
+ }
+ }
+ if (!PAMMountModified ())
{
y2milestone ("no changes to pam_mount.conf.xml");
return true;
}
+
SCR::Execute (.target.bash, sformat ("cp %1 %1.YaST2save", pam_mount_path));
// 1. delete all volume entries with 'cifs' fstype
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.17.4/VERSION new/yast2-samba-client-2.17.6/VERSION
--- old/yast2-samba-client-2.17.4/VERSION 2008-09-12 12:19:52.000000000 +0200
+++ new/yast2-samba-client-2.17.6/VERSION 2008-09-18 11:43:00.000000000 +0200
@@ -1 +1 @@
-2.17.4
+2.17.6
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org