Author: jan
Date: 2007-08-16 14:57:44 +0200 (Thu, 16 Aug 2007)
New Revision: 368
Modified:
trunk/openvas-client/ChangeLog
trunk/openvas-client/Makefile
trunk/openvas-client/configure
trunk/openvas-client/configure.in
trunk/openvas-client/include/config.h.in
trunk/openvas-client/include/config32.h
trunk/openvas-client/nessus.tmpl.in
trunk/openvas-client/nessus/preferences.c
Log:
* nessus.tmpl.in, include/config.h.in, include/config32.h, configure.in,
Makefile, nessus/preferences.c: Removed any occurance of NESSUSD_*.
* configure: updated.
Modified: trunk/openvas-client/ChangeLog
===================================================================
--- trunk/openvas-client/ChangeLog 2007-08-16 12:17:42 UTC (rev 367)
+++ trunk/openvas-client/ChangeLog 2007-08-16 12:57:44 UTC (rev 368)
@@ -1,5 +1,12 @@
2007-08-16 Jan-Oliver Wagner <[EMAIL PROTECTED]>
+ * nessus.tmpl.in, include/config.h.in, include/config32.h, configure.in,
+ Makefile, nessus/preferences.c: Removed any occurance of NESSUSD_*.
+
+ * configure: updated.
+
+2007-08-16 Jan-Oliver Wagner <[EMAIL PROTECTED]>
+
* src/gui/slad_install.c (slad_install): disable
sladinstaller test for CYGWIN as it does not work there.
Modified: trunk/openvas-client/Makefile
===================================================================
--- trunk/openvas-client/Makefile 2007-08-16 12:17:42 UTC (rev 367)
+++ trunk/openvas-client/Makefile 2007-08-16 12:57:44 UTC (rev 368)
@@ -56,7 +56,7 @@
doc : $(MAN_NESSUS_1)
$(MAN_NESSUS_1) : $(MAN_NESSUS_1).in
- @sed -e '[EMAIL PROTECTED]@?${NESSUSD_CONFDIR}?g;[EMAIL
PROTECTED]@?${NESSUSD_DATADIR}?g;[EMAIL PROTECTED]@?${NESSUSD_PLUGINS}?g;'
$(MAN_NESSUS_1).in >$(MAN_NESSUS_1)
+ @sed -e '' $(MAN_NESSUS_1).in >$(MAN_NESSUS_1)
clean:
Modified: trunk/openvas-client/configure
===================================================================
--- trunk/openvas-client/configure 2007-08-16 12:17:42 UTC (rev 367)
+++ trunk/openvas-client/configure 2007-08-16 12:57:44 UTC (rev 368)
@@ -696,14 +696,6 @@
NESS_COMPILER
NESS_OS_NAME
NESS_OS_VERSION
-NESSUSD_CONFDIR
-NESSUSD_STATEDIR
-NESSUSD_SHAREDSTATEDIR
-NESSUSD_DATADIR
-NESSUSD_LIBDIR
-NESSUSD_PLUGINS
-NESSUSD_REPORTS
-NESSUSD_LOGDIR
INSTALL_DIR
INSTALL
RUN_LIBS
@@ -10673,25 +10665,8 @@
ssl="-L/usr/kerberos/lib $ssl"
}
-
-NESSUSD_CONFDIR='${sysconfdir}'
-NESSUSD_STATEDIR='${localstatedir}/nessus'
-NESSUSD_SHAREDSTATEDIR='${sharedstatedir}/nessus'
-NESSUSD_DATADIR='${sysconfdir}/nessus'
-NESSUSD_LIBDIR='${libdir}/nessus'
-NESSUSD_LOGDIR='${localstatedir}/nessus/logs'
-
-NESSUSD_PLUGINS='${NESSUSD_LIBDIR}/plugins'
-NESSUSD_REPORTS='${NESSUSD_LIBDIR}/reports'
-
-
man_nessus_1=doc/OpenVAS-Client.1
-cat >>confdefs.h <<_ACEOF
-#define NESSUSD_LANGUAGE "${lang}"
-_ACEOF
-
-
# Extract the first word of "ar", so it can be a program name with args.
set dummy ar; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -10772,14 +10747,6 @@
-
-
-
-
-
-
-
-
ac_config_files="$ac_config_files nessus.tmpl include/corevers.h
openvasclient-mkcert doc/OpenVAS-Client.1"
cat >confcache <<\_ACEOF
@@ -11482,14 +11449,6 @@
NESS_COMPILER!$NESS_COMPILER$ac_delim
NESS_OS_NAME!$NESS_OS_NAME$ac_delim
NESS_OS_VERSION!$NESS_OS_VERSION$ac_delim
-NESSUSD_CONFDIR!$NESSUSD_CONFDIR$ac_delim
-NESSUSD_STATEDIR!$NESSUSD_STATEDIR$ac_delim
-NESSUSD_SHAREDSTATEDIR!$NESSUSD_SHAREDSTATEDIR$ac_delim
-NESSUSD_DATADIR!$NESSUSD_DATADIR$ac_delim
-NESSUSD_LIBDIR!$NESSUSD_LIBDIR$ac_delim
-NESSUSD_PLUGINS!$NESSUSD_PLUGINS$ac_delim
-NESSUSD_REPORTS!$NESSUSD_REPORTS$ac_delim
-NESSUSD_LOGDIR!$NESSUSD_LOGDIR$ac_delim
INSTALL_DIR!$INSTALL_DIR$ac_delim
INSTALL!$INSTALL$ac_delim
RUN_LIBS!$RUN_LIBS$ac_delim
@@ -11498,6 +11457,14 @@
nsl_lib!$nsl_lib$ac_delim
ssl_lib!$ssl_lib$ac_delim
gtk_flags!$gtk_flags$ac_delim
+debug_flags!$debug_flags$ac_delim
+nessus_lib!$nessus_lib$ac_delim
+man_nessus_1!$man_nessus_1$ac_delim
+dl_lib!$dl_lib$ac_delim
+client!$client$ac_delim
+client_install!$client_install$ac_delim
+ac_configure_args!$ac_configure_args$ac_delim
+ssl!$ssl$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -11539,14 +11506,6 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-debug_flags!$debug_flags$ac_delim
-nessus_lib!$nessus_lib$ac_delim
-man_nessus_1!$man_nessus_1$ac_delim
-dl_lib!$dl_lib$ac_delim
-client!$client$ac_delim
-client_install!$client_install$ac_delim
-ac_configure_args!$ac_configure_args$ac_delim
-ssl!$ssl$ac_delim
sslcflags!$sslcflags$ac_delim
installuser!$installuser$ac_delim
gettext_flags!$gettext_flags$ac_delim
@@ -11554,7 +11513,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 13; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 5; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
Modified: trunk/openvas-client/configure.in
===================================================================
--- trunk/openvas-client/configure.in 2007-08-16 12:17:42 UTC (rev 367)
+++ trunk/openvas-client/configure.in 2007-08-16 12:57:44 UTC (rev 368)
@@ -508,22 +508,8 @@
ssl="-L/usr/kerberos/lib $ssl"
}
-
-NESSUSD_CONFDIR='${sysconfdir}'
-NESSUSD_STATEDIR='${localstatedir}/nessus'
-NESSUSD_SHAREDSTATEDIR='${sharedstatedir}/nessus'
-NESSUSD_DATADIR='${sysconfdir}/nessus'
-NESSUSD_LIBDIR='${libdir}/nessus'
-NESSUSD_LOGDIR='${localstatedir}/nessus/logs'
-
-NESSUSD_PLUGINS='${NESSUSD_LIBDIR}/plugins'
-NESSUSD_REPORTS='${NESSUSD_LIBDIR}/reports'
-
-
man_nessus_1=doc/OpenVAS-Client.1
-AC_DEFINE_UNQUOTED(NESSUSD_LANGUAGE, "${lang}")
-
AC_PATH_PROG(AR, ar)
AC_SUBST(AR)
AC_SUBST(PWD)
@@ -539,14 +525,6 @@
AC_SUBST(NESS_COMPILER)
AC_SUBST(NESS_OS_NAME)
AC_SUBST(NESS_OS_VERSION)
-AC_SUBST(NESSUSD_CONFDIR)
-AC_SUBST(NESSUSD_STATEDIR)
-AC_SUBST(NESSUSD_SHAREDSTATEDIR)
-AC_SUBST(NESSUSD_DATADIR)
-AC_SUBST(NESSUSD_LIBDIR)
-AC_SUBST(NESSUSD_PLUGINS)
-AC_SUBST(NESSUSD_REPORTS)
-AC_SUBST(NESSUSD_LOGDIR)
AC_SUBST(CWALL)
AC_SUBST(INSTALL_DIR)
AC_SUBST(INSTALL)
Modified: trunk/openvas-client/include/config.h.in
===================================================================
--- trunk/openvas-client/include/config.h.in 2007-08-16 12:17:42 UTC (rev
367)
+++ trunk/openvas-client/include/config.h.in 2007-08-16 12:57:44 UTC (rev
368)
@@ -64,61 +64,10 @@
#undef DEBUGMORE
#undef ENABLE_PID_STAMP_DEBUGGING
-/*
- * NESSUSD SPECIFIC CONFIGURATION
- */
-
-
-/* miscellaneous */
-#define NESSUSD_LANGUAGE "(undefined)"
-#define NESSUSD_LOGS NESSUSD_LOGDIR
-#define NESSUSD_LOGINS NESSUSD_STATEDIR "/users"
-#define NESSUSD_JOBS NESSUSD_STATEDIR "/jobs"
-#define NESSUSD_CERTS NESSUSD_STATEDIR "/certs"
-
-#define NESSUSD_CA NESSUSD_SHAREDSTATEDIR "/CA"
-
-
-
-
-/* derived entries */
-#define NESSUSD_CONF NESSUSD_CONFDIR "/nessus/nessusd.conf"
-
-#define NESSUSD_MESSAGES NESSUSD_LOGS "/nessusd.messages"
-#define NESSUSD_DEBUGMSG NESSUSD_LOGS "/nessusd.dump"
-
-
-#define NESSUSD_DATAPOOL NESSUSD_STATEDIR "-datapool"
-#define NESSUSD_RULES NESSUSD_DATADIR "/nessusd.rules"
-#define NESSUSD_USERS NESSUSD_DATADIR "/nessusd.users"
-
-
-
/* Definitions for client/server ecryption, activated on the C compiler
command line as given by the command `nessus-config --cflags` */
#ifdef ENABLE_CRYPTO_LAYER
-/* seconds the server waits for the client after authentication */
-#define NESSUSD_NEGOT_TIMEOUT 600
-
-/* the files, keys are stored in */
-#define NESSUSD_USERKEYS /* logindir */ "~/auth/nessusd.user-keys"
-#define NESSUSD_USERPWDS NESSUSD_DATADIR "/nessusd.user-pwds"
-#define NESSUSD_KEYFILE NESSUSD_DATADIR "/nessusd.private-keys"
-
-/* The default server key file and key length */
-#define NESSUSD_KEYLENGTH 1024
-#define NESSUSD_MAXPWDFAIL 5
-#define NESSUSD_USERNAME "nessusd"
-
-/* The default rpc cipher nessusd will be connect to (if any) */
-#define NESSUSD_RPCIPHER "twofish/ripemd160"
-#define NESSUSD_RPCAUTH_METH 3 /* auth scheme, either 1 or 3 */
-
-/* The timeout secs when waiting for a log pipe to be established */
-#define NESSUSD_LOGPIPE NESSUSD_DATADIR "/nessusd.logpipe"
-#define NESSUSD_LOGPIPE_TMO 2
-
#endif /* ENABLE_CRYPTO_LAYER */
/* Obsolete: the port 3001 on which nessusd will be listening */
@@ -128,12 +77,6 @@
http://www.isi.edu/in-notes/iana/assignments/port-numbers */
#define NESIANA_PORT 1241
-/* The max number of client connections/sec */
-#define NESSUSD_CONNECT_RATE 4
-
-/* Block this many secs if the NESSUSD_CONNECT_RATE was exceeded */
-#define NESSUSD_CONNECT_BLOCKER 2
-
/*
* How much time before closing
* the connection if nothing comes
Modified: trunk/openvas-client/include/config32.h
===================================================================
--- trunk/openvas-client/include/config32.h 2007-08-16 12:17:42 UTC (rev
367)
+++ trunk/openvas-client/include/config32.h 2007-08-16 12:57:44 UTC (rev
368)
@@ -64,25 +64,6 @@
/*
- * NESSUSD SPECIFIC CONFIGURATION
- */
-
-
-/*
- * Some definitions used for client/server ecryption
- * (actvated only if ENABLE_CRYPTO_LAYER is set)
- */
-
-/* The default server key file and key length */
-#define NESSUSD_KEYLENGTH 1024
-#define NESSUSD_MAXPWDFAIL 5
-#define NESSUSD_USERNAME "nessusd"
-
-/* The default rpc cipher nessusd will be connect to (if any) */
-#define NESSUSD_RPCIPHER "twofish/ripemd160"
-#define NESSUSD_RPCAUTH_METH 3 /* auth scheme, either 1 or 3 */
-
-/*
* The default port on which nessusd
* will be listenning
*/
Modified: trunk/openvas-client/nessus/preferences.c
===================================================================
--- trunk/openvas-client/nessus/preferences.c 2007-08-16 12:17:42 UTC (rev
367)
+++ trunk/openvas-client/nessus/preferences.c 2007-08-16 12:57:44 UTC (rev
368)
@@ -162,10 +162,7 @@
{
fprintf(f, _("# OpenVAS-Client Preferences File\n\n"));
#ifdef NESSUS_ON_SSL
-# ifdef NESSUSD_CA
- if(strlen(NESSUSD_CA))
- fprintf(f, "trusted_ca = %s/cacert.pem\n", NESSUSD_CA);
-# endif
+ fprintf(f, "trusted_ca = cacert.pem\n");
#endif /* NESSUS_ON_SSL */
fprintf(f, "begin(SCANNER_SET)\n");
fprintf(f, "10180 = yes\n");
Modified: trunk/openvas-client/nessus.tmpl.in
===================================================================
--- trunk/openvas-client/nessus.tmpl.in 2007-08-16 12:17:42 UTC (rev 367)
+++ trunk/openvas-client/nessus.tmpl.in 2007-08-16 12:57:44 UTC (rev 368)
@@ -45,20 +45,6 @@
[EMAIL PROTECTED]@[EMAIL PROTECTED]@[EMAIL PROTECTED]@
-# Nessus specific
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-
-
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-
-NESSUS_DIRECTORIES="-DNESSUSD_CONFDIR=\"$(NESSUSD_CONFDIR)\""
"-DNESSUSD_STATEDIR=\"$(NESSUSD_STATEDIR)\""
"-DNESSUSD_DATADIR=\"$(NESSUSD_DATADIR)\""
"-DNESSUSD_LIBDIR=\"${NESSUSD_LIBDIR}\""
"-DNESSUSD_PLUGINS=\"${NESSUSD_PLUGINS}\""
"-DNESSUSD_REPORTS=\"${NESSUSD_REPORTS}\""
-DNESSUSD_SHAREDSTATEDIR=\"${NESSUSD_SHAREDSTATEDIR}\"
-DNESSUSD_LOGDIR=\"${NESSUSD_LOGDIR}\" -DNESSUS_DOCDIR=\"${NESSUS_DOCDIR}\"
-
#
# The server / client modes do not make a lot of sense
# as of today, as the software makes the checks (you need
@@ -132,7 +118,7 @@
NESSUS_DOCDIR=$(DESTDIR)/$(datadir)/doc/OpenVAS
# C compiler options
-NESSUS_CFLAGS=$(CWARN) $(include) $(NESSUS_DIRECTORIES) @sslcflags@
+NESSUS_CFLAGS=$(CWARN) $(include) -DNESSUS_DOCDIR=\"${NESSUS_DOCDIR}\"
@sslcflags@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
_______________________________________________
Openvas-commits mailing list
[email protected]
http://lists.wald.intevation.org/mailman/listinfo/openvas-commits
