Hello community,
here is the log from the commit of package yast2-samba-client
checked in at Thu Aug 24 17:42:47 CEST 2006.
--------
--- yast2-samba-client/yast2-samba-client.changes 2006-08-23 12:17:51.000000000 +0200
+++ yast2-samba-client/yast2-samba-client.changes 2006-08-24 15:50:14.000000000 +0200
@@ -2 +2,8 @@
-Wed Aug 23 10:33:03 CEST 2006 - jsuchome@suse.cz
+Wed Aug 23 12:17:06 CEST 2006 - jsuchome@suse.cz
+
+- new checkbox for Guest Access to shares (#144787)
+- added more options for autoyast (#188917)
+- 2.13.25
+
+-------------------------------------------------------------------
+Mon Aug 21 13:36:45 CEST 2006 - jsuchome@suse.cz
Old:
----
yast2-samba-client-2.13.24.tar.bz2
New:
----
yast2-samba-client-2.13.25.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-samba-client.spec ++++++
--- /var/tmp/diff_new_pack.JhhCWX/_old 2006-08-24 17:41:53.000000000 +0200
+++ /var/tmp/diff_new_pack.JhhCWX/_new 2006-08-24 17:41:53.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-samba-client (Version 2.13.24)
+# spec file for package yast2-samba-client (Version 2.13.25)
#
# 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.13.24
+Version: 2.13.25
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-samba-client-2.13.24.tar.bz2
+Source0: yast2-samba-client-2.13.25.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-pam yast2-perl-bindings yast2-testsuite
Requires: yast2 yast2-pam yast2-kerberos-client
@@ -34,7 +34,7 @@
Stanislav Visnovsky
%prep
-%setup -n yast2-samba-client-2.13.24
+%setup -n yast2-samba-client-2.13.25
%build
%{prefix}/bin/y2tool y2autoconf
@@ -72,6 +72,10 @@
%changelog -n yast2-samba-client
* Wed Aug 23 2006 - jsuchome@suse.cz
+- new checkbox for Guest Access to shares (#144787)
+- added more options for autoyast (#188917)
+- 2.13.25
+* Mon Aug 21 2006 - jsuchome@suse.cz
- autoyast: join to domain during Write, not during Import (#188917)
- 2.13.24
* Wed Jun 28 2006 - jsuchome@suse.cz
++++++ yast2-samba-client-2.13.24.tar.bz2 -> yast2-samba-client-2.13.25.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.13.24/VERSION new/yast2-samba-client-2.13.25/VERSION
--- old/yast2-samba-client-2.13.24/VERSION 2006-08-23 10:33:24.000000000 +0200
+++ new/yast2-samba-client-2.13.25/VERSION 2006-08-23 12:17:39.000000000 +0200
@@ -1 +1 @@
-2.13.24
+2.13.25
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.13.24/configure new/yast2-samba-client-2.13.25/configure
--- old/yast2-samba-client-2.13.24/configure 2006-06-20 11:22:27.000000000 +0200
+++ new/yast2-samba-client-2.13.25/configure 2006-08-07 15:40:33.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-samba-client 2.13.20.
+# Generated by GNU Autoconf 2.59 for yast2-samba-client 2.13.23.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-samba-client'
PACKAGE_TARNAME='yast2-samba-client'
-PACKAGE_VERSION='2.13.20'
-PACKAGE_STRING='yast2-samba-client 2.13.20'
+PACKAGE_VERSION='2.13.23'
+PACKAGE_STRING='yast2-samba-client 2.13.23'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -728,7 +728,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-samba-client 2.13.20 to adapt to many kinds of systems.
+\`configure' configures yast2-samba-client 2.13.23 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -795,7 +795,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-samba-client 2.13.20:";;
+ short | recursive ) echo "Configuration of yast2-samba-client 2.13.23:";;
esac
cat <<\_ACEOF
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-samba-client configure 2.13.20
+yast2-samba-client configure 2.13.23
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -922,7 +922,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-samba-client $as_me 2.13.20, which was
+It was created by yast2-samba-client $as_me 2.13.23, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1652,7 +1652,7 @@
# Define the identity of the package.
PACKAGE='yast2-samba-client'
- VERSION='2.13.20'
+ VERSION='2.13.23'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.20"
+VERSION="2.13.23"
RPMNAME="yast2-samba-client"
MAINTAINER="Jiri Suchomel "
@@ -2693,7 +2693,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-samba-client $as_me 2.13.20, which was
+This file was extended by yast2-samba-client $as_me 2.13.23, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2748,7 +2748,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-samba-client config.status 2.13.20
+yast2-samba-client config.status 2.13.23
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.13.24/configure.in new/yast2-samba-client-2.13.25/configure.in
--- old/yast2-samba-client-2.13.24/configure.in 2006-06-20 11:22:22.000000000 +0200
+++ new/yast2-samba-client-2.13.25/configure.in 2006-08-07 15:40:30.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-samba-client, 2.13.20, http://bugs.opensuse.org/, yast2-samba-client)
+AC_INIT(yast2-samba-client, 2.13.23, http://bugs.opensuse.org/, yast2-samba-client)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.20"
+VERSION="2.13.23"
RPMNAME="yast2-samba-client"
MAINTAINER="Jiri Suchomel "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.13.24/src/Samba.ycp new/yast2-samba-client-2.13.25/src/Samba.ycp
--- old/yast2-samba-client-2.13.24/src/Samba.ycp 2006-08-23 12:14:13.000000000 +0200
+++ new/yast2-samba-client-2.13.25/src/Samba.ycp 2006-08-24 15:31:33.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Data for configuration of samba-client, input and output functions.
* Authors: Stanislav Visnovsky
*
- * $Id: Samba.ycp 32516 2006-08-23 10:15:48Z jsuchome $
+ * $Id: Samba.ycp 32203 2006-08-07 13:35:36Z jsuchome $
*
* Representation of the configuration of samba-client.
* Input and output routines.
@@ -23,13 +23,13 @@
import "Progress";
import "Report";
import "Service";
-import "String";
-
+import "SambaAD";
import "SambaConfig";
import "SambaWinbind";
import "SambaNetJoin";
import "SambaNmbLookup";
-import "SambaAD";
+import "String";
+import "Summary";
/**
@@ -178,6 +178,23 @@
}
/**
+ * check if shares guest access is allowed
+ */
+global define boolean GetGuessAccess () {
+
+ return SambaConfig::GlobalGetTruth ("usershare allow guests", false);
+}
+
+/**
+ * Set the new value for guest access (#144787)
+ */
+global define boolean SetGuessAccess (boolean guest) {
+
+ SambaConfig::GlobalSetTruth ("usershare allow guests", guest);
+ return true;
+}
+
+/**
* Read user shares settings
*/
global define boolean ReadSharesSetting () {
@@ -194,6 +211,8 @@
/**
* set the new values for user shares
+ * @param max maximum number of shares (0 is for disabling)
+ * @param group permited group
*/
global define boolean SetShares (integer max, string group)
{
@@ -527,10 +546,17 @@
*/
global boolean Import (map settings) {
if (haskey(settings, "global")) {
- SambaConfig::GlobalSetStr("workgroup", settings["global","workgroup"]:"WORKGROUP");
- winbind_enabled = settings["global","winbind"]:false;
+ 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);
globals_configured = true;
- modified = true;
+ modified = true;
} else {
globals_configured = false;
}
@@ -564,9 +590,22 @@
}
map globals = $[
- "workgroup": SambaConfig::GlobalGetStr("workgroup", ""),
- "winbind" : winbind_enabled,
+ "workgroup" : SambaConfig::GlobalGetStr("workgroup", ""),
+ "winbind" : winbind_enabled,
];
+ if (mkhomedir_modified)
+ globals["mkhomedir"] = mkhomedir;
+ if (winbind_enabled)
+ globals["winbind_caching"] = GetWinbindCaching ();
+
+ if (GetMaxShares () > 0)
+ {
+ globals["max_shares"] = GetMaxShares ();
+ globals["shares_group"] = shares_group;
+ if (GetGuessAccess ())
+ globals["guest_access"] = true;
+ }
+
map ret = $[ "global": globals ];
if (SambaAD::ADS() != "")
{
@@ -591,22 +630,43 @@
* @return summary of the current configuration
*/
global string Summary() {
- import "Summary";
-
+
string summary = "";
string nc = Summary::NotConfigured();
string workgroup = SambaConfig::GlobalGetStr("workgroup", "");
-
+
// summary header
summary = Summary::AddHeader(summary, _("Global Configuration"));
-
- if( globals_configured ) {
- // autoyast summary item: configured workgroup
- summary = Summary::AddLine(summary, sformat(_("Workgroup or Domain: %1"), workgroup ) );
- } else {
+
+ if (globals_configured)
+ {
+ summary = Summary::AddLine (summary, sformat (
+ // autoyast summary item: configured workgroup
+ _("Workgroup or Domain: %1"), workgroup)
+ );
+
+ if (mkhomedir)
+ summary = Summary::AddLine (summary,
+ // autoyast summary item
+ _("Create Home Directory on Login")
+ );
+ if (GetWinbindCaching ())
+ summary = Summary::AddLine (summary,
+ // autoyast summary item
+ _("Offline Authentication Enabled")
+ );
+ if (GetMaxShares () > 0)
+ {
+ summary = Summary::AddLine (summary, sformat (
+ // autoyast summary item
+ _("Maximum Number of Shares: %1"), GetMaxShares ())
+ );
+ }
+ }
+ else
+ {
summary = Summary::AddLine(summary, nc );
}
-
return summary;
}
@@ -615,7 +675,6 @@
* @return summary of the current configuration
*/
global string ShortSummary() {
- import "Summary";
string summary = "";
string workgroup = SambaConfig::GlobalGetStr("workgroup", "");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.13.24/src/SambaWinbind.pm new/yast2-samba-client-2.13.25/src/SambaWinbind.pm
--- old/yast2-samba-client-2.13.24/src/SambaWinbind.pm 2006-06-22 14:33:45.000000000 +0200
+++ new/yast2-samba-client-2.13.25/src/SambaWinbind.pm 2006-08-07 15:36:31.000000000 +0200
@@ -4,7 +4,7 @@
# Authors: Stanislav Visnovsky
# Martin Lazar
#
-# $Id: SambaWinbind.pm 31613 2006-06-22 12:33:43Z jsuchome $
+# $Id: SambaWinbind.pm 31620 2006-06-22 12:35:33Z jsuchome $
package SambaWinbind;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.13.24/src/dialogs.ycp new/yast2-samba-client-2.13.25/src/dialogs.ycp
--- old/yast2-samba-client-2.13.24/src/dialogs.ycp 2006-08-08 09:34:33.000000000 +0200
+++ new/yast2-samba-client-2.13.25/src/dialogs.ycp 2006-08-23 12:21:06.000000000 +0200
@@ -3,7 +3,7 @@
* Summary: Dialogs definitions
* Authors: Stanislav Visnovsky
*
- * $Id: dialogs.ycp 32223 2006-08-08 07:36:01Z jsuchome $
+ * $Id: dialogs.ycp 32203 2006-08-07 13:35:36Z jsuchome $
*/
{
@@ -14,7 +14,7 @@
import "Stage";
import "Samba";
import "Label";
-import "PackageSystem";
+import "Package";
import "Popup";
import "Wizard";
import "Autologin";
@@ -38,7 +38,7 @@
allow_share = false;
}
string shares_group = Samba::shares_group;
-
+ boolean guest = allow_share && Samba::GetGuessAccess ();
term status_term = `VBox(
`ReplacePoint (`id(`rpstatus), `Empty())
);
@@ -46,6 +46,9 @@
// internal function: update the status line
void check_domain_membership (string domain) {
+ if (Mode::config ())
+ return;
+
Samba::SetWorkgroup(domain);
// busy popup text
@@ -81,7 +84,7 @@
term mkhomedir_term = `VBox (
`Left(`CheckBox(`id(`mkhomedir),
// checkbox label
- _("Create Home Directory on Login"), mkhomedir
+ _("&Create Home Directory on Login"), mkhomedir
))
);
@@ -111,7 +114,6 @@
`HBox(
`HSpacing (0.2),
`TextEntry(`id(`workgroup), (Stage::cont() ?
- // translators: text entry label
_("&Domain") :
// translators: text entry label
_("&Domain or Workgroup")), Samba::GetWorkgroupOrRealm()),
@@ -137,7 +139,12 @@
)
)
),
- GetSharesTerm (allow_share, shares_group, max_shares),
+ SharesTerm ($[
+ "allow_share" : allow_share,
+ "shares_group" : shares_group,
+ "max_shares" : max_shares,
+ "guest_access" : guest
+ ]),
autoyast_term
)),
(Stage::cont() ? HELPS["MembershipDialog_cont"]:"" :
@@ -150,7 +157,7 @@
foreach (symbol t, [`mkhomedir, `caching], {
UI::ChangeWidget (`id(t), `Enabled, Samba::GetWinbind() || Stage::cont());
});
- foreach (symbol t, [`group, `max_shares], {
+ foreach (symbol t, [`group, `max_shares, `guest_ch], {
UI::ChangeWidget (`id(t), `Enabled, allow_share);
});
@@ -179,7 +186,7 @@
UI::ChangeWidget (`id(`caching), `Enabled, use_winbind);
}
else if (ret == `share_ch) {
- foreach (symbol t, [`group, `max_shares], {
+ foreach (symbol t, [`group, `max_shares, `guest_ch], {
UI::ChangeWidget (`id(t), `Enabled,
(boolean) UI::QueryWidget(`id(`share_ch),`Value)
);
@@ -204,14 +211,16 @@
});
if ((string)UI::QueryWidget(`id(`ads),`Value) != "")
SambaAD::SetADS ((string)UI::QueryWidget(`id(`ads),`Value));
- break;
}
+ else
+ {
- if (Samba::GetWinbind() && workgroup_type == `workgroup ) {
- // translators: error message, winbind cannot provide user information taken
- // from a workgroup, must be a domain; %1 is the workgroup name
- Popup::Error(
- // translators: 1st part of an error message, winbind cannot provide user information taken from a workgroup, must be a domain; %1 is the workgroup name
+ if (Samba::GetWinbind() && workgroup_type == `workgroup)
+ {
+ Popup::Error(
+ // 1st part of an error message:
+ // winbind cannot provide user information taken from
+ // a workgroup, must be a domain; %1 is the workgroup name
sformat( _("Cannot use the workgroup\n'%1' for Linux authentication."), workgroup)
+ "\n\n"
+ (Stage::cont()
@@ -219,39 +228,43 @@
? _("Enter a valid domain.")
// translators: 2nd part of an error message
: _("Enter a domain or disable\nusing SMB for Linux authentication.")));
- continue;
- }
+ continue;
+ }
- symbol in_domain = nil;
- if (Stage::cont() && workgroup_type != `joined_domain) {
- // return `ok or `fail
- in_domain = JoinDomain(workgroup);
- if (in_domain == `fail) continue;
- }
+ symbol in_domain = nil;
+ if (Stage::cont() && workgroup_type != `joined_domain)
+ {
+ // return `ok or `fail
+ in_domain = JoinDomain(workgroup);
+ if (in_domain == `fail) continue;
+ }
- if (false) // we might use it to warn user (#155716)
- {
- // continue/cancel popup
- Popup::ContinueCancel (sformat (_("Configuring this system as a client for Active Directory resets the following
+ if (false) // we might use it to warn user (#155716)
+ {
+ // continue/cancel popup
+ Popup::ContinueCancel (sformat (_("Configuring this system as a client for Active Directory resets the following
settings in smb.conf to the default values:
%1"), mergestring (["domain master", "domain logons"], "\n")));
- }
- if (!Stage::cont()) {
- // return `ok, `fail or `nojoin
- in_domain = AskJoinDomain(workgroup, workgroup_type);
- if (in_domain == `fail) continue;
- if (in_domain != `ok && Samba::GetWinbind()) {
- // translators: 1st part of an error message, winbind cannot provide user information if the host is not in a domain
- Popup::Error( _("The host must be a member of a domain\nfor Linux authentication using SMB.")
- + "\n\n"
- // translators: 2nd part of an error message
- + _("Join a domain or disable use of SMB\nfor Linux authentication."));
- continue;
}
- }
- if (Samba::GetWinbind()) {
- // used outside this module for autologin function. must be complete sentence.
- Autologin::AskForDisabling(_("Samba is now enabled."));
+ if (!Stage::cont()) {
+ // return `ok, `fail or `nojoin
+ in_domain = AskJoinDomain(workgroup, workgroup_type);
+ if (in_domain == `fail) continue;
+ if (in_domain != `ok && Samba::GetWinbind()) {
+ // 1st part of an error message:
+ // winbind cannot provide user information if the host
+ // is not in a domain
+ Popup::Error( _("The host must be a member of a domain\nfor Linux authentication using SMB.")
+ + "\n\n"
+ // translators: 2nd part of an error message
+ + _("Join a domain or disable use of SMB\nfor Linux authentication."));
+ continue;
+ }
+ }
+ if (Samba::GetWinbind()) {
+ // used outside this module for autologin function. must be complete sentence.
+ Autologin::AskForDisabling(_("Samba is now enabled."));
+ }
}
list<string> packages = ["samba-winbind"];
@@ -259,7 +272,9 @@
{
packages = (list<string>)merge(packages,["krb5","krb5-client"]);
}
- PackageSystem::CheckAndInstallPackages (packages);
+ if (!Package::InstalledAll (packages))
+ Package::InstallAll (packages);
+
Samba::SetMkHomeDir (use_winbind &&
(boolean)UI::QueryWidget(`id(`mkhomedir), `Value));
Samba::SetWinbindCaching (use_winbind &&
@@ -278,6 +293,8 @@
Samba::stop_services = AskToStopServices ();
}
Samba::SetShares (max,(string)UI::QueryWidget(`id(`group),`Value));
+ Samba::SetGuessAccess (new_share &&
+ (boolean)UI::QueryWidget(`id(`guest_ch), `Value));
if(!Stage::cont() && !Mode::config() && use_winbind&& !was_winbind){
// message popup, part 1/2
Popup::Message (
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.13.24/src/routines.ycp new/yast2-samba-client-2.13.25/src/routines.ycp
--- old/yast2-samba-client-2.13.24/src/routines.ycp 2006-06-28 14:01:21.000000000 +0200
+++ new/yast2-samba-client-2.13.25/src/routines.ycp 2006-08-24 15:31:52.000000000 +0200
@@ -210,10 +210,11 @@
any ret = UI::UserInput();
string sel = (string) UI::QueryWidget( `id(`selection), `CurrentItem );
+ // textentry constant (automatically added to some kind of values)
if ( sel != nil && issubstring (sel, _(" (Domain)") ) )
{
- integer pos = find (sel, _(" (Domain)") );
- sel = substring (sel, 0, pos);
+ integer pos = search (sel, _(" (Domain)") );
+ sel = (pos == nil) ? sel : substring (sel, 0, pos);
}
UI::CloseDialog();
return ret == `ok ? sel : nil;
@@ -268,20 +269,21 @@
return Popup::YesNo (_("Other Windows sharing services are available. Stop them as well?"));
}
-
/**
* return the term with shares settings
- * @param allow if shares are allowed
- * @param group name of group owning the shares dir
- * @param max maximum number of allowed shares
+ * @param settings map with parameters to show in term
*/
-define term GetSharesTerm (boolean allow, string group, integer max) {
+define term SharesTerm (map settings) {
+
+ boolean allow = settings["allow_share"]:false;
+ string group = settings["group"]:"";
+ integer max = settings["max_shares"]:100;
+ boolean guest = settings["guest_access"]:false;
// frame label
string label = true ? _("Sharing by Users") :
// frame label
_("Sharing");
-
return `VBox (
`VSpacing (),
// frame label
@@ -290,12 +292,16 @@
`VSpacing (0.4),
`Left (`CheckBox(`id(`share_ch), `opt(`notify),
// checkbox label
- _("Allow Users to Share Their Directories"), allow)),
+ _("&Allow Users to Share Their Directories"), allow)),
+ haskey (settings, "guest_access") ?
+ `Left (`CheckBox(`id(`guest_ch), `opt(`notify),
+ // checkbox label
+ _("Allow &Guest Access"), guest)) : `VSpacing (0),
`HBox (`HSpacing (2), `VBox (
// texty entry label
- `TextEntry (`id(`group), _("Permitted Group"), group),
+ `TextEntry (`id(`group), _("&Permitted Group"), group),
// infield label
- `IntField (`id(`max_shares),_("Maximum Number of Shares"),
+ `IntField (`id(`max_shares),_("&Maximum Number of Shares"),
1, 99999, max)
)),
`VSpacing (0.2)
@@ -305,6 +311,21 @@
}
/**
+ * return the term with shares settings
+ * @param allow if shares are allowed
+ * @param group name of group owning the shares dir
+ * @param max maximum number of allowed shares
+ */
+define term GetSharesTerm (boolean allow, string group, integer max) {
+y2warning ("GetSharesTerm is obsolete, use SharesTerm instead");
+ return SharesTerm ($[
+ "allow_share" : allow,
+ "shares_group" : group,
+ "max_shares" : max
+ ]);
+}
+
+/**
* return the help text for shares
*/
define string SharesHelp () {
@@ -315,7 +336,10 @@
sformat (_("<p><b>Allow Users to Share Their Directories</b> enables members of the group in <b>Permitted Group</b> to share directories they own with other users. For example, <tt>users</tt> for a local scope or <tt>DOMAIN%1Users</tt> for a domain scope. The user also must make sure that the file system permissions allow access.</p>"), Samba::shares_separator) +
// membership dialog help (common part 3/4)
- _("<p>With <b>Maximum Number of Shares</b>, limit the total amount of shares that may be created.</p>");
+ _("<p>With <b>Maximum Number of Shares</b>, limit the total amount of shares that may be created.</p>") +
+
+ // membership dialog help common part
+ _("<p>To permit access to user shares without authentication, enable <b>Allow Guest Access</b>.</p>");
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org