Hello community, here is the log from the commit of package yast2-sshd for openSUSE:Factory checked in at Wed Jun 15 11:55:27 CEST 2011.
-------- --- yast2-sshd/yast2-sshd.changes 2009-01-29 10:53:14.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-sshd/yast2-sshd.changes 2011-06-15 10:54:16.000000000 +0200 @@ -1,0 +2,19 @@ +Wed Jun 15 10:45:10 CEST 2011 - [email protected] + +- Added possibility to manage the sshd service (#556535). +- 2.21.0 + +------------------------------------------------------------------- +Wed Jan 13 18:56:03 CET 2010 - [email protected] + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + +------------------------------------------------------------------- +Tue Feb 24 16:44:38 CET 2009 - [email protected] + +- Added Login Settings help and improved the current dialog labels + to be more accurate (bnc #470357).` + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-sshd-2.18.0.tar.bz2 New: ---- yast2-sshd-2.21.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-sshd.spec ++++++ --- /var/tmp/diff_new_pack.Y2TsqE/_old 2011-06-15 11:55:05.000000000 +0200 +++ /var/tmp/diff_new_pack.Y2TsqE/_new 2011-06-15 11:55:05.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package yast2-sshd (Version 2.18.0) +# spec file for package yast2-sshd # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,40 +19,42 @@ Name: yast2-sshd -Version: 2.18.0 +Version: 2.21.0 Release: 1 -License: GPL v2 or later -Group: System/YaST + BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-sshd-2.18.0.tar.bz2 +Source0: yast2-sshd-2.21.0.tar.bz2 + Prefix: /usr + +Group: System/YaST +License: GPL v2 or later Requires: yast2 >= 2.16.41 BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite + BuildArch: noarch + Summary: YaST2 - SSH Server Configuration %description This package contains the YaST2 component for SSH server configuration. - - -Authors: --------- - Lukas Ocilka <[email protected]> - Katarina Machalkova <[email protected]> - %prep -%setup -n yast2-sshd-2.18.0 +%setup -n yast2-sshd-2.21.0 %build %{prefix}/bin/y2tool y2autoconf %{prefix}/bin/y2tool y2automake autoreconf --force --install + export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" + %{?suse_update_config:%{suse_update_config -f}} ./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} -make %{?jobs:-j%jobs} +# V=1: verbose build in case we used AM_SILENT_RULES(yes) +# so that RPM_OPT_FLAGS check works +make %{?jobs:-j%jobs} V=1 %install make install DESTDIR="$RPM_BUILD_ROOT" @@ -76,4 +78,5 @@ %{prefix}/share/applications/YaST2/sshd.desktop /usr/share/YaST2/schema/autoyast/rnc/sshd_config.rnc %doc %{prefix}/share/doc/packages/yast2-sshd + %changelog ++++++ yast2-sshd-2.18.0.tar.bz2 -> yast2-sshd-2.21.0.tar.bz2 ++++++ ++++ 7774 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-sshd-2.18.0/Makefile.am new/yast2-sshd-2.21.0/Makefile.am --- old/yast2-sshd-2.18.0/Makefile.am 2009-01-29 11:02:48.000000000 +0100 +++ new/yast2-sshd-2.21.0/Makefile.am 2011-06-15 10:48:02.000000000 +0200 @@ -32,10 +32,10 @@ # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip -# where devtools instal m4 snippets +# where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common cmp -s $< $@ || cp -f $< $@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-sshd-2.18.0/VERSION new/yast2-sshd-2.21.0/VERSION --- old/yast2-sshd-2.18.0/VERSION 2009-01-29 10:49:59.000000000 +0100 +++ new/yast2-sshd-2.21.0/VERSION 2011-06-15 10:47:23.000000000 +0200 @@ -1 +1 @@ -2.18.0 +2.21.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-sshd-2.18.0/autodocs-ycp.ami new/yast2-sshd-2.21.0/autodocs-ycp.ami --- old/yast2-sshd-2.18.0/autodocs-ycp.ami 2009-01-29 11:02:48.000000000 +0100 +++ new/yast2-sshd-2.21.0/autodocs-ycp.ami 2011-06-15 10:48:02.000000000 +0200 @@ -1,5 +1,5 @@ # -*- makefile -*- Automake include file -# $Id: autodocs-ycp.ami 33394 2006-10-13 11:51:40Z mvidner $ +# $Id: autodocs-ycp.ami 57644 2009-06-19 08:38:11Z mvidner $ # Builds source documentation for YCP sources # Uses ycpdoc @@ -8,20 +8,25 @@ # Optional - the default is $(srcdir)/../../src/*.ycp # AUTODOCS_PM: Files that the perl autodocs is built from # Optional - the default is $(srcdir)/../../src/*.pm +# AUTODOCS_SUBDIR: To install the result to $(docdir)/SUBDIR/autodocs +# Optional - the default is no subdir, $(docdir)/autodocs +# AUTODOCS_STRIP: Strip it from filenames. The remaining / are replaced by __ +# Optional - the default is $(srcdir)/../../src -htmldir = $(docdir)/autodocs +htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs -html_DATA = index.html $(wildcard *.html) +html_DATA = index.html $(filter-out index.html, $(wildcard *.html)) CLEANFILES = $(html_DATA) pod2htm*.tmp AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp) AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm) +AUTODOCS_STRIP ?= $(srcdir)/../../src index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM) #including *.pm, for the index - ${YCPDOC} -d. $^ + ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP) for i in $(AUTODOCS_PM); do \ - b=`basename $$i`; b=$${b%.pm}; \ + b=$${i##$(AUTODOCS_STRIP)}; b=$${b#/}; b=$${b//\//__}; b=$${b%.pm}; \ pod2html --title=$$b --infile=$$i --outfile=$$b.html; \ - echo "<a href='$$b.html'>$$b</a>" > $$b.mod.html; \ + echo "<a href='$$b.html'>$${b/__/::}</a>" > $$b.mod.html; \ done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-sshd-2.18.0/configure.in new/yast2-sshd-2.21.0/configure.in --- old/yast2-sshd-2.18.0/configure.in 2009-01-29 11:02:48.000000000 +0100 +++ new/yast2-sshd-2.21.0/configure.in 2011-06-15 10:48:02.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-sshd dnl -dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-sshd, 2.18.0, http://bugs.opensuse.org/, yast2-sshd) +AC_INIT(yast2-sshd, 2.21.0, http://bugs.opensuse.org/, yast2-sshd) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.18.0" +VERSION="2.21.0" RPMNAME="yast2-sshd" MAINTAINER="Lukas Ocilka <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-sshd-2.18.0/missing new/yast2-sshd-2.21.0/missing --- old/yast2-sshd-2.18.0/missing 2009-01-29 11:02:51.000000000 +0100 +++ new/yast2-sshd-2.21.0/missing 2011-06-15 10:48:05.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to <[email protected]>." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-sshd-2.18.0/src/Sshd.ycp new/yast2-sshd-2.21.0/src/Sshd.ycp --- old/yast2-sshd-2.18.0/src/Sshd.ycp 2009-01-29 10:47:59.000000000 +0100 +++ new/yast2-sshd-2.21.0/src/Sshd.ycp 2011-06-14 16:29:01.000000000 +0200 @@ -30,7 +30,7 @@ /** * Sleep time between Read or Write steps */ -integer sl = 200; +integer sl = 150; /** * Returns whether the configuration has been modified. @@ -46,6 +46,40 @@ modified = true; } +string service_name = "sshd"; + +boolean start_service = nil; + +global boolean GetStartService () { + return start_service; +} + +global void SetStartService (boolean new_state) { + if (new_state == nil) { + y2error ("Cannot set 'StartService' to %1", new_state); + return; + } else if (start_service == new_state) { + y2warning ("'StartService' unchanged"); + return; + } + + start_service = new_state; + SetModified(); +} + +/** + * Describes whether the daemon is running + */ +boolean Running () { + return (Service::Status(service_name) == 0); +} + +boolean ReadStartService () { + start_service = Running(); + + return (start_service != nil); +} + /** * map of SSHD settings */ @@ -129,26 +163,6 @@ } /** - * Describes whether the daemon is running - */ -boolean sshd_is_running = false; - -/** - * Reads current sshd status - */ -boolean ReadSSHDService () { - if (Service::Status("sshd") == 0) { - sshd_is_running = true; - } else { - sshd_is_running = false; - } - - y2milestone((sshd_is_running ? "SSH is running":"SSH is not running")); - - return true; -} - -/** * Exports the current configuration. * * @return map of a current configuration @@ -161,7 +175,7 @@ global map Export () { return $[ "config" : SETTINGS, - "status" : sshd_is_running, + "status" : Running(), ]; } @@ -170,29 +184,13 @@ */ global boolean Import (map import_map) { SETTINGS = (map <string, list<string> >) import_map["config"]:$[]; - sshd_is_running = (import_map["status"]:false == true); + SetStartService (import_map["status"]:false == true); SetModified(); y2milestone ("Configuration has been imported"); return true; } /** - * Restarts the sshd when the daemon was running when starting the configuration - */ -boolean WriteSSHDService () { - boolean all_ok = true; - - if (sshd_is_running) { - y2milestone("Restarting sshd daemon"); - all_ok = Service::Restart("sshd"); - } else { - y2milestone("Sshd is not running - leaving..."); - } - - return all_ok; -} - -/** Returns a confirmation popup dialog whether user wants to really abort. */ global boolean Abort() { @@ -225,7 +223,7 @@ /* SSHD read dialog caption */ string caption = _("Initializing the SSHD Configuration"); - integer steps = 3; + integer steps = 4; Progress::New( caption, " ", steps, [ /* Progress stage 1 */ @@ -233,15 +231,18 @@ /* Progress stage 2 */ _("Read the current SSHD state"), /* Progress stage 3 */ - _("Read firewall settings") + _("Read firewall settings"), + /* Progress stage 4 */ + _("Read service status"), ], [ /* Progress step 1 */ _("Reading the current SSHD configuration..."), /* Progress step 2 */ - _("Reading the current SSHD state..."), + _("Reading the current SSHD state"), /* Progress step 3 */ _("Reading firewall settings..."), - /* Progress finished */ + /* Progress step 4 */ + _("Reading service status..."), Message::Finished() ], "" @@ -251,14 +252,12 @@ if (PollAbort()) return false; Progress::NextStage(); - /* Error message */ if(!ReadSSHDSettings()) Report::Error(Message::CannotReadCurrentSettings()); sleep(sl); if (PollAbort()) return false; - Progress::NextStep(); - /* Error message */ - if(!ReadSSHDService()) Report::Error(_("Cannot read the current SSHD state.")); + Progress::NextStage(); + if (!ReadStartService()) Report::Error(Message::CannotReadCurrentSettings()); sleep(sl); if (PollAbort()) return false; @@ -273,10 +272,61 @@ Progress::NextStage (); sleep(sl); + if (PollAbort()) return false; + Progress::NextStage (); + start_service = Service::Enabled (service_name); + sleep(sl); + modified = false; return true; } +boolean AdjustSSHDService () { + boolean enable_and_start = GetStartService(); + boolean enabled = Service::Enabled (service_name); + boolean running = (Service::Status (service_name) == 0); + + if (enable_and_start == nil) { + y2error ("Configuration error: Cannot start/stop service %1", service_name); + return false; + } + + // Service enable/disable + if (enable_and_start == enabled) { + y2milestone ("Service '%1' is already in the desired state", service_name); + } else { + if (enable_and_start && !Service::Enable (service_name)) { + y2error ("Cannot enable service %1", service_name); + return false; + } else if (!enable_and_start && !Service::Disable (service_name)) { + y2error ("Cannot disable service %1", service_name); + return false; + } + } + + // Start / restart service + if (enable_and_start) { + if (Running()) { + if (!Service::Restart(service_name)) { + y2error ("Cannot restart service %1", service_name); + return false; + } + } else { + if (!Service::Start (service_name)) { + y2error ("Cannot start service %1", service_name); + return false; + } + } + // Stop a running service + } else if (Running()) { + if (!Service::Stop (service_name)) { + return false; + } + } + + return true; +} + /** * Write all SSHD settings * @return true on success @@ -286,22 +336,22 @@ /* SSHD read dialog caption */ string caption = _("Saving the SSHD Configuration"); - integer steps = 3; - + integer steps = 4; + Progress::New(caption, " ", steps, [ /* Progress stage 1 */ _("Write the SSHD settings"), /* Progress stage 2 */ - _("Adjust the SSHD service"), + _("Write firewall settings"), /* Progress stage 3 */ - _("Write firewall settings") + _("Adjust SSHD service"), ], [ /* Progress step 1 */ _("Writing the SSHD settings..."), /* Progress step 2 */ - _("Adjusting the SSHD service..."), - /* Progress step 3 */ _("Writing firewall settings..."), + /* Progress step 3 */ + _("Adjusting SSHD service..."), Message::Finished() ], "" @@ -317,16 +367,15 @@ if(PollAbort()) return false; Progress::NextStage (); + boolean progress_state = Progress::set (false); /* Error message */ - if(!WriteSSHDService()) Report::Error (Message::CannotAdjustService("sshd")); + if(!SuSEFirewall::Write()) Report::Error(_("Cannot write firewall settings.")); + Progress::set (progress_state); sleep(sl); if(PollAbort()) return false; Progress::NextStage (); - boolean progress_state = Progress::set (false); - /* Error message */ - if(!SuSEFirewall::Write()) Report::Error(_("Cannot write firewall settings.")); - Progress::set (progress_state); + AdjustSSHDService(); sleep(sl); Progress::NextStage (); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-sshd-2.18.0/src/dialogs.ycp new/yast2-sshd-2.21.0/src/dialogs.ycp --- old/yast2-sshd-2.18.0/src/dialogs.ycp 2009-01-29 10:48:01.000000000 +0100 +++ new/yast2-sshd-2.21.0/src/dialogs.ycp 2011-06-14 16:18:57.000000000 +0200 @@ -28,6 +28,15 @@ mbox_y = 0; } +term ServiceConfigurationDialogContent () { + return `VBox ( + "start_stop", + `VSpacing(1), + "auto_start_up", + `VStretch() + ); +} + term ServerConfigurationDialogContent () { return `VBox ( `Left(`Label(_("SSHD TCP Ports"))), @@ -45,7 +54,7 @@ /* a push button */ `PushButton(`id("delete_port"), _("&Delete")) )), - `VSpacing(1), + `VSpacing (1), `Frame ( /* a dialog frame caption */ _("Server Features"), @@ -89,9 +98,9 @@ // `Left(`CheckBox (`id("PasswordAuthentication"), _("Pa&ssword Authentication"))), /* A check box */ - `Left(`CheckBox (`id("RSAAuthentication"), _("RSA Authenti&cation"))), + `Left(`CheckBox (`id("RSAAuthentication"), _("RSA Authenti&cation (Protocol V. 1 Only)"))), /* A check box */ - `Left(`CheckBox (`id("PubkeyAuthentication"), _("Public &Key Authentication"))) + `Left(`CheckBox (`id("PubkeyAuthentication"), _("Public &Key Authentication (Protocol V. 2 Only)"))) )) ), `VStretch() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-sshd-2.18.0/src/helps.ycp new/yast2-sshd-2.21.0/src/helps.ycp --- old/yast2-sshd-2.18.0/src/helps.ycp 2007-11-16 20:05:32.000000000 +0100 +++ new/yast2-sshd-2.21.0/src/helps.ycp 2009-11-24 15:13:50.000000000 +0100 @@ -26,9 +26,34 @@ "server_configuration" : _("<p><b><big>Server Configuration</big></b><br> Configure SSHD here.<br></p>"), - /* Login Settings dialog help */ + /* Login Settings dialog help 1 */ "login_settings" : _("<p><b><big>Login Settings</big></b><br> -Configure SSHD login settings here.<br></p>"), +Here you can configure the SSHD login and authentication settings. +Some apply to a particular protocol version only.</p>") + + /* Login Settings dialog help 2, text taken from sshd_config manpage */ + + _("<p><b>Print Message of the Day After Login</b> +Specifies whether sshd should print /etc/motd when +a user logs in interactively.</p>") + + /* Login Settings dialog help 3, text taken from sshd_config manpage */ + + _("<p><b>Permit Root Login</b><br> +Specifies whether root can log in using ssh.</p>") + + /* Login Settings dialog help 4, text taken from sshd_config manpage */ + + _("<p><b>Maximum Authentication Tries</b><br> +Specifies the maximum number of authentication attempts permitted per connection. +Once the number of failures reaches half this value, additional failures are logged.</p>") + + /* Login Settings dialog help 5, text taken from sshd_config manpage */ + + _("<p><b>RSA Authentication</b><br> +Specifies whether pure RSA authentication is allowed. +This option applies to protocol version 1 only.</p>") + + /* Login Settings dialog help 6, text taken from sshd_config manpage */ + + _("<p><b>Public Key Authentication</b><br> +Specifies whether public key authentication is allowed. +This option applies to protocol version 2 only.</p>"), /* Protocol and Cipher Settings dialog help*/ "proto_settings" : _("<p><b><big>Protocol and Cipher Settings</big></b><br> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-sshd-2.18.0/src/sshd.desktop new/yast2-sshd-2.21.0/src/sshd.desktop --- old/yast2-sshd-2.18.0/src/sshd.desktop 2008-05-19 15:28:03.000000000 +0200 +++ new/yast2-sshd-2.21.0/src/sshd.desktop 2010-01-15 11:13:56.000000000 +0100 @@ -19,9 +19,8 @@ X-SuSE-YaST-AutoInstRequires=lan Icon=yast-sshd -Exec=/sbin/yast2 sshd +Exec=xdg-su -c "/sbin/yast2 sshd" Name=SSHD Configuration GenericName=Configure a SSHD Daemon -X-KDE-SubstituteUID=true StartupNotify=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-sshd-2.18.0/src/wizards.ycp new/yast2-sshd-2.21.0/src/wizards.ycp --- old/yast2-sshd-2.18.0/src/wizards.ycp 2008-12-16 17:51:11.000000000 +0100 +++ new/yast2-sshd-2.21.0/src/wizards.ycp 2011-06-14 16:21:04.000000000 +0200 @@ -14,10 +14,20 @@ import "CWM"; import "CWMTab"; import "CWMFirewallInterfaces"; +import "CWMServiceStart"; +import "Sshd"; include "sshd/complex.ycp"; include "sshd/dialogs.ycp"; +void SaveAndRestart () { + Wizard::CreateDialog (); + Wizard::RestoreHelp (HELPS["write"]:""); + Sshd::Write (); + sleep (1000); + UI::CloseDialog (); +} + /** * Main workflow of the sshd configuration * @return sequence result @@ -52,9 +62,49 @@ "services" : [ "service:sshd" ], "display_details" : true, ]), + "start_stop" : CWMServiceStart::CreateStartStopWidget ($[ + "service_id" : "sshd", + // label - service status, informative text + "service_running_label" : _("SSH server is running"), + // label - service status, informative text + "service_not_running_label" : _("SSH server is not running"), + // push button (SSH service handling) + "start_now_button" : _("&Start SSH Server Now"), + // push button (SSH service handling) + "stop_now_button" : _("S&top SSH Server Now"), + "save_now_action" : SaveAndRestart, + // push button (SSH service handling) + "save_now_button" : _("Save Settings and Reload SSH Server &Now"), + "help" : sformat (CWMServiceStart::StartStopHelpTemplate (true), + // part of help text, used to describe pusbuttons (matching SSH service handling but without "&") + _("Start SSH Server Now"), + // part of help text, used to describe pusbuttons (matching SSH service handling but without "&") + _("Stop SSH Server Now"), + // part of help text, used to describe pusbuttons (matching SSH service handling but without "&") + _("Save Settings and Reload SSH Server Now")), + ]), + "auto_start_up" : CWMServiceStart::CreateAutoStartWidget ($[ + "get_service_auto_start" : Sshd::GetStartService, + "set_service_auto_start" : Sshd::SetStartService, + // radio button (starting SSH service - option 1) + "start_auto_button" : _("Now and When &Booting"), + // radio button (starting SSH service - option 2) + "start_manual_button" : _("&Manually"), + "help" : sformat (CWMServiceStart::AutoStartHelpTemplate (), + // part of help text, used to describe radiobuttons (matching starting SSH service but without "&") + _("Now and When Booting"), + // part of help text, used to describe radiobuttons (matching starting SSH service but without "&") + _("Manually") + ), + ]), ]; map <string, any> tabs = $[ + "service_configuration" : $[ + "header" : _("&Start-Up"), + "widget_names" : ["start_stop", "auto_start_up"], + "contents" : ServiceConfigurationDialogContent(), + ], "server_configuration" : $[ "header" : _("&General"), "widget_names" : ["sc", "fw"], @@ -74,7 +124,7 @@ map <string, any> wd = $[ "tab" : CWMTab::CreateWidget ($[ - "tab_order" : ["server_configuration", "login_settings", "proto_and_cipher"], + "tab_order" : ["service_configuration", "server_configuration", "login_settings", "proto_and_cipher"], "tabs" : tabs, "widget_descr" : widgets, "initial_tab" : "server_configuration", ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
