Hello community,
here is the log from the commit of package yast2-ftp-server
checked in at Sun Jul 1 17:30:34 CEST 2007.
--------
--- yast2-ftp-server/yast2-ftp-server.changes 2007-05-30 18:40:38.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-ftp-server/yast2-ftp-server.changes 2007-06-29 14:58:57.345642000 +0200
@@ -1,0 +2,7 @@
+Fri Jun 29 12:46:15 CEST 2007 - juhliarik@suse.cz
+
+- added patch for creating upload dir
+- added patch for position of ftp-server icon in YaST
+- V 2.15.6
+
+-------------------------------------------------------------------
Old:
----
yast2-ftp-server-2.15.5.tar.bz2
New:
----
yast2-ftp-server-2.15.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ftp-server.spec ++++++
--- /var/tmp/diff_new_pack.C31906/_old 2007-07-01 17:29:22.000000000 +0200
+++ /var/tmp/diff_new_pack.C31906/_new 2007-07-01 17:29:22.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-ftp-server (Version 2.15.5)
+# spec file for package yast2-ftp-server (Version 2.15.6)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-ftp-server
-Version: 2.15.5
+Version: 2.15.6
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ftp-server-2.15.5.tar.bz2
+Source0: yast2-ftp-server-2.15.6.tar.bz2
prefix: /usr
Requires: yast2 yast2-inetd
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-inetd yast2-testsuite
@@ -34,7 +34,7 @@
Jozef Uhliarik
%prep
-%setup -n yast2-ftp-server-2.15.5
+%setup -n yast2-ftp-server-2.15.6
%build
%{prefix}/bin/y2tool y2autoconf
@@ -70,6 +70,10 @@
%doc %{prefix}/share/doc/packages/yast2-ftp-server
%changelog
+* Fri Jun 29 2007 - juhliarik@suse.cz
+- added patch for creating upload dir
+- added patch for position of ftp-server icon in YaST
+- V 2.15.6
* Wed May 30 2007 - juhliarik@suse.cz
- added patch for uploading anonymous users via vsftpd
- added creation "upload" subdirectory with writing permission
++++++ yast2-ftp-server-2.15.5.tar.bz2 -> yast2-ftp-server-2.15.6.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ftp-server-2.15.5/configure new/yast2-ftp-server-2.15.6/configure
--- old/yast2-ftp-server-2.15.5/configure 2007-05-30 18:44:26.000000000 +0200
+++ new/yast2-ftp-server-2.15.6/configure 2007-06-29 15:04:08.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2-ftp-server 2.15.5.
+# Generated by GNU Autoconf 2.60 for yast2-ftp-server 2.15.6.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-ftp-server'
PACKAGE_TARNAME='yast2-ftp-server'
-PACKAGE_VERSION='2.15.5'
-PACKAGE_STRING='yast2-ftp-server 2.15.5'
+PACKAGE_VERSION='2.15.6'
+PACKAGE_STRING='yast2-ftp-server 2.15.6'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1181,7 +1181,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-ftp-server 2.15.5 to adapt to many kinds of systems.
+\`configure' configures yast2-ftp-server 2.15.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1252,7 +1252,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-ftp-server 2.15.5:";;
+ short | recursive ) echo "Configuration of yast2-ftp-server 2.15.6:";;
esac
cat <<\_ACEOF
@@ -1330,7 +1330,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-ftp-server configure 2.15.5
+yast2-ftp-server configure 2.15.6
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1344,7 +1344,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-ftp-server $as_me 2.15.5, which was
+It was created by yast2-ftp-server $as_me 2.15.6, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2145,7 +2145,7 @@
# Define the identity of the package.
PACKAGE='yast2-ftp-server'
- VERSION='2.15.5'
+ VERSION='2.15.6'
cat >>confdefs.h <<_ACEOF
@@ -2372,7 +2372,7 @@
-VERSION="2.15.5"
+VERSION="2.15.6"
RPMNAME="yast2-ftp-server"
MAINTAINER="Jozef Uhliarik "
@@ -3258,7 +3258,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-ftp-server $as_me 2.15.5, which was
+This file was extended by yast2-ftp-server $as_me 2.15.6, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3301,7 +3301,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-ftp-server config.status 2.15.5
+yast2-ftp-server config.status 2.15.6
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ftp-server-2.15.5/configure.in new/yast2-ftp-server-2.15.6/configure.in
--- old/yast2-ftp-server-2.15.5/configure.in 2007-05-30 18:44:21.000000000 +0200
+++ new/yast2-ftp-server-2.15.6/configure.in 2007-06-29 15:04:03.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-ftp-server, 2.15.5, http://bugs.opensuse.org/, yast2-ftp-server)
+AC_INIT(yast2-ftp-server, 2.15.6, http://bugs.opensuse.org/, yast2-ftp-server)
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.15.5"
+VERSION="2.15.6"
RPMNAME="yast2-ftp-server"
MAINTAINER="Jozef Uhliarik "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ftp-server-2.15.5/src/dialogs.ycp new/yast2-ftp-server-2.15.6/src/dialogs.ycp
--- old/yast2-ftp-server-2.15.5/src/dialogs.ycp 2007-05-29 16:07:36.000000000 +0200
+++ new/yast2-ftp-server-2.15.6/src/dialogs.ycp 2007-06-11 16:54:46.000000000 +0200
@@ -109,7 +109,10 @@
result["service_not_running_label"] = _("FTP is not running");
result["start_now_button"] = _("&Start FTP Now");
result["stop_now_button"] = _("S&top FTP Now");
+ result["save_now_action"] = SaveAndRestartVsftpd;
result["save_now_button"] = _("Sa&ve Settings and Restart FTP Now");
+ result["start_now_action"] = StartNowVsftpd;
+ result["stop_now_action"] = StopNowVsftpd;
result["help"] = sformat (CWMServiceStart::StartStopHelpTemplate (true),
// part of help text - push button label, NO SHORTCUT!!!
_("Start FTP daemon Now"),
@@ -135,7 +138,10 @@
result["service_not_running_label"] = _("FTP is not running");
result["start_now_button"] = _("&Start FTP Now");
result["stop_now_button"] = _("S&top FTP Now");
+ result["save_now_action"] = SaveAndRestartPure;
result["save_now_button"] = _("Sa&ve Settings and Restart FTP Now");
+ result["start_now_action"] = StartNowPure;
+ result["stop_now_action"] = StopNowPure;
result["help"] = sformat (CWMServiceStart::StartStopHelpTemplate (true),
// part of help text - push button label, NO SHORTCUT!!!
_("Start FTP daemon Now"),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ftp-server-2.15.5/src/ftp-server.desktop new/yast2-ftp-server-2.15.6/src/ftp-server.desktop
--- old/yast2-ftp-server-2.15.5/src/ftp-server.desktop 2007-04-18 15:46:18.000000000 +0200
+++ new/yast2-ftp-server-2.15.6/src/ftp-server.desktop 2007-06-11 16:01:08.000000000 +0200
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=Application
-Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Misc;
+Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Net_advanced;
X-KDE-ModuleType=Library
X-KDE-RootOnly=true
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ftp-server-2.15.5/src/FtpServer.ycp new/yast2-ftp-server-2.15.6/src/FtpServer.ycp
--- old/yast2-ftp-server-2.15.5/src/FtpServer.ycp 2007-05-30 16:55:39.000000000 +0200
+++ new/yast2-ftp-server-2.15.6/src/FtpServer.ycp 2007-06-13 11:41:02.000000000 +0200
@@ -37,6 +37,12 @@
global boolean WriteToEditMap (string key, string value);
+global boolean WriteSettings ();
+
+global boolean WriteUpload ();
+
+global boolean WriteXinetd ();
+
/**
* Data was modified?
*/
@@ -96,6 +102,16 @@
global boolean start_xinetd = false;
/**
+ * variable signifies if daemon will be stoped in xinetd
+ *
+ * global boolean variable
+ */
+
+global boolean stop_daemon_xinetd = false;
+
+
+
+/**
* variable signifies if it is create upload dir
* only for vsftpd and anonymous connections with allowed upload
*
@@ -350,6 +366,7 @@
if (result) {
result = InitEDIT_SETTINGS ();
}
+
//read info about anonymous user "ftp"
Users::SetGUI (false);
if ((Users::Read () == "") && (EDIT_SETTINGS["VirtualUser"]:nil == "NO")) {
@@ -446,6 +463,21 @@
return true;
}
+
+/**
+ * Restart daemon apply changes
+ * only if daemon running...
+ *
+ * @return boolean successfull
+*/
+//boolean ApplyChanges () {
+
+
+
+
+//}
+
+
/**
* Write firewall configuration
*
@@ -502,7 +534,7 @@
*
* @return boolean successfull
*/
-boolean WriteSettings () {
+global boolean WriteSettings () {
boolean result = false;
result = WriteToSETTINGS();
if (vsftpd_edit) {
@@ -558,7 +590,7 @@
*
* @return boolean result of function (true/false)
*/
-boolean WriteXinetd () {
+global boolean WriteXinetd () {
boolean result = false;
if (vsftpd_xined_id != -1) {
result = WriteStartViaXinetd (start_xinetd);
@@ -571,26 +603,32 @@
* It is necessary if user want to allow uploading for anonymous
* @return boolean result of function (true/false)
*/
-boolean WriteUpload () {
+global boolean WriteUpload () {
boolean result = true;
string command ="";
+ string upload ="";
integer authentication = tointeger(EDIT_SETTINGS["AnonAuthen"]:nil);
if ((vsftpd_edit) && (authentication == 0) && (create_upload_dir) && (upload_good_permission)) {
boolean write_enable = ((EDIT_SETTINGS["EnableUpload"]:nil == "YES") ? true:false);
boolean anon_upload = ((EDIT_SETTINGS["AnonReadOnly"]:nil == "NO") ? true:false);
boolean anon_create_dirs = ((EDIT_SETTINGS["AnonCreatDirs"]:nil == "YES") ? true:false);
- if ((write_enable) && ((anon_upload) || (anon_create_dirs)))
+ if ((write_enable) && ((anon_upload) || (anon_create_dirs)))
+ if (substring (anon_homedir, (size(anon_homedir)-1)) == "/")
+ upload ="upload";
+ else
+ upload ="/upload";
command = "dir=`ls ";
command = command + anon_homedir;
command = command + " | grep upload`; if [ -z $dir ]; then mkdir ";
- command = command + anon_homedir +"upload; chown ";
+ command = command + anon_homedir +upload + "; chown ";
if (EDIT_SETTINGS["GuestUser"]:nil !="")
- command = command + EDIT_SETTINGS["GuestUser"]:nil +":"+EDIT_SETTINGS["GuestUser"]:nil;
- else if (EDIT_SETTINGS["FTPUser"]:nil !="")
+ command = command + EDIT_SETTINGS["GuestUser"]:nil +":"+EDIT_SETTINGS["GuestUser"]:nil;
+ else if (EDIT_SETTINGS["FTPUser"]:nil !="")
command = command + EDIT_SETTINGS["FTPUser"]:nil +":"+EDIT_SETTINGS["FTPUser"]:nil;
- command = command + " " + anon_homedir +"upload; chmod 766 ";
- command = command + anon_homedir +"upload; else chmod 766 " + anon_homedir +"upload; fi";
+
+ command = command + " " + anon_homedir + upload + "; chmod 766 ";
+ command = command + anon_homedir +upload + "; else chmod 766 " + anon_homedir +"upload; fi";
/*
"dir=`ls /srv/ftp/ | grep upload`; if [ -z $dir ]; then echo $dir; mkdir /srv/ftp/upload;
chown ftp:ftp /srv/ftp/upload/; chmod 755 /srv/ftp/upload; else chmod 766 /srv/ftp/upload/; fi"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ftp-server-2.15.5/src/wid_functions.ycp new/yast2-ftp-server-2.15.6/src/wid_functions.ycp
--- old/yast2-ftp-server-2.15.5/src/wid_functions.ycp 2007-05-30 17:25:21.000000000 +0200
+++ new/yast2-ftp-server-2.15.6/src/wid_functions.ycp 2007-06-29 14:00:37.000000000 +0200
@@ -123,6 +123,264 @@
}
}
+
+/**
+ * Function start vsftpd
+ */
+boolean StartNowVsftpd () {
+ boolean result = false;
+ if (FtpServer::EDIT_SETTINGS["StartDaemon"]:nil == "2") {
+ if (FtpServer::EDIT_SETTINGS["StartXinetd"]:nil == "YES")
+ //FtpServer::start_xinetd = true;
+ Popup::Message("This is not supported via xinetd now!");
+ else {
+ Popup::Message("This is not supported via xinetd now!");
+ }
+ } else {
+ string command = "rcvsftpd start";
+ map options = (map)SCR::Execute (.target.bash_output, command);
+ y2milestone("[ftp-server] (StartNowVsftpd) command for starting vsftpd: %1 output: %2",command, options);
+ if (options["exit"]:nil == 0)
+ result = true;
+ else
+ result = false;
+ }
+ return result;
+}
+
+
+/**
+ * Function stop vsftpd
+ */
+boolean StopNowVsftpd () {
+ boolean result = false;
+if (FtpServer::EDIT_SETTINGS["StartDaemon"]:nil == "2") {
+ if (FtpServer::EDIT_SETTINGS["StartXinetd"]:nil == "YES")
+ //FtpServer::start_xinetd = true;
+ Popup::Message("This is not supported via xinetd now!");
+ else {
+ Popup::Message("This is not supported via xinetd now!");
+ }
+ } else {
+
+ string command = "rcvsftpd stop";
+ map options = (map)SCR::Execute (.target.bash_output, command);
+ y2milestone("[ftp-server] (StopNowVsftpd) command for stop vsftpd: %1 output: %2",command, options);
+ if (options["exit"]:nil == 0)
+ result = true;
+ else
+ result = false;
+ }
+ return result;
+}
+
+/**
+ * Function saves configuration and restarts vsftpd
+ */
+boolean SaveAndRestartVsftpd () {
+
+ boolean result = false;
+ if (FtpServer::EDIT_SETTINGS["StartDaemon"]:nil == "2") {
+ if (FtpServer::EDIT_SETTINGS["StartXinetd"]:nil == "YES")
+ //FtpServer::start_xinetd = true;
+ Popup::Message("This is not supported via xinetd now!");
+ else {
+ Popup::Message("This is not supported via xinetd now!");
+ /*
+ if ((Service::Status("xinetd") != 0) &&
+ (FtpServer::EDIT_SETTINGS["StartXinetd"]:nil == "NO")) {
+ if (Mode::normal()) {
+ UI::OpenDialog(
+ `VBox(
+ `Label("Xinetd is not started!"),
+ `Label("Do you want to start it?"),
+ `HBox(
+ `PushButton(`id(`accept), "&Start"),
+ `PushButton(`id(`cancel), "Canc&el")
+ )
+ ) // end of `VBox(
+ ); // end of UI::OpenDialog(
+ while (true) {
+ any ret = UI::UserInput();
+ if ( ret == `accept ) {
+ FtpServer::EDIT_SETTINGS["StartXinetd"] = "YES";
+ FtpServer::start_xinetd = true;
+ break;
+ } else if (ret == `cancel) {
+ //FtpServer::EDIT_SETTINGS["StartXinetd"] = "NO";
+ FtpServer::start_xinetd = false;
+ break;
+ }
+ };
+ UI::CloseDialog();
+ } // end of if (Mode::normal()) {
+ } // end of if ((Service::Status("xinetd") != 0)...
+ }
+ FtpServer::WriteSettings ();
+ FtpServer::WriteUpload ();
+ result = FtpServer::WriteXinetd ();
+ */
+ }
+ } else {
+ FtpServer::WriteSettings ();
+ FtpServer::WriteUpload ();
+ string command = "rcvsftpd restart";
+ map options = (map)SCR::Execute (.target.bash_output, command);
+ y2milestone("[ftp-server] (SaveAndRestartVsftpd) command for save and restart vsftpd: %1 output: %2",command, options);
+ if (options["exit"]:nil == 0)
+ result = true;
+ else
+ result = false;
+ }
+ return result;
+}
+
+
+/**
+ * Function start pure-ftpd
+ */
+
+boolean StartNowPure () {
+ boolean result = false;
+ if (FtpServer::EDIT_SETTINGS["StartDaemon"]:nil == "2") {
+ if (FtpServer::EDIT_SETTINGS["StartXinetd"]:nil == "YES")
+ //FtpServer::start_xinetd = true;
+ Popup::Message("This is not supported via xinetd now!");
+ else {
+ Popup::Message("This is not supported via xinetd now!");
+ /*
+ if ((Service::Status("xinetd") != 0) &&
+ (FtpServer::EDIT_SETTINGS["StartXinetd"]:nil == "NO")) {
+ if (Mode::normal()) {
+ UI::OpenDialog(
+ `VBox(
+ `Label("Xinetd is not started!"),
+ `Label("Do you want to start it?"),
+ `HBox(
+ `PushButton(`id(`accept), "&Start"),
+ `PushButton(`id(`cancel), "Canc&el")
+ )
+ ) // end of `VBox(
+ ); // end of UI::OpenDialog(
+ while (true) {
+ any ret = UI::UserInput();
+ if ( ret == `accept ) {
+ FtpServer::EDIT_SETTINGS["StartXinetd"] = "YES";
+ FtpServer::start_xinetd = true;
+ break;
+ } else if (ret == `cancel) {
+ //FtpServer::EDIT_SETTINGS["StartXinetd"] = "NO";
+ FtpServer::start_xinetd = false;
+ break;
+ }
+ };
+ UI::CloseDialog();
+ } // end of if (Mode::normal()) {
+ } // end of if ((Service::Status("xinetd") != 0)...
+ }
+ //FtpServer::WriteSettings ();
+ result = FtpServer::WriteXinetd ();
+ y2milestone("[ftp-server] (StopNowPure) command for start pure-ftpd via xinetd");
+ */
+ }
+ } else {
+ string command = "rcpure-ftpd start";
+ map options = (map)SCR::Execute (.target.bash_output, command);
+ y2milestone("[ftp-server] (StartNowPure) command for start pure-ftpd: %1 output: %2",command, options);
+ if (options["exit"]:nil == 0)
+ result = true;
+ else
+ result = false;
+ }
+ return result;
+}
+
+/**
+ * Function stop pure-ftpd
+ */
+
+boolean StopNowPure () {
+ boolean result = false;
+ if ((FtpServer::EDIT_SETTINGS["StartDaemon"]:nil == "2") && (Service::Status("xinetd") != 0)) {
+ Popup::Message("This is not supported via xinetd now!");
+ /*
+ FtpServer::stop_daemon_xinetd = true;
+ result = FtpServer::WriteXinetd ();
+ */
+ } else {
+ string command = "rcpure-ftpd stop";
+ map options = (map)SCR::Execute (.target.bash_output, command);
+ y2milestone("[ftp-server] (StopNowPure) command for stop pure-ftpd: %1 output: %2",command, options);
+ if (options["exit"]:nil == 0)
+ result = true;
+ else
+ result = false;
+ }
+ return result;
+}
+
+/**
+ * Function saves configuration and restarts pure-ftpd
+ */
+boolean SaveAndRestartPure () {
+ boolean result = false;
+ if (FtpServer::EDIT_SETTINGS["StartDaemon"]:nil == "2") {
+ if (FtpServer::EDIT_SETTINGS["StartXinetd"]:nil == "YES")
+ //FtpServer::start_xinetd = true;
+ Popup::Message("This is not supported via xinetd now!");
+ else {
+ Popup::Message("This is not supported via xinetd now!");
+ /*
+ if ((Service::Status("xinetd") != 0) &&
+ (FtpServer::EDIT_SETTINGS["StartXinetd"]:nil == "NO")) {
+ if (Mode::normal()) {
+ UI::OpenDialog(
+ `VBox(
+ `Label("Xinetd is not started!"),
+ `Label("Do you want to start it?"),
+ `HBox(
+ `PushButton(`id(`accept), "&Start"),
+ `PushButton(`id(`cancel), "Canc&el")
+ )
+ ) // end of `VBox(
+ ); // end of UI::OpenDialog(
+ while (true) {
+ any ret = UI::UserInput();
+ if ( ret == `accept ) {
+ FtpServer::EDIT_SETTINGS["StartXinetd"] = "YES";
+ FtpServer::start_xinetd = true;
+ break;
+ } else if (ret == `cancel) {
+ //FtpServer::EDIT_SETTINGS["StartXinetd"] = "NO";
+ FtpServer::start_xinetd = false;
+ break;
+ }
+ };
+ UI::CloseDialog();
+ } // end of if (Mode::normal()) {
+ } // end of if ((Service::Status("xinetd") != 0)...
+
+ }
+ FtpServer::WriteSettings ();
+ result = FtpServer::WriteXinetd ();
+ y2milestone("[ftp-server] (StopNowPure) command for save and restart pure-ftpd via xinetd");
+ */
+ }
+ } else {
+ FtpServer::WriteSettings ();
+ string command = "rcpure-ftpd restart";
+ map options = (map)SCR::Execute (.target.bash_output, command);
+ y2milestone("[ftp-server] (StopNowPure) command for save and restart pure-ftpd: %1 output: %2",command, options);
+ if (options["exit"]:nil == 0)
+ result = true;
+ else
+ result = false;
+ }
+ return result;
+}
+
+
+
/**
* Init function for general settings
* change ValidChars for textentry
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ftp-server-2.15.5/src/write_load.ycp new/yast2-ftp-server-2.15.6/src/write_load.ycp
--- old/yast2-ftp-server-2.15.5/src/write_load.ycp 2007-05-29 17:24:16.000000000 +0200
+++ new/yast2-ftp-server-2.15.6/src/write_load.ycp 2007-06-13 11:46:09.000000000 +0200
@@ -212,7 +212,7 @@
boolean WriteStartViaXinetd (boolean startxinetd) {
string pure_options = "";
boolean result = false;
- if (FtpServer::EDIT_SETTINGS["StartDaemon"]:nil == "2"){
+ if ((FtpServer::EDIT_SETTINGS["StartDaemon"]:nil == "2") && (!FtpServer::stop_daemon_xinetd)) {
if (FtpServer::vsftpd_edit) {
Inetd::netd_conf[FtpServer::vsftpd_xined_id,"enabled"] = true;
Inetd::netd_conf[FtpServer::pureftpd_xined_id,"enabled"] = false;
@@ -231,6 +231,7 @@
if (startxinetd)
Inetd::netd_status = 0; //start xinetd if not running else reload
} else {
+ Inetd::netd_status = 0;
Inetd::netd_conf[FtpServer::pureftpd_xined_id,"enabled"] = false;
Inetd::netd_conf[FtpServer::vsftpd_xined_id,"enabled"] = false;
} //end of else [ if (FtpServer::EDIT_SETTINGS["StartDaemon"]:nil == "2")]
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ftp-server-2.15.5/VERSION new/yast2-ftp-server-2.15.6/VERSION
--- old/yast2-ftp-server-2.15.5/VERSION 2007-05-30 17:33:41.000000000 +0200
+++ new/yast2-ftp-server-2.15.6/VERSION 2007-06-29 12:47:57.000000000 +0200
@@ -1 +1 @@
-2.15.5
+2.15.6
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org