Hello community,
here is the log from the commit of package yast2-squid
checked in at Thu Sep 6 21:24:31 CEST 2007.
--------
--- yast2-squid/yast2-squid.changes 2007-08-28 15:44:25.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-squid/yast2-squid.changes 2007-09-04 15:53:22.930629000 +0200
@@ -1,0 +2,9 @@
+Tue Sep 4 15:37:38 CEST 2007 - dfiser@suse.cz
+
+- Added .rnc schema file (bug #304267).
+- Removed some checks of local system if module is running as
+ autoyast client. In autoyast, Squid module is filled with default
+ values. (bug #304264)
+- v2.15.3
+
+-------------------------------------------------------------------
Old:
----
yast2-squid-2.15.2.tar.bz2
New:
----
yast2-squid-2.15.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-squid.spec ++++++
--- /var/tmp/diff_new_pack.o12130/_old 2007-09-06 21:23:43.000000000 +0200
+++ /var/tmp/diff_new_pack.o12130/_new 2007-09-06 21:23:43.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-squid (Version 2.15.2)
+# spec file for package yast2-squid (Version 2.15.3)
#
# 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-squid
-Version: 2.15.2
+Version: 2.15.3
Release: 1
License: GPL v2 only
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-squid-2.15.2.tar.bz2
+Source0: yast2-squid-2.15.3.tar.bz2
prefix: /usr
Requires: yast2
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite
@@ -33,7 +33,7 @@
Daniel Fiser
%prep
-%setup -n yast2-squid-2.15.2
+%setup -n yast2-squid-2.15.3
%build
%{prefix}/bin/y2tool y2autoconf
@@ -66,10 +66,17 @@
/usr/share/YaST2/modules/SquidACL.*
/usr/share/YaST2/modules/SquidErrorMessages.*
%{prefix}/share/applications/YaST2/squid.desktop
+/usr/share/YaST2/schema/autoyast/rnc/squid.rnc
/usr/share/YaST2/scrconf/*.scr
%doc %{prefix}/share/doc/packages/yast2-squid
%changelog
+* Tue Sep 04 2007 - dfiser@suse.cz
+- Added .rnc schema file (bug #304267).
+- Removed some checks of local system if module is running as
+ autoyast client. In autoyast, Squid module is filled with default
+ values. (bug #304264)
+- v2.15.3
* Tue Aug 28 2007 - dfiser@suse.cz
- Added checking of more input data (bug #304314).
- Changed workflow to DialogTree-based dialogs.
++++++ yast2-squid-2.15.2.tar.bz2 -> yast2-squid-2.15.3.tar.bz2 ++++++
++++ 3681 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-squid-2.15.2/configure.in new/yast2-squid-2.15.3/configure.in
--- old/yast2-squid-2.15.2/configure.in 2007-08-28 15:42:46.000000000 +0200
+++ new/yast2-squid-2.15.3/configure.in 2007-09-04 15:51:53.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-squid
dnl
-dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.15.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-squid, 2.15.2, http://bugs.opensuse.org/, yast2-squid)
+AC_INIT(yast2-squid, 2.15.3, http://bugs.opensuse.org/, yast2-squid)
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.2"
+VERSION="2.15.3"
RPMNAME="yast2-squid"
MAINTAINER="Daniel Fiser "
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-squid-2.15.2/Makefile.am new/yast2-squid-2.15.3/Makefile.am
--- old/yast2-squid-2.15.2/Makefile.am 2007-08-28 15:42:46.000000000 +0200
+++ new/yast2-squid-2.15.3/Makefile.am 2007-09-04 15:51:53.000000000 +0200
@@ -210,8 +210,7 @@
# For po/ modules
checkpo:
- test ! -d $(srcdir)/po || $(MAKE) -C po checkpo
-# test ! -d $(srcdir)/po \
-# || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; }
+ test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo
+# test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo make-pox
# No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am
SUBDIRS = agents doc src testsuite
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-squid-2.15.2/missing new/yast2-squid-2.15.3/missing
--- old/yast2-squid-2.15.2/missing 2007-08-28 15:42:49.000000000 +0200
+++ new/yast2-squid-2.15.3/missing 2007-09-04 15:51:56.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# 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).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 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-squid-2.15.2/src/complex.ycp new/yast2-squid-2.15.3/src/complex.ycp
--- old/yast2-squid-2.15.2/src/complex.ycp 2007-08-28 14:33:05.000000000 +0200
+++ new/yast2-squid-2.15.3/src/complex.ycp 2007-09-04 13:01:37.000000000 +0200
@@ -37,6 +37,7 @@
import "CWMServiceStart";
import "PackageSystem";
import "Squid";
+import "Mode";
include "squid/helps.ycp";
include "squid/dialogs.ycp";
@@ -108,7 +109,7 @@
"start_now_button" : _("&Start Squid Now"),
"stop_now_button" : _("S&top Squid Now"),
"save_now_action" : SaveAndRestart,
- "save_now_button" : _("Sa&ve Settings and Restart Firewall Now"),
+ "save_now_button" : _("Sa&ve Settings and Restart Squid Now"),
//"start_now_action" : uses the default function
//"stop_now_action" : uses the default function
"help" : sformat (CWMServiceStart::StartStopHelpTemplate (true),
@@ -197,7 +198,8 @@
`HSpacing(3),
`VBox(
"auto_start",
- "start_stop"
+ `VSpacing(),
+ (Mode::normal() ? "start_stop" : `Empty())
),
`HSpacing(3)
),
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-squid-2.15.2/src/Makefile.am new/yast2-squid-2.15.3/src/Makefile.am
--- old/yast2-squid-2.15.2/src/Makefile.am 2007-08-28 08:44:32.000000000 +0200
+++ new/yast2-squid-2.15.3/src/Makefile.am 2007-09-03 09:21:14.000000000 +0200
@@ -1,6 +1,7 @@
# Makefile.am for squid/src
yncludedir = @yncludedir@/squid
+rncdir = $(schemadir)/autoyast/rnc
client_DATA = \
squid.ycp \
@@ -26,11 +27,13 @@
SquidACL.ycp \
SquidErrorMessages.ycp
+rnc_DATA = squid.rnc
+
# create a symlink for local build, #145327
squid:
ln -sf . $@
ycpchook = squid
-EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA)
+EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA) $(rnc_DATA)
include $(top_srcdir)/Makefile.am.common
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-squid-2.15.2/src/squid_auto.ycp new/yast2-squid-2.15.3/src/squid_auto.ycp
--- old/yast2-squid-2.15.2/src/squid_auto.ycp 2007-08-16 14:33:48.000000000 +0200
+++ new/yast2-squid-2.15.3/src/squid_auto.ycp 2007-09-04 10:52:37.000000000 +0200
@@ -62,6 +62,9 @@
y2debug("func=%1", func);
y2debug("param=%1", param);
+if (!Squid::GetModified())
+ Squid::SetDefaultValues();
+
/* Create a summary*/
if(func == "Summary") {
ret = select(Squid::Summary(), 0, "");
@@ -74,6 +77,9 @@
/* Change configuration (run AutoSequence) */
else if (func == "Change") {
ret = SquidAutoSequence();
+ if (ret != `abort && ret != `cancel){
+ Squid::SetModified();
+ }
}
/* Import configuration */
else if (func == "Import") {
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-squid-2.15.2/src/squid.desktop new/yast2-squid-2.15.3/src/squid.desktop
--- old/yast2-squid-2.15.2/src/squid.desktop 2007-08-16 14:33:48.000000000 +0200
+++ new/yast2-squid-2.15.3/src/squid.desktop 2007-09-04 12:52:51.000000000 +0200
@@ -15,6 +15,7 @@
X-SuSE-YaST-Geometry=
X-SuSE-YaST-SortKey=
X-SuSE-YaST-AutoInstResource=squid
+X-SuSE-YaST-AutoInstSchema=squid.rnc
Icon=yast-squid
Exec=/sbin/yast2 squid
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-squid-2.15.2/src/squid.rnc new/yast2-squid-2.15.3/src/squid.rnc
--- old/yast2-squid-2.15.2/src/squid.rnc 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-squid-2.15.3/src/squid.rnc 2007-09-04 15:25:09.000000000 +0200
@@ -0,0 +1,124 @@
+default namespace = "http://www.suse.com/1.0/yast2ns"
+namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
+namespace config = "http://www.suse.com/1.0/configns"
+
+
+# for testing:
+# call 'trang squid.rnc squid.rng' to generate .rng file
+# call '/usr/bin/xmllint --noout --relaxng /path/to/squid.rng /path/to/xml' to
+# verify correctness of .rnc
+#start = element profile { squid }
+#include '/usr/share/YaST2/schema/autoyast/rnc/common.rnc'
+
+squid = element squid{
+ element acls{
+ LIST,
+ element listentry{
+ element name{ text }? &
+ element options{
+ LIST,
+ element option{ text }*
+ }? &
+ element type{ text }?
+ }*
+ }? &
+ element http_accesses{
+ LIST,
+ element listentry{
+ element acl{
+ LIST,
+ element listentry{ text }*
+ }? &
+ element allow{ BOOLEAN }?
+ }*
+ }? &
+ element http_ports{
+ LIST,
+ element listentry{
+ element host{ text }? &
+ element port{ text }? &
+ element transparent{ BOOLEAN }?
+ }*
+ }? &
+ element refresh_patterns{
+ LIST,
+ element listentry{
+ element case_sensitive{ BOOLEAN }? &
+ element max{ text }? &
+ element min{ text }? &
+ element percent{ text }? &
+ element regexp{ text }?
+ }*
+ }? &
+ element settings{
+ element access_log{
+ LIST,
+ element listentry{ text }*
+ }? &
+ element cache_dir{
+ LIST,
+ element listentry{ text }*
+ }? &
+ element cache_log{
+ LIST,
+ element listentry{ text }*
+ }? &
+ element cache_mem{
+ LIST,
+ element listentry{ text }*
+ }? &
+ element cache_mgr{
+ LIST,
+ element listentry{ text }*
+ }? &
+ element cache_replacement_policy{
+ LIST,
+ element listentry{ text }*
+ }? &
+ element cache_store_log{
+ LIST,
+ element listentry{ text }*
+ }? &
+ element cache_swap_high{
+ LIST,
+ element listentry{ text }*
+ }? &
+ element cache_swap_low{
+ LIST,
+ element listentry{ text }*
+ }? &
+ element client_lifetime{
+ LIST,
+ element listentry{ text }*
+ }? &
+ element connect_timeout{
+ LIST,
+ element listentry{ text }*
+ }? &
+ element emulate_httpd_log{
+ LIST,
+ element listentry{ text }*
+ }? &
+ element error_directory{
+ LIST,
+ element listentry{ text }*
+ }? &
+ element ftp_passive{
+ LIST,
+ element listentry{ text }*
+ }? &
+ element maximum_object_size{
+ LIST,
+ element listentry{ text }*
+ }? &
+ element memory_replacement_policy{
+ LIST,
+ element listentry{ text }*
+ }? &
+ element minimum_object_size{
+ LIST,
+ element listentry{ text }*
+ }?
+ }? &
+ element service_enabled_on_startup{ BOOLEAN }?
+}
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-squid-2.15.2/src/Squid.ycp new/yast2-squid-2.15.3/src/Squid.ycp
--- old/yast2-squid-2.15.2/src/Squid.ycp 2007-08-28 14:17:09.000000000 +0200
+++ new/yast2-squid-2.15.3/src/Squid.ycp 2007-09-04 11:24:36.000000000 +0200
@@ -57,7 +57,7 @@
/**
* Is service enabled?
*/
-boolean service_enabled = false;
+boolean service_enabled_on_startup = false;
/**
@@ -132,7 +132,7 @@
"emulate_httpd_log" : ["off"],
"connect_timeout" : ["2", "minutes"],
- "client_lifetime" : ["1", "day"],
+ "client_lifetime" : ["1", "days"],
"error_directory" : ["/usr/share/squid/errors/English"],
"cache_mgr" : ["webmaster"],
@@ -337,6 +337,7 @@
"regexp":"." ]
];
settings = parameters;
+ service_enabled_on_startup = false;
}
@@ -375,12 +376,13 @@
/******* SERVICE *******/
global boolean IsServiceEnabled()
{
- return service_enabled;
+ return service_enabled_on_startup;
}
global void SetServiceEnabled(boolean enabled)
{
- service_enabled = enabled;
+ SetModified();
+ service_enabled_on_startup = enabled;
}
/******* SERVICE END **/
@@ -973,7 +975,7 @@
boolean readServiceStatus()
{
- service_enabled = Service::Enabled("squid");
+ service_enabled_on_startup = Service::Enabled("squid");
return true;
}
@@ -1037,7 +1039,7 @@
y2debug("Squid::Read - acls: %1", acls);
y2debug("Squid::Read - refresh_patterns: %1", refresh_patterns);
y2debug("Squid::Read - settings: %1", settings);
- y2debug("Squid::Read - enabled: %1", service_enabled);
+ y2debug("Squid::Read - enabled: %1", service_enabled_on_startup);
y2milestone("================ Setting END ==================");
/* Error message */
@@ -1317,8 +1319,8 @@
}
//enabling / disabling service
- if (service_enabled == true) EnableService();
- if (service_enabled == false) DisableService();
+ if (service_enabled_on_startup == true) EnableService();
+ if (service_enabled_on_startup == false) DisableService();
// start Service
if(Abort()) return false;
@@ -1347,7 +1349,7 @@
* @return boolean True on success
*/
global boolean Import (map sett) {
- if (sett == $[]){
+ if (sett == $[] || sett == nil){
SetDefaultValues();
SetModified();
return true;
@@ -1356,7 +1358,8 @@
!haskey(sett, "acls") ||
!haskey(sett, "http_accesses") ||
!haskey(sett, "refresh_patterns") ||
- !haskey(sett, "settings")){
+ !haskey(sett, "settings") ||
+ !haskey(sett, "service_enabled_on_startup")){
return false;
}
@@ -1366,6 +1369,7 @@
http_accesses = (list