From scm-commit at wald.intevation.org Thu Jan 1 23:32:40 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Thu, 1 Jan 2009 23:32:40 +0100 (CET) Subject: [Openvas-commits] r2128 - in trunk/openvas-libraries: . libopenvas Message-ID: <20090101223240.368E24076F@pyrosoma.intevation.org> Author: jan Date: 2009-01-01 23:32:37 +0100 (Thu, 01 Jan 2009) New Revision: 2128 Modified: trunk/openvas-libraries/ChangeLog trunk/openvas-libraries/libopenvas/plugutils.c trunk/openvas-libraries/libopenvas/store.c Log: More patches by Stjepan Gros in preparation of Change Request #24 (subdirs for NVTs, http://www.openvas.org/openvas-cr-24.html). * libopenvas/store.c: Replaced any call of plug_get_fname by plug_get_cachefile. (store_load_plugin): Replaced call of plug_set_fname by plug_set_cachefile. * libopenvas/plugutils.c (plug_get_fname, plug_set_fname): Removed. Modified: trunk/openvas-libraries/ChangeLog =================================================================== --- trunk/openvas-libraries/ChangeLog 2008-12-31 14:44:52 UTC (rev 2127) +++ trunk/openvas-libraries/ChangeLog 2009-01-01 22:32:37 UTC (rev 2128) @@ -1,3 +1,16 @@ +2009-01-01 Jan-Oliver Wagner + + More patches by Stjepan Gros in preparation of + Change Request #24 (subdirs for NVTs, + http://www.openvas.org/openvas-cr-24.html). + + * libopenvas/store.c: Replaced any call of plug_get_fname + by plug_get_cachefile. + (store_load_plugin): Replaced call of plug_set_fname by + plug_set_cachefile. + + * libopenvas/plugutils.c (plug_get_fname, plug_set_fname): Removed. + 2008-12-31 Felix Wolfsteller As Result of CR #20, added two doxygen configuration files and targets Modified: trunk/openvas-libraries/libopenvas/plugutils.c =================================================================== --- trunk/openvas-libraries/libopenvas/plugutils.c 2008-12-31 14:44:52 UTC (rev 2127) +++ trunk/openvas-libraries/libopenvas/plugutils.c 2009-01-01 22:32:37 UTC (rev 2128) @@ -207,15 +207,6 @@ return _plug_get_path(desc); } -// XXX: This function remains for legacy until any use of it or FILENAME is resolved. This is part -// of the patch for CR #24. -void plug_set_fname(desc, filename) - struct arglist * desc; - const char * filename; -{ - arg_add_value(desc, "FILENAME", ARG_STRING, strlen(filename), estrdup(filename)); -} - /** * @brief Sets CACHEFILE in the given arglist. * @@ -243,13 +234,6 @@ return arg_get_value(desc, "CACHEFILE"); } -char * plug_get_fname(desc) - struct arglist * desc; -{ - return arg_get_value(desc, "FILENAME"); -} - - void plug_set_id(desc, id) struct arglist * desc; int id; Modified: trunk/openvas-libraries/libopenvas/store.c =================================================================== --- trunk/openvas-libraries/libopenvas/store.c 2008-12-31 14:44:52 UTC (rev 2127) +++ trunk/openvas-libraries/libopenvas/store.c 2009-01-01 22:32:37 UTC (rev 2128) @@ -371,7 +371,7 @@ ret = emalloc(sizeof(struct arglist)); plug_set_oid(ret, p.oid); plug_set_category(ret, p.category); - plug_set_fname(ret, file); + plug_set_cachefile(ret, file); plug_set_path(ret, p.path); plug_set_family(ret, p.family, NULL); plug_set_sign_key_ids(ret, p.sign_key_ids); @@ -619,7 +619,7 @@ char * store_fetch_path(struct arglist * desc) { - char * fname = plug_get_fname(desc); + char * fname = plug_get_cachefile(desc); static struct plugin p; store_get_plugin(&p, fname); @@ -628,7 +628,7 @@ char * store_fetch_version(struct arglist * desc) { - char * fname = plug_get_fname(desc); + char * fname = plug_get_cachefile(desc); static struct plugin p; store_get_plugin(&p, fname); @@ -637,7 +637,7 @@ char * store_fetch_summary(struct arglist * desc) { - char * fname = plug_get_fname(desc); + char * fname = plug_get_cachefile(desc); static struct plugin p; store_get_plugin(&p, fname); @@ -646,7 +646,7 @@ char * store_fetch_description(struct arglist * desc) { - char * fname = plug_get_fname(desc); + char * fname = plug_get_cachefile(desc); static struct plugin p; store_get_plugin(&p, fname); @@ -660,7 +660,7 @@ char * store_fetch_copyright(struct arglist * desc) { - char * fname = plug_get_fname(desc); + char * fname = plug_get_cachefile(desc); static struct plugin p; store_get_plugin(&p, fname); @@ -669,7 +669,7 @@ char * store_fetch_family(struct arglist * desc) { - char * fname = plug_get_fname(desc); + char * fname = plug_get_cachefile(desc); static struct plugin p; store_get_plugin(&p, fname); @@ -678,7 +678,7 @@ char * store_fetch_oid(struct arglist * desc) { - char * fname = plug_get_fname(desc); + char * fname = plug_get_cachefile(desc); static struct plugin p; store_get_plugin(&p, fname); @@ -687,7 +687,7 @@ char * store_fetch_cve_id(struct arglist * desc) { - char * fname = plug_get_fname(desc); + char * fname = plug_get_cachefile(desc); static struct plugin p; store_get_plugin(&p, fname); @@ -696,7 +696,7 @@ char * store_fetch_bugtraq_id(struct arglist * desc) { - char * fname = plug_get_fname(desc); + char * fname = plug_get_cachefile(desc); static struct plugin p; store_get_plugin(&p, fname); @@ -706,7 +706,7 @@ char * store_fetch_xref(struct arglist * desc) { - char * fname = plug_get_fname(desc); + char * fname = plug_get_cachefile(desc); static struct plugin p; store_get_plugin(&p, fname); @@ -715,7 +715,7 @@ char * store_fetch_tag(struct arglist * desc) { - char * fname = plug_get_fname(desc); + char * fname = plug_get_cachefile(desc); static struct plugin p; store_get_plugin(&p, fname); @@ -724,7 +724,7 @@ struct arglist * store_fetch_required_keys(struct arglist * desc) { - char * fname = plug_get_fname(desc); + char * fname = plug_get_cachefile(desc); static struct plugin p; struct arglist * ret; @@ -735,7 +735,7 @@ struct arglist * store_fetch_excluded_keys(struct arglist * desc) { - char * fname = plug_get_fname(desc); + char * fname = plug_get_cachefile(desc); static struct plugin p; struct arglist * ret; @@ -746,7 +746,7 @@ struct arglist * store_fetch_required_ports(struct arglist * desc) { - char * fname = plug_get_fname(desc); + char * fname = plug_get_cachefile(desc); static struct plugin p; struct arglist * ret; @@ -757,7 +757,7 @@ struct arglist * store_fetch_required_udp_ports(struct arglist * desc) { - char * fname = plug_get_fname(desc); + char * fname = plug_get_cachefile(desc); static struct plugin p; struct arglist * ret; From scm-commit at wald.intevation.org Fri Jan 2 09:09:41 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Fri, 2 Jan 2009 09:09:41 +0100 (CET) Subject: [Openvas-commits] r2130 - trunk/openvas-libraries Message-ID: <20090102080941.2AF5240777@pyrosoma.intevation.org> Author: mwiegand Date: 2009-01-02 09:09:39 +0100 (Fri, 02 Jan 2009) New Revision: 2130 Modified: trunk/openvas-libraries/ChangeLog trunk/openvas-libraries/configure Log: * configure: Regenerated to completely remove --enable-debug-store. Modified: trunk/openvas-libraries/ChangeLog =================================================================== --- trunk/openvas-libraries/ChangeLog 2009-01-02 00:52:00 UTC (rev 2129) +++ trunk/openvas-libraries/ChangeLog 2009-01-02 08:09:39 UTC (rev 2130) @@ -1,3 +1,7 @@ +2009-01-02 Michael Wiegand + + * configure: Regenerated to completely remove --enable-debug-store. + 2009-01-01 Jan-Oliver Wagner More patches by Stjepan Gros in preparation of Modified: trunk/openvas-libraries/configure =================================================================== --- trunk/openvas-libraries/configure 2009-01-02 00:52:00 UTC (rev 2129) +++ trunk/openvas-libraries/configure 2009-01-02 08:09:39 UTC (rev 2130) @@ -1467,7 +1467,6 @@ optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) --enable-release set the compiler flags to -O6 - --enable-debug-store Warn the user if a plugin has too many CVE/BID/XRefs --enable-debug-ssl produce verbose output regarding SSL --enable-debug set the compiler flags to -g --enable-ptmx force using/disabling the /dev/ptmx multiplexer @@ -3711,7 +3710,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3714 "configure"' > conftest.$ac_ext + echo '#line 3713 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6619,11 +6618,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6622: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6621: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6626: \$? = $ac_status" >&5 + echo "$as_me:6625: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6887,11 +6886,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6890: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6889: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6894: \$? = $ac_status" >&5 + echo "$as_me:6893: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6991,11 +6990,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6994: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6993: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6998: \$? = $ac_status" >&5 + echo "$as_me:6997: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9288,7 +9287,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:11726: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11731: \$? = $ac_status" >&5 + echo "$as_me:11730: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -11828,11 +11827,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11831: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11830: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11835: \$? = $ac_status" >&5 + echo "$as_me:11834: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -13389,11 +13388,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13392: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13391: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13396: \$? = $ac_status" >&5 + echo "$as_me:13395: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13493,11 +13492,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13496: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13495: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13500: \$? = $ac_status" >&5 + echo "$as_me:13499: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15680,11 +15679,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15683: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15682: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15687: \$? = $ac_status" >&5 + echo "$as_me:15686: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15948,11 +15947,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15951: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15950: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15955: \$? = $ac_status" >&5 + echo "$as_me:15954: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16052,11 +16051,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16055: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16054: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16059: \$? = $ac_status" >&5 + echo "$as_me:16058: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -19482,18 +19481,6 @@ fi - -# Check whether --enable-debug-store was given. -if test "${enable_debug_store+set}" = set; then - enableval=$enable_debug_store; if test x$enable_debug_store = xyes ; then - cat >>confdefs.h <<\_ACEOF -#define DEBUG_STORE 1 -_ACEOF - - fi -fi - - debug_ssl="" # Check whether --enable-debug-ssl was given. From scm-commit at wald.intevation.org Fri Jan 2 10:56:35 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Fri, 2 Jan 2009 10:56:35 +0100 (CET) Subject: [Openvas-commits] r2131 - in trunk/openvas-libraries: . libopenvas Message-ID: <20090102095635.3334E40777@pyrosoma.intevation.org> Author: felix Date: 2009-01-02 10:56:33 +0100 (Fri, 02 Jan 2009) New Revision: 2131 Modified: trunk/openvas-libraries/ChangeLog trunk/openvas-libraries/libopenvas/kb.c Log: * libopenvas/kb.c: Documentation. Modified: trunk/openvas-libraries/ChangeLog =================================================================== --- trunk/openvas-libraries/ChangeLog 2009-01-02 08:09:39 UTC (rev 2130) +++ trunk/openvas-libraries/ChangeLog 2009-01-02 09:56:33 UTC (rev 2131) @@ -1,3 +1,7 @@ +2009-01-02 Felix Wolfsteller + + * libopenvas/kb.c: Documentation. + 2009-01-02 Michael Wiegand * configure: Regenerated to completely remove --enable-debug-store. Modified: trunk/openvas-libraries/libopenvas/kb.c =================================================================== --- trunk/openvas-libraries/libopenvas/kb.c 2009-01-02 08:09:39 UTC (rev 2130) +++ trunk/openvas-libraries/libopenvas/kb.c 2009-01-02 09:56:33 UTC (rev 2131) @@ -19,6 +19,20 @@ * Knowledge base management API */ +/** + * @file + * Knowledge base management API.\n + * Knowledge bases collect information and can be used to share information + * between NVTs.\n + * A Knowledge base is an array of knowledge base items (kb_item). + * An item is defined by its name and has a value (either int or char*), a + * type flag (indicating whether the value shall be interpreted as int or char*) + * and a pointer to the "next" item.\n + * A knowledge base (kb_item**) stores single items at a position according to + * a hash of the items name (function mkkey). Because of that, a knwoledge + * base has a fixed size of 65537 items and kb_items are implemented as lists.\n + */ + #include #include @@ -89,7 +103,10 @@ } - +/** + * Get the value of a kb_item with type KB_TYPE_STR and name name. + * @return (char*) value of the kb_item name with type KB_TYPE_STR. + */ char * kb_item_get_str(struct kb_item ** kb, char * name) { struct kb_item * item = kb_item_get_single(kb, name, KB_TYPE_STR); @@ -100,6 +117,10 @@ return item->v.v_str; } +/** + * Get the value of a kb_item with tyoe KB_TYPE_INT and name name. + * @return (int) value of the kb_item name with type KB_TYPE_INT. + */ int kb_item_get_int(struct kb_item ** kb, char * name) { struct kb_item * item = kb_item_get_single(kb, name, KB_TYPE_INT); @@ -109,7 +130,17 @@ return item->v.v_int; } - +/** + * @brief Returns a list of copies of kb_items with name name in a knowledge base. + * The result has to be freed (kb_item_get_all_free). + * Use kb_item_get_pattern if you want to get all items matching a pattern, + * rather than a single name. + * + * @param kb The knowledge base. + * @param name Name of the item(s) of interest. + * + * @return A kb_item list (has to be freed) with kb_items of name name. + */ struct kb_item * kb_item_get_all(struct kb_item ** kb, char * name) { unsigned h = mkkey(name); @@ -136,6 +167,16 @@ return ret; } +/** + * @brief Returns a list of copies of kb_items that match a pattern. + * The items have to be freed, e.g. with kb_item_get_all_free. + * + * @param kb The knowledge base. + * @param expr A pattern that can be used with fnmatch (e.g. "www/*"). + * + * @return A list of kb_items (has to be freed) whose name matches the pattern + * exp. + */ struct kb_item * kb_item_get_pattern(struct kb_item ** kb, char * expr ) { int i; @@ -167,7 +208,10 @@ /** - * Free the result of kb_item_get_all() + * Frees a list of kb_items, e.g. the result of kb_item_get_all() or + * kb_item_get_pattern(). + * + * @param items The list of kb_items to free. */ void kb_item_get_all_free(struct kb_item * items) { @@ -183,7 +227,17 @@ /** - * WRITE to the knowledge base + * Add a kb_item with type KB_TYPE_STR and value value to the knowledge base. + * + * @param kb The knowledge base itself. + * @param name Name of the item to add. + * @param value Value of the item to add. + * @param replace 0 if an existing item should NOT be replaced (e.g. to create + * lists), different than 0 if the value of an existing item with + * that name shall be replaced. + * + * @return -1 if kb equals NULL or if an item as wished exists already, 0 if + * success. */ static int kb_item_addset_str(struct kb_item ** kb, char * name, char * value, int replace) { From scm-commit at wald.intevation.org Fri Jan 2 11:50:01 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Fri, 2 Jan 2009 11:50:01 +0100 (CET) Subject: [Openvas-commits] r2132 - in trunk/openvas-libraries: . libopenvas Message-ID: <20090102105001.E4E7140777@pyrosoma.intevation.org> Author: mwiegand Date: 2009-01-02 11:50:00 +0100 (Fri, 02 Jan 2009) New Revision: 2132 Modified: trunk/openvas-libraries/ChangeLog trunk/openvas-libraries/libopenvas/bpf_share.h trunk/openvas-libraries/libopenvas/pcap.c trunk/openvas-libraries/libopenvas/plugutils.c trunk/openvas-libraries/libopenvas/popen.c Log: Added missing includes to enable compilation on Darwin and NetBSD, based on suggestions by Adrian Portelli. This solves parts of bug #860 (http://bugs.openvas.org/860) and bug #862 (http://bugs.openvas.org/862). * libopenvas/pcap.c: Added missing include for netinet/in.h. * libopenvas/plugutils.c: Changed to use sys/wait.h instead of wait.h. * libopenvas/bpf_share.h: Added missing include for sys/types.h. * libopenvas/popen.c: Added missing include for sys/resource.h. Modified: trunk/openvas-libraries/ChangeLog =================================================================== --- trunk/openvas-libraries/ChangeLog 2009-01-02 09:56:33 UTC (rev 2131) +++ trunk/openvas-libraries/ChangeLog 2009-01-02 10:50:00 UTC (rev 2132) @@ -1,3 +1,18 @@ +2009-01-02 Michael Wiegand + + Added missing includes to enable compilation on Darwin and NetBSD, + based on suggestions by Adrian Portelli. This solves parts of bug + #860 (http://bugs.openvas.org/860) and bug #862 + (http://bugs.openvas.org/862). + + * libopenvas/pcap.c: Added missing include for netinet/in.h. + + * libopenvas/plugutils.c: Changed to use sys/wait.h instead of wait.h. + + * libopenvas/bpf_share.h: Added missing include for sys/types.h. + + * libopenvas/popen.c: Added missing include for sys/resource.h. + 2009-01-02 Felix Wolfsteller * libopenvas/kb.c: Documentation. Modified: trunk/openvas-libraries/libopenvas/bpf_share.h =================================================================== --- trunk/openvas-libraries/libopenvas/bpf_share.h 2009-01-02 09:56:33 UTC (rev 2131) +++ trunk/openvas-libraries/libopenvas/bpf_share.h 2009-01-02 10:50:00 UTC (rev 2132) @@ -26,6 +26,8 @@ #ifndef OPENVAS_BPF_SHARE_H #define OPENVAS_BPF_SHARE_H +#include + int bpf_server(); int bpf_open_live(char*, char*); u_char* bpf_next(int, int *); Modified: trunk/openvas-libraries/libopenvas/pcap.c =================================================================== --- trunk/openvas-libraries/libopenvas/pcap.c 2009-01-02 09:56:33 UTC (rev 2131) +++ trunk/openvas-libraries/libopenvas/pcap.c 2009-01-02 10:50:00 UTC (rev 2132) @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include Modified: trunk/openvas-libraries/libopenvas/plugutils.c =================================================================== --- trunk/openvas-libraries/libopenvas/plugutils.c 2009-01-02 09:56:33 UTC (rev 2131) +++ trunk/openvas-libraries/libopenvas/plugutils.c 2009-01-02 10:50:00 UTC (rev 2132) @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include Modified: trunk/openvas-libraries/libopenvas/popen.c =================================================================== --- trunk/openvas-libraries/libopenvas/popen.c 2009-01-02 09:56:33 UTC (rev 2131) +++ trunk/openvas-libraries/libopenvas/popen.c 2009-01-02 10:50:00 UTC (rev 2132) @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include From scm-commit at wald.intevation.org Fri Jan 2 11:53:38 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Fri, 2 Jan 2009 11:53:38 +0100 (CET) Subject: [Openvas-commits] r2133 - in trunk/openvas-libnasl: . include Message-ID: <20090102105338.805F940777@pyrosoma.intevation.org> Author: mwiegand Date: 2009-01-02 11:53:36 +0100 (Fri, 02 Jan 2009) New Revision: 2133 Modified: trunk/openvas-libnasl/ChangeLog trunk/openvas-libnasl/include/nasl.h Log: * include/nasl.h: Added missing declaration for openvas_certificate_free. Modified: trunk/openvas-libnasl/ChangeLog =================================================================== --- trunk/openvas-libnasl/ChangeLog 2009-01-02 10:50:00 UTC (rev 2132) +++ trunk/openvas-libnasl/ChangeLog 2009-01-02 10:53:36 UTC (rev 2133) @@ -1,3 +1,8 @@ +2009-01-02 Michael Wiegand + + * include/nasl.h: Added missing declaration for + openvas_certificate_free. + 2008-12-20 Tim Brown * nasl/Makefile, nasl.tmpl.in: Honour LDFLAGS. Modified: trunk/openvas-libnasl/include/nasl.h =================================================================== --- trunk/openvas-libnasl/include/nasl.h 2009-01-02 10:50:00 UTC (rev 2132) +++ trunk/openvas-libnasl/include/nasl.h 2009-01-02 10:53:36 UTC (rev 2133) @@ -90,6 +90,7 @@ int nasl_verify_signature(const char* filename); char* nasl_extract_signature_fprs(const char* filename); GSList* nasl_get_all_certificates(); +void openvas_certificate_free(openvas_certificate*); /* End of Signature information extraction */ int execute_nasl_script(struct arglist *, const char *, const char *, int); From scm-commit at wald.intevation.org Fri Jan 2 12:16:31 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Fri, 2 Jan 2009 12:16:31 +0100 (CET) Subject: [Openvas-commits] r2135 - in trunk/openvas-client: . nessus nessus/prefs_dialog Message-ID: <20090102111631.22C2314225@pyrosoma.intevation.org> Author: felix Date: 2009-01-02 12:16:30 +0100 (Fri, 02 Jan 2009) New Revision: 2135 Modified: trunk/openvas-client/ChangeLog trunk/openvas-client/nessus/prefs_dialog/prefs_target.c trunk/openvas-client/nessus/read_target_file.c Log: Documentation added. * nessus/read_target_file.c, nessus/prefs_dialog/prefs_target.c: Documentation added. Modified: trunk/openvas-client/ChangeLog =================================================================== --- trunk/openvas-client/ChangeLog 2009-01-02 11:05:04 UTC (rev 2134) +++ trunk/openvas-client/ChangeLog 2009-01-02 11:16:30 UTC (rev 2135) @@ -1,3 +1,8 @@ +2009-01-02 Felix Wolfsteller + + * nessus/read_target_file.c, nessus/prefs_dialog/prefs_target.c: + Documentation added. + 2008-12-29 Felix Wolfsteller * Makefile: 'Clean' target now also removes generated documentation Modified: trunk/openvas-client/nessus/prefs_dialog/prefs_target.c =================================================================== --- trunk/openvas-client/nessus/prefs_dialog/prefs_target.c 2009-01-02 11:05:04 UTC (rev 2134) +++ trunk/openvas-client/nessus/prefs_dialog/prefs_target.c 2009-01-02 11:16:30 UTC (rev 2135) @@ -26,6 +26,10 @@ * do so, delete this exception statement from your version. */ +/** + * @file Build up target selection pane in GUI. + */ + #include #ifdef USE_GTK @@ -33,6 +37,13 @@ #include "read_target_file.h" #include "nessus_i18n.h" +/** + * Builds the target selection frame and hooks it up in an arglist. + * Returns the arglist. + * + * @return Arglist, in which gtk widgets of the Target Selection Frame are + * hooked. + */ struct arglist * prefs_dialog_target() { Modified: trunk/openvas-client/nessus/read_target_file.c =================================================================== --- trunk/openvas-client/nessus/read_target_file.c 2009-01-02 11:05:04 UTC (rev 2134) +++ trunk/openvas-client/nessus/read_target_file.c 2009-01-02 11:16:30 UTC (rev 2135) @@ -35,6 +35,11 @@ #ifdef USE_GTK +/** + * Callback for click on + * Shows up a file selection dialog and attempts to read that target file if + * OK is clicked. + */ void target_file_select() { GtkWidget * file; @@ -49,7 +54,12 @@ gtk_widget_show(file); } - +/** + * Sets the string parameter target as text to the TARGET text entry of the + * TARGET dialog. + * + * @param target String to be displayed in the TARGET text entry. + */ static void target_file_apply(target) char * target; @@ -63,7 +73,14 @@ } #endif - +/** + * Returns a string assembled out of the lines in file filename. + * + * @param filename File to read. + * + * @return Content of file with newlines being replaced by commata or NULL if an + * error occured. + */ char * target_file_to_list(filename) const char * filename; @@ -133,6 +150,11 @@ return strdup(target); } + /** + * @brief Prepends "file:" to a string. + * + * @return String argument file with "file:" prepended. + */ char* target_file_name(file) char * file; @@ -142,6 +164,13 @@ return ret; } +/** + * Callback for click on okay on target-file selection dialog. + * Sets the string in GUI via call to target_file_apply. + * + * @param bidon Ignored (callback). + * @param gtkw File Selection dialog. + */ void read_target_file(bidon, gtkw) GtkWidget * bidon; @@ -155,4 +184,3 @@ gtk_widget_destroy(gtkw); } #endif - From scm-commit at wald.intevation.org Fri Jan 2 12:18:06 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Fri, 2 Jan 2009 12:18:06 +0100 (CET) Subject: [Openvas-commits] r2136 - trunk/doc/website Message-ID: <20090102111806.DCE4714225@pyrosoma.intevation.org> Author: mwiegand Date: 2009-01-02 12:18:06 +0100 (Fri, 02 Jan 2009) New Revision: 2136 Modified: trunk/doc/website/openvas-cr-24.htm4 trunk/doc/website/openvas-crs.htm4 Log: Updated status for CR #24. Modified: trunk/doc/website/openvas-cr-24.htm4 =================================================================== --- trunk/doc/website/openvas-cr-24.htm4 2009-01-02 11:16:30 UTC (rev 2135) +++ trunk/doc/website/openvas-cr-24.htm4 2009-01-02 11:18:06 UTC (rev 2136) @@ -30,7 +30,7 @@

OpenVAS Change Request #24: OpenVAS-Server: Reorganize NVTs in Subdirectories

-Status: In discusssion. +Status: Voted +6. In progress.

Purpose

@@ -143,6 +143,8 @@

History

From scm-commit at wald.intevation.org Fri Jan 2 12:23:23 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Fri, 2 Jan 2009 12:23:23 +0100 (CET) Subject: [Openvas-commits] r2137 - in trunk/openvas-client: . nessus Message-ID: <20090102112323.2EE4740776@pyrosoma.intevation.org> Author: felix Date: 2009-01-02 12:23:22 +0100 (Fri, 02 Jan 2009) New Revision: 2137 Modified: trunk/openvas-client/ChangeLog trunk/openvas-client/nessus/read_target_file.c Log: * nessus/read_target_file.c: Replaced C&R function declarations. Modified: trunk/openvas-client/ChangeLog =================================================================== --- trunk/openvas-client/ChangeLog 2009-01-02 11:18:06 UTC (rev 2136) +++ trunk/openvas-client/ChangeLog 2009-01-02 11:23:22 UTC (rev 2137) @@ -1,5 +1,9 @@ 2009-01-02 Felix Wolfsteller + * nessus/read_target_file.c: Replaced C&R function declarations. + +2009-01-02 Felix Wolfsteller + * nessus/read_target_file.c, nessus/prefs_dialog/prefs_target.c: Documentation added. Modified: trunk/openvas-client/nessus/read_target_file.c =================================================================== --- trunk/openvas-client/nessus/read_target_file.c 2009-01-02 11:18:06 UTC (rev 2136) +++ trunk/openvas-client/nessus/read_target_file.c 2009-01-02 11:23:22 UTC (rev 2137) @@ -61,8 +61,7 @@ * @param target String to be displayed in the TARGET text entry. */ static void -target_file_apply(target) - char * target; +target_file_apply(char* target) { struct arglist * ctrls = arg_get_value(MainDialog, "TARGET"); GtkWidget * entry; @@ -82,8 +81,7 @@ * error occured. */ char * -target_file_to_list(filename) - const char * filename; +target_file_to_list(const char* filename) { HANDLE fd = open(filename, O_RDONLY); char * ret,*t; @@ -141,8 +139,7 @@ #ifdef USE_GTK char * -target_translate(target) - const char * target; +target_translate(const char* target) { if(!strncmp(target, "file:", 5)) return target_file_to_list(target+strlen("file:")); @@ -156,8 +153,7 @@ * @return String argument file with "file:" prepended. */ char* -target_file_name(file) - char * file; +target_file_name(const char* file) { char * ret = emalloc(strlen(file)+strlen("file:")+1); sprintf(ret, "file:%s", file); @@ -172,9 +168,7 @@ * @param gtkw File Selection dialog. */ void -read_target_file(bidon, gtkw) - GtkWidget * bidon; - GtkWidget * gtkw; +read_target_file(GtkWidget* bidon, GtkWidget* gtkw) { const char * filename = gtk_file_selection_get_filename(GTK_FILE_SELECTION(gtkw)); char * ret = target_file_name(filename); From scm-commit at wald.intevation.org Fri Jan 2 13:06:05 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Fri, 2 Jan 2009 13:06:05 +0100 (CET) Subject: [Openvas-commits] r2138 - trunk/openvas-client Message-ID: <20090102120605.86F8240778@pyrosoma.intevation.org> Author: felix Date: 2009-01-02 13:06:04 +0100 (Fri, 02 Jan 2009) New Revision: 2138 Modified: trunk/openvas-client/ChangeLog trunk/openvas-client/TODO Log: * TODO: Added wish to rename prefs_dialog/prefs_dialog_plugins_prefs and the like. Modified: trunk/openvas-client/ChangeLog =================================================================== --- trunk/openvas-client/ChangeLog 2009-01-02 11:23:22 UTC (rev 2137) +++ trunk/openvas-client/ChangeLog 2009-01-02 12:06:04 UTC (rev 2138) @@ -1,5 +1,10 @@ 2009-01-02 Felix Wolfsteller + * TODO: Added wish to rename prefs_dialog/prefs_dialog_plugins_prefs and + the like. + +2009-01-02 Felix Wolfsteller + * nessus/read_target_file.c: Replaced C&R function declarations. 2009-01-02 Felix Wolfsteller Modified: trunk/openvas-client/TODO =================================================================== --- trunk/openvas-client/TODO 2009-01-02 11:23:22 UTC (rev 2137) +++ trunk/openvas-client/TODO 2009-01-02 12:06:04 UTC (rev 2138) @@ -1,6 +1,11 @@ List of things that should/could be done to improve OpenVAS-Client: +2009-01-02 Felix Wolfsteller + + * Rename nessus/prefs_dialog and modules inside it. File and + function names in there became unbearable and misleading. + 2008-10-21 Felix Wolfsteller * GUI/usability: Add context-menus on right mouse button click. From scm-commit at wald.intevation.org Fri Jan 2 01:52:24 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Fri, 2 Jan 2009 01:52:24 +0100 (CET) Subject: [Openvas-commits] r2129 - trunk/openvas-client/po Message-ID: <20090102005224.7A1BD40774@pyrosoma.intevation.org> Author: jfs Date: 2009-01-02 01:52:00 +0100 (Fri, 02 Jan 2009) New Revision: 2129 Modified: trunk/openvas-client/po/de.po trunk/openvas-client/po/es.po trunk/openvas-client/po/fr.po trunk/openvas-client/po/he.po trunk/openvas-client/po/hr.po trunk/openvas-client/po/sv.po Log: Update PO files with current source code Modified: trunk/openvas-client/po/de.po =================================================================== --- trunk/openvas-client/po/de.po 2009-01-01 22:32:37 UTC (rev 2128) +++ trunk/openvas-client/po/de.po 2009-01-02 00:52:00 UTC (rev 2129) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: OpenVAS-Client 1.0\n" "Report-Msgid-Bugs-To: openvas-devel at wald.intevation.org\n" -"POT-Creation-Date: 2008-12-10 14:11+0100\n" +"POT-Creation-Date: 2009-01-02 01:47+0100\n" "PO-Revision-Date: 2004-08-17 01:05+0200\n" "Last-Translator: Michael Wiegand \n" "Language-Team: OpenVAS Developers \n" @@ -135,135 +135,199 @@ "ist ein ernster Betriebssystems-Fehler. Vielleicht l?st ein Neustart des " "Systems das Problem." -#: nessus/comm.c:91 +#: src/gui/ssh_key_info_form.c:170 +#, fuzzy +msgid "Account name:" +msgstr "Host-Name:" + +#: src/gui/ssh_key_info_form.c:178 +msgid "SSH login name:" +msgstr "" + +#: src/gui/ssh_key_info_form.c:185 +msgid "SSH public key:" +msgstr "" + +#: src/gui/ssh_key_info_form.c:193 +msgid "SSH private key:" +msgstr "" + +#: src/gui/ssh_key_info_form.c:201 +msgid "SSH key passphrase:" +msgstr "" + +#: src/gui/ssh_key_info_form.c:208 +#: nessus/prefs_dialog/prefs_scan_assistant.c:264 +#: nessus/prefs_dialog/prefs_scan_assistant.c:281 +msgid "Comment:" +msgstr "Kommentar:" + +#: src/gui/ssh_key_info_form.c:234 +#, fuzzy +msgid "Please provide a better name." +msgstr "Bitte einen Dateinamen ausw?hlen." + +#: src/gui/ssh_key_info_form.c:240 +#, fuzzy +msgid "Please provide a longer username." +msgstr "Bitte einen Dateinamen ausw?hlen." + +#: src/gui/ssh_key_info_form.c:245 +msgid "Please provide a passphrase with more then 5 characters." +msgstr "" + +#: src/gui/ssh_key_info_form.c:251 +msgid "Please provide a better comment for public key." +msgstr "" + +#: src/gui/ssh_key_info_form.c:257 +msgid "Comment must not contain spaces." +msgstr "" + +#: src/gui/ssh_keys_dialog.c:98 src/gui/ssh_keys_dialog.c:161 +#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:597 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:276 +#, fuzzy +msgid "OpenVAS SSH Key Manager" +msgstr "OpenVAS-Server" + +#: src/gui/ssh_keys_dialog.c:191 +msgid "Create a new keypair" +msgstr "" + +#: nessus/comm.h:40 +msgid "Select SSH Login" +msgstr "" + +#: nessus/comm.c:92 #, c-format msgid "Receiving plugins: %d" msgstr "Empfange Plugins: %d" -#: nessus/comm.c:96 +#: nessus/comm.c:97 #, c-format msgid "Receiving dependencies: %d" msgstr "Empfange Abh?ngigkeiten: %d" -#: nessus/comm.c:447 +#: nessus/comm.c:444 #, c-format msgid "Error : we received a preference (%s) for the plugin %s\n" msgstr "Fehler: Eine Voreinstellung (%s) f?r Plugin %s wurde empfangen\n" -#: nessus/comm.c:450 +#: nessus/comm.c:447 #, c-format msgid "but apparently the server has not loaded it\n" msgstr "aber anscheinend hat der Server es nicht geladen\n" -#: nessus/comm.c:822 +#: nessus/comm.c:870 #, c-format msgid "Can't open %s: %s" msgstr "Kann %s nicht ?ffnen: %s" -#: nessus/comm.c:846 +#: nessus/comm.c:894 #, c-format msgid "Error reading from %s: %s" msgstr "Fehler beim Lesen von %s: %s" -#: nessus/comm.c:966 nessus/comm.c:1340 +#: nessus/comm.c:1015 nessus/comm.c:1401 msgid "The daemon shut down the communication" msgstr "Der Daemon hat die Kommunikation abgebrochen" -#: nessus/comm.c:993 +#: nessus/comm.c:1042 msgid "Error processing plugin information from the server" msgstr "Fehler bei der Verbeitung der Plugin-Information vom Server" -#: nessus/comm.c:999 +#: nessus/comm.c:1048 msgid "Invalid SEND_PLUGINS_MD5 response from server" msgstr "Ung?ltige SEND_PLUGINS_MD5 Antwort vom Server" -#: nessus/comm.c:1166 +#: nessus/comm.c:1224 msgid "Invalid PLUGIN_INFO response from server" msgstr "Ung?ltige PLUGIN_INFO Antwort vom Server" -#: nessus/comm.c:1180 nessus/comm.c:1384 +#: nessus/comm.c:1238 nessus/comm.c:1445 msgid "Found and enabled one new plugin." msgstr "Es wurde ein neues Plugin gefunden und automatisch aktiviert." -#: nessus/comm.c:1182 nessus/comm.c:1386 +#: nessus/comm.c:1240 nessus/comm.c:1447 msgid "Found and disabled one new plugin." msgstr "Es wurde ein neues Plugin gefunden und automatisch deaktiviert." -#: nessus/comm.c:1187 nessus/comm.c:1391 +#: nessus/comm.c:1245 nessus/comm.c:1452 #, c-format msgid "Found and enabled %d new plugins." msgstr "Es wurden %d neue Plugins gefunden und automatisch aktiviert." -#: nessus/comm.c:1189 nessus/comm.c:1393 +#: nessus/comm.c:1247 nessus/comm.c:1454 #, c-format msgid "Found and disabled %d new plugins." msgstr "Es wurden %d neue Plugins gefunden und automatisch deaktiviert." -#: nessus/comm.c:1287 +#: nessus/comm.c:1348 msgid "Invalid PLUGINS_MD5 information sent from server" msgstr "Ung?ltige PLUGIN_MD5 Information vom Server" -#: nessus/comm.c:1320 +#: nessus/comm.c:1381 msgid "Error while updating the cached plugin information" msgstr "" "Fehler bei der Aktualisierung der zwischengespeicherten Plugin-Informationen" -#: nessus/comm.c:1675 +#: nessus/comm.c:1736 #, c-format msgid "Could not parse certificate: %s" msgstr "Konnte Zertifkat nicht verarbeiten: %s" -#: nessus/comm.c:1682 +#: nessus/comm.c:1743 #, c-format msgid "Invalid response from server to certificate request: %s" msgstr "Ung?ltige Serverantwort auf Zertifikatsanfrage: %s" -#: nessus/context.c:244 +#: nessus/context.c:245 msgid "context_remove_child detected existing children." msgstr "context_remove_child hat noch existierende Kindprozesse entdeckt." -#: nessus/context.c:434 nessus/prefs_dialog/prefs_scope_tree.c:273 +#: nessus/context.c:426 nessus/prefs_dialog/prefs_scope_tree.c:273 msgid "context_rename() called with illegal type" msgstr "context_rename() mit illegalem Typ aufgerufen" -#: nessus/context.c:451 nessus/context.c:482 +#: nessus/context.c:443 nessus/context.c:474 #, c-format msgid "Directory %s couldn't be renamed to %s: %s." msgstr "Verzeichnis %s konnte nicht in %s umbenannt werden: %s." -#: nessus/context.c:499 +#: nessus/context.c:491 #, c-format msgid "Can't move \"%s\" to \"%s\"." msgstr "Kann \"%s\" nicht nach \"%s\" verschieben." -#: nessus/context.c:522 nessus/context.c:561 nessus/html_graph_output.c:1116 +#: nessus/context.c:514 nessus/context.c:553 nessus/html_graph_output.c:1116 #, c-format msgid "Directory %s couldn't be created: %s." msgstr "Verzeichnis %s konnte nicht erzeugt werden: %s." -#: nessus/context.c:547 nessus/prefs_dialog/prefs_scan_assistant.c:263 +#: nessus/context.c:539 nessus/prefs_dialog/prefs_scan_assistant.c:263 msgid "unnamed task" msgstr "unbenannte Aufgabe" -#: nessus/context.c:550 nessus/prefs_dialog/prefs_scan_assistant.c:280 +#: nessus/context.c:542 nessus/prefs_dialog/prefs_scan_assistant.c:280 msgid "unnamed scope" msgstr "unbenannter Bereich" -#: nessus/context.c:553 +#: nessus/context.c:545 msgid "context_new(): No name provided for context" msgstr "context_new(): Kein Name f?r Kontext angegeben" -#: nessus/context.c:601 +#: nessus/context.c:593 #, c-format msgid "File %s couldn't be deleted: %s." msgstr "Datei %s konnte nicht gel?scht werden: %s." -#: nessus/context.c:607 +#: nessus/context.c:599 #, c-format msgid "Directory %s couldn't be deleted: %s." msgstr "Verzeichnis %s konnte nicht gel?scht werden: %s." -#: nessus/context.c:630 +#: nessus/context.c:622 msgid "context_delete() deleted the current context." msgstr "context_delete() hat den aktuellen Kontext gel?scht." @@ -271,12 +335,12 @@ msgid "No free tempfile!" msgstr "Keine freie tempor?re Datei!" -#: nessus/backend.c:106 +#: nessus/backend.c:105 #, c-format msgid "Can't create file %s: %s" msgstr "Kann %s nicht erstellen: %s" -#: nessus/backend.c:116 +#: nessus/backend.c:115 #, c-format msgid "Can't open file %s: %s" msgstr "Kann %s nicht ?ffnen: %s" @@ -369,58 +433,58 @@ msgid "idle_server: soc(%d) out of range\n" msgstr "idle_server: soc(%d) ausserhalb des Bereichs\n" -#: nessus/monitor_dialog.c:221 +#: nessus/monitor_dialog.c:218 #, c-format msgid "Scanning network from %s" msgstr "Scanne Netzwerk von %s" -#: nessus/monitor_dialog.c:222 +#: nessus/monitor_dialog.c:219 msgid "some host" msgstr "irgendeinem Host" -#: nessus/monitor_dialog.c:260 +#: nessus/monitor_dialog.c:257 msgid "Hostname" msgstr "Host-Name" -#: nessus/monitor_dialog.c:266 +#: nessus/monitor_dialog.c:263 msgid "Portscan" msgstr "Port Scanning" -#: nessus/monitor_dialog.c:272 +#: nessus/monitor_dialog.c:269 msgid "Checks" msgstr "Pr?fungen" -#: nessus/monitor_dialog.c:279 nessus/monitor_dialog.c:629 +#: nessus/monitor_dialog.c:276 nessus/monitor_dialog.c:621 msgid "Stop" msgstr "Stoppen" -#: nessus/monitor_dialog.c:308 +#: nessus/monitor_dialog.c:305 msgid "Stop the whole test" msgstr "Den gesamten Test Stoppen" -#: nessus/monitor_dialog.c:393 nessus/monitor_dialog.c:414 +#: nessus/monitor_dialog.c:388 nessus/monitor_dialog.c:409 #, c-format msgid "Error ! Null hostname in the list\n" msgstr "Fehler! Leerer Host-Name in der Liste\n" -#: nessus/monitor_dialog.c:591 +#: nessus/monitor_dialog.c:583 msgid "Portscan:" msgstr "Port Scanning:" -#: nessus/monitor_dialog.c:595 +#: nessus/monitor_dialog.c:587 msgid "Checks:" msgstr "Pr?fungen:" -#: nessus/nessus.c:374 +#: nessus/nessus.c:379 msgid "Host not found!" msgstr "Host nicht gefunden!" -#: nessus/nessus.c:377 +#: nessus/nessus.c:382 #, c-format msgid "Could not open a connection to %s\n" msgstr "Kann keine Verbindung mit %s aufbauen\n" -#: nessus/nessus.c:403 +#: nessus/nessus.c:408 msgid "" "Could not initialize the OpenSSL library !\n" "Please launch openvasclient-mkrand(1) first !" @@ -428,7 +492,7 @@ "Kann die OpenSSL-Bibliothek nicht initialisieren!\n" "Bitte starten Sie zun?chst openvasclient-mkrand(1) !" -#: nessus/nessus.c:419 +#: nessus/nessus.c:424 #, c-format msgid "" "Unknown SSL version \"%s\"\n" @@ -437,12 +501,12 @@ "Unbekannte SSL Version \"%s\"\n" "Benutze Voreinstellung: %s" -#: nessus/nessus.c:502 +#: nessus/nessus.c:507 #, c-format msgid "paranoia_level=%d but \"trusted_ca\" not set" msgstr "paranoia_level=%d aber \"trusted_ca\" nicht gesetzt" -#: nessus/nessus.c:509 +#: nessus/nessus.c:514 #, c-format msgid "" "paranoia_level=%d but \"trusted_ca\" file not found:\n" @@ -451,7 +515,7 @@ "paranoia_level=%d, aber \"trusted_ca\"-Datei nicht gefunden:\n" "%s" -#: nessus/nessus.c:524 +#: nessus/nessus.c:529 #, c-format msgid "" "Error while setting the trusted CA: %s\n" @@ -460,98 +524,98 @@ "Fehler beim Setzen der vertrauensw?rdigen CA: %s\n" "SSL-Verbindungen werden wahrscheinlich fehlschlagen." -#: nessus/nessus.c:569 +#: nessus/nessus.c:574 msgid "SSL error: cannot get server certificate" msgstr "SSL Fehler: Kein Serverzertifikat erhalten" -#: nessus/nessus.c:581 +#: nessus/nessus.c:586 msgid "Invalid server certificate" msgstr "Ung?ltiges Serverzertifikat" -#: nessus/nessus.c:585 +#: nessus/nessus.c:590 msgid "Could not save server certificate" msgstr "Kann Serverzertifikat nicht speichern" -#: nessus/nessus.c:596 +#: nessus/nessus.c:601 msgid "Could not register the connection" msgstr "Kann die Verbindung nicht registrieren" -#: nessus/nessus.c:609 +#: nessus/nessus.c:614 msgid "" "Unable to establish a connection to the remote host using the specified " "protocol version!" msgstr "" "Konnte mit der gew?hlten Protokollversion keine Verbindung zum Host aufbauen!" -#: nessus/nessus.c:618 +#: nessus/nessus.c:623 msgid "Login failed" msgstr "Anmeldung fehlgeschlagen" -#: nessus/nessus.c:680 +#: nessus/nessus.c:685 msgid "Display version information" msgstr "Versionsinformationen anzeigen" -#: nessus/nessus.c:682 +#: nessus/nessus.c:687 msgid "No pixmaps" msgstr "Keine Pixmaps verwenden" -#: nessus/nessus.c:684 +#: nessus/nessus.c:689 msgid "Batch-mode scan" msgstr "Scan im Batch-Modus" -#: nessus/nessus.c:684 +#: nessus/nessus.c:689 msgid " " msgstr " " -#: nessus/nessus.c:686 +#: nessus/nessus.c:691 msgid "Configuration file" msgstr "Konfigurationsdatei" -#: nessus/nessus.c:686 +#: nessus/nessus.c:691 msgid "<.rcfile>" msgstr "<.rcfile>" -#: nessus/nessus.c:688 nessus/nessus.c:690 +#: nessus/nessus.c:693 nessus/nessus.c:695 msgid "Output format" msgstr "Ausgabeformat" -#: nessus/nessus.c:688 +#: nessus/nessus.c:693 msgid "[nbe|html|html_graph|text|xml|tex]" msgstr "[nbe|html|html_graph|text|xml|tex]" -#: nessus/nessus.c:690 +#: nessus/nessus.c:695 msgid "[nbe|html|text|xml|tex]" msgstr "[nbe|html|text|xml|tex]" -#: nessus/nessus.c:692 +#: nessus/nessus.c:697 msgid "Display status messages in batch mode" msgstr "Statusmeldungen im Batch-Modus anzeigen" -#: nessus/nessus.c:693 +#: nessus/nessus.c:698 msgid "Obtain list of plugins installed on the server" msgstr "Liste der auf dem Server installierten Plugins ausgeben" -#: nessus/nessus.c:694 +#: nessus/nessus.c:699 msgid "Obtain list of server and plugin preferences" msgstr "Liste der Plugin- und Servereinstellungen ausgeben" -#: nessus/nessus.c:695 +#: nessus/nessus.c:700 msgid "Input file (report conversion)" msgstr "Quelldatei (Berichtskonvertierung)" -#: nessus/nessus.c:695 +#: nessus/nessus.c:700 msgid "" msgstr "" -#: nessus/nessus.c:696 +#: nessus/nessus.c:701 msgid "Output file (report conversion)" msgstr "Zieldatei (Berichtskonvertierung)" -#: nessus/nessus.c:696 +#: nessus/nessus.c:701 msgid "" msgstr "" -#: nessus/nessus.c:697 +#: nessus/nessus.c:702 msgid "" "Override SSL \"paranoia\" question preventing OpenVAS-Client from checking " "certificates" @@ -559,31 +623,31 @@ "SSL \"paranoia\" Frage ?bergehen und Pr?fung des Zertifikats durch OpenVAS-" "Client abschalten" -#: nessus/nessus.c:698 +#: nessus/nessus.c:703 msgid "Issue SQL output for -p and -P (experimental)" msgstr "Ergebnisse der Optionen -p und -P aus SQL ausgeben (experimentell)" -#: nessus/nessus.c:699 +#: nessus/nessus.c:704 msgid "List sessions" msgstr "Sitzungen auflisten" -#: nessus/nessus.c:699 +#: nessus/nessus.c:704 msgid " " msgstr " " -#: nessus/nessus.c:700 +#: nessus/nessus.c:705 msgid "Restore session" msgstr "Sitzung wiederherstellen" -#: nessus/nessus.c:700 +#: nessus/nessus.c:705 msgid " " msgstr " " -#: nessus/nessus.c:705 +#: nessus/nessus.c:710 msgid "- client for the OpenVAS security scanner" msgstr "- Client f?r den OpenVAS Sicherheits-Scanner" -#: nessus/nessus.c:734 +#: nessus/nessus.c:739 #, c-format msgid "" "OpenVAS-Client (%s) %s for %s\n" @@ -592,7 +656,7 @@ "OpenVAS-Client (%s) %s f?r %s\n" "\n" -#: nessus/nessus.c:735 +#: nessus/nessus.c:740 #, c-format msgid "" "NessusClient origin: (C) 1998 - 2003 Renaud Deraison \n" @@ -600,24 +664,24 @@ "Urspr?nglicher NessusClient: (C) 1998 - 2003 Renaud Deraison " "\n" -#: nessus/nessus.c:736 +#: nessus/nessus.c:741 #, c-format msgid "New code since OpenVAS-Client: (C) 2007, 2008 Intevation GmbH\n" msgstr "Neuer Quelltext seit OpenVAS-Client: (C) 2007, 2008 Intevation GmbH\n" -#: nessus/nessus.c:761 +#: nessus/nessus.c:766 #, c-format msgid "The session ID is required to restore a session.\n" msgstr "" "F?r das Wiederherstellen einer Sitzung wird eine Sitzungs-ID ben?tigt.\n" -#: nessus/nessus.c:762 nessus/nessus.c:780 nessus/nessus.c:833 -#: nessus/nessus.c:917 nessus/nessus.c:952 +#: nessus/nessus.c:767 nessus/nessus.c:785 nessus/nessus.c:838 +#: nessus/nessus.c:922 nessus/nessus.c:957 #, c-format msgid "Please use %s --help for more information.\n" msgstr "Unter %s --help erhalten Sie weitere Informationen.\n" -#: nessus/nessus.c:779 +#: nessus/nessus.c:784 #, c-format msgid "" "You need to specify an input file as well as an output file for report " @@ -626,76 +690,76 @@ "F?r die Konvertierung eines Berichts muss sowohl eine Quelldatei als auch " "eine Zieldatei angegeben werden.\n" -#: nessus/nessus.c:816 +#: nessus/nessus.c:821 #, c-format msgid "Unsupported report type '%s'\n" msgstr "Nicht unterst?tztes Berichtsformat '%s'\n" -#: nessus/nessus.c:824 +#: nessus/nessus.c:829 #, c-format msgid "Could not import '%s' - is it a .nbe file?\n" msgstr "Kann '%s' nicht importieren - ist es eine .nbe Datei?\n" -#: nessus/nessus.c:832 +#: nessus/nessus.c:837 #, c-format msgid "The option -make_config_file can only be used in batch mode.\n" msgstr "" "Die Option -make_config_file kann nur im Batch-Modus angewandt werden\n" -#: nessus/nessus.c:843 +#: nessus/nessus.c:848 #, c-format msgid "list-sessions requires %s\n" msgstr "list-sessions erfordert %s\n" -#: nessus/nessus.c:849 +#: nessus/nessus.c:854 #, c-format msgid "restore-session requires -q %s \n" msgstr "restore-session erfordert -q %s \n" -#: nessus/nessus.c:855 +#: nessus/nessus.c:860 #, c-format msgid "--restore-session and --list-sessions are mutually exclusive\n" msgstr "" "--restore-session und --list-sessions schliessen sich gegenseitig aus\n" -#: nessus/nessus.c:893 +#: nessus/nessus.c:898 #, c-format msgid "Verbose mode can only be used in batch mode\n" msgstr "Wortreicher Modus kann nur f?r Batch-Modus angewandt werden\n" -#: nessus/nessus.c:916 nessus/nessus.c:951 +#: nessus/nessus.c:921 nessus/nessus.c:956 #, c-format msgid "Batch mode requires login information.\n" msgstr "Der Batch-Modus ben?tigt Anmeldeinformationen.\n" -#: nessus/nessus.c:927 +#: nessus/nessus.c:932 msgid "list-sessions only requires " msgstr "list-sessions erfordert lediglich " -#: nessus/nessus.c:936 +#: nessus/nessus.c:941 msgid "restore-session only requires " msgstr "restore-session erfordert lediglich " -#: nessus/nessus.c:945 +#: nessus/nessus.c:950 msgid "list-prefs and list-plugins require " msgstr "list-prefs und list-plugins erfordern " -#: nessus/nessus.c:976 nessus/nessus.c:991 +#: nessus/nessus.c:981 nessus/nessus.c:996 #, c-format msgid "Could not connect to openvasd\n" msgstr "Kann keine Verbindung zu openvasd aufbauen\n" -#: nessus/nessus.c:1018 nessus/nessus.c:1025 +#: nessus/nessus.c:1023 nessus/nessus.c:1030 #, c-format msgid "Missing parameter\n" msgstr "Fehlender Parameter\n" -#: nessus/nessus.c:1053 +#: nessus/nessus.c:1058 #, c-format msgid "A new openvasrc file has been saved\n" msgstr "Eine neue openvasrc Datei wurde gespeichert\n" -#: nessus/nessus.c:1096 +#: nessus/nessus.c:1101 #, c-format msgid "" "\n" @@ -1102,7 +1166,7 @@ msgid "Global Settings" msgstr "Globale Einstellungen" -#: nessus/preferences.c:746 nessus/preferences.c:767 +#: nessus/preferences.c:745 nessus/preferences.c:766 msgid "prefs_set_value() called with illegal type" msgstr "prefs_set_value() mit illegalem Typ aufgerufen" @@ -1334,11 +1398,11 @@ msgid "prefs_context_update called with illegal context." msgstr "prefs_context_update() mit illegalem Kontext aufgerufen." -#: nessus/prefs_dialog/prefs_dialog.c:111 +#: nessus/prefs_dialog/prefs_dialog.c:110 msgid "users-manual.pdf" msgstr "users-manual-de.pdf" -#: nessus/prefs_dialog/prefs_dialog.c:131 +#: nessus/prefs_dialog/prefs_dialog.c:130 msgid "The global settings have been saved." msgstr "Die globalen Einstellungen wurden gespeichert." @@ -1473,7 +1537,7 @@ msgstr "Optionen" #: nessus/prefs_dialog/prefs_dialog.c:682 -#: nessus/prefs_dialog/prefs_dialog_prefs.c:185 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:190 msgid "Report" msgstr "Report" @@ -1495,7 +1559,7 @@ "Renaud Deraison, Thomas Arendsen Hein, Jan-Oliver Wagner, Bernhard Herzog, " "Michel Arboi (SSL-Unterst?tzung), Bruce Verderaime (Kuchendiagramme)\n" -#: nessus/prefs_dialog/prefs_dialog.c:1524 +#: nessus/prefs_dialog/prefs_dialog.c:1449 msgid "" "You must enter the name of the primary target\n" "to attack in the 'target' section" @@ -1624,116 +1688,121 @@ msgid "Remember the set of plugins" msgstr "Speichere die Pluginauswahl" -#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:88 +#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:95 msgid "Advanced Plugins preferences" msgstr "Erweiterte Plugin-Voreinstellungen" -#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:95 -#: nessus/prefs_dialog/prefs_options.c:101 +#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:102 +#: nessus/prefs_dialog/prefs_options.c:102 msgid "Credentials" msgstr "Zugangsdaten" -#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:179 +#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:188 #, c-format msgid "%s asked for unknown preference type %s." msgstr "%s verlangt unbekannten Einstellungstyp %s." -#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:379 +#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:388 msgid "Select file" msgstr "Datei ausw?hlen" -#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:429 -msgid "No SSH Key selected" -msgstr "Kein SSH-Schl?ssel ausgew?hlt" +#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:575 +#, fuzzy +msgid "SSH Key Information" +msgstr "Keine Informationen" -#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:567 +#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:709 msgid "Select..." msgstr "Ausw?hlen..." -#: nessus/prefs_dialog/prefs_dialog_prefs.c:60 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:65 msgid "Preferences" msgstr "Voreinstellungen" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:80 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:85 msgid "User interface" msgstr "Benutzerschnittstelle" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:92 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:97 msgid "Auto expand tree elements" msgstr "Automatisches aufklappen der Baumelemente" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:98 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:103 msgid "Order by:" msgstr "Sortieren nach:" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:108 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:113 #: nessus/prefs_dialog/prefs_report.c:499 msgid "Host/Port/Severity" msgstr "Rechner/Port/Schweregrad" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:110 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:115 #: nessus/prefs_dialog/prefs_report.c:501 msgid "Port/Host/Severity" msgstr "Port/Rechner/Schweregrad" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:116 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:121 msgid "Connection to OpenVAS Server" msgstr "Verbindung mit OpenVAS-Server" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:128 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:133 msgid "Automatically connect" msgstr "Automatisch verbinden" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:134 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:139 msgid "Protocol version:" msgstr "Protokollversion:" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:144 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:149 msgid "OTP 1.0" msgstr "OTP 1.0" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:147 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:152 msgid "Plugin Cache" msgstr "Plugin-Zwischenspeicher" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:159 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:164 msgid "Cache plugin information when connecting" msgstr "Plugin-Informationen bei Verbindungsaufbau zwischenspeichern" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:166 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:171 msgid "Use plugin cache with reports" msgstr "Verwende Plugin-Zwischenspeicher f?r Berichte" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:174 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:179 msgid "Load plugin cache for scopes immediately" msgstr "Lade Plugin-Zwischenspeicher f?r Bereiche sofort" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:197 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:202 msgid "Include plugin details in PDF" msgstr "F?ge Plugin-Details in PDF-Bericht ein" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:205 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:210 msgid "Show script origin in report window" msgstr "Zeige Skript-Herkunft im Berichtsfenster" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:219 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:224 msgid "External Links in HTML/PDF" msgstr "Externe Verweise in HTML/PDF" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:230 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:235 msgid "OpenVAS IDs:" msgstr "OpenVAS IDs:" # -#: nessus/prefs_dialog/prefs_dialog_prefs.c:242 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:247 msgid "CVE IDs:" msgstr "CVE IDs:" # -#: nessus/prefs_dialog/prefs_dialog_prefs.c:254 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:259 msgid "BugTraq IDs:" msgstr "BugTraq IDs:" +#: nessus/prefs_dialog/prefs_dialog_prefs.c:272 +msgid "SSH Key Management" +msgstr "" + #: nessus/prefs_dialog/prefs_dialog_scan_opt.c:141 msgid "General scan options" msgstr "Allgemeine Scan-Einstellungen" @@ -2291,11 +2360,6 @@ msgid "Please enter a name for your task:" msgstr "Bitte geben Sie eine Bezeichnung f?r Ihre Aufgabe an:" -#: nessus/prefs_dialog/prefs_scan_assistant.c:264 -#: nessus/prefs_dialog/prefs_scan_assistant.c:281 -msgid "Comment:" -msgstr "Kommentar:" - #: nessus/prefs_dialog/prefs_scan_assistant.c:269 msgid "Step 2: Scope" msgstr "Schritt 2: Bereich" @@ -2492,28 +2556,28 @@ msgid "Low" msgstr "Niedrig" -#: nessus/prefs_dialog/prefs_options.c:93 +#: nessus/prefs_dialog/prefs_options.c:94 msgid "General" msgstr "Allgemein" -#: nessus/prefs_dialog/prefs_options.c:97 +#: nessus/prefs_dialog/prefs_options.c:98 msgid "Plugins" msgstr "Plugins" -#: nessus/prefs_dialog/prefs_options.c:105 +#: nessus/prefs_dialog/prefs_options.c:106 #: nessus/prefs_dialog/prefs_target.c:49 msgid "Target selection" msgstr "Zielauswahl" -#: nessus/prefs_dialog/prefs_options.c:109 +#: nessus/prefs_dialog/prefs_options.c:110 msgid "Access Rules" msgstr "Zugriffsregeln" -#: nessus/prefs_dialog/prefs_options.c:113 +#: nessus/prefs_dialog/prefs_options.c:114 msgid "Prefs." msgstr "Voreinst." -#: nessus/prefs_dialog/prefs_options.c:117 +#: nessus/prefs_dialog/prefs_options.c:118 msgid "KB" msgstr "WB" @@ -2588,6 +2652,9 @@ msgid "Perform a DNS zone transfer" msgstr "F?hre einen DNS-Zonentransfer durch" +#~ msgid "No SSH Key selected" +#~ msgstr "Kein SSH-Schl?ssel ausgew?hlt" + #~ msgid "Not yet implemented." #~ msgstr "Noch nicht implementiert" Modified: trunk/openvas-client/po/es.po =================================================================== --- trunk/openvas-client/po/es.po 2009-01-01 22:32:37 UTC (rev 2128) +++ trunk/openvas-client/po/es.po 2009-01-02 00:52:00 UTC (rev 2129) @@ -38,7 +38,7 @@ msgstr "" "Project-Id-Version: openvas-client 0.9.1\n" "Report-Msgid-Bugs-To: openvas-devel at wald.intevation.org\n" -"POT-Creation-Date: 2008-06-25 14:05+0200\n" +"POT-Creation-Date: 2009-01-02 01:47+0100\n" "PO-Revision-Date: 2008-08-22 01:18+0200\n" "Last-Translator: Javier Fern?ndez-Sanguino \n" "Language-Team: Debian Spanish \n" @@ -68,6 +68,25 @@ "X-POFile-SpellExtra: Jan session Bernhard OTP net openvasclient\n" "X-POFile-SpellExtra: contextrename\n" +#: src/openvas-lib/openvas_certificate_file.c:101 +#, fuzzy, c-format +msgid "Error adding comment to key file: %s" +msgstr "Error al leer de %s: %s" + +#: src/openvas-lib/openvas_certificate_file.c:118 +msgid "Error accessing certificate file for report." +msgstr "" + +#: src/openvas-lib/openvas_certificate_file.c:126 +#, fuzzy, c-format +msgid "Error exporting key file: %s" +msgstr "Error al escribir %s: %s" + +#: src/openvas-lib/openvas_certificate_file.c:165 +#, fuzzy, c-format +msgid "Error loading certificate store %s: %s" +msgstr "Error al leer de %s: %s" + #: src/gui/about_dlg.c:113 msgid "About OpenVAS-Client" msgstr "Sobre OpenVAS-Client" @@ -168,112 +187,227 @@ "grave en el sistema operativo, es posible que se arregle si reinicia el " "sistema." -#: nessus/comm.c:90 +#: src/gui/ssh_key_info_form.c:170 +#, fuzzy +msgid "Account name:" +msgstr "Sistema:" + +#: src/gui/ssh_key_info_form.c:178 +msgid "SSH login name:" +msgstr "" + +#: src/gui/ssh_key_info_form.c:185 +msgid "SSH public key:" +msgstr "" + +#: src/gui/ssh_key_info_form.c:193 +msgid "SSH private key:" +msgstr "" + +#: src/gui/ssh_key_info_form.c:201 +msgid "SSH key passphrase:" +msgstr "" + +#: src/gui/ssh_key_info_form.c:208 +#: nessus/prefs_dialog/prefs_scan_assistant.c:264 +#: nessus/prefs_dialog/prefs_scan_assistant.c:281 +msgid "Comment:" +msgstr "Comentario:" + +#: src/gui/ssh_key_info_form.c:234 +#, fuzzy +msgid "Please provide a better name." +msgstr "Por favor, escoja un fichero." + +#: src/gui/ssh_key_info_form.c:240 +#, fuzzy +msgid "Please provide a longer username." +msgstr "Por favor, escoja un fichero." + +#: src/gui/ssh_key_info_form.c:245 +msgid "Please provide a passphrase with more then 5 characters." +msgstr "" + +#: src/gui/ssh_key_info_form.c:251 +msgid "Please provide a better comment for public key." +msgstr "" + +#: src/gui/ssh_key_info_form.c:257 +msgid "Comment must not contain spaces." +msgstr "" + +#: src/gui/ssh_keys_dialog.c:98 src/gui/ssh_keys_dialog.c:161 +#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:597 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:276 +#, fuzzy +msgid "OpenVAS SSH Key Manager" +msgstr "Servidor OpenVAS" + +#: src/gui/ssh_keys_dialog.c:191 +msgid "Create a new keypair" +msgstr "" + +#: nessus/comm.h:40 +msgid "Select SSH Login" +msgstr "" + +#: nessus/comm.c:92 #, c-format msgid "Receiving plugins: %d" msgstr "Recibiendo complementos: %d" -#: nessus/comm.c:95 +#: nessus/comm.c:97 #, c-format msgid "Receiving dependencies: %d" msgstr "Recibiendo dependencias: %d" -#: nessus/comm.c:385 +#: nessus/comm.c:444 #, c-format msgid "Error : we received a preference (%s) for the plugin %s\n" msgstr "Error: recibidos una preferencia (%s) para el complemento %s\n" -#: nessus/comm.c:388 +#: nessus/comm.c:447 #, c-format msgid "but apparently the server has not loaded it\n" msgstr "pero parece que el servidor no lo ha cargado\n" -#: nessus/comm.c:754 +#: nessus/comm.c:870 #, c-format msgid "Can't open %s: %s" msgstr "No se pudo abrir %s: %s" -#: nessus/comm.c:778 +#: nessus/comm.c:894 #, c-format msgid "Error reading from %s: %s" msgstr "Error al leer de %s: %s" -#: nessus/comm.c:907 nessus/comm.c:1250 +#: nessus/comm.c:1015 nessus/comm.c:1401 msgid "The daemon shut down the communication" msgstr "El demonio cerr? la comunicaci?n" -#: nessus/comm.c:932 +#: nessus/comm.c:1042 msgid "Error processing plugin information from the server" msgstr "" "Se produjo un error al procesar la informaci?n de complementos proporcionada " "por el servidor" -#: nessus/comm.c:938 +#: nessus/comm.c:1048 msgid "Invalid SEND_PLUGINS_MD5 response from server" msgstr "Respuesta SEND_PLUGINS_MD5 del servidor inv?lida" -#: nessus/comm.c:1099 +#: nessus/comm.c:1224 msgid "Invalid PLUGIN_INFO response from server" msgstr "Respuesta PLUGIN_INFO del servidor inv?lida" -#: nessus/comm.c:1198 +#: nessus/comm.c:1238 nessus/comm.c:1445 +msgid "Found and enabled one new plugin." +msgstr "" + +#: nessus/comm.c:1240 nessus/comm.c:1447 +msgid "Found and disabled one new plugin." +msgstr "" + +#: nessus/comm.c:1245 nessus/comm.c:1452 +#, c-format +msgid "Found and enabled %d new plugins." +msgstr "" + +#: nessus/comm.c:1247 nessus/comm.c:1454 +#, c-format +msgid "Found and disabled %d new plugins." +msgstr "" + +#: nessus/comm.c:1348 msgid "Invalid PLUGINS_MD5 information sent from server" msgstr "Informaci?n PLUGINS_MD5 enviada por el servidor inv?lida" -#: nessus/comm.c:1231 +#: nessus/comm.c:1381 msgid "Error while updating the cached plugin information" msgstr "" "Se produjo un error al actualizar la informaci?n cacheada de complementos" -#: nessus/context.c:222 +#: nessus/comm.c:1736 +#, fuzzy, c-format +msgid "Could not parse certificate: %s" +msgstr "No se pudo guardar el certificado del servidor" + +#: nessus/comm.c:1743 +#, fuzzy, c-format +msgid "Invalid response from server to certificate request: %s" +msgstr "Certificado de servidor inv?lido" + +#: nessus/context.c:245 msgid "context_remove_child detected existing children." msgstr "la funci?n context_remove_child detect? que exist?an hijos." -#: nessus/context.c:362 nessus/prefs_dialog/prefs_scope_tree.c:273 +#: nessus/context.c:426 nessus/prefs_dialog/prefs_scope_tree.c:273 msgid "context_rename() called with illegal type" msgstr "se llam? a context_rename() con un tipo de datos ilegal" -#: nessus/context.c:379 nessus/context.c:410 +#: nessus/context.c:443 nessus/context.c:474 #, c-format msgid "Directory %s couldn't be renamed to %s: %s." msgstr "No se pudo cambiar el nombre del directorio %s a %s: %s." -#: nessus/context.c:427 +#: nessus/context.c:491 #, c-format msgid "Can't move \"%s\" to \"%s\"." msgstr "No se pudo mover \"%s\" a \"%s\"." -#: nessus/context.c:450 nessus/context.c:489 +#: nessus/context.c:514 nessus/context.c:553 nessus/html_graph_output.c:1116 #, c-format msgid "Directory %s couldn't be created: %s." msgstr "No se pudo crear el directorio %s: %s." -#: nessus/context.c:475 nessus/prefs_dialog/prefs_scan_assistant.c:263 +#: nessus/context.c:539 nessus/prefs_dialog/prefs_scan_assistant.c:263 msgid "unnamed task" msgstr "tarea sin nombre" -#: nessus/context.c:478 nessus/prefs_dialog/prefs_scan_assistant.c:280 +#: nessus/context.c:542 nessus/prefs_dialog/prefs_scan_assistant.c:280 msgid "unnamed scope" msgstr "alcance sin nombre" -#: nessus/context.c:481 +#: nessus/context.c:545 msgid "context_new(): No name provided for context" msgstr "context_new(): No se ha proporcionado un nombre para el contexto" -#: nessus/context.c:526 +#: nessus/context.c:593 #, c-format msgid "File %s couldn't be deleted: %s." msgstr "No se pudo borrar el fichero %s: %s." -#: nessus/context.c:532 +#: nessus/context.c:599 #, c-format msgid "Directory %s couldn't be deleted: %s." msgstr "No se pudo borrar el directorio %s: %s." -#: nessus/context.c:553 +#: nessus/context.c:622 msgid "context_delete() deleted the current context." msgstr "context_delete() borr? el contexto actual." +#: nessus/backend.c:82 +msgid "No free tempfile!" +msgstr "" + +#: nessus/backend.c:105 +#, fuzzy, c-format +msgid "Can't create file %s: %s" +msgstr "No se pudo abrir %s: %s" + +#: nessus/backend.c:115 +#, fuzzy, c-format +msgid "Can't open file %s: %s" +msgstr "No se pudo abrir %s: %s" + +#: nessus/backend.c:622 +msgid "Unknown report type - please set an extension to the filename" +msgstr "" + +#: nessus/backend.c:631 +#, fuzzy +msgid "This file format can not be read back by the OpenVAS-Client" +msgstr "# Este fichero lo gener? OpenVAS-Client autom?ticamente\n" + #: nessus/filter.c:67 nessus/filter.c:80 msgid "Filter plugins..." msgstr "Filtrar complementos..." @@ -292,11 +426,11 @@ msgid "Name" msgstr "Nombre" -#: nessus/filter.c:116 nessus/pdf_output.c:952 +#: nessus/filter.c:116 nessus/pdf_output.c:799 msgid "Description" msgstr "Descripci?n" -#: nessus/filter.c:122 nessus/pdf_output.c:804 nessus/pdf_output.c:941 +#: nessus/filter.c:122 nessus/pdf_output.c:580 nessus/pdf_output.c:784 msgid "Summary" msgstr "Resumen" @@ -308,15 +442,15 @@ msgid "ID number" msgstr "N?mero ID:" -#: nessus/filter.c:140 nessus/pdf_output.c:942 +#: nessus/filter.c:140 nessus/pdf_output.c:785 msgid "Category" msgstr "Categor?a" -#: nessus/filter.c:146 nessus/pdf_output.c:945 +#: nessus/filter.c:146 nessus/pdf_output.c:789 msgid "CVE" msgstr "CVE" -#: nessus/filter.c:152 nessus/pdf_output.c:946 +#: nessus/filter.c:152 nessus/pdf_output.c:791 msgid "BID" msgstr "BID" @@ -333,6 +467,15 @@ msgid "Invalid regular expression" msgstr "Expresi?n regular inv?lida." +#: nessus/parser.c:221 +#, fuzzy +msgid "Invalid port range" +msgstr "Rango de puertos:" + +#: nessus/parser.c:223 +msgid "These hosts could not be tested because you are not allowed to do so:" +msgstr "" + #: nessus/monitor_dialog.c:84 #, c-format msgid "is_server_present: fd(%d) out of range\n" @@ -343,32 +486,32 @@ msgid "idle_server: soc(%d) out of range\n" msgstr "idle_server: soc(%d) fuera de rango\n" -#: nessus/monitor_dialog.c:221 +#: nessus/monitor_dialog.c:218 #, c-format msgid "Scanning network from %s" msgstr "Sondeando la red desde %s" -#: nessus/monitor_dialog.c:222 +#: nessus/monitor_dialog.c:219 msgid "some host" msgstr "un sistema" -#: nessus/monitor_dialog.c:260 +#: nessus/monitor_dialog.c:257 msgid "Hostname" msgstr "Nombre de sistema" -#: nessus/monitor_dialog.c:266 +#: nessus/monitor_dialog.c:263 msgid "Portscan" msgstr "An?lisis de puertos" -#: nessus/monitor_dialog.c:272 +#: nessus/monitor_dialog.c:269 msgid "Checks" msgstr "Comprobaciones" -#: nessus/monitor_dialog.c:279 nessus/monitor_dialog.c:619 +#: nessus/monitor_dialog.c:276 nessus/monitor_dialog.c:621 msgid "Stop" msgstr "Parar" -#: nessus/monitor_dialog.c:308 +#: nessus/monitor_dialog.c:305 msgid "Stop the whole test" msgstr "Parar toda la prueba" @@ -377,24 +520,24 @@ msgid "Error ! Null hostname in the list\n" msgstr "?Error! Hay un nombre de equipo vac?o en la lista\n" -#: nessus/monitor_dialog.c:581 +#: nessus/monitor_dialog.c:583 msgid "Portscan:" msgstr "Sondeo de puertos:" -#: nessus/monitor_dialog.c:585 +#: nessus/monitor_dialog.c:587 msgid "Checks:" msgstr "Comprobaciones:" -#: nessus/nessus.c:373 +#: nessus/nessus.c:379 msgid "Host not found!" msgstr "?No se encontr? el sistema!" -#: nessus/nessus.c:376 +#: nessus/nessus.c:382 #, c-format msgid "Could not open a connection to %s\n" msgstr "No se pudo abrir una conexi?n a %s\n" -#: nessus/nessus.c:402 +#: nessus/nessus.c:408 msgid "" "Could not initialize the OpenSSL library !\n" "Please launch openvasclient-mkrand(1) first !" @@ -402,7 +545,7 @@ "?No se pudo inicializar la librer?a OpenSSL!\n" "Por favor, ejecute primero openvasclient-mkrand(1)." -#: nessus/nessus.c:418 +#: nessus/nessus.c:424 #, c-format msgid "" "Unknown SSL version \"%s\"\n" @@ -411,12 +554,19 @@ "Versi?n de SSL desconocida: ?%s?\n" "Se utilizar? la versi?n por omisi?n: %s" -#: nessus/nessus.c:501 +#: nessus/nessus.c:507 #, c-format msgid "paranoia_level=%d but \"trusted_ca\" not set" msgstr "paranoia_level=%d pero no se ha establecido la opci?n ?trusted_ca?" -#: nessus/nessus.c:516 +#: nessus/nessus.c:514 +#, fuzzy, c-format +msgid "" +"paranoia_level=%d but \"trusted_ca\" file not found:\n" +"%s" +msgstr "paranoia_level=%d pero no se ha establecido la opci?n ?trusted_ca?" + +#: nessus/nessus.c:529 #, c-format msgid "" "Error while setting the trusted CA: %s\n" @@ -425,226 +575,251 @@ "Se produjo un error cuando se configuraba la CA de confianza: %s\n" "Es probable que las conexiones SSL fallen." -#: nessus/nessus.c:561 +#: nessus/nessus.c:574 msgid "SSL error: cannot get server certificate" msgstr "Error SSL: no se pudo obtener el certificado del servidor" -#: nessus/nessus.c:573 +#: nessus/nessus.c:586 msgid "Invalid server certificate" msgstr "Certificado de servidor inv?lido" -#: nessus/nessus.c:577 +#: nessus/nessus.c:590 msgid "Could not save server certificate" msgstr "No se pudo guardar el certificado del servidor" -#: nessus/nessus.c:588 +#: nessus/nessus.c:601 msgid "Could not register the connection" msgstr "No se pudo registrar la conexi?n" -#: nessus/nessus.c:601 +#: nessus/nessus.c:614 msgid "" "Unable to establish a connection to the remote host using the specified " "protocol version!" -msgstr "?No se pudo establecer una conexi?n con el servidor remoto con la versi?n de protocolo especificada!" +msgstr "" +"?No se pudo establecer una conexi?n con el servidor remoto con la versi?n de " +"protocolo especificada!" -#: nessus/nessus.c:610 +#: nessus/nessus.c:623 msgid "Login failed" msgstr "Fall? el acceso" -#: nessus/nessus.c:670 +#: nessus/nessus.c:685 msgid "Display version information" msgstr "Mostrar informaci?n de versi?n" -#: nessus/nessus.c:672 +#: nessus/nessus.c:687 msgid "No pixmaps" msgstr "No utilizar mapas de pixel" -#: nessus/nessus.c:674 +#: nessus/nessus.c:689 msgid "Batch-mode scan" msgstr "An?lisis en modo por lotes" -#: nessus/nessus.c:674 +#: nessus/nessus.c:689 msgid " " -msgstr " " +msgstr "" +" " -#: nessus/nessus.c:676 +#: nessus/nessus.c:691 msgid "Configuration file" msgstr "Archivo de configuraci?n" -#: nessus/nessus.c:676 +#: nessus/nessus.c:691 msgid "<.rcfile>" msgstr "<.rcfile>" -#: nessus/nessus.c:677 +#: nessus/nessus.c:693 nessus/nessus.c:695 msgid "Output format" msgstr "Formato de salida" -#: nessus/nessus.c:677 +#: nessus/nessus.c:693 msgid "[nbe|html|html_graph|text|xml|tex]" msgstr "[nbe|html|html_graph|text|xml|tex]" -#: nessus/nessus.c:678 +#: nessus/nessus.c:695 +#, fuzzy +msgid "[nbe|html|text|xml|tex]" +msgstr "[nbe|html|html_graph|text|xml|tex]" + +#: nessus/nessus.c:697 msgid "Display status messages in batch mode" msgstr "Mostrar mensajes de estado en modo por lotes" -#: nessus/nessus.c:679 +#: nessus/nessus.c:698 msgid "Obtain list of plugins installed on the server" msgstr "Obtiene la lista de complementos instalados en el servidor" -#: nessus/nessus.c:680 +#: nessus/nessus.c:699 msgid "Obtain list of server and plugin preferences" msgstr "Obtiene la lista de preferencias del servidor y de los complementos" -#: nessus/nessus.c:681 +#: nessus/nessus.c:700 msgid "Input file (report conversion)" msgstr "Archivo de entrada (conversi?n de informes)" -#: nessus/nessus.c:681 +#: nessus/nessus.c:700 msgid "" msgstr "" -#: nessus/nessus.c:682 +#: nessus/nessus.c:701 msgid "Output file (report conversion)" msgstr "Archivo de salida (conversi?n de informes)" -#: nessus/nessus.c:682 +#: nessus/nessus.c:701 msgid "" msgstr "" -#: nessus/nessus.c:683 +#: nessus/nessus.c:702 msgid "" "Override SSL \"paranoia\" question preventing OpenVAS-Client from checking " "certificates" -msgstr "Omite la pregunta SSL ?paranoica? evitando que OpenVAS-Client compruebe los certificados" +msgstr "" +"Omite la pregunta SSL ?paranoica? evitando que OpenVAS-Client compruebe los " +"certificados" -#: nessus/nessus.c:684 +#: nessus/nessus.c:703 msgid "Issue SQL output for -p and -P (experimental)" msgstr "Generar salida SQL en -p y -P (experimental)" -#: nessus/nessus.c:685 +#: nessus/nessus.c:704 msgid "List sessions" msgstr "Listar sesiones" -#: nessus/nessus.c:685 +#: nessus/nessus.c:704 msgid " " msgstr " " -#: nessus/nessus.c:686 +#: nessus/nessus.c:705 msgid "Restore session" msgstr "Recuperar sesi?n" -#: nessus/nessus.c:686 +#: nessus/nessus.c:705 msgid " " -msgstr " " +msgstr "" +" " -#: nessus/nessus.c:691 +#: nessus/nessus.c:710 msgid "- client for the OpenVAS security scanner" msgstr "- cliente para la herramienta de an?lisis de seguridad OpenVAS" -#: nessus/nessus.c:720 +#: nessus/nessus.c:739 #, c-format msgid "" "OpenVAS-Client (%s) %s for %s\n" "\n" -msgstr "OpenVAS-Client (%s) %s para %s\n\n" +msgstr "" +"OpenVAS-Client (%s) %s para %s\n" +"\n" -#: nessus/nessus.c:721 +#: nessus/nessus.c:740 #, c-format msgid "" "NessusClient origin: (C) 1998 - 2003 Renaud Deraison \n" -msgstr "NessusClient origen: (C) 1998 - 2003 Renaud Deraison \n" +msgstr "" +"NessusClient origen: (C) 1998 - 2003 Renaud Deraison \n" -#: nessus/nessus.c:722 +#: nessus/nessus.c:741 #, c-format msgid "New code since OpenVAS-Client: (C) 2007, 2008 Intevation GmbH\n" -msgstr "C?digo introducido desde OpenVAS-Client: (C) 2007, 2008 Intevation GmbH\n" +msgstr "" +"C?digo introducido desde OpenVAS-Client: (C) 2007, 2008 Intevation GmbH\n" -#: nessus/nessus.c:746 +#: nessus/nessus.c:766 #, c-format msgid "The session ID is required to restore a session.\n" msgstr "Es necesario un identificador de sesi?n para recuperar una sesi?n.\n" -#: nessus/nessus.c:747 nessus/nessus.c:765 nessus/nessus.c:816 -#: nessus/nessus.c:900 nessus/nessus.c:926 +#: nessus/nessus.c:767 nessus/nessus.c:785 nessus/nessus.c:838 +#: nessus/nessus.c:922 nessus/nessus.c:957 #, c-format msgid "Please use %s --help for more information.\n" msgstr "Use %s --help para m?s informaci?n.\n" -#: nessus/nessus.c:764 +#: nessus/nessus.c:784 #, c-format msgid "" "You need to specify an input file as well as an output file for report " "conversion.\n" -msgstr "Debe especificar un archivo de entrada y un archivo de salida para la conversi?n de informes.\n" +msgstr "" +"Debe especificar un archivo de entrada y un archivo de salida para la " +"conversi?n de informes.\n" -#: nessus/nessus.c:799 +#: nessus/nessus.c:821 #, c-format msgid "Unsupported report type '%s'\n" msgstr "Tipo de informe '%s' no soportado\n" -#: nessus/nessus.c:807 +#: nessus/nessus.c:829 #, c-format msgid "Could not import '%s' - is it a .nbe file?\n" msgstr "No se pudo importar '%s': ?es un archivo .nbe?\n" -#: nessus/nessus.c:815 +#: nessus/nessus.c:837 #, c-format msgid "The option -make_config_file can only be used in batch mode.\n" -msgstr "S?lo puede utilizarse la opci?n -make_config_file en el modo de procesamiento por lotes.\n" +msgstr "" +"S?lo puede utilizarse la opci?n -make_config_file en el modo de " +"procesamiento por lotes.\n" -#: nessus/nessus.c:826 +#: nessus/nessus.c:848 #, c-format msgid "list-sessions requires %s\n" msgstr "la opci?n 'list-sessions' necesita %s\n" -#: nessus/nessus.c:832 -#, c-format -msgid "restore-session requires -q %s result\n" +#: nessus/nessus.c:854 +#, fuzzy, c-format +msgid "restore-session requires -q %s \n" msgstr "la opci?n 'restore-sessions' necesita '-q %s resultado'\n" -#: nessus/nessus.c:838 +#: nessus/nessus.c:860 #, c-format msgid "--restore-session and --list-sessions are mutually exclusive\n" msgstr "" "no se pueden utilizar conjuntamente las opciones --restore-session y --list-" "sessions\n" -#: nessus/nessus.c:876 +#: nessus/nessus.c:898 #, c-format msgid "Verbose mode can only be used in batch mode\n" msgstr "" "S?lo puede utilizarse el modo de depuraci?n en el modo de procesamiento por " "lotes\n" -#: nessus/nessus.c:899 nessus/nessus.c:925 +#: nessus/nessus.c:921 nessus/nessus.c:956 #, c-format msgid "Batch mode requires login information.\n" msgstr "El modo por lotes requiere informaci?n de acceso.\n" -#: nessus/nessus.c:910 +#: nessus/nessus.c:932 msgid "list-sessions only requires " msgstr "la opci?n 'list-sessions' s?lo necesita " -#: nessus/nessus.c:919 +#: nessus/nessus.c:941 msgid "restore-session only requires " msgstr "la opci?n 'restore-session' s?lo necesita " -#: nessus/nessus.c:950 nessus/nessus.c:965 +#: nessus/nessus.c:950 +#, fuzzy +msgid "list-prefs and list-plugins require " +msgstr "la opci?n 'list-sessions' necesita %s\n" + +#: nessus/nessus.c:981 nessus/nessus.c:996 #, c-format msgid "Could not connect to openvasd\n" msgstr "No se pudo conectar a openvasd\n" -#: nessus/nessus.c:992 nessus/nessus.c:999 +#: nessus/nessus.c:1023 nessus/nessus.c:1030 #, c-format msgid "Missing parameter\n" msgstr "Falta un par?metro\n" -#: nessus/nessus.c:1027 +#: nessus/nessus.c:1058 #, c-format msgid "A new openvasrc file has been saved\n" msgstr "Se ha generado un nuevo fichero openvasrc\n" -#: nessus/nessus.c:1070 +#: nessus/nessus.c:1101 #, c-format msgid "" "\n" @@ -656,14 +831,15 @@ "\n" " Se compil? esta versi?n de OpenVAS-Client sin soporte de interfaz gr?fica\n" " y s?lo puede ejecutarse en modo por lotes.\n" -" Encontrar? la ayuda de c?mo ejecutar OpenVAS-Client en modo por lotes utilizando\n" +" Encontrar? la ayuda de c?mo ejecutar OpenVAS-Client en modo por lotes " +"utilizando\n" " la opci?n --help y en la documentaci?n de OpenVAS.\n" -#: nessus/pdf_output.c:381 +#: nessus/pdf_output.c:174 msgid "Could not fork (out of memory?)" msgstr "No se pudo hacer 'fork' (?sin memoria?)" -#: nessus/pdf_output.c:504 +#: nessus/pdf_output.c:306 msgid "" "PDF report export failed!\n" "Maybe HTMLDoc (required for PDF export) is not installed or in search path." @@ -672,81 +848,69 @@ "Quiz?s no est? instalado HTMLDoc (necesario para la exportaci?n a PDF) o no " "est? en la ruta de b?squeda." -#: nessus/pdf_output.c:506 +#: nessus/pdf_output.c:308 #, c-format msgid "PDF report export failed! (htmldoc exit code: %d)" msgstr "" "?Fall? la exportaci?n de informe a PDF! (c?digo de salida de htmldoc: %d)" -#: nessus/pdf_output.c:537 +#: nessus/pdf_output.c:346 msgid "Could not create this file !" msgstr "?No se pudo crear este archivo!" -#: nessus/pdf_output.c:551 +#: nessus/pdf_output.c:360 msgid "Reports per Host" msgstr "Informes por sistema" -#: nessus/pdf_output.c:571 +#: nessus/pdf_output.c:379 #, c-format msgid "Scan of this host started at: %s
\n" msgstr "El an?lisis de este sistema empez? en: %s
\n" -#: nessus/pdf_output.c:573 +#: nessus/pdf_output.c:381 #, c-format msgid "Scan of this host finished at: %s
\n" msgstr "El an?lisis de este sistema termin? en: %s
\n" -#: nessus/pdf_output.c:583 +#: nessus/pdf_output.c:391 msgid "Service (Port)" msgstr "Servicio (puerto)" -#: nessus/pdf_output.c:586 +#: nessus/pdf_output.c:394 msgid "Issue regarding port" msgstr "Problemas asociados al puerto" -#: nessus/pdf_output.c:610 -msgid "Security hole found" -msgstr "Se encontraron problemas de seguridad" +#: nessus/pdf_output.c:417 nessus/pdf_output.c:624 +msgid "Security hole(s) found" +msgstr "Problema/s de seguridad detectado/s" -#: nessus/pdf_output.c:615 nessus/pdf_output.c:853 +#: nessus/pdf_output.c:422 nessus/pdf_output.c:629 msgid "Security warning(s) found" msgstr "Se ha/n encontrado aviso/s de seguridad" -#: nessus/pdf_output.c:620 -msgid "Security notes found" -msgstr "Se encontraron notas de seguridad" +#: nessus/pdf_output.c:427 nessus/pdf_output.c:634 +msgid "Security note(s) found" +msgstr "Nota/s de seguridad detectada/s" -#: nessus/pdf_output.c:629 nessus/pdf_output.c:638 +#: nessus/pdf_output.c:436 nessus/pdf_output.c:445 msgid "No Information" msgstr "No hay informaci?n" -#: nessus/pdf_output.c:647 +#: nessus/pdf_output.c:454 msgid "[ return to summary ]" msgstr "[ volver al resumen ]" -#: nessus/pdf_output.c:651 +#: nessus/pdf_output.c:458 #, c-format msgid "Security Issues and Fixes - Host %s" msgstr "Problemas y arreglos de seguridad - Sistema %s" -#: nessus/pdf_output.c:687 -msgid "Vulnerability" -msgstr "Vulnerabilidad" - -#: nessus/pdf_output.c:712 nessus/prefs_dialog/prefs_plugins_tree.c:448 -msgid "Warning" -msgstr "Aviso" - -#: nessus/pdf_output.c:739 -msgid "Informational" -msgstr "Informaci?n" - -#: nessus/pdf_output.c:753 +#: nessus/pdf_output.c:528 #, c-format msgid "[ return to %s ]" msgstr "[ volver a %s ]" -#: nessus/pdf_output.c:771 +#: nessus/pdf_output.c:546 msgid "" "This file was generated by OpenVAS, " "the free security scanner." @@ -754,19 +918,20 @@ "Este archivo lo gener? el OpenVAS, la " "herramienta de an?lisis de seguridad libre." -#: nessus/pdf_output.c:793 +#: nessus/pdf_output.c:569 msgid "OpenVAS Scan Report" msgstr "Informe de an?lisis de OpenVAS" -#: nessus/pdf_output.c:808 +#: nessus/pdf_output.c:584 +#, fuzzy msgid "" "This report gives details on hosts that were tested and issues that were " -"found." +"found. " msgstr "" "Este informe proporciona los detalles de los sistemas probados y los " "problemas detectados." -#: nessus/pdf_output.c:809 +#: nessus/pdf_output.c:585 msgid "" "Please follow the recommended steps and procedures to eradicate these " "threats.\n" @@ -774,204 +939,294 @@ "Por favor, siga los pasos y procedimientos recomendados para eliminar esos " "riesgos.\n" -#: nessus/pdf_output.c:813 +#: nessus/pdf_output.c:589 #, c-format msgid "Scan started at: %s
\n" msgstr "El an?lisis empez? en: %s
\n" -#: nessus/pdf_output.c:814 +#: nessus/pdf_output.c:590 #, c-format msgid "Scan finished at: %s
\n" msgstr "El an?lisis termin? en: %s
\n" -#: nessus/pdf_output.c:820 +#: nessus/pdf_output.c:596 msgid "Host" msgstr "Sistema" -#: nessus/pdf_output.c:823 +#: nessus/pdf_output.c:599 msgid "Possible Issues" msgstr "Posibles problemas" -#: nessus/pdf_output.c:826 +#: nessus/pdf_output.c:602 msgid "Holes" msgstr "Agujeros" -#: nessus/pdf_output.c:829 +#: nessus/pdf_output.c:605 msgid "Warnings" msgstr "Avisos" -#: nessus/pdf_output.c:832 +#: nessus/pdf_output.c:608 msgid "Notes" msgstr "Notas" -#: nessus/pdf_output.c:848 -msgid "Security hole(s) found" -msgstr "Problema/s de seguridad detectado/s" - -#: nessus/pdf_output.c:858 -msgid "Security note(s) found" -msgstr "Nota/s de seguridad detectada/s" - -#: nessus/pdf_output.c:863 +#: nessus/pdf_output.c:639 msgid "No noticeable information found" msgstr "No se encontr? ninguna informaci?n de inter?s" -#: nessus/pdf_output.c:881 +#: nessus/pdf_output.c:657 msgid "Total" msgstr "Total" -#: nessus/pdf_output.c:943 +#: nessus/pdf_output.c:713 nessus/pdf_output.c:717 nessus/pdf_output.c:727 +msgid "Signed by" +msgstr "" + +#: nessus/pdf_output.c:713 +#, fuzzy +msgid "not signed" +msgstr "no conectado" + +#: nessus/pdf_output.c:718 +msgid "unknown signature(s)" +msgstr "" + +#: nessus/pdf_output.c:735 +#, fuzzy +msgid "trusted" +msgstr "CA de confianza:" + +#: nessus/pdf_output.c:736 +msgid "not trusted" +msgstr "" + +#: nessus/pdf_output.c:749 +msgid "unknown signature" +msgstr "" + +#: nessus/pdf_output.c:786 msgid "Family" msgstr "Familia" -#: nessus/pdf_output.c:944 +#: nessus/pdf_output.c:787 msgid "Version" msgstr "Versi?n" -#: nessus/pdf_output.c:947 +#: nessus/pdf_output.c:793 msgid "XRefs" msgstr "XRefs" -#: nessus/pdf_output.c:962 +#: nessus/pdf_output.c:809 msgid "Parameters" msgstr "Par?metros" -#: nessus/pdf_output.c:985 +#: nessus/pdf_output.c:839 msgid "Appendix: NVT Information" msgstr "Ap?ndice: Informaci?n NVT" -#: nessus/plugin_infos.c:56 +#: nessus/plugin_infos.c:58 #, c-format msgid "Dependencies of Plugin '%s'" msgstr "Dependencias del complemento '%s'" -#: nessus/plugin_infos.c:87 +#: nessus/plugin_infos.c:89 msgid "No dependencies found." msgstr "No se encontraron dependencias." -#: nessus/plugin_infos.c:112 +#: nessus/plugin_infos.c:114 msgid "), currently " msgstr "), actualmente " -#: nessus/plugin_infos.c:114 +#: nessus/plugin_infos.c:116 msgid "enabled" msgstr "activado" -#: nessus/plugin_infos.c:116 +#: nessus/plugin_infos.c:118 msgid "disabled" msgstr "desactivado" -#: nessus/plugin_infos.c:177 nessus/plugin_infos.c:409 +#: nessus/plugin_infos.c:176 nessus/plugin_infos.c:578 msgid "Set plugin timeout..." msgstr "Configurar el tiempo de expiraci?n del complemento..." -#: nessus/plugin_infos.c:194 +#: nessus/plugin_infos.c:193 msgid "Set plugin timeout:" msgstr "Configurar el tiempo de expiraci?n del complemento:" -#: nessus/plugin_infos.c:281 +#: nessus/plugin_infos.c:265 #, c-format +msgid "Can not find certificate for: %s." +msgstr "" + +#: nessus/plugin_infos.c:269 +#, fuzzy, c-format +msgid "OpenVAS Certificate View: %s" +msgstr "Utilizar fichero de certificado:" + +#: nessus/plugin_infos.c:283 +#, c-format +msgid "Owner Name: %s" +msgstr "" + +#: nessus/plugin_infos.c:288 +#, c-format +msgid "Fingeprint: %s" +msgstr "" + +#: nessus/plugin_infos.c:339 +#, c-format msgid "Error ! Plugin selected not found ?!\n" msgstr "?Error! ?No se ha encontrado el complemento seleccionado!\n" -#: nessus/plugin_infos.c:316 +#: nessus/plugin_infos.c:374 #, c-format msgid "Family: %s" msgstr "Familia: %s" -#: nessus/plugin_infos.c:323 +#: nessus/plugin_infos.c:381 #, c-format msgid "Category: %s" msgstr "Categor?a: %s" -#: nessus/plugin_infos.c:330 -#, c-format -msgid "OpenVAS Plugin ID: %d" -msgstr "ID de complemento de OpenVAS: %d" +#: nessus/plugin_infos.c:388 +#, fuzzy, c-format +msgid "OpenVAS NVT OID: %s" +msgstr "OpenVAS IDs:" -#: nessus/plugin_infos.c:340 +#: nessus/plugin_infos.c:398 #, c-format msgid "CVE: %s" msgstr "CVE: %s" -#: nessus/plugin_infos.c:351 +#: nessus/plugin_infos.c:409 #, c-format msgid "Bugtraq ID: %s" msgstr "ID Bugtraq: %s" -#: nessus/plugin_infos.c:362 +#: nessus/plugin_infos.c:420 #, c-format msgid "Other references: %s" msgstr "Otras referencias: %s" -#: nessus/plugin_infos.c:381 +#: nessus/plugin_infos.c:431 +#, fuzzy, c-format +msgid "Plugin Version: %s" +msgstr "Descripci?n del complemento:" + +#: nessus/plugin_infos.c:442 +#, c-format +msgid "Script tags: %s" +msgstr "" + +#: nessus/plugin_infos.c:455 msgid "Plugin description:" msgstr "Descripci?n del complemento:" -#: nessus/plugin_infos.c:416 +#: nessus/plugin_infos.c:512 +#, fuzzy, c-format +msgid "Signature information available on server connection." +msgstr "Esta p?gina no est? disponible en el contexto actual." + +#: nessus/plugin_infos.c:516 +#, c-format +msgid "" +"Signatures:\n" +"\tUnknown signature(s)." +msgstr "" + +#: nessus/plugin_infos.c:520 +#, c-format +msgid "" +"Signatures:\n" +"\tNVT is not signed." +msgstr "" + +#: nessus/plugin_infos.c:529 +#, c-format +msgid "Signatures:" +msgstr "" + +#: nessus/plugin_infos.c:532 +#, c-format +msgid "Signatures (NOT verified):" +msgstr "" + +#: nessus/plugin_infos.c:549 +msgid "trusted" +msgstr "" + +#: nessus/plugin_infos.c:550 +msgid "untrusted" +msgstr "" + +#: nessus/plugin_infos.c:558 +#, fuzzy +msgid "View" +msgstr "_Ver" + +#: nessus/plugin_infos.c:585 msgid "Show dependencies" msgstr "Mostrar dependencias" -#: nessus/preferences.c:156 +#: nessus/preferences.c:130 #, c-format msgid "Error writing %s: %s" msgstr "Error al escribir %s: %s" -#: nessus/preferences.c:163 +#: nessus/preferences.c:137 #, c-format msgid "" "# OpenVAS-Client Preferences File\n" "\n" msgstr "# Fichero de preferencias de OpenVAS-Client\n" -#: nessus/preferences.c:229 +#: nessus/preferences.c:203 #, c-format msgid "The OpenVAS-Client doesn't have the right to read %s\n" msgstr "El cliente de OpenVAS no tiene permisos para leer %s\n" -#: nessus/preferences.c:243 +#: nessus/preferences.c:217 msgid "Couldn't find prefs file... Creating a new one..." msgstr "No se encontr? el fichero de preferencias... Creando uno nuevo..." -#: nessus/preferences.c:247 nessus/preferences.c:254 +#: nessus/preferences.c:221 nessus/preferences.c:228 #, c-format msgid "Error creating %s: %s" msgstr "Error al crear %s: %s" -#: nessus/preferences.c:262 +#: nessus/preferences.c:236 #, c-format msgid "Error reading %s: %s" msgstr "Error al leer %s: %s" -#: nessus/preferences.c:280 +#: nessus/preferences.c:255 #, c-format msgid "Parse error in %s: %s" msgstr "Error al analizar en %s: %s" -#: nessus/preferences.c:294 +#: nessus/preferences.c:269 #, c-format msgid "Missing 'end' in %s" msgstr "Falta 'end' en %s" -#: nessus/preferences.c:522 +#: nessus/preferences.c:507 #, c-format msgid "%s could not be opened write only" msgstr "no se pudo abrir %s como s?lo escritura" -#: nessus/preferences.c:526 +#: nessus/preferences.c:511 #, c-format msgid "# This file was automagically created by OpenVAS-Client\n" msgstr "# Este fichero lo gener? OpenVAS-Client autom?ticamente\n" -#: nessus/preferences.c:643 +#: nessus/preferences.c:630 msgid "Global Settings" msgstr "Valores globales" -#: nessus/preferences.c:757 nessus/preferences.c:778 +#: nessus/preferences.c:745 nessus/preferences.c:766 msgid "prefs_set_value() called with illegal type" msgstr "se llam? a prefs_set_value() con un tipo ilegal" -#: nessus/read_target_file.c:41 nessus/report.c:204 +#: nessus/read_target_file.c:41 nessus/report.c:245 msgid "Load file" msgstr "Cargar fichero" @@ -998,36 +1253,111 @@ msgid "file mapping failed: %s\n" msgstr "fall? el mapeo de fichero: %s\n" -#: nessus/report.c:117 +#: nessus/html_graph_output.c:1123 +#, fuzzy, c-format +msgid "Can't change to directory %s: %s." +msgstr "No se pudo abrir %s: %s" + +#: nessus/html_graph_output.c:1130 +#, fuzzy, c-format +msgid "Can't write index: %s" +msgstr "No se pudo abrir %s: %s" + +#: nessus/xml_output_ng.c:713 +#, fuzzy, c-format +msgid "Can't open %s for writing: %s." +msgstr "No se pudo abrir %s: %s" + +#: nessus/report.c:143 msgid "report_save() called with illegal type" msgstr "llamada a report_save() con un tipo ilegal" -#: nessus/report.c:136 +#: nessus/report.c:162 msgid "report_save() couldn't create context" msgstr "report_save() no pudo crear el contexto" -#: nessus/report.c:142 +#: nessus/report.c:168 msgid "report_save() couldn't find a report filename" msgstr "report_save() no pudo encontrar el fichero del informe" -#: nessus/report.c:150 +#: nessus/report.c:176 msgid "report_save() couldn't save the report" msgstr "report_save() no pudo guardar el informe" -#: nessus/report.c:162 +#: nessus/report.c:188 msgid "report_save() couldn't save the plugin information" msgstr "report_save() no pudo guardar la informaci?n de complementos" -#: nessus/sslui.c:85 +#: nessus/report.c:203 +#, fuzzy +msgid "report_save() couldn't save the certificate information" +msgstr "report_save() no pudo guardar la informaci?n de complementos" + +#: nessus/report_save.c:178 +#, fuzzy +msgid "Export Report" +msgstr "Informe" + +#: nessus/report_save.c:194 +#, fuzzy +msgid "Export Options" +msgstr "Opciones" + +#: nessus/report_save.c:203 +msgid "Report file format : " +msgstr "" + +#: nessus/report_save.c:239 +msgid "ASCII text" +msgstr "" + +#: nessus/report_save.c:245 +msgid "HTML with Pies and Graphs" +msgstr "" + +#: nessus/report_save.c:283 +#, c-format +msgid "PDF file %s not found." +msgstr "" + +#: nessus/report_save.c:289 +#, c-format +msgid "" +"You haven't configured a PDF viewer.\n" +"The report was saved as %s so you can manually open it." +msgstr "" + +#: nessus/report_save.c:300 +#, c-format +msgid "Can't launch PDF viewer: %s" +msgstr "" + +#: nessus/report_save.c:334 +#, fuzzy, c-format +msgid "" +"Can't open PDF file: %s:\n" +"%s" +msgstr "No se pudo abrir %s: %s" + +#: nessus/sighand.c:53 +msgid "Connection closed by the server (SIGPIPE caught)" +msgstr "" + +#: nessus/sighand.c:59 +#, fuzzy +msgid "Connection timed out" +msgstr "Conexi?n: usuario %s" + +#: nessus/sslui.c:86 msgid "SSL Setup" msgstr "Configuraci?n SSL" -#: nessus/sslui.c:128 +#: nessus/sslui.c:129 msgid "Display and remember the server certificate, do not care about the CA" msgstr "" "Mostrar y recordar el certificado del servidor, no tener en cuenta la CA" -#: nessus/sslui.c:138 +#: nessus/sslui.c:139 msgid "" "Trust the server certificate if and only if it is valid and certified by the " "CA" @@ -1035,44 +1365,47 @@ "Confiar s?lo en el certificado del servidor si es v?lido y est? certificado " "por la CA" -#: nessus/sslui.c:146 +#: nessus/sslui.c:147 msgid "Verify that the server certificate is valid *and* remember it" msgstr "Verificar que el certificado del servidor es v?lido *y* recordarlo" # TODO - revisar, deber?a ser 'Continuar'? -#: nessus/sslui.c:157 +#: nessus/sslui.c:158 msgid "OK" msgstr "OK" -#: nessus/sslui.c:194 +#: nessus/sslui.c:195 msgid "" "Please choose your level of SSL paranoia (Hint: if you want to manage\n" "many servers from your client, choose 2. Otherwise, choose 1, or 3,\n" "if you are paranoid.\n" -msgstr "Escoja su nivel de paranoia SSL (Pista: si quiere gestionar muchos servidores desde su cliente escoja 2. En cualquier otro caso escoja 1, o 3 si es vd. paranoico).\n" +msgstr "" +"Escoja su nivel de paranoia SSL (Pista: si quiere gestionar muchos " +"servidores desde su cliente escoja 2. En cualquier otro caso escoja 1, o 3 " +"si es vd. paranoico).\n" -#: nessus/sslui.c:280 +#: nessus/sslui.c:288 msgid "This certificate has never been shown before. Here it is:" msgstr "Nunca se ha mostrado este certificado. Se muestra a continuaci?n:" -#: nessus/sslui.c:310 +#: nessus/sslui.c:319 msgid "Do you accept this certificate?" msgstr "?Acepta este certificado?" -#: nessus/sslui.c:320 +#: nessus/sslui.c:327 msgid "Yes" msgstr "S?" -#: nessus/sslui.c:326 +#: nessus/sslui.c:333 msgid "No" msgstr "No" -#: nessus/sslui.c:374 +#: nessus/sslui.c:384 #, c-format msgid "This certificate has never been seen before and can't be shown\n" msgstr "Este certificado no se ha mostrado nunca antes y no puede mostrarse\n" -#: nessus/sslui.c:394 +#: nessus/sslui.c:404 #, c-format msgid "Do you accept it? (y/n) " msgstr "?Lo acepta? (s/n)" @@ -1097,7 +1430,7 @@ msgstr "Conexi?n: usuario %s" #: nessus/prefs_dialog/prefs_context.c:291 -#: nessus/prefs_dialog/prefs_dialog.c:777 +#: nessus/prefs_dialog/prefs_dialog.c:761 msgid "not connected" msgstr "no conectado" @@ -1120,158 +1453,154 @@ msgid "prefs_context_update called with illegal context." msgstr "llamada a prefs_context_update con un contexto ilegal." -#: nessus/prefs_dialog/prefs_dialog.c:111 +#: nessus/prefs_dialog/prefs_dialog.c:110 msgid "users-manual.pdf" msgstr "users-manual.pdf" -#: nessus/prefs_dialog/prefs_dialog.c:131 +#: nessus/prefs_dialog/prefs_dialog.c:130 msgid "The global settings have been saved." msgstr "Se han guardado las configuraciones globales." -#: nessus/prefs_dialog/prefs_dialog.c:187 -msgid "Not yet implemented." -msgstr "No implementado a?n." - -#: nessus/prefs_dialog/prefs_dialog.c:362 +#: nessus/prefs_dialog/prefs_dialog.c:353 msgid "OpenVAS-Client" msgstr "OpenVAS-Client" -#: nessus/prefs_dialog/prefs_dialog.c:384 +#: nessus/prefs_dialog/prefs_dialog.c:375 msgid "_File" msgstr "_Archivo" -#: nessus/prefs_dialog/prefs_dialog.c:389 +#: nessus/prefs_dialog/prefs_dialog.c:380 msgid "_Connect" msgstr "_Conectar" -#: nessus/prefs_dialog/prefs_dialog.c:393 +#: nessus/prefs_dialog/prefs_dialog.c:384 msgid "_Disconnect" msgstr "_Desconectar" -#: nessus/prefs_dialog/prefs_dialog.c:400 +#: nessus/prefs_dialog/prefs_dialog.c:391 msgid "SLAD _Install" msgstr "_Instalar SLAD" -#: nessus/prefs_dialog/prefs_dialog.c:404 +#: nessus/prefs_dialog/prefs_dialog.c:395 msgid "_Scan Assistant" msgstr "Asistente de _sondeos" -#: nessus/prefs_dialog/prefs_dialog.c:412 +#: nessus/prefs_dialog/prefs_dialog.c:403 msgid "Save _Global Settings" msgstr "Guardar configuraci?n _global" -#: nessus/prefs_dialog/prefs_dialog.c:424 +#: nessus/prefs_dialog/prefs_dialog.c:415 msgid "_View" msgstr "_Ver" -#: nessus/prefs_dialog/prefs_dialog.c:429 +#: nessus/prefs_dialog/prefs_dialog.c:420 msgid "_Toolbar" msgstr "_Barra" -#: nessus/prefs_dialog/prefs_dialog.c:433 +#: nessus/prefs_dialog/prefs_dialog.c:424 msgid "_Message log" msgstr "Registro de _mensajes" -#: nessus/prefs_dialog/prefs_dialog.c:439 +#: nessus/prefs_dialog/prefs_dialog.c:430 msgid "_Task" msgstr "_Tarea" -#: nessus/prefs_dialog/prefs_dialog.c:444 -#: nessus/prefs_dialog/prefs_dialog.c:476 +#: nessus/prefs_dialog/prefs_dialog.c:435 +#: nessus/prefs_dialog/prefs_dialog.c:460 msgid "_New" msgstr "_Nueva" -#: nessus/prefs_dialog/prefs_dialog.c:448 -#: nessus/prefs_dialog/prefs_dialog.c:480 -#: nessus/prefs_dialog/prefs_dialog.c:512 +#: nessus/prefs_dialog/prefs_dialog.c:439 +#: nessus/prefs_dialog/prefs_dialog.c:464 +#: nessus/prefs_dialog/prefs_dialog.c:496 msgid "_Rename" msgstr "_Renombrar" -#: nessus/prefs_dialog/prefs_dialog.c:458 +#: nessus/prefs_dialog/prefs_dialog.c:449 msgid "_Scope" msgstr "_Alcance" -#: nessus/prefs_dialog/prefs_dialog.c:489 +#: nessus/prefs_dialog/prefs_dialog.c:473 msgid "_Move to task" msgstr "_Mover a tarea" -#: nessus/prefs_dialog/prefs_dialog.c:507 +#: nessus/prefs_dialog/prefs_dialog.c:491 msgid "_Report" msgstr "Info_rme" -#: nessus/prefs_dialog/prefs_dialog.c:522 +#: nessus/prefs_dialog/prefs_dialog.c:506 msgid "_Import" msgstr "_Importar" -#: nessus/prefs_dialog/prefs_dialog.c:526 +#: nessus/prefs_dialog/prefs_dialog.c:510 msgid "E_xport" msgstr "E_xportar" -#: nessus/prefs_dialog/prefs_dialog.c:536 +#: nessus/prefs_dialog/prefs_dialog.c:520 msgid "_Help" msgstr "_Ayuda" -#: nessus/prefs_dialog/prefs_dialog.c:541 +#: nessus/prefs_dialog/prefs_dialog.c:525 msgid "_Users Manual" msgstr "Manual de _usuario" -#: nessus/prefs_dialog/prefs_dialog.c:545 +#: nessus/prefs_dialog/prefs_dialog.c:529 msgid "_About" msgstr "_Sobre" -#: nessus/prefs_dialog/prefs_dialog.c:581 -#: nessus/prefs_dialog/prefs_dialog.c:583 +#: nessus/prefs_dialog/prefs_dialog.c:565 +#: nessus/prefs_dialog/prefs_dialog.c:567 #: nessus/prefs_dialog/prefs_scan_assistant.c:238 msgid "Scan Assistant" msgstr "Asistente de sondeos" -#: nessus/prefs_dialog/prefs_dialog.c:590 -#: nessus/prefs_dialog/prefs_dialog.c:592 +#: nessus/prefs_dialog/prefs_dialog.c:574 +#: nessus/prefs_dialog/prefs_dialog.c:576 msgid "New" msgstr "Nuevo" -#: nessus/prefs_dialog/prefs_dialog.c:599 -#: nessus/prefs_dialog/prefs_dialog.c:601 +#: nessus/prefs_dialog/prefs_dialog.c:583 +#: nessus/prefs_dialog/prefs_dialog.c:585 msgid "Delete" msgstr "Borrar" -#: nessus/prefs_dialog/prefs_dialog.c:611 -#: nessus/prefs_dialog/prefs_dialog.c:613 +#: nessus/prefs_dialog/prefs_dialog.c:595 +#: nessus/prefs_dialog/prefs_dialog.c:597 msgid "Connect" msgstr "Conectar" -#: nessus/prefs_dialog/prefs_dialog.c:621 -#: nessus/prefs_dialog/prefs_dialog.c:623 +#: nessus/prefs_dialog/prefs_dialog.c:605 +#: nessus/prefs_dialog/prefs_dialog.c:607 msgid "Disconnect" msgstr "Desconectar" -#: nessus/prefs_dialog/prefs_dialog.c:633 -#: nessus/prefs_dialog/prefs_dialog.c:635 +#: nessus/prefs_dialog/prefs_dialog.c:617 +#: nessus/prefs_dialog/prefs_dialog.c:619 msgid "Execute" msgstr "Ejecutar" -#: nessus/prefs_dialog/prefs_dialog.c:656 +#: nessus/prefs_dialog/prefs_dialog.c:640 msgid "Context" msgstr "Contexto" -#: nessus/prefs_dialog/prefs_dialog.c:686 +#: nessus/prefs_dialog/prefs_dialog.c:670 msgid "Comments" msgstr "Comentarios" -#: nessus/prefs_dialog/prefs_dialog.c:692 +#: nessus/prefs_dialog/prefs_dialog.c:676 msgid "Options" msgstr "Opciones" -#: nessus/prefs_dialog/prefs_dialog.c:698 -#: nessus/prefs_dialog/prefs_dialog_prefs.c:187 +#: nessus/prefs_dialog/prefs_dialog.c:682 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:190 msgid "Report" msgstr "Informe" -#: nessus/prefs_dialog/prefs_dialog.c:718 +#: nessus/prefs_dialog/prefs_dialog.c:702 msgid "Message log" msgstr "Registro de mensajes" -#: nessus/prefs_dialog/prefs_dialog.c:739 +#: nessus/prefs_dialog/prefs_dialog.c:723 msgid "" "Welcome to OpenVAS-Client, http://www.openvas.org/\n" "NessusClient origin: Copyright 1998-2007 by Renaud Deraison\n" @@ -1285,7 +1614,7 @@ "Autores: Renaud Deraison, Thomas Arendsen Hein, Jan-Oliver Wagner, Bernhard " "Herzog, Michel Arboi (soporte SSL), Bruce Verderaime (tartas/gr?ficos)\n" -#: nessus/prefs_dialog/prefs_dialog.c:1519 +#: nessus/prefs_dialog/prefs_dialog.c:1449 msgid "" "You must enter the name of the primary target\n" "to attack in the 'target' section" @@ -1414,109 +1743,119 @@ msgid "Remember the set of plugins" msgstr "Recordar el conjunto de complementos" -#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:88 +#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:95 msgid "Advanced Plugins preferences" msgstr "Preferencias avanzadas de complementos" -#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:95 -#: nessus/prefs_dialog/prefs_options.c:101 +#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:102 +#: nessus/prefs_dialog/prefs_options.c:102 msgid "Credentials" msgstr "Credenciales" -#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:351 +#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:188 +#, c-format +msgid "%s asked for unknown preference type %s." +msgstr "" + +#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:388 msgid "Select file" msgstr "Seleccionar archivo" -#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:496 +#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:575 +#, fuzzy +msgid "SSH Key Information" +msgstr "No hay informaci?n" + +#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:709 msgid "Select..." msgstr "Seleccionar..." -#: nessus/prefs_dialog/prefs_dialog_prefs.c:60 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:65 msgid "Preferences" msgstr "Preferencias" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:80 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:85 msgid "User interface" msgstr "Interfaz de usuario" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:92 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:97 msgid "Auto expand tree elements" msgstr "Autoexpandir los elementos del ?rbol" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:98 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:103 msgid "Order by:" msgstr "Ordenar por:" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:108 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:113 #: nessus/prefs_dialog/prefs_report.c:499 msgid "Host/Port/Severity" msgstr "Sistema/Puerto/Criticidad" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:110 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:115 #: nessus/prefs_dialog/prefs_report.c:501 msgid "Port/Host/Severity" msgstr "Puerto/Sistema/Criticidad" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:116 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:121 msgid "Connection to OpenVAS Server" msgstr "Conexi?n al servidor OpenVAS" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:128 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:133 msgid "Automatically connect" msgstr "Conectarse autom?ticamente" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:134 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:139 msgid "Protocol version:" msgstr "Versi?n de protocolo:" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:144 -msgid "NTP 1.2" -msgstr "NTP 1.2" - -#: nessus/prefs_dialog/prefs_dialog_prefs.c:146 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:149 msgid "OTP 1.0" msgstr "OTP 1.0" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:149 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:152 msgid "Plugin Cache" msgstr "Cach? de complementos" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:161 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:164 msgid "Cache plugin information when connecting" msgstr "Almacenar informaci?n de complementos al conectarse" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:168 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:171 msgid "Use plugin cache with reports" msgstr "Utilizar cach? de complementos con los informes" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:176 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:179 msgid "Load plugin cache for scopes immediately" msgstr "Cargar la informaci?n de la cach? para los ?mbitos inmediatamente" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:199 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:202 msgid "Include plugin details in PDF" msgstr "Incluir los detalles del complemento en PDF" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:207 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:210 msgid "Show script origin in report window" msgstr "Mostrar el origen del script en la ventana de informes" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:221 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:224 msgid "External Links in HTML/PDF" msgstr "Enlaces externos en HTML/PDF" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:232 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:235 msgid "OpenVAS IDs:" msgstr "OpenVAS IDs:" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:244 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:247 msgid "CVE IDs:" msgstr "IDs de CVE:" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:256 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:259 msgid "BugTraq IDs:" msgstr "IDs de Bugtraq:" +#: nessus/prefs_dialog/prefs_dialog_prefs.c:272 +msgid "SSH Key Management" +msgstr "" + #: nessus/prefs_dialog/prefs_dialog_scan_opt.c:141 msgid "General scan options" msgstr "Opciones generales de sondeos" @@ -1622,19 +1961,20 @@ "puede ser un nombre de dominio o una direcci?n IP." #: nessus/prefs_dialog/prefs_help.h:39 +#, fuzzy msgid "" -"Enter the port number where you will be serviced by the OpenVAS Server. With " -"older server systems, this is the port 3001, but the official port is 1241." +"Enter the port number where you will be serviced by the OpenVAS Server. " +"Usual is 1241." msgstr "" "Introduzca el n?mero de puerto donde est? el servicio que ofrece el servidor " "OpenVAS. El puerto oficial es 1241 pero en servidores antiguos este puerto " "es el 3001." -#: nessus/prefs_dialog/prefs_help.h:44 +#: nessus/prefs_dialog/prefs_help.h:43 msgid "Set to default OpenVAS port 1241." msgstr "Configurar valor por omisi?n de puerto OpenVAS 1241." -#: nessus/prefs_dialog/prefs_help.h:47 +#: nessus/prefs_dialog/prefs_help.h:46 msgid "" "Enter the user name where you are registerd with on the OpenVAS Server. If " "you log in for the first time, you will be asked for a password. Maybe you " @@ -1645,7 +1985,7 @@ "Quiz?s deba solicitar al administrador del servidor de OpenVAS que le cree " "un usuario en ?ste." -#: nessus/prefs_dialog/prefs_help.h:53 +#: nessus/prefs_dialog/prefs_help.h:52 msgid "" "Maximal of number of hosts that the OpenVAS Server will test at the same " "time. Be aware that the OpenVAS Server will spawn max_hosts x max_checks " @@ -1655,7 +1995,7 @@ "simult?nea. ?Tenga en cuenta que el servidor OpenVAS ejecutar? max_hosts x " "max_checks procesos!" -#: nessus/prefs_dialog/prefs_help.h:58 +#: nessus/prefs_dialog/prefs_help.h:57 msgid "" "Maximal number of security checks that will be launched at the same time " "against each host. Be aware that the OpenVAS Server will spawn max_hosts x " @@ -1665,11 +2005,11 @@ "forma simult?nea contra cada sistema. ?Tenga en cuenta que el servidor " "OpenVAS ejecutar? max_hosts x max_checks procesos!" -#: nessus/prefs_dialog/prefs_help.h:63 +#: nessus/prefs_dialog/prefs_help.h:62 msgid "Name of the remote file that several plugins will attempt to read." msgstr "Nombre del fichero remoto que algunos complementos intentar?n leer." -#: nessus/prefs_dialog/prefs_help.h:67 +#: nessus/prefs_dialog/prefs_help.h:66 msgid "" "If this option is checked, then OpenVAS Server will send some TCP packets to " "the target host to determine if the target host is alive. This method does " @@ -1681,7 +2021,7 @@ "ya que no es una opci?n fiable y cada vez menos equipos responden a " "solicitudes de ICMP echo entrantes." -#: nessus/prefs_dialog/prefs_help.h:73 +#: nessus/prefs_dialog/prefs_help.h:72 msgid "" "If this option is set, OpenVAS Server will do a reverse lookup on the IP " "addresses before it tests them. This may slow down the whole test." @@ -1689,28 +2029,22 @@ "El servidor de OpenVAS realizar? una resoluci?n inversa de las direcciones " "IP antes de probarlas. Esta opci?n puede ralentizar el resto de las pruebas." -#: nessus/prefs_dialog/prefs_help.h:78 +#: nessus/prefs_dialog/prefs_help.h:77 msgid "" -"Are the target hosts protected by a firewall ? If so and if we are outside " -"the firewall, it is a good idea to turn this option ON, so that OpenVAS " -"Server will perform some additional tests to check that the remote firewall " -"is well configured (this option is still experimental)." -msgstr "" -"?Est?n protegidos por un cortafuegos los sistemas objetivos? Si es as? y " -"est? fuera del cortafuegos es una buena idea activar esta opci?n de forma " -"que OpenVAS realice algunas pruebas adicionales para determinar si el " -"cortafuegos remoto est? bien configurado (esta opci?n es a?n experimental)." - -#: nessus/prefs_dialog/prefs_help.h:86 -msgid "" "Security tests may ask the OpenVAS Server to be launched if and only if some " "information gathered by other test exist in the knowledge base, or if and " "only if a given port is open. This option speeds up the test, but may make " "OpenVAS Server miss some vulnerability. If you are paranoid, disable this " "option" -msgstr "Las pruebas de seguridad pueden solicitar al servidor de OpenVAS que se ejecuten si y s?lo si se ha recogido en la base de datos de conocimiento alguna informaci?n por parte de otras pruebas, o si se ha encontrado un puerto espec?fico abierto. Esta opci?n acelera la prueba pero puede que OpenVAS no encuentre alguna vulnerabilidad. Deshabilite esta opci?n si es vd. paranoico." +msgstr "" +"Las pruebas de seguridad pueden solicitar al servidor de OpenVAS que se " +"ejecuten si y s?lo si se ha recogido en la base de datos de conocimiento " +"alguna informaci?n por parte de otras pruebas, o si se ha encontrado un " +"puerto espec?fico abierto. Esta opci?n acelera la prueba pero puede que " +"OpenVAS no encuentre alguna vulnerabilidad. Deshabilite esta opci?n si es " +"vd. paranoico." -#: nessus/prefs_dialog/prefs_help.h:94 +#: nessus/prefs_dialog/prefs_help.h:85 msgid "" "Some security checks may harm the target server, by disabling the remote " "service temporarily or until a reboot. If you enable this option, OpenVAS " @@ -1729,7 +2063,7 @@ "deshabilite esta opci?n. Desde un punto de vista de administrador de " "sistemas, le recomendamos que la habilite." -#: nessus/prefs_dialog/prefs_help.h:105 +#: nessus/prefs_dialog/prefs_help.h:96 msgid "" "If you enable this option, the hosts on the local network will be designated " "by their ethernet MAC address instead of their IP address. This is " @@ -1742,7 +2076,7 @@ "seguro." # QUESTION: Should "default" be translated? -#: nessus/prefs_dialog/prefs_help.h:111 +#: nessus/prefs_dialog/prefs_help.h:102 msgid "" "Ports that will be scanned by OpenVAS Server. You can enter single ports, " "such as \"1-8000\"; or more complex sets, such as \"21,23,25,1024-2048,6000" @@ -1755,7 +2089,7 @@ "?default? si quiere analizar el rango de puertos por omisi?n del fichero de " "servicios de OpenVAS." -#: nessus/prefs_dialog/prefs_help.h:118 +#: nessus/prefs_dialog/prefs_help.h:109 msgid "" "To save scanning time, you may ask OpenVAS Server to declare TCP ports it " "did not scan as closed. This will result in an incomplete audit but it will " @@ -1770,7 +2104,7 @@ "El servidor OpenVAS considerar? a los puertos que no conoce como abiertos si " "deshabilita esta opci?n." -#: nessus/prefs_dialog/prefs_help.h:126 +#: nessus/prefs_dialog/prefs_help.h:117 msgid "" "OpenVAS Server will perform an AXFR request (that is, a zone transfer) to " "the target name server and will attempt to obtain the list of the hosts of " @@ -1780,7 +2114,7 @@ "de zona) al servidor de nombre objetivo para intentar obtener una lista de " "los equipos en el dominio objetivo. Una vez hecho esto, probar? cada sistema." -#: nessus/prefs_dialog/prefs_help.h:132 +#: nessus/prefs_dialog/prefs_help.h:123 msgid "" "OpenVAS Server will determine which hosts can mount the filesystems exported " "by the target server, and will test them. Beware : this test is recursive." @@ -1789,17 +2123,17 @@ "ficheros exportados por el servidor objetivo y los probar?. Ojo: esta prueba " "es recursiva." -#: nessus/prefs_dialog/prefs_help.h:137 +#: nessus/prefs_dialog/prefs_help.h:128 msgid "" "OpenVAS Server will test the whole subnet of the target host. If you select " "this option, you should allow OpenVAS Server to ping the hosts before " "scanning them in the 'Scan options' section." msgstr "" "El servidor OpenVAS probar? la subred completa del servidor objetivo. " -"Deber?a permitir a OpenVAS que haga ?ping? a los equipos antes de " -"analizarlos en la secci?n ?Opciones de an?lisis? si habilita esta opci?n." +"Deber?a permitir a OpenVAS que haga ?ping? a los equipos antes de analizarlos " +"en la secci?n ?Opciones de an?lisis? si habilita esta opci?n." -#: nessus/prefs_dialog/prefs_help.h:142 +#: nessus/prefs_dialog/prefs_help.h:133 msgid "" "The first host(s) that will be attacked by OpenVAS Server. The options below " "allow you to extend the test to a larger set of computer. You may define " @@ -1811,7 +2145,7 @@ "equipos. Puede definir m?s de un objetivo principal separ?ndolos con una " "coma (,). Por ejemplo: ?sistema1, sistema2?." -#: nessus/prefs_dialog/prefs_help.h:148 +#: nessus/prefs_dialog/prefs_help.h:139 msgid "" "A textfile can be specified that contains the list of targets. This textfile " "may contain comma-separated lists of host and also may contain many of such " @@ -1821,7 +2155,7 @@ "fichero de texto puede contener una lista separada por comas de equipos y " "puede tener m?s de una l?nea de este tipo." -#: nessus/prefs_dialog/prefs_help.h:153 +#: nessus/prefs_dialog/prefs_help.h:144 msgid "" "It is possible to check for the presence of CGIs in multiple paths like /cgi-" "bin, /cgis, /home-cgis, and so on. In that case, put all your paths here " @@ -1832,7 +2166,7 @@ "las rutas separadas por dos puntos. Por ejemplo: ?/cgi-bin:/cgi-aws:/" "~deraison/cgi?." -#: nessus/prefs_dialog/prefs_help.h:159 +#: nessus/prefs_dialog/prefs_help.h:150 msgid "" "The warning sign means that this plugin may harm the target host by " "disabling the attacked service or by crashing the host. You should be " @@ -1845,17 +2179,19 @@ "reinicie sus servidores o que tenga que reiniciar manualmente servicios al " "terminar." -#: nessus/prefs_dialog/prefs_help.h:167 +#: nessus/prefs_dialog/prefs_help.h:158 +#, fuzzy msgid "" "If you turn on this option, all the information collected about the target " "hosts will be saved on the side of OpenVAS Server for further re-use. See " -"http://www.nessus.org/doc/kb_saving.html for details." +"http://www.openvas.org/compendium/scan-options-knowledge-base.html for " +"details." msgstr "" "Toda la informaci?n recogida de los sistemas objetivos se almacena en el " "servidor OpenVAS para su posterior reutilizaci?n si habilita esta opci?n. " "Para m?s informaci?n consulte http://www.nessus.org/doc/kb_saving.html." -#: nessus/prefs_dialog/prefs_help.h:173 +#: nessus/prefs_dialog/prefs_help.h:164 msgid "" "If you select this option, all the hosts selected in the 'Target' section of " "the OpenVAS-Client will be tested." @@ -1863,7 +2199,7 @@ "Se probar?n todos los servidores seleccionados en la secci?n ?Objetivo? de " "OpenVAS-Client si selecciona esta opci?n." -#: nessus/prefs_dialog/prefs_help.h:177 +#: nessus/prefs_dialog/prefs_help.h:168 msgid "" "If you select this option, only the hosts to which a recent knowledge base " "is attached will be tested." @@ -1871,7 +2207,7 @@ "S?lo se analizar?n los equipos que tengan informaci?n reciente en la base de " "datos de conocimiento si habilita esta opci?n." -#: nessus/prefs_dialog/prefs_help.h:181 +#: nessus/prefs_dialog/prefs_help.h:172 msgid "" "If you select this option, only the hosts which have no (or an outdated) " "knowledge base attached will be tested. Use this option to populate your " @@ -1882,7 +2218,7 @@ "reciente. Utilice esta opci?n para completar la informaci?n de la base de " "datos de conocimiento." -#: nessus/prefs_dialog/prefs_help.h:186 +#: nessus/prefs_dialog/prefs_help.h:177 msgid "" "If you select this option, the knowledge bases of the target hosts will be " "restored in memory if they are recent enough. You can use this option with " @@ -1897,7 +2233,7 @@ "analizaron en el pasado o para impedir que las pruebas de seguridad " "realizadas en el pasado se vuelvan a realizar." -#: nessus/prefs_dialog/prefs_help.h:193 +#: nessus/prefs_dialog/prefs_help.h:184 msgid "" "If you select this option, the port scanners that were launched in the past " "against the targetted hosts will not be launched again and the data of the " @@ -1908,7 +2244,7 @@ "utilizar?n los datos almacenados en la base de datos de conocimiento como si " "se hubieran hecho ahora esos an?lisis." -#: nessus/prefs_dialog/prefs_help.h:199 +#: nessus/prefs_dialog/prefs_help.h:190 msgid "" "If you select this option, all the plugins that performs information " "gathering and which have already been launched against the target hosts will " @@ -1917,7 +2253,7 @@ "No se volver?n a ejecutar los complementos que recogen informaci?n de los " "sistemas objetivos y que ya se hayan ejecutado si selecciona esta opci?n." -#: nessus/prefs_dialog/prefs_help.h:204 +#: nessus/prefs_dialog/prefs_help.h:195 msgid "" "If you select this option, all the plugins that performs attacks and which " "have already been launched against the target hosts will not be launched " @@ -1926,7 +2262,7 @@ "No se volver?n a ejecutar los complementos que realicen ataques sobre los " "sistemas objetivos y que ya se hayan ejecutado si selecciona esta opci?n." -#: nessus/prefs_dialog/prefs_help.h:209 +#: nessus/prefs_dialog/prefs_help.h:200 msgid "" "If you select this option, all the plugins that may harm the target hosts " "and which have already been launched will not be launched again." @@ -1934,13 +2270,13 @@ "No se volver?n a ejecutar los complementos que puedan da?ar a los sistemas " "objetivos y que ya se hayan ejecutado si selecciona esta opci?n." -#: nessus/prefs_dialog/prefs_help.h:214 +#: nessus/prefs_dialog/prefs_help.h:205 msgid "This value defines the maximum age (in seconds) of a knowledge base." msgstr "" "Este valor define la vida m?xima (en segundos) de la informaci?n en la base " "de datos de conocimiento." -#: nessus/prefs_dialog/prefs_help.h:218 +#: nessus/prefs_dialog/prefs_help.h:209 msgid "" "If this option is set, the client will only report what has changed between " "the new scan and the last one." @@ -1949,7 +2285,7 @@ "an?lisis anteriores si activa esta opci?n." # -#: nessus/prefs_dialog/prefs_help.h:224 +#: nessus/prefs_dialog/prefs_help.h:215 msgid "" "If you enable this option, then OpenVAS Server will enable the plugins that " "are depended on by the set of plugins you selected." @@ -1957,7 +2293,7 @@ "El servidor OpenVAS activar? los complementos que dependan del conjunto de " "complementos que ha seleccionado si activa esta opci?n." -#: nessus/prefs_dialog/prefs_help.h:228 +#: nessus/prefs_dialog/prefs_help.h:219 msgid "" "If you enable this option, then openvasd will not report data coming from " "the plugins that you did not specifically enable." @@ -1965,6 +2301,13 @@ "El servidor de openvasd no reportar? datos que provengan de complementos que " "no haya habilitado expl?citamente si activa esta opci?n." +#: nessus/prefs_dialog/prefs_help.h:223 +msgid "" +"If you enable this option, then new plugins (that you have not seen before " +"in this scope) are automatically enabled. In any case, a message will be " +"displayed when new plugins have been found, showing your choice." +msgstr "" + #: nessus/prefs_dialog/prefs_kb.c:37 msgid "Enable KB saving" msgstr "Activar almacenamiento KB" @@ -2012,6 +2355,10 @@ msgid "Max age of a saved KB (in secs) : " msgstr "Vida m?xima de la KB almacenada (en segundos): " +#: nessus/prefs_dialog/prefs_plugins_tree.c:448 +msgid "Warning" +msgstr "Aviso" + #: nessus/prefs_dialog/prefs_report.c:141 #, c-format msgid "Scan took place from %s to %s" @@ -2032,11 +2379,13 @@ msgstr "No est? disponible la fecha del an?lisis." #: nessus/prefs_dialog/prefs_report.c:371 -#, c-format +#, fuzzy, c-format msgid "" -"Reported by NVT \"%s\" (1.3.6.1.4.1.25623.1.0.%d):\n" +"Reported by NVT \"%s\" (%s):\n" "\n" -msgstr "Reportado por NVT \"%s\" (1.3.6.1.4.1.25623.1.0.%d):\n\n" +msgstr "" +"Reportado por NVT \"%s\" (1.3.6.1.4.1.25623.1.0.%d):\n" +"\n" #: nessus/prefs_dialog/prefs_scan_assistant.c:253 msgid "Step 1: Task" @@ -2065,11 +2414,6 @@ msgid "Please enter a name for your task:" msgstr "Introduzca un nombre para su tarea:" -#: nessus/prefs_dialog/prefs_scan_assistant.c:264 -#: nessus/prefs_dialog/prefs_scan_assistant.c:281 -msgid "Comment:" -msgstr "Comentario:" - #: nessus/prefs_dialog/prefs_scan_assistant.c:269 msgid "Step 2: Scope" msgstr "Paso 2: ?mbito" @@ -2243,39 +2587,39 @@ msgstr "on_scope_edited(): el elemento de men? no tiene etiqueta." #: nessus/prefs_dialog/prefs_scope_tree.c:794 -msgid "Low" -msgstr "Bajo" +msgid "High" +msgstr "Alto" #: nessus/prefs_dialog/prefs_scope_tree.c:806 msgid "Medium" msgstr "Medio" #: nessus/prefs_dialog/prefs_scope_tree.c:818 -msgid "High" -msgstr "Alto" +msgid "Low" +msgstr "Bajo" -#: nessus/prefs_dialog/prefs_options.c:93 +#: nessus/prefs_dialog/prefs_options.c:94 msgid "General" msgstr "General" -#: nessus/prefs_dialog/prefs_options.c:97 +#: nessus/prefs_dialog/prefs_options.c:98 msgid "Plugins" msgstr "Complementos" -#: nessus/prefs_dialog/prefs_options.c:105 +#: nessus/prefs_dialog/prefs_options.c:106 #: nessus/prefs_dialog/prefs_target.c:49 msgid "Target selection" msgstr "Selecci?n de objetivos" -#: nessus/prefs_dialog/prefs_options.c:109 +#: nessus/prefs_dialog/prefs_options.c:110 msgid "Access Rules" msgstr "Reglas de acceso" -#: nessus/prefs_dialog/prefs_options.c:113 +#: nessus/prefs_dialog/prefs_options.c:114 msgid "Prefs." msgstr "Preferencias" -#: nessus/prefs_dialog/prefs_options.c:117 +#: nessus/prefs_dialog/prefs_options.c:118 msgid "KB" msgstr "KB" @@ -2334,6 +2678,11 @@ msgid "Silent" msgstr "Silencioso" +#: nessus/prefs_dialog/prefs_plugins.c:363 +#, fuzzy +msgid "Automatically enable new plugins" +msgstr "Conectarse autom?ticamente" + #: nessus/prefs_dialog/prefs_target.c:65 msgid "Target(s):" msgstr "Objetivo/s:" @@ -2346,6 +2695,39 @@ msgid "Perform a DNS zone transfer" msgstr "Realizar una transferencia de zonas de DNS" +#~ msgid "Security hole found" +#~ msgstr "Se encontraron problemas de seguridad" + +#~ msgid "Security notes found" +#~ msgstr "Se encontraron notas de seguridad" + +#~ msgid "Vulnerability" +#~ msgstr "Vulnerabilidad" + +#~ msgid "Informational" +#~ msgstr "Informaci?n" + +#~ msgid "OpenVAS Plugin ID: %d" +#~ msgstr "ID de complemento de OpenVAS: %d" + +#~ msgid "Not yet implemented." +#~ msgstr "No implementado a?n." + +#~ msgid "NTP 1.2" +#~ msgstr "NTP 1.2" + +#~ msgid "" +#~ "Are the target hosts protected by a firewall ? If so and if we are " +#~ "outside the firewall, it is a good idea to turn this option ON, so that " +#~ "OpenVAS Server will perform some additional tests to check that the " +#~ "remote firewall is well configured (this option is still experimental)." +#~ msgstr "" +#~ "?Est?n protegidos por un cortafuegos los sistemas objetivos? Si es as? y " +#~ "est? fuera del cortafuegos es una buena idea activar esta opci?n de forma " +#~ "que OpenVAS realice algunas pruebas adicionales para determinar si el " +#~ "cortafuegos remoto est? bien configurado (esta opci?n es a?n " +#~ "experimental)." + #~ msgid "\tSSL used for client - server communication\n" #~ msgstr "\tSe utiliza SSL para la comunicaci?n cliente-servidor\n" Modified: trunk/openvas-client/po/fr.po =================================================================== --- trunk/openvas-client/po/fr.po 2009-01-01 22:32:37 UTC (rev 2128) +++ trunk/openvas-client/po/fr.po 2009-01-02 00:52:00 UTC (rev 2129) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: openvas-devel at wald.intevation.org\n" -"POT-Creation-Date: 2008-09-21 09:32+0200\n" +"POT-Creation-Date: 2009-01-02 01:47+0100\n" "PO-Revision-Date: 2008-09-23 07:11+0200\n" "Last-Translator: sitepamarco \n" "Language-Team: Fran?aise \n" @@ -21,6 +21,25 @@ "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +#: src/openvas-lib/openvas_certificate_file.c:101 +#, fuzzy, c-format +msgid "Error adding comment to key file: %s" +msgstr "Erreur de lecture de %s: %s" + +#: src/openvas-lib/openvas_certificate_file.c:118 +msgid "Error accessing certificate file for report." +msgstr "" + +#: src/openvas-lib/openvas_certificate_file.c:126 +#, fuzzy, c-format +msgid "Error exporting key file: %s" +msgstr "Erreur d'?criture %s: %s" + +#: src/openvas-lib/openvas_certificate_file.c:165 +#, fuzzy, c-format +msgid "Error loading certificate store %s: %s" +msgstr "Erreur de lecture de %s: %s" + #: src/gui/about_dlg.c:113 msgid "About OpenVAS-Client" msgstr "? propos d'OpenVAS-Client" @@ -120,109 +139,224 @@ "Erreur de branche. L'installation de SLAD ne peut pas ?tre lanc?e. C'est un " "probl?me syst?me s?rieux. Un red?marrage est peut-?tre n?cessaire." -#: nessus/comm.c:90 +#: src/gui/ssh_key_info_form.c:170 +#, fuzzy +msgid "Account name:" +msgstr "Nom d'h?te :" + +#: src/gui/ssh_key_info_form.c:178 +msgid "SSH login name:" +msgstr "" + +#: src/gui/ssh_key_info_form.c:185 +msgid "SSH public key:" +msgstr "" + +#: src/gui/ssh_key_info_form.c:193 +msgid "SSH private key:" +msgstr "" + +#: src/gui/ssh_key_info_form.c:201 +msgid "SSH key passphrase:" +msgstr "" + +#: src/gui/ssh_key_info_form.c:208 +#: nessus/prefs_dialog/prefs_scan_assistant.c:264 +#: nessus/prefs_dialog/prefs_scan_assistant.c:281 +msgid "Comment:" +msgstr "Commentaire :" + +#: src/gui/ssh_key_info_form.c:234 +#, fuzzy +msgid "Please provide a better name." +msgstr "Choisissez un nom de fichier." + +#: src/gui/ssh_key_info_form.c:240 +#, fuzzy +msgid "Please provide a longer username." +msgstr "Choisissez un nom de fichier." + +#: src/gui/ssh_key_info_form.c:245 +msgid "Please provide a passphrase with more then 5 characters." +msgstr "" + +#: src/gui/ssh_key_info_form.c:251 +msgid "Please provide a better comment for public key." +msgstr "" + +#: src/gui/ssh_key_info_form.c:257 +msgid "Comment must not contain spaces." +msgstr "" + +#: src/gui/ssh_keys_dialog.c:98 src/gui/ssh_keys_dialog.c:161 +#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:597 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:276 +#, fuzzy +msgid "OpenVAS SSH Key Manager" +msgstr "Serveur OpenVAS" + +#: src/gui/ssh_keys_dialog.c:191 +msgid "Create a new keypair" +msgstr "" + +#: nessus/comm.h:40 +msgid "Select SSH Login" +msgstr "" + +#: nessus/comm.c:92 #, c-format msgid "Receiving plugins: %d" msgstr "R?ception des plugins : %d" -#: nessus/comm.c:95 +#: nessus/comm.c:97 #, c-format msgid "Receiving dependencies: %d" msgstr "R?ceptions des d?pendances : %d" -#: nessus/comm.c:385 +#: nessus/comm.c:444 #, c-format msgid "Error : we received a preference (%s) for the plugin %s\n" msgstr "Erreur : nous avons re?u une pr?f?rence (%s) pour le plugin %s\n" -#: nessus/comm.c:388 +#: nessus/comm.c:447 #, c-format msgid "but apparently the server has not loaded it\n" msgstr "mais apparemment le serveur ne l'a pas charg?\n" -#: nessus/comm.c:754 +#: nessus/comm.c:870 #, c-format msgid "Can't open %s: %s" msgstr "Impossible d'ouvrir %s : %s" -#: nessus/comm.c:778 +#: nessus/comm.c:894 #, c-format msgid "Error reading from %s: %s" msgstr "Erreur de lecture de %s: %s" -#: nessus/comm.c:907 nessus/comm.c:1250 +#: nessus/comm.c:1015 nessus/comm.c:1401 msgid "The daemon shut down the communication" msgstr "Le d?mon a interrompu la connexion" -#: nessus/comm.c:932 +#: nessus/comm.c:1042 msgid "Error processing plugin information from the server" msgstr "Erreur de traitement du plugin " -#: nessus/comm.c:938 +#: nessus/comm.c:1048 msgid "Invalid SEND_PLUGINS_MD5 response from server" msgstr "R?ponse invalide SEND_PLUGINS_MD5 du serveur" -#: nessus/comm.c:1099 +#: nessus/comm.c:1224 msgid "Invalid PLUGIN_INFO response from server" msgstr "R?ponse invalide PLUGIN_INFO du serveur" -#: nessus/comm.c:1198 +#: nessus/comm.c:1238 nessus/comm.c:1445 +msgid "Found and enabled one new plugin." +msgstr "" + +#: nessus/comm.c:1240 nessus/comm.c:1447 +msgid "Found and disabled one new plugin." +msgstr "" + +#: nessus/comm.c:1245 nessus/comm.c:1452 +#, c-format +msgid "Found and enabled %d new plugins." +msgstr "" + +#: nessus/comm.c:1247 nessus/comm.c:1454 +#, c-format +msgid "Found and disabled %d new plugins." +msgstr "" + +#: nessus/comm.c:1348 msgid "Invalid PLUGINS_MD5 information sent from server" msgstr "Information invalide PLUGIN_MD5 du serveur" -#: nessus/comm.c:1231 +#: nessus/comm.c:1381 msgid "Error while updating the cached plugin information" msgstr "Erreur de mise ? jour du cache des plugins" -#: nessus/context.c:222 +#: nessus/comm.c:1736 +#, fuzzy, c-format +msgid "Could not parse certificate: %s" +msgstr "Impossible de sauvegarder le certificat serveur" + +#: nessus/comm.c:1743 +#, fuzzy, c-format +msgid "Invalid response from server to certificate request: %s" +msgstr "Certificat serveur invalide" + +#: nessus/context.c:245 msgid "context_remove_child detected existing children." msgstr "context_remove_child a d?tect? des conflits." -#: nessus/context.c:362 nessus/prefs_dialog/prefs_scope_tree.c:273 +#: nessus/context.c:426 nessus/prefs_dialog/prefs_scope_tree.c:273 msgid "context_rename() called with illegal type" msgstr "context_rename() d?claration illicite" -#: nessus/context.c:379 nessus/context.c:410 +#: nessus/context.c:443 nessus/context.c:474 #, c-format msgid "Directory %s couldn't be renamed to %s: %s." msgstr "Le dossier %s ne peut ?tre renomm? %s: %s." -#: nessus/context.c:427 +#: nessus/context.c:491 #, c-format msgid "Can't move \"%s\" to \"%s\"." msgstr "\"%s\" ne peut ?tre d?plac? vers \"%s\"." -#: nessus/context.c:450 nessus/context.c:489 +#: nessus/context.c:514 nessus/context.c:553 nessus/html_graph_output.c:1116 #, c-format msgid "Directory %s couldn't be created: %s." msgstr "Le dossier %s ne peut pas ?tre cr?? : %s." -#: nessus/context.c:475 nessus/prefs_dialog/prefs_scan_assistant.c:263 +#: nessus/context.c:539 nessus/prefs_dialog/prefs_scan_assistant.c:263 msgid "unnamed task" msgstr "t?che ? nommer" -#: nessus/context.c:478 nessus/prefs_dialog/prefs_scan_assistant.c:280 +#: nessus/context.c:542 nessus/prefs_dialog/prefs_scan_assistant.c:280 msgid "unnamed scope" msgstr "p?rim?tre ? nommer" -#: nessus/context.c:481 +#: nessus/context.c:545 msgid "context_new(): No name provided for context" msgstr "context_new(): aucun nom fourni pour le contexte" -#: nessus/context.c:526 +#: nessus/context.c:593 #, c-format msgid "File %s couldn't be deleted: %s." msgstr "Le fichier %s ne peut pas ?tre effac? : %s." -#: nessus/context.c:532 +#: nessus/context.c:599 #, c-format msgid "Directory %s couldn't be deleted: %s." msgstr "Le dossier %s ne peut pas ?tre effac? : %s." -#: nessus/context.c:553 +#: nessus/context.c:622 msgid "context_delete() deleted the current context." msgstr "context_delete() a effac? le contexte courant." +#: nessus/backend.c:82 +msgid "No free tempfile!" +msgstr "" + +#: nessus/backend.c:105 +#, fuzzy, c-format +msgid "Can't create file %s: %s" +msgstr "Impossible d'ouvrir %s : %s" + +#: nessus/backend.c:115 +#, fuzzy, c-format +msgid "Can't open file %s: %s" +msgstr "Impossible d'ouvrir %s : %s" + +#: nessus/backend.c:622 +msgid "Unknown report type - please set an extension to the filename" +msgstr "" + +#: nessus/backend.c:631 +#, fuzzy +msgid "This file format can not be read back by the OpenVAS-Client" +msgstr "# Ce fichier a ?t? automatiquement cr?? par OpenVAS-Client\n" + #: nessus/filter.c:67 nessus/filter.c:80 msgid "Filter plugins..." msgstr "Filtrer les plugins..." @@ -241,11 +375,11 @@ msgid "Name" msgstr "Nom" -#: nessus/filter.c:116 nessus/pdf_output.c:952 +#: nessus/filter.c:116 nessus/pdf_output.c:799 msgid "Description" msgstr "Description" -#: nessus/filter.c:122 nessus/pdf_output.c:804 nessus/pdf_output.c:941 +#: nessus/filter.c:122 nessus/pdf_output.c:580 nessus/pdf_output.c:784 msgid "Summary" msgstr "R?sum?" @@ -257,15 +391,15 @@ msgid "ID number" msgstr "Num?ro ID" -#: nessus/filter.c:140 nessus/pdf_output.c:942 +#: nessus/filter.c:140 nessus/pdf_output.c:785 msgid "Category" msgstr "Cat?gorie" -#: nessus/filter.c:146 nessus/pdf_output.c:945 +#: nessus/filter.c:146 nessus/pdf_output.c:789 msgid "CVE" msgstr "CVE" -#: nessus/filter.c:152 nessus/pdf_output.c:946 +#: nessus/filter.c:152 nessus/pdf_output.c:791 msgid "BID" msgstr "BID" @@ -282,6 +416,15 @@ msgid "Invalid regular expression" msgstr "Expression r?guli?re invalide" +#: nessus/parser.c:221 +#, fuzzy +msgid "Invalid port range" +msgstr "Plage des ports :" + +#: nessus/parser.c:223 +msgid "These hosts could not be tested because you are not allowed to do so:" +msgstr "" + #: nessus/monitor_dialog.c:84 #, c-format msgid "is_server_present: fd(%d) out of range\n" @@ -292,32 +435,32 @@ msgid "idle_server: soc(%d) out of range\n" msgstr "idle_server: soc(%d) hors limite\n" -#: nessus/monitor_dialog.c:221 +#: nessus/monitor_dialog.c:218 #, c-format msgid "Scanning network from %s" msgstr "Examen du r?seau depuis %s" -#: nessus/monitor_dialog.c:222 +#: nessus/monitor_dialog.c:219 msgid "some host" msgstr "des h?tes" -#: nessus/monitor_dialog.c:260 +#: nessus/monitor_dialog.c:257 msgid "Hostname" msgstr "Nom d'h?te" -#: nessus/monitor_dialog.c:266 +#: nessus/monitor_dialog.c:263 msgid "Portscan" msgstr "Port examin?" -#: nessus/monitor_dialog.c:272 +#: nessus/monitor_dialog.c:269 msgid "Checks" msgstr "V?rifications" -#: nessus/monitor_dialog.c:279 nessus/monitor_dialog.c:619 +#: nessus/monitor_dialog.c:276 nessus/monitor_dialog.c:621 msgid "Stop" msgstr "Arr?t" -#: nessus/monitor_dialog.c:308 +#: nessus/monitor_dialog.c:305 msgid "Stop the whole test" msgstr "Arr?t de tous les tests" @@ -326,24 +469,24 @@ msgid "Error ! Null hostname in the list\n" msgstr "Erreur ! Nom d'h?te 'Null' dans la liste \n" -#: nessus/monitor_dialog.c:581 +#: nessus/monitor_dialog.c:583 msgid "Portscan:" msgstr "Examen des ports :" -#: nessus/monitor_dialog.c:585 +#: nessus/monitor_dialog.c:587 msgid "Checks:" msgstr "V?rifications :" -#: nessus/nessus.c:373 +#: nessus/nessus.c:379 msgid "Host not found!" msgstr "H?te non trouv?!" -#: nessus/nessus.c:376 +#: nessus/nessus.c:382 #, c-format msgid "Could not open a connection to %s\n" msgstr "Connexion impossible avec %s\n" -#: nessus/nessus.c:402 +#: nessus/nessus.c:408 msgid "" "Could not initialize the OpenSSL library !\n" "Please launch openvasclient-mkrand(1) first !" @@ -351,7 +494,7 @@ "Impossible d'initialiser la librairie OpenSSL !\n" "Veuillez lancer openvasclient-mkrand(1) en premier!" -#: nessus/nessus.c:418 +#: nessus/nessus.c:424 #, c-format msgid "" "Unknown SSL version \"%s\"\n" @@ -360,12 +503,19 @@ "Version inconnue de SSL \"%s\"\n" "Utilisation par d?faut : %s" -#: nessus/nessus.c:501 +#: nessus/nessus.c:507 #, c-format msgid "paranoia_level=%d but \"trusted_ca\" not set" msgstr "paranoia_level=%d mais \"trusted_ca\" ind?fini" -#: nessus/nessus.c:516 +#: nessus/nessus.c:514 +#, fuzzy, c-format +msgid "" +"paranoia_level=%d but \"trusted_ca\" file not found:\n" +"%s" +msgstr "paranoia_level=%d mais \"trusted_ca\" ind?fini" + +#: nessus/nessus.c:529 #, c-format msgid "" "Error while setting the trusted CA: %s\n" @@ -374,94 +524,99 @@ "Erreur de certificat CA: %s\n" "Les connexions SSL ont ?chou?." -#: nessus/nessus.c:561 +#: nessus/nessus.c:574 msgid "SSL error: cannot get server certificate" msgstr "Erreur SSL : certificat serveur inaccessible" -#: nessus/nessus.c:573 +#: nessus/nessus.c:586 msgid "Invalid server certificate" msgstr "Certificat serveur invalide" -#: nessus/nessus.c:577 +#: nessus/nessus.c:590 msgid "Could not save server certificate" msgstr "Impossible de sauvegarder le certificat serveur" -#: nessus/nessus.c:588 +#: nessus/nessus.c:601 msgid "Could not register the connection" msgstr "Impossible d'enregistrer la connexion" -#: nessus/nessus.c:601 +#: nessus/nessus.c:614 msgid "" "Unable to establish a connection to the remote host using the specified " "protocol version!" msgstr "" "Connexion impossible avec l'h?te distant avec cette version du protocole!" -#: nessus/nessus.c:610 +#: nessus/nessus.c:623 msgid "Login failed" msgstr "L'authentification a ?chou?" -#: nessus/nessus.c:670 +#: nessus/nessus.c:685 msgid "Display version information" msgstr "Afficher la version" -#: nessus/nessus.c:672 +#: nessus/nessus.c:687 msgid "No pixmaps" msgstr "Pas de pixmaps" -#: nessus/nessus.c:674 +#: nessus/nessus.c:689 msgid "Batch-mode scan" msgstr "Examen en mode Batch" -#: nessus/nessus.c:674 +#: nessus/nessus.c:689 msgid " " msgstr " " -#: nessus/nessus.c:676 +#: nessus/nessus.c:691 msgid "Configuration file" msgstr "Fichier de configuration" -#: nessus/nessus.c:676 +#: nessus/nessus.c:691 msgid "<.rcfile>" msgstr "<.rcfile>" -#: nessus/nessus.c:677 +#: nessus/nessus.c:693 nessus/nessus.c:695 msgid "Output format" msgstr "Format de sortie" -#: nessus/nessus.c:677 +#: nessus/nessus.c:693 msgid "[nbe|html|html_graph|text|xml|tex]" msgstr "[nbe|html|html_graph|text|xml|tex]" -#: nessus/nessus.c:678 +#: nessus/nessus.c:695 +#, fuzzy +msgid "[nbe|html|text|xml|tex]" +msgstr "[nbe|html|html_graph|text|xml|tex]" + +#: nessus/nessus.c:697 msgid "Display status messages in batch mode" msgstr "Afficher le statut en mode Batch" -#: nessus/nessus.c:679 +#: nessus/nessus.c:698 msgid "Obtain list of plugins installed on the server" msgstr "Lister les plugins install?s sur le serveur" -#: nessus/nessus.c:680 +#: nessus/nessus.c:699 msgid "Obtain list of server and plugin preferences" msgstr "Lister les pr?f?rences des serveurs et plugins" -#: nessus/nessus.c:681 +#: nessus/nessus.c:700 msgid "Input file (report conversion)" msgstr "Fichier en entr?e (conversion de rapport)" -#: nessus/nessus.c:681 +#: nessus/nessus.c:700 msgid "" msgstr "" -#: nessus/nessus.c:682 +#: nessus/nessus.c:701 msgid "Output file (report conversion)" msgstr "Fichier en sortie (conversion de rapport)" -#: nessus/nessus.c:682 +#: nessus/nessus.c:701 msgid "" msgstr "" -#: nessus/nessus.c:683 +#: nessus/nessus.c:702 msgid "" "Override SSL \"paranoia\" question preventing OpenVAS-Client from checking " "certificates" @@ -469,31 +624,31 @@ "Forcer la r?gle SSL \"paranoia\" interdisant OpenVAS-Client la v?rification " "des certificats" -#: nessus/nessus.c:684 +#: nessus/nessus.c:703 msgid "Issue SQL output for -p and -P (experimental)" msgstr "Pr?senter en SQL pour les options -p et -P (experimental)" -#: nessus/nessus.c:685 +#: nessus/nessus.c:704 msgid "List sessions" msgstr "Lister les sessions" -#: nessus/nessus.c:685 +#: nessus/nessus.c:704 msgid " " msgstr " " -#: nessus/nessus.c:686 +#: nessus/nessus.c:705 msgid "Restore session" msgstr "Restaurer la session" -#: nessus/nessus.c:686 +#: nessus/nessus.c:705 msgid " " msgstr " " -#: nessus/nessus.c:691 +#: nessus/nessus.c:710 msgid "- client for the OpenVAS security scanner" msgstr "- Client pour le scanner de vuln?rabilit?s OpenVAS" -#: nessus/nessus.c:720 +#: nessus/nessus.c:739 #, c-format msgid "" "OpenVAS-Client (%s) %s for %s\n" @@ -502,7 +657,7 @@ "OpenVAS-Client (%s) %s pour %s\n" "\n" -#: nessus/nessus.c:721 +#: nessus/nessus.c:740 #, c-format msgid "" "NessusClient origin: (C) 1998 - 2003 Renaud Deraison \n" @@ -510,23 +665,23 @@ "Origine NessusClient : (C) 1998 - 2003 Renaud Deraison \n" -#: nessus/nessus.c:722 +#: nessus/nessus.c:741 #, c-format msgid "New code since OpenVAS-Client: (C) 2007, 2008 Intevation GmbH\n" msgstr "Nouveau code depuis OpenVAS-Client: (C) 2007, 2008 Intevation GmbH\n" -#: nessus/nessus.c:746 +#: nessus/nessus.c:766 #, c-format msgid "The session ID is required to restore a session.\n" msgstr "Le num?ro de session est n?cessaire ? sa restauration.\n" -#: nessus/nessus.c:747 nessus/nessus.c:765 nessus/nessus.c:816 -#: nessus/nessus.c:900 nessus/nessus.c:926 +#: nessus/nessus.c:767 nessus/nessus.c:785 nessus/nessus.c:838 +#: nessus/nessus.c:922 nessus/nessus.c:957 #, c-format msgid "Please use %s --help for more information.\n" msgstr "Veuillez utiliser %s --help pour plus d'information.\n" -#: nessus/nessus.c:764 +#: nessus/nessus.c:784 #, c-format msgid "" "You need to specify an input file as well as an output file for report " @@ -535,70 +690,75 @@ "Vous devez sp?cifier les fichiers en entr?e et en sortie pour la " "conversion.\n" -#: nessus/nessus.c:799 +#: nessus/nessus.c:821 #, c-format msgid "Unsupported report type '%s'\n" msgstr "Type de rapport '%s' non support?\n" -#: nessus/nessus.c:807 +#: nessus/nessus.c:829 #, c-format msgid "Could not import '%s' - is it a .nbe file?\n" msgstr "Impossible d'importer '%s' - Est-ce bien un fichier .nbe?\n" -#: nessus/nessus.c:815 +#: nessus/nessus.c:837 #, c-format msgid "The option -make_config_file can only be used in batch mode.\n" msgstr "L'option -make_config_file ne peut ?tre utilis? qu'en mode Batch\n" -#: nessus/nessus.c:826 +#: nessus/nessus.c:848 #, c-format msgid "list-sessions requires %s\n" msgstr "list-sessions n?cessite %s\n" -#: nessus/nessus.c:832 -#, c-format -msgid "restore-session requires -q %s result\n" +#: nessus/nessus.c:854 +#, fuzzy, c-format +msgid "restore-session requires -q %s \n" msgstr "restore-session n?cessite -q %s result\n" -#: nessus/nessus.c:838 +#: nessus/nessus.c:860 #, c-format msgid "--restore-session and --list-sessions are mutually exclusive\n" msgstr "--restore-session et --list-sessions ensemble sont exclusives\n" -#: nessus/nessus.c:876 +#: nessus/nessus.c:898 #, c-format msgid "Verbose mode can only be used in batch mode\n" msgstr "La verbosit? ne peut ?tre demand? qu'en mode Batch\n" -#: nessus/nessus.c:899 nessus/nessus.c:925 +#: nessus/nessus.c:921 nessus/nessus.c:956 #, c-format msgid "Batch mode requires login information.\n" msgstr "Le mode Batch n?cessite une authentification.\n" -#: nessus/nessus.c:910 +#: nessus/nessus.c:932 msgid "list-sessions only requires " msgstr "list-sessions n?cessite seulement " -#: nessus/nessus.c:919 +#: nessus/nessus.c:941 msgid "restore-session only requires " msgstr "restore-session n?cessite seulement " -#: nessus/nessus.c:950 nessus/nessus.c:965 +#: nessus/nessus.c:950 +#, fuzzy +msgid "list-prefs and list-plugins require " +msgstr "list-sessions n?cessite %s\n" + +#: nessus/nessus.c:981 nessus/nessus.c:996 #, c-format msgid "Could not connect to openvasd\n" msgstr "Connexion impossible ? openvasd\n" -#: nessus/nessus.c:992 nessus/nessus.c:999 +#: nessus/nessus.c:1023 nessus/nessus.c:1030 #, c-format msgid "Missing parameter\n" msgstr "Param?tre manquant\n" -#: nessus/nessus.c:1027 +#: nessus/nessus.c:1058 #, c-format msgid "A new openvasrc file has been saved\n" msgstr "Nouveau fichier openvasrc sauvegard?\n" -#: nessus/nessus.c:1070 +#: nessus/nessus.c:1101 #, c-format msgid "" "\n" @@ -613,11 +773,11 @@ " Une aide sur le mode Batch pour OpenVAS-Client est disponible en tapant\n" " l'option --help dans la documentation OpenVAS.\n" -#: nessus/pdf_output.c:381 +#: nessus/pdf_output.c:174 msgid "Could not fork (out of memory?)" msgstr "Fork impossible (manque de m?moire?)" -#: nessus/pdf_output.c:504 +#: nessus/pdf_output.c:306 msgid "" "PDF report export failed!\n" "Maybe HTMLDoc (required for PDF export) is not installed or in search path." @@ -626,80 +786,68 @@ "HTMLDoc (n?cessaire ? l'export PDF) n'est pas install? ou non d?fini dans le " "chemin de recherche." -#: nessus/pdf_output.c:506 +#: nessus/pdf_output.c:308 #, c-format msgid "PDF report export failed! (htmldoc exit code: %d)" msgstr "L'export PDF a ?chou?! (htmldoc exit code: %d)" -#: nessus/pdf_output.c:537 +#: nessus/pdf_output.c:346 msgid "Could not create this file !" msgstr "Impossible de cr?er le fichier !" -#: nessus/pdf_output.c:551 +#: nessus/pdf_output.c:360 msgid "Reports per Host" msgstr "Rapport par h?te" -#: nessus/pdf_output.c:571 +#: nessus/pdf_output.c:379 #, c-format msgid "Scan of this host started at: %s
\n" msgstr "L'examen de l'h?te a d?but? ? : %s
\n" -#: nessus/pdf_output.c:573 +#: nessus/pdf_output.c:381 #, c-format msgid "Scan of this host finished at: %s
\n" msgstr "L'examen de l'h?te s'est termin? ? : %s
\n" -#: nessus/pdf_output.c:583 +#: nessus/pdf_output.c:391 msgid "Service (Port)" msgstr "Service (Port)" -#: nessus/pdf_output.c:586 +#: nessus/pdf_output.c:394 msgid "Issue regarding port" msgstr "Probl?me de port" -#: nessus/pdf_output.c:610 -msgid "Security hole found" -msgstr "Trou de s?curit? trouv?" +#: nessus/pdf_output.c:417 nessus/pdf_output.c:624 +msgid "Security hole(s) found" +msgstr "Faille(s) de s?curit? trouv?e(s)" -#: nessus/pdf_output.c:615 nessus/pdf_output.c:853 +#: nessus/pdf_output.c:422 nessus/pdf_output.c:629 msgid "Security warning(s) found" msgstr "Avertissement(s) de s?curit? trouv?(s)" -#: nessus/pdf_output.c:620 -msgid "Security notes found" -msgstr "Notes de s?curit? trouv?es" +#: nessus/pdf_output.c:427 nessus/pdf_output.c:634 +msgid "Security note(s) found" +msgstr "Note(s) de s?curit? trouv?e(s)" -#: nessus/pdf_output.c:629 nessus/pdf_output.c:638 +#: nessus/pdf_output.c:436 nessus/pdf_output.c:445 msgid "No Information" msgstr "Aucune information" -#: nessus/pdf_output.c:647 +#: nessus/pdf_output.c:454 msgid "[ return to summary ]" msgstr "[ revenir au r?sum? ]" -#: nessus/pdf_output.c:651 +#: nessus/pdf_output.c:458 #, c-format msgid "Security Issues and Fixes - Host %s" msgstr "Probl?mes de s?curit? et solutions - H?te %s" -#: nessus/pdf_output.c:687 -msgid "Vulnerability" -msgstr "V?n?rabilit?" - -#: nessus/pdf_output.c:712 nessus/prefs_dialog/prefs_plugins_tree.c:448 -msgid "Warning" -msgstr "Avertissement" - -#: nessus/pdf_output.c:739 -msgid "Informational" -msgstr "Pour information" - -#: nessus/pdf_output.c:753 +#: nessus/pdf_output.c:528 #, c-format msgid "[ return to %s ]" msgstr "[ revenir ? %s ]" -#: nessus/pdf_output.c:771 +#: nessus/pdf_output.c:546 msgid "" "This file was generated by OpenVAS, " "the free security scanner." @@ -707,168 +855,259 @@ "Ce fichier a ?t? g?n?r? par OpenVAS, " "le scanner de vuln?rabilit?s libre." -#: nessus/pdf_output.c:793 +#: nessus/pdf_output.c:569 msgid "OpenVAS Scan Report" msgstr "Rapport OpenVAS" -#: nessus/pdf_output.c:808 +#: nessus/pdf_output.c:584 +#, fuzzy msgid "" "This report gives details on hosts that were tested and issues that were " -"found." +"found. " msgstr "" "Ce rapport fourni des d?tails sur les h?tes test?s et les probl?mes " "rencontr?s." -#: nessus/pdf_output.c:809 +#: nessus/pdf_output.c:585 msgid "" "Please follow the recommended steps and procedures to eradicate these " "threats.\n" msgstr "Veillez ? suivre les recommandations pour ?radiquer ces menaces.\n" -#: nessus/pdf_output.c:813 +#: nessus/pdf_output.c:589 #, c-format msgid "Scan started at: %s
\n" msgstr "L'examen a d?but? ? : %s
\n" -#: nessus/pdf_output.c:814 +#: nessus/pdf_output.c:590 #, c-format msgid "Scan finished at: %s
\n" msgstr "L'examen s'est termin? ? : %s
\n" -#: nessus/pdf_output.c:820 +#: nessus/pdf_output.c:596 msgid "Host" msgstr "H?te" -#: nessus/pdf_output.c:823 +#: nessus/pdf_output.c:599 msgid "Possible Issues" msgstr "Probl?mes potentiels" -#: nessus/pdf_output.c:826 +#: nessus/pdf_output.c:602 msgid "Holes" msgstr "Failles" -#: nessus/pdf_output.c:829 +#: nessus/pdf_output.c:605 msgid "Warnings" msgstr "Avertissements" -#: nessus/pdf_output.c:832 +#: nessus/pdf_output.c:608 msgid "Notes" msgstr "Notes" -#: nessus/pdf_output.c:848 -msgid "Security hole(s) found" -msgstr "Faille(s) de s?curit? trouv?e(s)" - -#: nessus/pdf_output.c:858 -msgid "Security note(s) found" -msgstr "Note(s) de s?curit? trouv?e(s)" - -#: nessus/pdf_output.c:863 +#: nessus/pdf_output.c:639 msgid "No noticeable information found" msgstr "Aucune information particuli?re trouv?e" -#: nessus/pdf_output.c:881 +#: nessus/pdf_output.c:657 msgid "Total" msgstr "Total" -#: nessus/pdf_output.c:943 +#: nessus/pdf_output.c:713 nessus/pdf_output.c:717 nessus/pdf_output.c:727 +msgid "Signed by" +msgstr "" + +#: nessus/pdf_output.c:713 +#, fuzzy +msgid "not signed" +msgstr "non connect?" + +#: nessus/pdf_output.c:718 +msgid "unknown signature(s)" +msgstr "" + +#: nessus/pdf_output.c:735 +#, fuzzy +msgid "trusted" +msgstr "CA de confiance:" + +#: nessus/pdf_output.c:736 +msgid "not trusted" +msgstr "" + +#: nessus/pdf_output.c:749 +msgid "unknown signature" +msgstr "" + +#: nessus/pdf_output.c:786 msgid "Family" msgstr "Famille" -#: nessus/pdf_output.c:944 +#: nessus/pdf_output.c:787 msgid "Version" msgstr "Version" -#: nessus/pdf_output.c:947 +#: nessus/pdf_output.c:793 msgid "XRefs" msgstr "XRefs" -#: nessus/pdf_output.c:962 +#: nessus/pdf_output.c:809 msgid "Parameters" msgstr "Param?tres" -#: nessus/pdf_output.c:985 +#: nessus/pdf_output.c:839 msgid "Appendix: NVT Information" msgstr "Appendice : information NVT" -#: nessus/plugin_infos.c:56 +#: nessus/plugin_infos.c:58 #, c-format msgid "Dependencies of Plugin '%s'" msgstr "D?pendances des plugIns '%s'" -#: nessus/plugin_infos.c:87 +#: nessus/plugin_infos.c:89 msgid "No dependencies found." msgstr "Aucune d?pendance trouv?e." -#: nessus/plugin_infos.c:112 +#: nessus/plugin_infos.c:114 msgid "), currently " msgstr "), actuellement " -#: nessus/plugin_infos.c:114 +#: nessus/plugin_infos.c:116 msgid "enabled" msgstr "activ?" -#: nessus/plugin_infos.c:116 +#: nessus/plugin_infos.c:118 msgid "disabled" msgstr "d?sactiv?" -#: nessus/plugin_infos.c:177 nessus/plugin_infos.c:409 +#: nessus/plugin_infos.c:176 nessus/plugin_infos.c:578 msgid "Set plugin timeout..." msgstr "Fixer le temps imparti au plugin..." -#: nessus/plugin_infos.c:194 +#: nessus/plugin_infos.c:193 msgid "Set plugin timeout:" msgstr "Fixer le temps imparti au plugin :" -#: nessus/plugin_infos.c:281 +#: nessus/plugin_infos.c:265 #, c-format +msgid "Can not find certificate for: %s." +msgstr "" + +#: nessus/plugin_infos.c:269 +#, fuzzy, c-format +msgid "OpenVAS Certificate View: %s" +msgstr "Certificat de l'utilisateur :" + +#: nessus/plugin_infos.c:283 +#, c-format +msgid "Owner Name: %s" +msgstr "" + +#: nessus/plugin_infos.c:288 +#, c-format +msgid "Fingeprint: %s" +msgstr "" + +#: nessus/plugin_infos.c:339 +#, c-format msgid "Error ! Plugin selected not found ?!\n" msgstr "Erreur ! Plugin s?lectionn? introuvable ?!\n" -#: nessus/plugin_infos.c:316 +#: nessus/plugin_infos.c:374 #, c-format msgid "Family: %s" msgstr "Famille : %s" -#: nessus/plugin_infos.c:323 +#: nessus/plugin_infos.c:381 #, c-format msgid "Category: %s" msgstr "Cat?gorie : %s" -#: nessus/plugin_infos.c:330 -#, c-format -msgid "OpenVAS Plugin ID: %d" -msgstr "N? ID du plugin OpenVAS : %d" +#: nessus/plugin_infos.c:388 +#, fuzzy, c-format +msgid "OpenVAS NVT OID: %s" +msgstr "N? ID OpenVAS :" -#: nessus/plugin_infos.c:340 +#: nessus/plugin_infos.c:398 #, c-format msgid "CVE: %s" msgstr "CVE: %s" -#: nessus/plugin_infos.c:351 +#: nessus/plugin_infos.c:409 #, c-format msgid "Bugtraq ID: %s" msgstr "Bugtraq ID: %s" -#: nessus/plugin_infos.c:362 +#: nessus/plugin_infos.c:420 #, c-format msgid "Other references: %s" msgstr "Autres r?f?rences : %s" -#: nessus/plugin_infos.c:381 +#: nessus/plugin_infos.c:431 +#, fuzzy, c-format +msgid "Plugin Version: %s" +msgstr "Description des Plugins :" + +#: nessus/plugin_infos.c:442 +#, c-format +msgid "Script tags: %s" +msgstr "" + +#: nessus/plugin_infos.c:455 msgid "Plugin description:" msgstr "Description des Plugins :" -#: nessus/plugin_infos.c:416 +#: nessus/plugin_infos.c:512 +#, fuzzy, c-format +msgid "Signature information available on server connection." +msgstr "La page demand?e n'est pas accessible dans ce contexte." + +#: nessus/plugin_infos.c:516 +#, c-format +msgid "" +"Signatures:\n" +"\tUnknown signature(s)." +msgstr "" + +#: nessus/plugin_infos.c:520 +#, c-format +msgid "" +"Signatures:\n" +"\tNVT is not signed." +msgstr "" + +#: nessus/plugin_infos.c:529 +#, c-format +msgid "Signatures:" +msgstr "" + +#: nessus/plugin_infos.c:532 +#, c-format +msgid "Signatures (NOT verified):" +msgstr "" + +#: nessus/plugin_infos.c:549 +msgid "trusted" +msgstr "" + +#: nessus/plugin_infos.c:550 +msgid "untrusted" +msgstr "" + +#: nessus/plugin_infos.c:558 +#, fuzzy +msgid "View" +msgstr "_Vue" + +#: nessus/plugin_infos.c:585 msgid "Show dependencies" msgstr "Montrer les d?pendances" -#: nessus/preferences.c:156 +#: nessus/preferences.c:130 #, c-format msgid "Error writing %s: %s" msgstr "Erreur d'?criture %s: %s" -#: nessus/preferences.c:163 +#: nessus/preferences.c:137 #, c-format msgid "" "# OpenVAS-Client Preferences File\n" @@ -877,55 +1116,55 @@ "# Fichier de pr?f?rences OpenVAS-Client\n" "\n" -#: nessus/preferences.c:229 +#: nessus/preferences.c:203 #, c-format msgid "The OpenVAS-Client doesn't have the right to read %s\n" msgstr "OpenVAS-Client n'a pas le droit de lire %s\n" -#: nessus/preferences.c:243 +#: nessus/preferences.c:217 msgid "Couldn't find prefs file... Creating a new one..." msgstr "" "Impossible de trouver le fichier de pr?f?rences ... Cr?ation d'un nouveau..." -#: nessus/preferences.c:247 nessus/preferences.c:254 +#: nessus/preferences.c:221 nessus/preferences.c:228 #, c-format msgid "Error creating %s: %s" msgstr "Erreur en cr?ant %s: %s" -#: nessus/preferences.c:262 +#: nessus/preferences.c:236 #, c-format msgid "Error reading %s: %s" msgstr "Erreur de lecture %s: %s" -#: nessus/preferences.c:280 +#: nessus/preferences.c:255 #, c-format msgid "Parse error in %s: %s" msgstr "Erreur de syntaxe %s : %s" -#: nessus/preferences.c:294 +#: nessus/preferences.c:269 #, c-format msgid "Missing 'end' in %s" msgstr "'end' manquant dans %s" -#: nessus/preferences.c:522 +#: nessus/preferences.c:507 #, c-format msgid "%s could not be opened write only" msgstr "Impossible d'ouvrir en ?criture %s" -#: nessus/preferences.c:526 +#: nessus/preferences.c:511 #, c-format msgid "# This file was automagically created by OpenVAS-Client\n" msgstr "# Ce fichier a ?t? automatiquement cr?? par OpenVAS-Client\n" -#: nessus/preferences.c:643 +#: nessus/preferences.c:630 msgid "Global Settings" msgstr "Param?tres globaux" -#: nessus/preferences.c:757 nessus/preferences.c:778 +#: nessus/preferences.c:745 nessus/preferences.c:766 msgid "prefs_set_value() called with illegal type" msgstr "prefs_set_value() d?claration illicite" -#: nessus/read_target_file.c:41 nessus/report.c:204 +#: nessus/read_target_file.c:41 nessus/report.c:245 msgid "Load file" msgstr "Charger le fichier" @@ -952,36 +1191,111 @@ msgid "file mapping failed: %s\n" msgstr "Echec du mapping : %s\n" -#: nessus/report.c:117 +#: nessus/html_graph_output.c:1123 +#, fuzzy, c-format +msgid "Can't change to directory %s: %s." +msgstr "Impossible d'ouvrir %s : %s" + +#: nessus/html_graph_output.c:1130 +#, fuzzy, c-format +msgid "Can't write index: %s" +msgstr "Impossible d'ouvrir %s : %s" + +#: nessus/xml_output_ng.c:713 +#, fuzzy, c-format +msgid "Can't open %s for writing: %s." +msgstr "Impossible d'ouvrir %s : %s" + +#: nessus/report.c:143 msgid "report_save() called with illegal type" msgstr "report_save() d?claration illicite" -#: nessus/report.c:136 +#: nessus/report.c:162 msgid "report_save() couldn't create context" msgstr "report_save() n'a pas pu cr?er le contexte" -#: nessus/report.c:142 +#: nessus/report.c:168 msgid "report_save() couldn't find a report filename" msgstr "report_save() n'a pas trouv? de nom de fichier" -#: nessus/report.c:150 +#: nessus/report.c:176 msgid "report_save() couldn't save the report" msgstr "report_save() n'a pas pu sauver le rapport" -#: nessus/report.c:162 +#: nessus/report.c:188 msgid "report_save() couldn't save the plugin information" msgstr "report_save() n'a pas pu sauver les informations de plugin" -#: nessus/sslui.c:85 +#: nessus/report.c:203 +#, fuzzy +msgid "report_save() couldn't save the certificate information" +msgstr "report_save() n'a pas pu sauver les informations de plugin" + +#: nessus/report_save.c:178 +#, fuzzy +msgid "Export Report" +msgstr "Rapport" + +#: nessus/report_save.c:194 +#, fuzzy +msgid "Export Options" +msgstr "Options" + +#: nessus/report_save.c:203 +msgid "Report file format : " +msgstr "" + +#: nessus/report_save.c:239 +msgid "ASCII text" +msgstr "" + +#: nessus/report_save.c:245 +msgid "HTML with Pies and Graphs" +msgstr "" + +#: nessus/report_save.c:283 +#, c-format +msgid "PDF file %s not found." +msgstr "" + +#: nessus/report_save.c:289 +#, c-format +msgid "" +"You haven't configured a PDF viewer.\n" +"The report was saved as %s so you can manually open it." +msgstr "" + +#: nessus/report_save.c:300 +#, c-format +msgid "Can't launch PDF viewer: %s" +msgstr "" + +#: nessus/report_save.c:334 +#, fuzzy, c-format +msgid "" +"Can't open PDF file: %s:\n" +"%s" +msgstr "Impossible d'ouvrir %s : %s" + +#: nessus/sighand.c:53 +msgid "Connection closed by the server (SIGPIPE caught)" +msgstr "" + +#: nessus/sighand.c:59 +#, fuzzy +msgid "Connection timed out" +msgstr "Connexion : utilisateur %s" + +#: nessus/sslui.c:86 msgid "SSL Setup" msgstr "Configuration SSL" -#: nessus/sslui.c:128 +#: nessus/sslui.c:129 msgid "Display and remember the server certificate, do not care about the CA" msgstr "" "Afficher et sauvegarder le certificat serveur, ne pas tenir compte du CA" -#: nessus/sslui.c:138 +#: nessus/sslui.c:139 msgid "" "Trust the server certificate if and only if it is valid and certified by the " "CA" @@ -989,15 +1303,15 @@ "Faire confiance au certificat serveur si et seulement si il est confirm? par " "le CA" -#: nessus/sslui.c:146 +#: nessus/sslui.c:147 msgid "Verify that the server certificate is valid *and* remember it" msgstr "V?rifier la validit? du certificat serveur *et* le conserver" -#: nessus/sslui.c:157 +#: nessus/sslui.c:158 msgid "OK" msgstr "OK" -#: nessus/sslui.c:194 +#: nessus/sslui.c:195 msgid "" "Please choose your level of SSL paranoia (Hint: if you want to manage\n" "many servers from your client, choose 2. Otherwise, choose 1, or 3,\n" @@ -1009,30 +1323,30 @@ " Autrement, choisir 1, ou 3,\n" "si vous ?tes parano?aque\n" -#: nessus/sslui.c:280 +#: nessus/sslui.c:288 msgid "This certificate has never been shown before. Here it is:" msgstr "Ce certificat n'a pas ?t? rencontr? auparavant. Le voici:" -#: nessus/sslui.c:310 +#: nessus/sslui.c:319 msgid "Do you accept this certificate?" msgstr "Acceptez-vous ce certificat ?" -#: nessus/sslui.c:320 +#: nessus/sslui.c:327 msgid "Yes" msgstr "Oui" -#: nessus/sslui.c:326 +#: nessus/sslui.c:333 msgid "No" msgstr "Non" -#: nessus/sslui.c:374 +#: nessus/sslui.c:384 #, c-format msgid "This certificate has never been seen before and can't be shown\n" msgstr "" "Ce certificat n'a jamais ?t? rencontr? auparavant et ne peut pas ?tre " "affich?\n" -#: nessus/sslui.c:394 +#: nessus/sslui.c:404 #, c-format msgid "Do you accept it? (y/n) " msgstr "L'acceptez-vous ? (y/n)" @@ -1057,7 +1371,7 @@ msgstr "Connexion : utilisateur %s" #: nessus/prefs_dialog/prefs_context.c:291 -#: nessus/prefs_dialog/prefs_dialog.c:777 +#: nessus/prefs_dialog/prefs_dialog.c:761 msgid "not connected" msgstr "non connect?" @@ -1080,158 +1394,154 @@ msgid "prefs_context_update called with illegal context." msgstr "prefs_context_update() d?claration illicite." -#: nessus/prefs_dialog/prefs_dialog.c:111 +#: nessus/prefs_dialog/prefs_dialog.c:110 msgid "users-manual.pdf" msgstr "users-manual.pdf" -#: nessus/prefs_dialog/prefs_dialog.c:131 +#: nessus/prefs_dialog/prefs_dialog.c:130 msgid "The global settings have been saved." msgstr "Les param?tres globaux ont ?t? sauvegard?s." -#: nessus/prefs_dialog/prefs_dialog.c:187 -msgid "Not yet implemented." -msgstr "Pas encore impl?ment?." - -#: nessus/prefs_dialog/prefs_dialog.c:362 +#: nessus/prefs_dialog/prefs_dialog.c:353 msgid "OpenVAS-Client" msgstr "OpenVAS-Client" -#: nessus/prefs_dialog/prefs_dialog.c:384 +#: nessus/prefs_dialog/prefs_dialog.c:375 msgid "_File" msgstr "_Fichier" -#: nessus/prefs_dialog/prefs_dialog.c:389 +#: nessus/prefs_dialog/prefs_dialog.c:380 msgid "_Connect" msgstr "_Connecter" -#: nessus/prefs_dialog/prefs_dialog.c:393 +#: nessus/prefs_dialog/prefs_dialog.c:384 msgid "_Disconnect" msgstr "_D?connecter" -#: nessus/prefs_dialog/prefs_dialog.c:400 +#: nessus/prefs_dialog/prefs_dialog.c:391 msgid "SLAD _Install" msgstr "SLAD _Installation" -#: nessus/prefs_dialog/prefs_dialog.c:404 +#: nessus/prefs_dialog/prefs_dialog.c:395 msgid "_Scan Assistant" msgstr "_Scan Assistant" -#: nessus/prefs_dialog/prefs_dialog.c:412 +#: nessus/prefs_dialog/prefs_dialog.c:403 msgid "Save _Global Settings" msgstr "_Sauver Configuration Globale" -#: nessus/prefs_dialog/prefs_dialog.c:424 +#: nessus/prefs_dialog/prefs_dialog.c:415 msgid "_View" msgstr "_Vue" -#: nessus/prefs_dialog/prefs_dialog.c:429 +#: nessus/prefs_dialog/prefs_dialog.c:420 msgid "_Toolbar" msgstr "_Barre d'outils" -#: nessus/prefs_dialog/prefs_dialog.c:433 +#: nessus/prefs_dialog/prefs_dialog.c:424 msgid "_Message log" msgstr "_Message log" -#: nessus/prefs_dialog/prefs_dialog.c:439 +#: nessus/prefs_dialog/prefs_dialog.c:430 msgid "_Task" msgstr "_T?che" -#: nessus/prefs_dialog/prefs_dialog.c:444 -#: nessus/prefs_dialog/prefs_dialog.c:476 +#: nessus/prefs_dialog/prefs_dialog.c:435 +#: nessus/prefs_dialog/prefs_dialog.c:460 msgid "_New" msgstr "_Nouveau" -#: nessus/prefs_dialog/prefs_dialog.c:448 -#: nessus/prefs_dialog/prefs_dialog.c:480 -#: nessus/prefs_dialog/prefs_dialog.c:512 +#: nessus/prefs_dialog/prefs_dialog.c:439 +#: nessus/prefs_dialog/prefs_dialog.c:464 +#: nessus/prefs_dialog/prefs_dialog.c:496 msgid "_Rename" msgstr "_Renommer" -#: nessus/prefs_dialog/prefs_dialog.c:458 +#: nessus/prefs_dialog/prefs_dialog.c:449 msgid "_Scope" msgstr "_P?rim?tre" -#: nessus/prefs_dialog/prefs_dialog.c:489 +#: nessus/prefs_dialog/prefs_dialog.c:473 msgid "_Move to task" msgstr "_Aller ? la t?che" -#: nessus/prefs_dialog/prefs_dialog.c:507 +#: nessus/prefs_dialog/prefs_dialog.c:491 msgid "_Report" msgstr "_Rapport" -#: nessus/prefs_dialog/prefs_dialog.c:522 +#: nessus/prefs_dialog/prefs_dialog.c:506 msgid "_Import" msgstr "_Importer" -#: nessus/prefs_dialog/prefs_dialog.c:526 +#: nessus/prefs_dialog/prefs_dialog.c:510 msgid "E_xport" msgstr "E_xporter" -#: nessus/prefs_dialog/prefs_dialog.c:536 +#: nessus/prefs_dialog/prefs_dialog.c:520 msgid "_Help" msgstr "_Aide" -#: nessus/prefs_dialog/prefs_dialog.c:541 +#: nessus/prefs_dialog/prefs_dialog.c:525 msgid "_Users Manual" msgstr "_Manuel Utilisateur" -#: nessus/prefs_dialog/prefs_dialog.c:545 +#: nessus/prefs_dialog/prefs_dialog.c:529 msgid "_About" msgstr "_? propos" -#: nessus/prefs_dialog/prefs_dialog.c:581 -#: nessus/prefs_dialog/prefs_dialog.c:583 +#: nessus/prefs_dialog/prefs_dialog.c:565 +#: nessus/prefs_dialog/prefs_dialog.c:567 #: nessus/prefs_dialog/prefs_scan_assistant.c:238 msgid "Scan Assistant" msgstr "Scan Assistant" -#: nessus/prefs_dialog/prefs_dialog.c:590 -#: nessus/prefs_dialog/prefs_dialog.c:592 +#: nessus/prefs_dialog/prefs_dialog.c:574 +#: nessus/prefs_dialog/prefs_dialog.c:576 msgid "New" msgstr "Nouveau" -#: nessus/prefs_dialog/prefs_dialog.c:599 -#: nessus/prefs_dialog/prefs_dialog.c:601 +#: nessus/prefs_dialog/prefs_dialog.c:583 +#: nessus/prefs_dialog/prefs_dialog.c:585 msgid "Delete" msgstr "Supprimer" -#: nessus/prefs_dialog/prefs_dialog.c:611 -#: nessus/prefs_dialog/prefs_dialog.c:613 +#: nessus/prefs_dialog/prefs_dialog.c:595 +#: nessus/prefs_dialog/prefs_dialog.c:597 msgid "Connect" msgstr "Connecter" -#: nessus/prefs_dialog/prefs_dialog.c:621 -#: nessus/prefs_dialog/prefs_dialog.c:623 +#: nessus/prefs_dialog/prefs_dialog.c:605 +#: nessus/prefs_dialog/prefs_dialog.c:607 msgid "Disconnect" msgstr "D?connecter" -#: nessus/prefs_dialog/prefs_dialog.c:633 -#: nessus/prefs_dialog/prefs_dialog.c:635 +#: nessus/prefs_dialog/prefs_dialog.c:617 +#: nessus/prefs_dialog/prefs_dialog.c:619 msgid "Execute" msgstr "Ex?cuter" -#: nessus/prefs_dialog/prefs_dialog.c:656 +#: nessus/prefs_dialog/prefs_dialog.c:640 msgid "Context" msgstr "Contexte" -#: nessus/prefs_dialog/prefs_dialog.c:686 +#: nessus/prefs_dialog/prefs_dialog.c:670 msgid "Comments" msgstr "Commentaires" -#: nessus/prefs_dialog/prefs_dialog.c:692 +#: nessus/prefs_dialog/prefs_dialog.c:676 msgid "Options" msgstr "Options" -#: nessus/prefs_dialog/prefs_dialog.c:698 -#: nessus/prefs_dialog/prefs_dialog_prefs.c:187 +#: nessus/prefs_dialog/prefs_dialog.c:682 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:190 msgid "Report" msgstr "Rapport" -#: nessus/prefs_dialog/prefs_dialog.c:718 +#: nessus/prefs_dialog/prefs_dialog.c:702 msgid "Message log" msgstr "Message log" -#: nessus/prefs_dialog/prefs_dialog.c:739 +#: nessus/prefs_dialog/prefs_dialog.c:723 msgid "" "Welcome to OpenVAS-Client, http://www.openvas.org/\n" "NessusClient origin: Copyright 1998-2007 by Renaud Deraison\n" @@ -1245,7 +1555,7 @@ "Auteurs : Renaud Deraison, Thomas Arendsen Hein, Jan-Oliver Wagner, Bernhard " "Herzog, Michel Arboi (soutien SSL), Bruce Verderaime (Graphiques)\n" -#: nessus/prefs_dialog/prefs_dialog.c:1519 +#: nessus/prefs_dialog/prefs_dialog.c:1449 msgid "" "You must enter the name of the primary target\n" "to attack in the 'target' section" @@ -1373,112 +1683,122 @@ msgid "Remember the set of plugins" msgstr "Se rappeler de la s?lection des plugins" -#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:88 +#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:95 msgid "Advanced Plugins preferences" msgstr "Pr?f?rences avanc?es des plugins" -#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:95 -#: nessus/prefs_dialog/prefs_options.c:101 +#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:102 +#: nessus/prefs_dialog/prefs_options.c:102 msgid "Credentials" msgstr "Accr?ditations" -#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:351 +#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:188 +#, c-format +msgid "%s asked for unknown preference type %s." +msgstr "" + +#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:388 msgid "Select file" msgstr "Choisir le fichier" -#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:496 +#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:575 +#, fuzzy +msgid "SSH Key Information" +msgstr "Aucune information" + +#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:709 msgid "Select..." msgstr "Choisir..." -#: nessus/prefs_dialog/prefs_dialog_prefs.c:60 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:65 msgid "Preferences" msgstr "Pr?f?rences" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:80 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:85 msgid "User interface" msgstr "Interface utilisateur" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:92 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:97 msgid "Auto expand tree elements" msgstr "D?velopper automatiquement l'arborescence" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:98 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:103 msgid "Order by:" msgstr "Tri par:" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:108 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:113 #: nessus/prefs_dialog/prefs_report.c:499 msgid "Host/Port/Severity" msgstr "H?te/Port/S?v?rit?" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:110 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:115 #: nessus/prefs_dialog/prefs_report.c:501 msgid "Port/Host/Severity" msgstr "Port/H?te/S?v?rit?" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:116 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:121 msgid "Connection to OpenVAS Server" msgstr "Connexion au serveur OpenVAS" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:128 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:133 msgid "Automatically connect" msgstr "Connecter automatiquement" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:134 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:139 msgid "Protocol version:" msgstr "Version du protocole :" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:144 -msgid "NTP 1.2" -msgstr "NTP 1.2" - -#: nessus/prefs_dialog/prefs_dialog_prefs.c:146 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:149 msgid "OTP 1.0" msgstr "OTP 1.0" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:149 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:152 msgid "Plugin Cache" msgstr "Cache des plugins" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:161 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:164 msgid "Cache plugin information when connecting" msgstr "Information sur le cache des plugins ? la connexion" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:168 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:171 msgid "Use plugin cache with reports" msgstr "Utiliser le cache des plugins avec les rapports" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:176 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:179 msgid "Load plugin cache for scopes immediately" msgstr "" "Charger imm?diatement les plugins en cache pour les p?rim?tres concern?s" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:199 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:202 msgid "Include plugin details in PDF" msgstr "Inclure le d?tail des plugins dans le PDF" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:207 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:210 msgid "Show script origin in report window" msgstr "Montrez l'origine du script dans la fen?tre du rapport" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:221 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:224 msgid "External Links in HTML/PDF" msgstr "Liens externes dans le HTML/PDF" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:232 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:235 msgid "OpenVAS IDs:" msgstr "N? ID OpenVAS :" # -#: nessus/prefs_dialog/prefs_dialog_prefs.c:244 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:247 msgid "CVE IDs:" msgstr "N? ID CVE :" # -#: nessus/prefs_dialog/prefs_dialog_prefs.c:256 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:259 msgid "BugTraq IDs:" msgstr "N? ID BugTraq :" +#: nessus/prefs_dialog/prefs_dialog_prefs.c:272 +msgid "SSH Key Management" +msgstr "" + #: nessus/prefs_dialog/prefs_dialog_scan_opt.c:141 msgid "General scan options" msgstr "Options g?n?rales de l'examen" @@ -1582,18 +1902,19 @@ "de domaine ou une adresse IP." #: nessus/prefs_dialog/prefs_help.h:39 +#, fuzzy msgid "" -"Enter the port number where you will be serviced by the OpenVAS Server. With " -"older server systems, this is the port 3001, but the official port is 1241." +"Enter the port number where you will be serviced by the OpenVAS Server. " +"Usual is 1241." msgstr "" "Entrez le n? de port sur lequel ?coute le serveur OpenVAS. Sur d'anciens " "syst?mes, c'?tait le port 3001, mais le port officiel est 1241." -#: nessus/prefs_dialog/prefs_help.h:44 +#: nessus/prefs_dialog/prefs_help.h:43 msgid "Set to default OpenVAS port 1241." msgstr "Fixer le port 1241 par d?faut." -#: nessus/prefs_dialog/prefs_help.h:47 +#: nessus/prefs_dialog/prefs_help.h:46 msgid "" "Enter the user name where you are registerd with on the OpenVAS Server. If " "you log in for the first time, you will be asked for a password. Maybe you " @@ -1603,7 +1924,7 @@ "OpenVAS. Si c'est la premi?re fois, un mot de passe vous sera demand?. " "Contactez votre administrateur pour cr?er votre nom d'uilisateur." -#: nessus/prefs_dialog/prefs_help.h:53 +#: nessus/prefs_dialog/prefs_help.h:52 msgid "" "Maximal of number of hosts that the OpenVAS Server will test at the same " "time. Be aware that the OpenVAS Server will spawn max_hosts x max_checks " @@ -1612,7 +1933,7 @@ "Nombre maximal d'h?tes que le serveur OpenVAS teste en m?me temps. Soyez " "conscient que le serveur g?n?re max_hosts x max_checks processus!" -#: nessus/prefs_dialog/prefs_help.h:58 +#: nessus/prefs_dialog/prefs_help.h:57 msgid "" "Maximal number of security checks that will be launched at the same time " "against each host. Be aware that the OpenVAS Server will spawn max_hosts x " @@ -1622,11 +1943,11 @@ "chaque cible. Soyez conscient que le serveur g?n?re max_hosts x max_checks " "processus!" -#: nessus/prefs_dialog/prefs_help.h:63 +#: nessus/prefs_dialog/prefs_help.h:62 msgid "Name of the remote file that several plugins will attempt to read." msgstr "Nom du fichier distant que plusieurs plugins tenteront de lire." -#: nessus/prefs_dialog/prefs_help.h:67 +#: nessus/prefs_dialog/prefs_help.h:66 msgid "" "If this option is checked, then OpenVAS Server will send some TCP packets to " "the target host to determine if the target host is alive. This method does " @@ -1638,7 +1959,7 @@ "pas ICMP, ICMP n'?tant pas fiable car de moins en moins d'h?tes r?pondent ? " "ces requ?tes." -#: nessus/prefs_dialog/prefs_help.h:73 +#: nessus/prefs_dialog/prefs_help.h:72 msgid "" "If this option is set, OpenVAS Server will do a reverse lookup on the IP " "addresses before it tests them. This may slow down the whole test." @@ -1647,20 +1968,8 @@ "noms d'apr?s l'adresse IP avant de lancer les tests. Ceci peut fortement " "ralentir l'ensemble des tests." -#: nessus/prefs_dialog/prefs_help.h:78 +#: nessus/prefs_dialog/prefs_help.h:77 msgid "" -"Are the target hosts protected by a firewall ? If so and if we are outside " -"the firewall, it is a good idea to turn this option ON, so that OpenVAS " -"Server will perform some additional tests to check that the remote firewall " -"is well configured (this option is still experimental)." -msgstr "" -"Les cibles sont prot?g?es par un parefeu? Dans ce cas et si nous sommes ? " -"l'ext?rieur du parefeu, c'est une bonne id?e d'activer cette option afin que " -"le serveur OpenVas proc?de ? des tests suppl?mentaires pour v?rifier sa " -"bonne configuration (cette option est exp?rimentale)" - -#: nessus/prefs_dialog/prefs_help.h:86 -msgid "" "Security tests may ask the OpenVAS Server to be launched if and only if some " "information gathered by other test exist in the knowledge base, or if and " "only if a given port is open. This option speeds up the test, but may make " @@ -1673,7 +1982,7 @@ "tests mais peut conduire le serveur ? omettre des failles. Si vous ?tes " "parano?aque, d?sactivez cette option" -#: nessus/prefs_dialog/prefs_help.h:94 +#: nessus/prefs_dialog/prefs_help.h:85 msgid "" "Some security checks may harm the target server, by disabling the remote " "service temporarily or until a reboot. If you enable this option, OpenVAS " @@ -1691,7 +2000,7 @@ "point de vue s?curit?, nous recommandons de d?sactiver cette option. D'un " "point de vue administration syst?me, nous recommandons de l'activer." -#: nessus/prefs_dialog/prefs_help.h:105 +#: nessus/prefs_dialog/prefs_help.h:96 msgid "" "If you enable this option, the hosts on the local network will be designated " "by their ethernet MAC address instead of their IP address. This is " @@ -1703,7 +2012,7 @@ "vous utilisez OpenVAS sur un r?seau DHCP. Dans l'incertitude, d?sactivez " "cette option." -#: nessus/prefs_dialog/prefs_help.h:111 +#: nessus/prefs_dialog/prefs_help.h:102 msgid "" "Ports that will be scanned by OpenVAS Server. You can enter single ports, " "such as \"1-8000\"; or more complex sets, such as \"21,23,25,1024-2048,6000" @@ -1716,7 +2025,7 @@ "ou \"default\" pour ceux d?finis par d?faut dans le fichier de services " "OpenVAS." -#: nessus/prefs_dialog/prefs_help.h:118 +#: nessus/prefs_dialog/prefs_help.h:109 msgid "" "To save scanning time, you may ask OpenVAS Server to declare TCP ports it " "did not scan as closed. This will result in an incomplete audit but it will " @@ -1731,7 +2040,7 @@ "d?sactiv?e, le serveur OpenVAS consid?re les ports dont il ne conna?t pas " "l'?tat comme ?tant ouverts." -#: nessus/prefs_dialog/prefs_help.h:126 +#: nessus/prefs_dialog/prefs_help.h:117 msgid "" "OpenVAS Server will perform an AXFR request (that is, a zone transfer) to " "the target name server and will attempt to obtain the list of the hosts of " @@ -1741,7 +2050,7 @@ "serveur de nom de la cible et tente d'obtenir la liste des h?tes du domaine. " "Ensuite il teste chaque h?te." -#: nessus/prefs_dialog/prefs_help.h:132 +#: nessus/prefs_dialog/prefs_help.h:123 msgid "" "OpenVAS Server will determine which hosts can mount the filesystems exported " "by the target server, and will test them. Beware : this test is recursive." @@ -1750,7 +2059,7 @@ "fichier export?s par un serveur de la cible et les teste. Attention, ce test " "est r?cursif." -#: nessus/prefs_dialog/prefs_help.h:137 +#: nessus/prefs_dialog/prefs_help.h:128 msgid "" "OpenVAS Server will test the whole subnet of the target host. If you select " "this option, you should allow OpenVAS Server to ping the hosts before " @@ -1760,7 +2069,7 @@ "activez cette option, vous devriez autoriser OpenVAS ? 'pinger' les h?tes " "avant de les examiner dans la section 'Options Scan'." -#: nessus/prefs_dialog/prefs_help.h:142 +#: nessus/prefs_dialog/prefs_help.h:133 msgid "" "The first host(s) that will be attacked by OpenVAS Server. The options below " "allow you to extend the test to a larger set of computer. You may define " @@ -1772,7 +2081,7 @@ "pouvez d?finir plusieurs cibles primaires en les s?parant par une virgule " "(,). Ex. : \"host1,host2\"." -#: nessus/prefs_dialog/prefs_help.h:148 +#: nessus/prefs_dialog/prefs_help.h:139 msgid "" "A textfile can be specified that contains the list of targets. This textfile " "may contain comma-separated lists of host and also may contain many of such " @@ -1782,7 +2091,7 @@ "fichier peut contenir une liste d'h?tes s?par?s par des virgules mais aussi " "un grand nombre de lignes distinctes." -#: nessus/prefs_dialog/prefs_help.h:153 +#: nessus/prefs_dialog/prefs_help.h:144 msgid "" "It is possible to check for the presence of CGIs in multiple paths like /cgi-" "bin, /cgis, /home-cgis, and so on. In that case, put all your paths here " @@ -1792,7 +2101,7 @@ "comme /cgi-bin, /cgis, /home-cgis, etc. Dans ce cas, s?parer vos chemins par " "deux points. Par exemple : '/cgi-bin:/cgi-aws:/~deraison/cgi'." -#: nessus/prefs_dialog/prefs_help.h:159 +#: nessus/prefs_dialog/prefs_help.h:150 msgid "" "The warning sign means that this plugin may harm the target host by " "disabling the attacked service or by crashing the host. You should be " @@ -1804,17 +2113,19 @@ "Soyez prudent en l'activant car il peut vous obliger ? red?marrer vos " "serveurs ou des services manuellement." -#: nessus/prefs_dialog/prefs_help.h:167 +#: nessus/prefs_dialog/prefs_help.h:158 +#, fuzzy msgid "" "If you turn on this option, all the information collected about the target " "hosts will be saved on the side of OpenVAS Server for further re-use. See " -"http://www.nessus.org/doc/kb_saving.html for details." +"http://www.openvas.org/compendium/scan-options-knowledge-base.html for " +"details." msgstr "" "Si vous activez cette option, toutes les informations collect?es ? propos " "des cibles sont sauvegard?es c?t? serveur OpenVAS pour une r?utilisation " "ult?rieure. Plus de d?tails sur http://www.nessus.org/doc/kb_saving.html" -#: nessus/prefs_dialog/prefs_help.h:173 +#: nessus/prefs_dialog/prefs_help.h:164 msgid "" "If you select this option, all the hosts selected in the 'Target' section of " "the OpenVAS-Client will be tested." @@ -1822,7 +2133,7 @@ "Si vous activez cette option, tous les h?tes d?finis dans la section 'Cible' " "d'OpenVAS-Client sont test?s." -#: nessus/prefs_dialog/prefs_help.h:177 +#: nessus/prefs_dialog/prefs_help.h:168 msgid "" "If you select this option, only the hosts to which a recent knowledge base " "is attached will be tested." @@ -1830,7 +2141,7 @@ "Si vous activez cette option, seuls les h?tes pour lesquels une base de " "connaissance r?cente existe, sont test?s." -#: nessus/prefs_dialog/prefs_help.h:181 +#: nessus/prefs_dialog/prefs_help.h:172 msgid "" "If you select this option, only the hosts which have no (or an outdated) " "knowledge base attached will be tested. Use this option to populate your " @@ -1840,7 +2151,7 @@ "de base de connaissance ou cette base n'est plus d'actualit?, sont test?s. " "Utilisez cette option pour renseigner vos bases de connaissance." -#: nessus/prefs_dialog/prefs_help.h:186 +#: nessus/prefs_dialog/prefs_help.h:177 msgid "" "If you select this option, the knowledge bases of the target hosts will be " "restored in memory if they are recent enough. You can use this option with " @@ -1854,7 +2165,7 @@ "h?te d?j? test? par le pass? ou ?viter d'ex?cuter ? nouveau des tests d?j? " "r?alis?s." -#: nessus/prefs_dialog/prefs_help.h:193 +#: nessus/prefs_dialog/prefs_help.h:184 msgid "" "If you select this option, the port scanners that were launched in the past " "against the targetted hosts will not be launched again and the data of the " @@ -1864,7 +2175,7 @@ "seront pas r?examin?s et les donn?es de la base de connaissance seront " "retourn?es ? titre de r?sultat." -#: nessus/prefs_dialog/prefs_help.h:199 +#: nessus/prefs_dialog/prefs_help.h:190 msgid "" "If you select this option, all the plugins that performs information " "gathering and which have already been launched against the target hosts will " @@ -1874,7 +2185,7 @@ "informations et ayant ?t? d?j? ex?cut?s contre la cible, ne seront pas ? " "nouveau lanc?s." -#: nessus/prefs_dialog/prefs_help.h:204 +#: nessus/prefs_dialog/prefs_help.h:195 msgid "" "If you select this option, all the plugins that performs attacks and which " "have already been launched against the target hosts will not be launched " @@ -1883,7 +2194,7 @@ "Si vous activez cette option, tous les plugins utilis?s pour des attaques et " "ayant ?t? d?j? ex?cut?s contre la cible, ne seront pas ? nouveau lanc?s." -#: nessus/prefs_dialog/prefs_help.h:209 +#: nessus/prefs_dialog/prefs_help.h:200 msgid "" "If you select this option, all the plugins that may harm the target hosts " "and which have already been launched will not be launched again." @@ -1891,13 +2202,13 @@ "Si vous activez cette option, tous les plugins pouvant causer des dommages " "aux cibles et ayant ?t? d?j? ex?cut?s ne seront pas ? nouveau lanc?s." -#: nessus/prefs_dialog/prefs_help.h:214 +#: nessus/prefs_dialog/prefs_help.h:205 msgid "This value defines the maximum age (in seconds) of a knowledge base." msgstr "" "Cette valeur d?finie la dur?e de validit? maximale (en secondes) d'une base " "de connaissance." -#: nessus/prefs_dialog/prefs_help.h:218 +#: nessus/prefs_dialog/prefs_help.h:209 msgid "" "If this option is set, the client will only report what has changed between " "the new scan and the last one." @@ -1905,7 +2216,7 @@ "Si vous activez cette option, le client ne rapporte seulement que la " "diff?rence entre cet examen et celui pr?c?dent." -#: nessus/prefs_dialog/prefs_help.h:224 +#: nessus/prefs_dialog/prefs_help.h:215 msgid "" "If you enable this option, then OpenVAS Server will enable the plugins that " "are depended on by the set of plugins you selected." @@ -1913,7 +2224,7 @@ "Si vous activez cette option, le serveur OpenVAS active les plugins " "d?pendants de ceux d?j? s?lectionn?s." -#: nessus/prefs_dialog/prefs_help.h:228 +#: nessus/prefs_dialog/prefs_help.h:219 msgid "" "If you enable this option, then openvasd will not report data coming from " "the plugins that you did not specifically enable." @@ -1921,6 +2232,13 @@ "Si vous activez cette option, alors le serveur OpenVAS ne rapporte pas les " "donn?es provenant des plugins non explicitement s?lectionn?s." +#: nessus/prefs_dialog/prefs_help.h:223 +msgid "" +"If you enable this option, then new plugins (that you have not seen before " +"in this scope) are automatically enabled. In any case, a message will be " +"displayed when new plugins have been found, showing your choice." +msgstr "" + #: nessus/prefs_dialog/prefs_kb.c:37 msgid "Enable KB saving" msgstr "Activer la BdC" @@ -1965,6 +2283,10 @@ msgid "Max age of a saved KB (in secs) : " msgstr "Validit? max. BdC (en sec.) : " +#: nessus/prefs_dialog/prefs_plugins_tree.c:448 +msgid "Warning" +msgstr "Avertissement" + #: nessus/prefs_dialog/prefs_report.c:141 #, c-format msgid "Scan took place from %s to %s" @@ -1985,9 +2307,9 @@ msgstr "Temps de l'examen ind?termin?." #: nessus/prefs_dialog/prefs_report.c:371 -#, c-format +#, fuzzy, c-format msgid "" -"Reported by NVT \"%s\" (1.3.6.1.4.1.25623.1.0.%d):\n" +"Reported by NVT \"%s\" (%s):\n" "\n" msgstr "" "Rapport? par NVT \"%s\" (1.3.6.1.4.1.25623.1.0.%d):\n" @@ -2020,11 +2342,6 @@ msgid "Please enter a name for your task:" msgstr "Veuillez nommer cette t?che :" -#: nessus/prefs_dialog/prefs_scan_assistant.c:264 -#: nessus/prefs_dialog/prefs_scan_assistant.c:281 -msgid "Comment:" -msgstr "Commentaire :" - #: nessus/prefs_dialog/prefs_scan_assistant.c:269 msgid "Step 2: Scope" msgstr "?tape 2 : P?rim?tre" @@ -2206,39 +2523,39 @@ msgstr "on_scope_edited(): cet item du menu n'a pas d'?tiquette." #: nessus/prefs_dialog/prefs_scope_tree.c:794 -msgid "Low" -msgstr "Bas" +msgid "High" +msgstr "?lev?" #: nessus/prefs_dialog/prefs_scope_tree.c:806 msgid "Medium" msgstr "Moyen" #: nessus/prefs_dialog/prefs_scope_tree.c:818 -msgid "High" -msgstr "?lev?" +msgid "Low" +msgstr "Bas" -#: nessus/prefs_dialog/prefs_options.c:93 +#: nessus/prefs_dialog/prefs_options.c:94 msgid "General" msgstr "G?n?ral" -#: nessus/prefs_dialog/prefs_options.c:97 +#: nessus/prefs_dialog/prefs_options.c:98 msgid "Plugins" msgstr "Plugins" -#: nessus/prefs_dialog/prefs_options.c:105 +#: nessus/prefs_dialog/prefs_options.c:106 #: nessus/prefs_dialog/prefs_target.c:49 msgid "Target selection" msgstr "S?lection de cibles" -#: nessus/prefs_dialog/prefs_options.c:109 +#: nessus/prefs_dialog/prefs_options.c:110 msgid "Access Rules" msgstr "R?gles d'acc?s" -#: nessus/prefs_dialog/prefs_options.c:113 +#: nessus/prefs_dialog/prefs_options.c:114 msgid "Prefs." msgstr "Pr?f." -#: nessus/prefs_dialog/prefs_options.c:117 +#: nessus/prefs_dialog/prefs_options.c:118 msgid "KB" msgstr "BdC" @@ -2297,6 +2614,11 @@ msgid "Silent" msgstr "Silencieux" +#: nessus/prefs_dialog/prefs_plugins.c:363 +#, fuzzy +msgid "Automatically enable new plugins" +msgstr "Connecter automatiquement" + #: nessus/prefs_dialog/prefs_target.c:65 msgid "Target(s):" msgstr "Cible(s):" @@ -2308,3 +2630,35 @@ #: nessus/prefs_dialog/prefs_target.c:84 msgid "Perform a DNS zone transfer" msgstr "R?aliser un transfert de zone DNS" + +#~ msgid "Security hole found" +#~ msgstr "Trou de s?curit? trouv?" + +#~ msgid "Security notes found" +#~ msgstr "Notes de s?curit? trouv?es" + +#~ msgid "Vulnerability" +#~ msgstr "V?n?rabilit?" + +#~ msgid "Informational" +#~ msgstr "Pour information" + +#~ msgid "OpenVAS Plugin ID: %d" +#~ msgstr "N? ID du plugin OpenVAS : %d" + +#~ msgid "Not yet implemented." +#~ msgstr "Pas encore impl?ment?." + +#~ msgid "NTP 1.2" +#~ msgstr "NTP 1.2" + +#~ msgid "" +#~ "Are the target hosts protected by a firewall ? If so and if we are " +#~ "outside the firewall, it is a good idea to turn this option ON, so that " +#~ "OpenVAS Server will perform some additional tests to check that the " +#~ "remote firewall is well configured (this option is still experimental)." +#~ msgstr "" +#~ "Les cibles sont prot?g?es par un parefeu? Dans ce cas et si nous sommes ? " +#~ "l'ext?rieur du parefeu, c'est une bonne id?e d'activer cette option afin " +#~ "que le serveur OpenVas proc?de ? des tests suppl?mentaires pour v?rifier " +#~ "sa bonne configuration (cette option est exp?rimentale)" Modified: trunk/openvas-client/po/he.po =================================================================== --- trunk/openvas-client/po/he.po 2009-01-01 22:32:37 UTC (rev 2128) +++ trunk/openvas-client/po/he.po 2009-01-02 00:52:00 UTC (rev 2129) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: he\n" "Report-Msgid-Bugs-To: openvas-devel at wald.intevation.org\n" -"POT-Creation-Date: 2008-06-25 14:05+0200\n" +"POT-Creation-Date: 2009-01-02 01:47+0100\n" "PO-Revision-Date: 2007-08-29 19:57+0300\n" "Last-Translator: Moti Yehoshua \n" "Language-Team: \n" @@ -18,6 +18,25 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" +#: src/openvas-lib/openvas_certificate_file.c:101 +#, fuzzy, c-format +msgid "Error adding comment to key file: %s" +msgstr "?? ???? ????? ?%s: %s" + +#: src/openvas-lib/openvas_certificate_file.c:118 +msgid "Error accessing certificate file for report." +msgstr "" + +#: src/openvas-lib/openvas_certificate_file.c:126 +#, fuzzy, c-format +msgid "Error exporting key file: %s" +msgstr "???? ??????%s: %s" + +#: src/openvas-lib/openvas_certificate_file.c:165 +#, fuzzy, c-format +msgid "Error loading certificate store %s: %s" +msgstr "?? ???? ????? ?%s: %s" + #: src/gui/about_dlg.c:113 msgid "About OpenVAS-Client" msgstr "????? ????? ???? OpenVAS" @@ -117,109 +136,224 @@ "???? ????? ????. ?? ???? ?????? ?? ????? ?????? SLAD. ????? ?????? ???? " "?????? ??????. ???? ????? ???? ????? ?? ?????." -#: nessus/comm.c:90 +#: src/gui/ssh_key_info_form.c:170 +#, fuzzy +msgid "Account name:" +msgstr "?? ???? ????:" + +#: src/gui/ssh_key_info_form.c:178 +msgid "SSH login name:" +msgstr "" + +#: src/gui/ssh_key_info_form.c:185 +msgid "SSH public key:" +msgstr "" + +#: src/gui/ssh_key_info_form.c:193 +msgid "SSH private key:" +msgstr "" + +#: src/gui/ssh_key_info_form.c:201 +msgid "SSH key passphrase:" +msgstr "" + +#: src/gui/ssh_key_info_form.c:208 +#: nessus/prefs_dialog/prefs_scan_assistant.c:264 +#: nessus/prefs_dialog/prefs_scan_assistant.c:281 +msgid "Comment:" +msgstr "????:" + +#: src/gui/ssh_key_info_form.c:234 +#, fuzzy +msgid "Please provide a better name." +msgstr "?? ????? ??? ????" + +#: src/gui/ssh_key_info_form.c:240 +#, fuzzy +msgid "Please provide a longer username." +msgstr "?? ????? ??? ????" + +#: src/gui/ssh_key_info_form.c:245 +msgid "Please provide a passphrase with more then 5 characters." +msgstr "" + +#: src/gui/ssh_key_info_form.c:251 +msgid "Please provide a better comment for public key." +msgstr "" + +#: src/gui/ssh_key_info_form.c:257 +msgid "Comment must not contain spaces." +msgstr "" + +#: src/gui/ssh_keys_dialog.c:98 src/gui/ssh_keys_dialog.c:161 +#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:597 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:276 +#, fuzzy +msgid "OpenVAS SSH Key Manager" +msgstr "OpenVAS" + +#: src/gui/ssh_keys_dialog.c:191 +msgid "Create a new keypair" +msgstr "" + +#: nessus/comm.h:40 +msgid "Select SSH Login" +msgstr "" + +#: nessus/comm.c:92 #, c-format msgid "Receiving plugins: %d" msgstr "?????? ??????: %d" -#: nessus/comm.c:95 +#: nessus/comm.c:97 #, c-format msgid "Receiving dependencies: %d" msgstr "??????? ??????: %d" -#: nessus/comm.c:385 +#: nessus/comm.c:444 #, c-format msgid "Error : we received a preference (%s) for the plugin %s\n" msgstr "????: ?????? ????(%s) ???? ????? %s \n" -#: nessus/comm.c:388 +#: nessus/comm.c:447 #, c-format msgid "but apparently the server has not loaded it\n" msgstr "?? ??? ????? ???? ?? ????\n" -#: nessus/comm.c:754 +#: nessus/comm.c:870 #, c-format msgid "Can't open %s: %s" msgstr "?? ???? ????? %s %s" -#: nessus/comm.c:778 +#: nessus/comm.c:894 #, c-format msgid "Error reading from %s: %s" msgstr "?? ???? ????? ?%s: %s" -#: nessus/comm.c:907 nessus/comm.c:1250 +#: nessus/comm.c:1015 nessus/comm.c:1401 msgid "The daemon shut down the communication" msgstr "?????? ??? ?? ???????" -#: nessus/comm.c:932 +#: nessus/comm.c:1042 msgid "Error processing plugin information from the server" msgstr "???? ?????? ???? ?????? ???? ????" -#: nessus/comm.c:938 +#: nessus/comm.c:1048 msgid "Invalid SEND_PLUGINS_MD5 response from server" msgstr "????? ????? ????? SEND_PLUGINS_MD5 ?????" -#: nessus/comm.c:1099 +#: nessus/comm.c:1224 msgid "Invalid PLUGIN_INFO response from server" msgstr "????? ?? ????? ?????? PLUGIN_INFO ?????" -#: nessus/comm.c:1198 +#: nessus/comm.c:1238 nessus/comm.c:1445 +msgid "Found and enabled one new plugin." +msgstr "" + +#: nessus/comm.c:1240 nessus/comm.c:1447 +msgid "Found and disabled one new plugin." +msgstr "" + +#: nessus/comm.c:1245 nessus/comm.c:1452 +#, c-format +msgid "Found and enabled %d new plugins." +msgstr "" + +#: nessus/comm.c:1247 nessus/comm.c:1454 +#, c-format +msgid "Found and disabled %d new plugins." +msgstr "" + +#: nessus/comm.c:1348 msgid "Invalid PLUGINS_MD5 information sent from server" msgstr "???? PLUGINS_MD5 ???? ????? ?????" -#: nessus/comm.c:1231 +#: nessus/comm.c:1381 msgid "Error while updating the cached plugin information" msgstr "????? ???? ????? ????? ???????" -#: nessus/context.c:222 +#: nessus/comm.c:1736 +#, fuzzy, c-format +msgid "Could not parse certificate: %s" +msgstr "?? ???? ????? ?? ????? ????" + +#: nessus/comm.c:1743 +#, fuzzy, c-format +msgid "Invalid response from server to certificate request: %s" +msgstr "????? ??? ?????" + +#: nessus/context.c:245 msgid "context_remove_child detected existing children." msgstr "???????? context_remove_child ????? ????? \"???\" ????" -#: nessus/context.c:362 nessus/prefs_dialog/prefs_scope_tree.c:273 +#: nessus/context.c:426 nessus/prefs_dialog/prefs_scope_tree.c:273 msgid "context_rename() called with illegal type" msgstr "???????? context_rename() ????? ????? ????? ?? ????" -#: nessus/context.c:379 nessus/context.c:410 +#: nessus/context.c:443 nessus/context.c:474 #, c-format msgid "Directory %s couldn't be renamed to %s: %s." msgstr "?? ???? ????? ?? ?? ?????? %s ?%s: %s" -#: nessus/context.c:427 +#: nessus/context.c:491 #, c-format msgid "Can't move \"%s\" to \"%s\"." msgstr "?? ???? ?????? ?\"%s\" ?\"%s\"" -#: nessus/context.c:450 nessus/context.c:489 +#: nessus/context.c:514 nessus/context.c:553 nessus/html_graph_output.c:1116 #, c-format msgid "Directory %s couldn't be created: %s." msgstr "????? %s ?? ????? ??????:%s" -#: nessus/context.c:475 nessus/prefs_dialog/prefs_scan_assistant.c:263 +#: nessus/context.c:539 nessus/prefs_dialog/prefs_scan_assistant.c:263 msgid "unnamed task" msgstr "????? ?? ??????" -#: nessus/context.c:478 nessus/prefs_dialog/prefs_scan_assistant.c:280 +#: nessus/context.c:542 nessus/prefs_dialog/prefs_scan_assistant.c:280 msgid "unnamed scope" msgstr "???? ?? ?????" -#: nessus/context.c:481 +#: nessus/context.c:545 msgid "context_new(): No name provided for context" msgstr "context_new(): ?? ???? ?? ???? ????????" -#: nessus/context.c:526 +#: nessus/context.c:593 #, c-format msgid "File %s couldn't be deleted: %s." msgstr "????? %s ?? ???? ??????: %s" -#: nessus/context.c:532 +#: nessus/context.c:599 #, c-format msgid "Directory %s couldn't be deleted: %s." msgstr "?????? %s ?? ????? ??????: %s" -#: nessus/context.c:553 +#: nessus/context.c:622 msgid "context_delete() deleted the current context." msgstr "???????? context_delete() ???? ?? ???? ??????" +#: nessus/backend.c:82 +msgid "No free tempfile!" +msgstr "" + +#: nessus/backend.c:105 +#, fuzzy, c-format +msgid "Can't create file %s: %s" +msgstr "?? ???? ????? %s %s" + +#: nessus/backend.c:115 +#, fuzzy, c-format +msgid "Can't open file %s: %s" +msgstr "?? ???? ????? %s %s" + +#: nessus/backend.c:622 +msgid "Unknown report type - please set an extension to the filename" +msgstr "" + +#: nessus/backend.c:631 +#, fuzzy +msgid "This file format can not be read back by the OpenVAS-Client" +msgstr "#???? ?? ???? ????? ??? ?? ??? Nessus\n" + #: nessus/filter.c:67 nessus/filter.c:80 msgid "Filter plugins..." msgstr "???? ??????..." @@ -238,11 +372,11 @@ msgid "Name" msgstr "??" -#: nessus/filter.c:116 nessus/pdf_output.c:952 +#: nessus/filter.c:116 nessus/pdf_output.c:799 msgid "Description" msgstr "?????" -#: nessus/filter.c:122 nessus/pdf_output.c:804 nessus/pdf_output.c:941 +#: nessus/filter.c:122 nessus/pdf_output.c:580 nessus/pdf_output.c:784 msgid "Summary" msgstr "?????" @@ -254,15 +388,15 @@ msgid "ID number" msgstr "???? ????" -#: nessus/filter.c:140 nessus/pdf_output.c:942 +#: nessus/filter.c:140 nessus/pdf_output.c:785 msgid "Category" msgstr "???????" -#: nessus/filter.c:146 nessus/pdf_output.c:945 +#: nessus/filter.c:146 nessus/pdf_output.c:789 msgid "CVE" msgstr "CVE" -#: nessus/filter.c:152 nessus/pdf_output.c:946 +#: nessus/filter.c:152 nessus/pdf_output.c:791 msgid "BID" msgstr "BID" @@ -279,6 +413,15 @@ msgid "Invalid regular expression" msgstr "????? ?????? ?? ????" +#: nessus/parser.c:221 +#, fuzzy +msgid "Invalid port range" +msgstr "???? ??????:" + +#: nessus/parser.c:223 +msgid "These hosts could not be tested because you are not allowed to do so:" +msgstr "" + #: nessus/monitor_dialog.c:84 #, c-format msgid "is_server_present: fd(%d) out of range\n" @@ -289,32 +432,32 @@ msgid "idle_server: soc(%d) out of range\n" msgstr "???_??_????: soc(%d)???? ?????\n" -#: nessus/monitor_dialog.c:221 +#: nessus/monitor_dialog.c:218 #, c-format msgid "Scanning network from %s" msgstr "???? ??? ? %s" -#: nessus/monitor_dialog.c:222 +#: nessus/monitor_dialog.c:219 msgid "some host" msgstr "???? ?????? ??????" -#: nessus/monitor_dialog.c:260 +#: nessus/monitor_dialog.c:257 msgid "Hostname" msgstr "??-????" -#: nessus/monitor_dialog.c:266 +#: nessus/monitor_dialog.c:263 msgid "Portscan" msgstr "????? ??????" -#: nessus/monitor_dialog.c:272 +#: nessus/monitor_dialog.c:269 msgid "Checks" msgstr "??????" -#: nessus/monitor_dialog.c:279 nessus/monitor_dialog.c:619 +#: nessus/monitor_dialog.c:276 nessus/monitor_dialog.c:621 msgid "Stop" msgstr "????" -#: nessus/monitor_dialog.c:308 +#: nessus/monitor_dialog.c:305 msgid "Stop the whole test" msgstr "???? ?? ??????" @@ -323,24 +466,24 @@ msgid "Error ! Null hostname in the list\n" msgstr "????! ??-???? ??? ??????\n" -#: nessus/monitor_dialog.c:581 +#: nessus/monitor_dialog.c:583 msgid "Portscan:" msgstr "???? ??????" -#: nessus/monitor_dialog.c:585 +#: nessus/monitor_dialog.c:587 msgid "Checks:" msgstr "??????:" -#: nessus/nessus.c:373 +#: nessus/nessus.c:379 msgid "Host not found!" msgstr "?? ???? ????!" -#: nessus/nessus.c:376 +#: nessus/nessus.c:382 #, c-format msgid "Could not open a connection to %s\n" msgstr "?? ???? ????? ??????? ?? %s\n" -#: nessus/nessus.c:402 +#: nessus/nessus.c:408 #, fuzzy msgid "" "Could not initialize the OpenSSL library !\n" @@ -349,7 +492,7 @@ "?? ???? ????? ?? ?????? OpenSSL!\n" "?? ???? ?? nessusclient-mkrand(1) ?????" -#: nessus/nessus.c:418 +#: nessus/nessus.c:424 #, c-format msgid "" "Unknown SSL version \"%s\"\n" @@ -358,12 +501,19 @@ "????? SSL ?? ????? \"%s\"\n" "????? ?????? ????: %s" -#: nessus/nessus.c:501 +#: nessus/nessus.c:507 #, c-format msgid "paranoia_level=%d but \"trusted_ca\" not set" msgstr "???_????????l=%d ?? \"trusted_ca\" ?? ??????" -#: nessus/nessus.c:516 +#: nessus/nessus.c:514 +#, fuzzy, c-format +msgid "" +"paranoia_level=%d but \"trusted_ca\" file not found:\n" +"%s" +msgstr "???_????????l=%d ?? \"trusted_ca\" ?? ??????" + +#: nessus/nessus.c:529 #, c-format msgid "" "Error while setting the trusted CA: %s\n" @@ -372,46 +522,46 @@ "???? ?????? ??????: %s\n" "???? ??????? SSL ????" -#: nessus/nessus.c:561 +#: nessus/nessus.c:574 msgid "SSL error: cannot get server certificate" msgstr "???? SSL:?? ???? ????? ????? ?????" -#: nessus/nessus.c:573 +#: nessus/nessus.c:586 msgid "Invalid server certificate" msgstr "????? ??? ?????" -#: nessus/nessus.c:577 +#: nessus/nessus.c:590 msgid "Could not save server certificate" msgstr "?? ???? ????? ?? ????? ????" -#: nessus/nessus.c:588 +#: nessus/nessus.c:601 msgid "Could not register the connection" msgstr "?? ???? ????? ?? ????????" -#: nessus/nessus.c:601 +#: nessus/nessus.c:614 msgid "" "Unable to establish a connection to the remote host using the specified " "protocol version!" msgstr "" -#: nessus/nessus.c:610 +#: nessus/nessus.c:623 msgid "Login failed" msgstr "??????? ?????" -#: nessus/nessus.c:670 +#: nessus/nessus.c:685 msgid "Display version information" msgstr "" -#: nessus/nessus.c:672 +#: nessus/nessus.c:687 #, fuzzy msgid "No pixmaps" msgstr "\t-n : ??? pixmaps\n" -#: nessus/nessus.c:674 +#: nessus/nessus.c:689 msgid "Batch-mode scan" msgstr "" -#: nessus/nessus.c:674 +#: nessus/nessus.c:689 #, fuzzy msgid " " msgstr "" @@ -419,54 +569,58 @@ "????? ???? ?????:\n" " %s -q [-pPS] " -#: nessus/nessus.c:676 +#: nessus/nessus.c:691 #, fuzzy msgid "Configuration file" msgstr "??????? ?????" -#: nessus/nessus.c:676 +#: nessus/nessus.c:691 msgid "<.rcfile>" msgstr "" -#: nessus/nessus.c:677 +#: nessus/nessus.c:693 nessus/nessus.c:695 msgid "Output format" msgstr "" -#: nessus/nessus.c:677 +#: nessus/nessus.c:693 msgid "[nbe|html|html_graph|text|xml|tex]" msgstr "" -#: nessus/nessus.c:678 +#: nessus/nessus.c:695 +msgid "[nbe|html|text|xml|tex]" +msgstr "" + +#: nessus/nessus.c:697 msgid "Display status messages in batch mode" msgstr "" -#: nessus/nessus.c:679 +#: nessus/nessus.c:698 #, fuzzy msgid "Obtain list of plugins installed on the server" msgstr "\t-p : ??? ?? ????? ??????? ????.\n" -#: nessus/nessus.c:680 +#: nessus/nessus.c:699 #, fuzzy msgid "Obtain list of server and plugin preferences" msgstr "\t-P : ??? ?????? ?????? ????\n" -#: nessus/nessus.c:681 +#: nessus/nessus.c:700 msgid "Input file (report conversion)" msgstr "" -#: nessus/nessus.c:681 +#: nessus/nessus.c:700 msgid "" msgstr "" -#: nessus/nessus.c:682 +#: nessus/nessus.c:701 msgid "Output file (report conversion)" msgstr "" -#: nessus/nessus.c:682 +#: nessus/nessus.c:701 msgid "" msgstr "" -#: nessus/nessus.c:683 +#: nessus/nessus.c:702 #, fuzzy msgid "" "Override SSL \"paranoia\" question preventing OpenVAS-Client from checking " @@ -476,16 +630,16 @@ "\t ???? ??????.\n" "\n" -#: nessus/nessus.c:684 +#: nessus/nessus.c:703 #, fuzzy msgid "Issue SQL output for -p and -P (experimental)" msgstr "\t-S : ??? ??? SQL ???? -p ? -P (??????).\n" -#: nessus/nessus.c:685 +#: nessus/nessus.c:704 msgid "List sessions" msgstr "" -#: nessus/nessus.c:685 +#: nessus/nessus.c:704 #, fuzzy msgid " " msgstr "" @@ -493,11 +647,11 @@ "????? ?????? :\n" " %s -s -q " -#: nessus/nessus.c:686 +#: nessus/nessus.c:705 msgid "Restore session" msgstr "" -#: nessus/nessus.c:686 +#: nessus/nessus.c:705 #, fuzzy msgid " " msgstr "" @@ -505,110 +659,115 @@ "???? ?????:\n" " %s -R -q " -#: nessus/nessus.c:691 +#: nessus/nessus.c:710 msgid "- client for the OpenVAS security scanner" msgstr "" -#: nessus/nessus.c:720 +#: nessus/nessus.c:739 #, fuzzy, c-format msgid "" "OpenVAS-Client (%s) %s for %s\n" "\n" msgstr "OpenVAS-????" -#: nessus/nessus.c:721 +#: nessus/nessus.c:740 #, c-format msgid "" "NessusClient origin: (C) 1998 - 2003 Renaud Deraison \n" msgstr "" -#: nessus/nessus.c:722 +#: nessus/nessus.c:741 #, c-format msgid "New code since OpenVAS-Client: (C) 2007, 2008 Intevation GmbH\n" msgstr "" -#: nessus/nessus.c:746 +#: nessus/nessus.c:766 #, c-format msgid "The session ID is required to restore a session.\n" msgstr "" -#: nessus/nessus.c:747 nessus/nessus.c:765 nessus/nessus.c:816 -#: nessus/nessus.c:900 nessus/nessus.c:926 +#: nessus/nessus.c:767 nessus/nessus.c:785 nessus/nessus.c:838 +#: nessus/nessus.c:922 nessus/nessus.c:957 #, c-format msgid "Please use %s --help for more information.\n" msgstr "" -#: nessus/nessus.c:764 +#: nessus/nessus.c:784 #, c-format msgid "" "You need to specify an input file as well as an output file for report " "conversion.\n" msgstr "" -#: nessus/nessus.c:799 +#: nessus/nessus.c:821 #, c-format msgid "Unsupported report type '%s'\n" msgstr "??? ??? ?? ???? '%s'\n" -#: nessus/nessus.c:807 +#: nessus/nessus.c:829 #, fuzzy, c-format msgid "Could not import '%s' - is it a .nbe file?\n" msgstr "?? ???? ????? ?? '%s' ??? ?? ???? ???? nsr ?? nbe ?\n" -#: nessus/nessus.c:815 +#: nessus/nessus.c:837 #, fuzzy, c-format msgid "The option -make_config_file can only be used in batch mode.\n" msgstr "??? ????? ???? ?????? ???? ????? ????\n" -#: nessus/nessus.c:826 +#: nessus/nessus.c:848 #, c-format msgid "list-sessions requires %s\n" msgstr "list-sessions erfordert %s\n" -#: nessus/nessus.c:832 -#, c-format -msgid "restore-session requires -q %s result\n" +#: nessus/nessus.c:854 +#, fuzzy, c-format +msgid "restore-session requires -q %s \n" msgstr "????? ????? ???? - %s?????\n" -#: nessus/nessus.c:838 +#: nessus/nessus.c:860 #, c-format msgid "--restore-session and --list-sessions are mutually exclusive\n" msgstr "--???? ?????? ? --??? ?????? \n" -#: nessus/nessus.c:876 +#: nessus/nessus.c:898 #, c-format msgid "Verbose mode can only be used in batch mode\n" msgstr "??? ????? ???? ?????? ???? ????? ????\n" -#: nessus/nessus.c:899 nessus/nessus.c:925 +#: nessus/nessus.c:921 nessus/nessus.c:956 #, c-format msgid "Batch mode requires login information.\n" msgstr "" -#: nessus/nessus.c:910 +#: nessus/nessus.c:932 msgid "list-sessions only requires " msgstr "?????-????? ????? ??" -#: nessus/nessus.c:919 +#: nessus/nessus.c:941 msgid "restore-session only requires " msgstr "?????-????? ????? ??" -#: nessus/nessus.c:950 nessus/nessus.c:965 +#: nessus/nessus.c:950 +#, fuzzy +msgid "list-prefs and list-plugins require " +msgstr "list-sessions erfordert %s\n" + +#: nessus/nessus.c:981 nessus/nessus.c:996 #, fuzzy, c-format msgid "Could not connect to openvasd\n" msgstr "?? ????? ?????? ?Nessusd\n" -#: nessus/nessus.c:992 nessus/nessus.c:999 +#: nessus/nessus.c:1023 nessus/nessus.c:1030 #, c-format msgid "Missing parameter\n" msgstr "??? ?????\n" -#: nessus/nessus.c:1027 +#: nessus/nessus.c:1058 #, fuzzy, c-format msgid "A new openvasrc file has been saved\n" msgstr "???? nessusrc ??? ????\n" -#: nessus/nessus.c:1070 +#: nessus/nessus.c:1101 #, c-format msgid "" "\n" @@ -618,11 +777,11 @@ " the --help option and in the OpenVAS documentation.\n" msgstr "" -#: nessus/pdf_output.c:381 +#: nessus/pdf_output.c:174 msgid "Could not fork (out of memory?)" msgstr "?? ???? ???? (??? ???? ???????)" -#: nessus/pdf_output.c:504 +#: nessus/pdf_output.c:306 msgid "" "PDF report export failed!\n" "Maybe HTMLDoc (required for PDF export) is not installed or in search path." @@ -630,80 +789,68 @@ "???? ????? PDF ????!\n" "????? ?HTMLDoc (???? ???? ???? PDF) ?? ????? ????? ?????? ?? ??? ???????" -#: nessus/pdf_output.c:506 +#: nessus/pdf_output.c:308 #, c-format msgid "PDF report export failed! (htmldoc exit code: %d)" msgstr "???? ???? PDF ????! (htmldoc ??? ?????: %d)" -#: nessus/pdf_output.c:537 +#: nessus/pdf_output.c:346 msgid "Could not create this file !" msgstr "?? ???? ????? ???? ?? !" -#: nessus/pdf_output.c:551 +#: nessus/pdf_output.c:360 msgid "Reports per Host" msgstr "??\"? ??? ??? ????" -#: nessus/pdf_output.c:571 +#: nessus/pdf_output.c:379 #, c-format msgid "Scan of this host started at: %s
\n" msgstr "????? ?? ??? ???? ???? ? %s
\n" -#: nessus/pdf_output.c:573 +#: nessus/pdf_output.c:381 #, c-format msgid "Scan of this host finished at: %s
\n" msgstr "????? ?? ??? ???? ?? ??????? ?: %s
\n" -#: nessus/pdf_output.c:583 +#: nessus/pdf_output.c:391 msgid "Service (Port)" msgstr "???? (????)" -#: nessus/pdf_output.c:586 +#: nessus/pdf_output.c:394 msgid "Issue regarding port" msgstr "????? ????? ?????" -#: nessus/pdf_output.c:610 -msgid "Security hole found" -msgstr "???? ??? ?????" +#: nessus/pdf_output.c:417 nessus/pdf_output.c:624 +msgid "Security hole(s) found" +msgstr "???? ????? ??????" -#: nessus/pdf_output.c:615 nessus/pdf_output.c:853 +#: nessus/pdf_output.c:422 nessus/pdf_output.c:629 msgid "Security warning(s) found" msgstr "????? ????? ?????" -#: nessus/pdf_output.c:620 -msgid "Security notes found" -msgstr "????? ????? ?????" +#: nessus/pdf_output.c:427 nessus/pdf_output.c:634 +msgid "Security note(s) found" +msgstr "????? ?????" -#: nessus/pdf_output.c:629 nessus/pdf_output.c:638 +#: nessus/pdf_output.c:436 nessus/pdf_output.c:445 msgid "No Information" msgstr "??? ????" -#: nessus/pdf_output.c:647 +#: nessus/pdf_output.c:454 msgid "[ return to summary ]" msgstr "[???? ?????? ]" -#: nessus/pdf_output.c:651 +#: nessus/pdf_output.c:458 #, c-format msgid "Security Issues and Fixes - Host %s" msgstr "????? ??????? ????? -??? ???? %s" -#: nessus/pdf_output.c:687 -msgid "Vulnerability" -msgstr "????? ?????" - -#: nessus/pdf_output.c:712 nessus/prefs_dialog/prefs_plugins_tree.c:448 -msgid "Warning" -msgstr "?????" - -#: nessus/pdf_output.c:739 -msgid "Informational" -msgstr "????" - -#: nessus/pdf_output.c:753 +#: nessus/pdf_output.c:528 #, c-format msgid "[ return to %s ]" msgstr "[???? ? %s ]" -#: nessus/pdf_output.c:771 +#: nessus/pdf_output.c:546 msgid "" "This file was generated by OpenVAS, " "the free security scanner." @@ -711,171 +858,262 @@ "???? ?? ???? ?? ??? OpenVAS,???? " "?????? ??????" -#: nessus/pdf_output.c:793 +#: nessus/pdf_output.c:569 #, fuzzy msgid "OpenVAS Scan Report" msgstr "??\"? ????? ?? Nessus" -#: nessus/pdf_output.c:808 +#: nessus/pdf_output.c:584 +#, fuzzy msgid "" "This report gives details on hosts that were tested and issues that were " -"found." +"found. " msgstr "??\"??? ???? ???? ?? ????? ?????? ??????" -#: nessus/pdf_output.c:809 +#: nessus/pdf_output.c:585 msgid "" "Please follow the recommended steps and procedures to eradicate these " "threats.\n" msgstr "?? ????? ?????? ??????? ???????? ?? ??? ???? ?? ???????\n" -#: nessus/pdf_output.c:813 +#: nessus/pdf_output.c:589 #, c-format msgid "Scan started at: %s
\n" msgstr "????? ???? ?: %s
\n" -#: nessus/pdf_output.c:814 +#: nessus/pdf_output.c:590 #, c-format msgid "Scan finished at: %s
\n" msgstr "????? ??????? ?: %s
\n" -#: nessus/pdf_output.c:820 +#: nessus/pdf_output.c:596 msgid "Host" msgstr "??? ????" -#: nessus/pdf_output.c:823 +#: nessus/pdf_output.c:599 msgid "Possible Issues" msgstr "M?gliche Probleme" -#: nessus/pdf_output.c:826 +#: nessus/pdf_output.c:602 msgid "Holes" msgstr "???? ?????" -#: nessus/pdf_output.c:829 +#: nessus/pdf_output.c:605 msgid "Warnings" msgstr "??????" -#: nessus/pdf_output.c:832 +#: nessus/pdf_output.c:608 msgid "Notes" msgstr "?????" -#: nessus/pdf_output.c:848 -msgid "Security hole(s) found" -msgstr "???? ????? ??????" - -#: nessus/pdf_output.c:858 -msgid "Security note(s) found" -msgstr "????? ?????" - -#: nessus/pdf_output.c:863 +#: nessus/pdf_output.c:639 msgid "No noticeable information found" msgstr "?? ???? ????" -#: nessus/pdf_output.c:881 +#: nessus/pdf_output.c:657 msgid "Total" msgstr "??" -#: nessus/pdf_output.c:943 +#: nessus/pdf_output.c:713 nessus/pdf_output.c:717 nessus/pdf_output.c:727 +msgid "Signed by" +msgstr "" + +#: nessus/pdf_output.c:713 #, fuzzy +msgid "not signed" +msgstr "?? ?????" + +#: nessus/pdf_output.c:718 +msgid "unknown signature(s)" +msgstr "" + +#: nessus/pdf_output.c:735 +#, fuzzy +msgid "trusted" +msgstr "Trusted CA:" + +#: nessus/pdf_output.c:736 +msgid "not trusted" +msgstr "" + +#: nessus/pdf_output.c:749 +msgid "unknown signature" +msgstr "" + +#: nessus/pdf_output.c:786 +#, fuzzy msgid "Family" msgstr "?????: %s" -#: nessus/pdf_output.c:944 +#: nessus/pdf_output.c:787 msgid "Version" msgstr "" -#: nessus/pdf_output.c:947 +#: nessus/pdf_output.c:793 #, fuzzy msgid "XRefs" msgstr "?????" -#: nessus/pdf_output.c:962 +#: nessus/pdf_output.c:809 msgid "Parameters" msgstr "" -#: nessus/pdf_output.c:985 +#: nessus/pdf_output.c:839 #, fuzzy msgid "Appendix: NVT Information" msgstr "??? ????" -#: nessus/plugin_infos.c:56 +#: nessus/plugin_infos.c:58 #, c-format msgid "Dependencies of Plugin '%s'" msgstr "?????? ?? ?????? '%s'" -#: nessus/plugin_infos.c:87 +#: nessus/plugin_infos.c:89 msgid "No dependencies found." msgstr "?? ????? ??????" -#: nessus/plugin_infos.c:112 +#: nessus/plugin_infos.c:114 msgid "), currently " msgstr "????" -#: nessus/plugin_infos.c:114 +#: nessus/plugin_infos.c:116 msgid "enabled" msgstr "?????" -#: nessus/plugin_infos.c:116 +#: nessus/plugin_infos.c:118 msgid "disabled" msgstr "??????" -#: nessus/plugin_infos.c:177 nessus/plugin_infos.c:409 +#: nessus/plugin_infos.c:176 nessus/plugin_infos.c:578 msgid "Set plugin timeout..." msgstr "??? ??? ????? ????..." -#: nessus/plugin_infos.c:194 +#: nessus/plugin_infos.c:193 msgid "Set plugin timeout:" msgstr "??? ??? ????? ????:" -#: nessus/plugin_infos.c:281 +#: nessus/plugin_infos.c:265 #, c-format +msgid "Can not find certificate for: %s." +msgstr "" + +#: nessus/plugin_infos.c:269 +#, fuzzy, c-format +msgid "OpenVAS Certificate View: %s" +msgstr "???? ????? ?????:" + +#: nessus/plugin_infos.c:283 +#, c-format +msgid "Owner Name: %s" +msgstr "" + +#: nessus/plugin_infos.c:288 +#, c-format +msgid "Fingeprint: %s" +msgstr "" + +#: nessus/plugin_infos.c:339 +#, c-format msgid "Error ! Plugin selected not found ?!\n" msgstr "????! ????? ????? ?? ????\n" -#: nessus/plugin_infos.c:316 +#: nessus/plugin_infos.c:374 #, c-format msgid "Family: %s" msgstr "?????: %s" -#: nessus/plugin_infos.c:323 +#: nessus/plugin_infos.c:381 #, c-format msgid "Category: %s" msgstr "???????e: %s" -#: nessus/plugin_infos.c:330 +#: nessus/plugin_infos.c:388 #, fuzzy, c-format -msgid "OpenVAS Plugin ID: %d" -msgstr "???? ???? ????Nessus: %d" +msgid "OpenVAS NVT OID: %s" +msgstr "OpenVAS" -#: nessus/plugin_infos.c:340 +#: nessus/plugin_infos.c:398 #, c-format msgid "CVE: %s" msgstr "CVE: %s" -#: nessus/plugin_infos.c:351 +#: nessus/plugin_infos.c:409 #, c-format msgid "Bugtraq ID: %s" msgstr "Bugtraq ID: %s" -#: nessus/plugin_infos.c:362 +#: nessus/plugin_infos.c:420 #, c-format msgid "Other references: %s" msgstr "?????? ?????: %s" -#: nessus/plugin_infos.c:381 +#: nessus/plugin_infos.c:431 +#, fuzzy, c-format +msgid "Plugin Version: %s" +msgstr "????? ??????" + +#: nessus/plugin_infos.c:442 +#, c-format +msgid "Script tags: %s" +msgstr "" + +#: nessus/plugin_infos.c:455 #, fuzzy msgid "Plugin description:" msgstr "????? ??????" -#: nessus/plugin_infos.c:416 +#: nessus/plugin_infos.c:512 +#, fuzzy, c-format +msgid "Signature information available on server connection." +msgstr "???? ?? ???? ???? ????? ??????" + +#: nessus/plugin_infos.c:516 +#, c-format +msgid "" +"Signatures:\n" +"\tUnknown signature(s)." +msgstr "" + +#: nessus/plugin_infos.c:520 +#, c-format +msgid "" +"Signatures:\n" +"\tNVT is not signed." +msgstr "" + +#: nessus/plugin_infos.c:529 +#, c-format +msgid "Signatures:" +msgstr "" + +#: nessus/plugin_infos.c:532 +#, c-format +msgid "Signatures (NOT verified):" +msgstr "" + +#: nessus/plugin_infos.c:549 +msgid "trusted" +msgstr "" + +#: nessus/plugin_infos.c:550 +msgid "untrusted" +msgstr "" + +#: nessus/plugin_infos.c:558 +#, fuzzy +msgid "View" +msgstr "_???" + +#: nessus/plugin_infos.c:585 msgid "Show dependencies" msgstr "??? ??????" -#: nessus/preferences.c:156 +#: nessus/preferences.c:130 #, c-format msgid "Error writing %s: %s" msgstr "???? ??????%s: %s" -#: nessus/preferences.c:163 +#: nessus/preferences.c:137 #, c-format msgid "" "# OpenVAS-Client Preferences File\n" @@ -884,54 +1122,54 @@ "# ???? ?????? ?? ???? OpenVAS\n" "\n" -#: nessus/preferences.c:229 +#: nessus/preferences.c:203 #, fuzzy, c-format msgid "The OpenVAS-Client doesn't have the right to read %s\n" msgstr "????? Nessus ??? ????? ????? ?? %s\n" -#: nessus/preferences.c:243 +#: nessus/preferences.c:217 msgid "Couldn't find prefs file... Creating a new one..." msgstr "?? ???? ???? ???? ??????. ???? ???? ???..." -#: nessus/preferences.c:247 nessus/preferences.c:254 +#: nessus/preferences.c:221 nessus/preferences.c:228 #, c-format msgid "Error creating %s: %s" msgstr "???? ?????? %s: %s" -#: nessus/preferences.c:262 +#: nessus/preferences.c:236 #, c-format msgid "Error reading %s: %s" msgstr "???? ?????? %s: %s" -#: nessus/preferences.c:280 +#: nessus/preferences.c:255 #, c-format msgid "Parse error in %s: %s" msgstr "???? ?????? %s : %s" -#: nessus/preferences.c:294 +#: nessus/preferences.c:269 #, c-format msgid "Missing 'end' in %s" msgstr "??? 'end'? %s" -#: nessus/preferences.c:522 +#: nessus/preferences.c:507 #, c-format msgid "%s could not be opened write only" msgstr "%s ?? ???? ??????. ????? ????" -#: nessus/preferences.c:526 +#: nessus/preferences.c:511 #, fuzzy, c-format msgid "# This file was automagically created by OpenVAS-Client\n" msgstr "#???? ?? ???? ????? ??? ?? ??? Nessus\n" -#: nessus/preferences.c:643 +#: nessus/preferences.c:630 msgid "Global Settings" msgstr "?????? ?????????" -#: nessus/preferences.c:757 nessus/preferences.c:778 +#: nessus/preferences.c:745 nessus/preferences.c:766 msgid "prefs_set_value() called with illegal type" msgstr "????? ?prefs_set_value() ?? ??? ?? ????." -#: nessus/read_target_file.c:41 nessus/report.c:204 +#: nessus/read_target_file.c:41 nessus/report.c:245 msgid "Load file" msgstr "??? ????" @@ -958,49 +1196,124 @@ msgid "file mapping failed: %s\n" msgstr "????? ???? ????: %s\n" -#: nessus/report.c:117 +#: nessus/html_graph_output.c:1123 +#, fuzzy, c-format +msgid "Can't change to directory %s: %s." +msgstr "?? ???? ????? %s %s" + +#: nessus/html_graph_output.c:1130 +#, fuzzy, c-format +msgid "Can't write index: %s" +msgstr "?? ???? ????? %s %s" + +#: nessus/xml_output_ng.c:713 +#, fuzzy, c-format +msgid "Can't open %s for writing: %s." +msgstr "?? ???? ????? %s %s" + +#: nessus/report.c:143 msgid "report_save() called with illegal type" msgstr "report_save() ???? ?? ??? ?? ????" -#: nessus/report.c:136 +#: nessus/report.c:162 msgid "report_save() couldn't create context" msgstr "report_save()?? ???? ????? ????" -#: nessus/report.c:142 +#: nessus/report.c:168 msgid "report_save() couldn't find a report filename" msgstr "report_save() ?? ???? ???? ??\"?" -#: nessus/report.c:150 +#: nessus/report.c:176 msgid "report_save() couldn't save the report" msgstr "report_save() ?? ???? ????? ??\"?" -#: nessus/report.c:162 +#: nessus/report.c:188 msgid "report_save() couldn't save the plugin information" msgstr "report_save() ?? ???? ????? ???? ????" -#: nessus/sslui.c:85 +#: nessus/report.c:203 +#, fuzzy +msgid "report_save() couldn't save the certificate information" +msgstr "report_save() ?? ???? ????? ???? ????" + +#: nessus/report_save.c:178 +#, fuzzy +msgid "Export Report" +msgstr "??\"?" + +#: nessus/report_save.c:194 +#, fuzzy +msgid "Export Options" +msgstr "????????" + +#: nessus/report_save.c:203 +msgid "Report file format : " +msgstr "" + +#: nessus/report_save.c:239 +msgid "ASCII text" +msgstr "" + +#: nessus/report_save.c:245 +msgid "HTML with Pies and Graphs" +msgstr "" + +#: nessus/report_save.c:283 +#, c-format +msgid "PDF file %s not found." +msgstr "" + +#: nessus/report_save.c:289 +#, c-format +msgid "" +"You haven't configured a PDF viewer.\n" +"The report was saved as %s so you can manually open it." +msgstr "" + +#: nessus/report_save.c:300 +#, c-format +msgid "Can't launch PDF viewer: %s" +msgstr "" + +#: nessus/report_save.c:334 +#, fuzzy, c-format +msgid "" +"Can't open PDF file: %s:\n" +"%s" +msgstr "?? ???? ????? %s %s" + +#: nessus/sighand.c:53 +msgid "Connection closed by the server (SIGPIPE caught)" +msgstr "" + +#: nessus/sighand.c:59 +#, fuzzy +msgid "Connection timed out" +msgstr "???????:????? %s %s" + +#: nessus/sslui.c:86 msgid "SSL Setup" msgstr "SSL ?????" -#: nessus/sslui.c:128 +#: nessus/sslui.c:129 msgid "Display and remember the server certificate, do not care about the CA" msgstr "??? ????? ????? ???, ????? ??CA" -#: nessus/sslui.c:138 +#: nessus/sslui.c:139 msgid "" "Trust the server certificate if and only if it is valid and certified by the " "CA" msgstr "??? ?????? ??? ?? ????? ???? ???? ??????? ?? ??? CA" -#: nessus/sslui.c:146 +#: nessus/sslui.c:147 msgid "Verify that the server certificate is valid *and* remember it" msgstr "??? ?????? ???? ????? ????? ?? ??" -#: nessus/sslui.c:157 +#: nessus/sslui.c:158 msgid "OK" msgstr "????" -#: nessus/sslui.c:194 +#: nessus/sslui.c:195 msgid "" "Please choose your level of SSL paranoia (Hint: if you want to manage\n" "many servers from your client, choose 2. Otherwise, choose 1, or 3,\n" @@ -1010,28 +1323,28 @@ "????? ???? ?????? ????? ??? 2, ???? ??? 1 ?? 3\n" "?? ??? ????????)\n" -#: nessus/sslui.c:280 +#: nessus/sslui.c:288 msgid "This certificate has never been shown before. Here it is:" msgstr "????? ?? ?? ????? ???? ??. ??? ???:" -#: nessus/sslui.c:310 +#: nessus/sslui.c:319 msgid "Do you accept this certificate?" msgstr "??? ??? ???? ????? ???" -#: nessus/sslui.c:320 +#: nessus/sslui.c:327 msgid "Yes" msgstr "??" -#: nessus/sslui.c:326 +#: nessus/sslui.c:333 msgid "No" msgstr "??" -#: nessus/sslui.c:374 +#: nessus/sslui.c:384 #, c-format msgid "This certificate has never been seen before and can't be shown\n" msgstr "????? ?? ?? ????? ???? ??. ??? ?????? ?????\n" -#: nessus/sslui.c:394 +#: nessus/sslui.c:404 #, c-format msgid "Do you accept it? (y/n) " msgstr "??? ??? ????? (??/??)" @@ -1056,7 +1369,7 @@ msgstr "???????:????? %s %s" #: nessus/prefs_dialog/prefs_context.c:291 -#: nessus/prefs_dialog/prefs_dialog.c:777 +#: nessus/prefs_dialog/prefs_dialog.c:761 msgid "not connected" msgstr "?? ?????" @@ -1079,158 +1392,154 @@ msgid "prefs_context_update called with illegal context." msgstr "prefs_context_update() ????? ????? ???? ?? ????" -#: nessus/prefs_dialog/prefs_dialog.c:111 +#: nessus/prefs_dialog/prefs_dialog.c:110 msgid "users-manual.pdf" msgstr "????? ?????.pdf" -#: nessus/prefs_dialog/prefs_dialog.c:131 +#: nessus/prefs_dialog/prefs_dialog.c:130 msgid "The global settings have been saved." msgstr "?????? ???????? ?????" -#: nessus/prefs_dialog/prefs_dialog.c:187 -msgid "Not yet implemented." -msgstr "????? ?? ?????" - -#: nessus/prefs_dialog/prefs_dialog.c:362 +#: nessus/prefs_dialog/prefs_dialog.c:353 msgid "OpenVAS-Client" msgstr "OpenVAS-????" -#: nessus/prefs_dialog/prefs_dialog.c:384 +#: nessus/prefs_dialog/prefs_dialog.c:375 msgid "_File" msgstr "_????" -#: nessus/prefs_dialog/prefs_dialog.c:389 +#: nessus/prefs_dialog/prefs_dialog.c:380 msgid "_Connect" msgstr "_?????" -#: nessus/prefs_dialog/prefs_dialog.c:393 +#: nessus/prefs_dialog/prefs_dialog.c:384 msgid "_Disconnect" msgstr "_?????" -#: nessus/prefs_dialog/prefs_dialog.c:400 +#: nessus/prefs_dialog/prefs_dialog.c:391 msgid "SLAD _Install" msgstr "SLAD _?????" -#: nessus/prefs_dialog/prefs_dialog.c:404 +#: nessus/prefs_dialog/prefs_dialog.c:395 msgid "_Scan Assistant" msgstr "_???? ?????" -#: nessus/prefs_dialog/prefs_dialog.c:412 +#: nessus/prefs_dialog/prefs_dialog.c:403 msgid "Save _Global Settings" msgstr "_???? ?????? ????????" -#: nessus/prefs_dialog/prefs_dialog.c:424 +#: nessus/prefs_dialog/prefs_dialog.c:415 msgid "_View" msgstr "_???" -#: nessus/prefs_dialog/prefs_dialog.c:429 +#: nessus/prefs_dialog/prefs_dialog.c:420 msgid "_Toolbar" msgstr "_???? ????" -#: nessus/prefs_dialog/prefs_dialog.c:433 +#: nessus/prefs_dialog/prefs_dialog.c:424 msgid "_Message log" msgstr "_???? ?????" -#: nessus/prefs_dialog/prefs_dialog.c:439 +#: nessus/prefs_dialog/prefs_dialog.c:430 msgid "_Task" msgstr "_?????" -#: nessus/prefs_dialog/prefs_dialog.c:444 -#: nessus/prefs_dialog/prefs_dialog.c:476 +#: nessus/prefs_dialog/prefs_dialog.c:435 +#: nessus/prefs_dialog/prefs_dialog.c:460 msgid "_New" msgstr "_???" -#: nessus/prefs_dialog/prefs_dialog.c:448 -#: nessus/prefs_dialog/prefs_dialog.c:480 -#: nessus/prefs_dialog/prefs_dialog.c:512 +#: nessus/prefs_dialog/prefs_dialog.c:439 +#: nessus/prefs_dialog/prefs_dialog.c:464 +#: nessus/prefs_dialog/prefs_dialog.c:496 msgid "_Rename" msgstr "_??? ??" -#: nessus/prefs_dialog/prefs_dialog.c:458 +#: nessus/prefs_dialog/prefs_dialog.c:449 msgid "_Scope" msgstr "_????" -#: nessus/prefs_dialog/prefs_dialog.c:489 +#: nessus/prefs_dialog/prefs_dialog.c:473 msgid "_Move to task" msgstr "_???? ??????" -#: nessus/prefs_dialog/prefs_dialog.c:507 +#: nessus/prefs_dialog/prefs_dialog.c:491 msgid "_Report" msgstr "_????" -#: nessus/prefs_dialog/prefs_dialog.c:522 +#: nessus/prefs_dialog/prefs_dialog.c:506 msgid "_Import" msgstr "_????" -#: nessus/prefs_dialog/prefs_dialog.c:526 +#: nessus/prefs_dialog/prefs_dialog.c:510 msgid "E_xport" msgstr "_????" -#: nessus/prefs_dialog/prefs_dialog.c:536 +#: nessus/prefs_dialog/prefs_dialog.c:520 msgid "_Help" msgstr "_????" -#: nessus/prefs_dialog/prefs_dialog.c:541 +#: nessus/prefs_dialog/prefs_dialog.c:525 msgid "_Users Manual" msgstr "_??? ????? ??????" -#: nessus/prefs_dialog/prefs_dialog.c:545 +#: nessus/prefs_dialog/prefs_dialog.c:529 msgid "_About" msgstr "_?????" -#: nessus/prefs_dialog/prefs_dialog.c:581 -#: nessus/prefs_dialog/prefs_dialog.c:583 +#: nessus/prefs_dialog/prefs_dialog.c:565 +#: nessus/prefs_dialog/prefs_dialog.c:567 #: nessus/prefs_dialog/prefs_scan_assistant.c:238 msgid "Scan Assistant" msgstr "???? ?????" -#: nessus/prefs_dialog/prefs_dialog.c:590 -#: nessus/prefs_dialog/prefs_dialog.c:592 +#: nessus/prefs_dialog/prefs_dialog.c:574 +#: nessus/prefs_dialog/prefs_dialog.c:576 msgid "New" msgstr "???" -#: nessus/prefs_dialog/prefs_dialog.c:599 -#: nessus/prefs_dialog/prefs_dialog.c:601 +#: nessus/prefs_dialog/prefs_dialog.c:583 +#: nessus/prefs_dialog/prefs_dialog.c:585 msgid "Delete" msgstr "???" -#: nessus/prefs_dialog/prefs_dialog.c:611 -#: nessus/prefs_dialog/prefs_dialog.c:613 +#: nessus/prefs_dialog/prefs_dialog.c:595 +#: nessus/prefs_dialog/prefs_dialog.c:597 msgid "Connect" msgstr "?????" -#: nessus/prefs_dialog/prefs_dialog.c:621 -#: nessus/prefs_dialog/prefs_dialog.c:623 +#: nessus/prefs_dialog/prefs_dialog.c:605 +#: nessus/prefs_dialog/prefs_dialog.c:607 msgid "Disconnect" msgstr "?????" -#: nessus/prefs_dialog/prefs_dialog.c:633 -#: nessus/prefs_dialog/prefs_dialog.c:635 +#: nessus/prefs_dialog/prefs_dialog.c:617 +#: nessus/prefs_dialog/prefs_dialog.c:619 msgid "Execute" msgstr "???" -#: nessus/prefs_dialog/prefs_dialog.c:656 +#: nessus/prefs_dialog/prefs_dialog.c:640 msgid "Context" msgstr "????" -#: nessus/prefs_dialog/prefs_dialog.c:686 +#: nessus/prefs_dialog/prefs_dialog.c:670 msgid "Comments" msgstr "?????" -#: nessus/prefs_dialog/prefs_dialog.c:692 +#: nessus/prefs_dialog/prefs_dialog.c:676 msgid "Options" msgstr "????????" -#: nessus/prefs_dialog/prefs_dialog.c:698 -#: nessus/prefs_dialog/prefs_dialog_prefs.c:187 +#: nessus/prefs_dialog/prefs_dialog.c:682 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:190 msgid "Report" msgstr "??\"?" -#: nessus/prefs_dialog/prefs_dialog.c:718 +#: nessus/prefs_dialog/prefs_dialog.c:702 msgid "Message log" msgstr "???? ??????" -#: nessus/prefs_dialog/prefs_dialog.c:739 +#: nessus/prefs_dialog/prefs_dialog.c:723 msgid "" "Welcome to OpenVAS-Client, http://www.openvas.org/\n" "NessusClient origin: Copyright 1998-2007 by Renaud Deraison\n" @@ -1249,7 +1558,7 @@ "????? ????? (????? SSL)\n" "???? ??????? (??????,???). \n" -#: nessus/prefs_dialog/prefs_dialog.c:1519 +#: nessus/prefs_dialog/prefs_dialog.c:1449 msgid "" "You must enter the name of the primary target\n" "to attack in the 'target' section" @@ -1379,113 +1688,123 @@ msgid "Remember the set of plugins" msgstr "???? ?? ????? ??????? ????" -#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:88 +#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:95 msgid "Advanced Plugins preferences" msgstr "?????? ??????? ???? ??????" -#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:95 -#: nessus/prefs_dialog/prefs_options.c:101 +#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:102 +#: nessus/prefs_dialog/prefs_options.c:102 msgid "Credentials" msgstr "???????" -#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:351 +#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:188 +#, c-format +msgid "%s asked for unknown preference type %s." +msgstr "" + +#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:388 msgid "Select file" msgstr "??? ????" -#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:496 +#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:575 +#, fuzzy +msgid "SSH Key Information" +msgstr "??? ????" + +#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:709 msgid "Select..." msgstr "???..." -#: nessus/prefs_dialog/prefs_dialog_prefs.c:60 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:65 msgid "Preferences" msgstr "??????" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:80 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:85 msgid "User interface" msgstr "???? ?????" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:92 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:97 msgid "Auto expand tree elements" msgstr "???? ?? ??????? ????????" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:98 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:103 msgid "Order by:" msgstr "" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:108 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:113 #: nessus/prefs_dialog/prefs_report.c:499 msgid "Host/Port/Severity" msgstr "??? ????/????/????? ?????" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:110 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:115 #: nessus/prefs_dialog/prefs_report.c:501 msgid "Port/Host/Severity" msgstr "????/??? ????/????? ?????" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:116 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:121 #, fuzzy msgid "Connection to OpenVAS Server" msgstr "????? ???? Nessus" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:128 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:133 msgid "Automatically connect" msgstr "????? ????????" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:134 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:139 msgid "Protocol version:" msgstr "" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:144 -msgid "NTP 1.2" -msgstr "" - -#: nessus/prefs_dialog/prefs_dialog_prefs.c:146 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:149 msgid "OTP 1.0" msgstr "" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:149 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:152 msgid "Plugin Cache" msgstr "????? ??????" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:161 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:164 msgid "Cache plugin information when connecting" msgstr "???? ???? ?????? ?????? ???? ???????" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:168 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:171 msgid "Use plugin cache with reports" msgstr "????? ?????? ?????? ???? ??\"???" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:176 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:179 msgid "Load plugin cache for scopes immediately" msgstr "??? ?????? ????? ?????? ???? ????" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:199 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:202 msgid "Include plugin details in PDF" msgstr "???? ???? ?????? ????? PDF" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:207 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:210 msgid "Show script origin in report window" msgstr "" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:221 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:224 msgid "External Links in HTML/PDF" msgstr "??????? ???????? ? HTML/PDF" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:232 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:235 #, fuzzy msgid "OpenVAS IDs:" msgstr "OpenVAS" # -#: nessus/prefs_dialog/prefs_dialog_prefs.c:244 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:247 msgid "CVE IDs:" msgstr "CVE IDs:" # -#: nessus/prefs_dialog/prefs_dialog_prefs.c:256 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:259 msgid "BugTraq IDs:" msgstr "BugTraq IDs:" +#: nessus/prefs_dialog/prefs_dialog_prefs.c:272 +msgid "SSH Key Management" +msgstr "" + #: nessus/prefs_dialog/prefs_dialog_scan_opt.c:141 msgid "General scan options" msgstr "???????? ????? ??????." @@ -1589,18 +1908,18 @@ #: nessus/prefs_dialog/prefs_help.h:39 #, fuzzy msgid "" -"Enter the port number where you will be serviced by the OpenVAS Server. With " -"older server systems, this is the port 3001, but the official port is 1241." +"Enter the port number where you will be serviced by the OpenVAS Server. " +"Usual is 1241." msgstr "" "???? ?? ???? ????? ??? ???? ??? Nessus ??????? ??? ????? ??? ???? 3001, ?? " "????? ????? ??? 1241" -#: nessus/prefs_dialog/prefs_help.h:44 +#: nessus/prefs_dialog/prefs_help.h:43 #, fuzzy msgid "Set to default OpenVAS port 1241." msgstr "??? ?????? ???? ?Nessus ?? ???? 1241" -#: nessus/prefs_dialog/prefs_help.h:47 +#: nessus/prefs_dialog/prefs_help.h:46 #, fuzzy msgid "" "Enter the user name where you are registerd with on the OpenVAS Server. If " @@ -1610,7 +1929,7 @@ "???? ?? ?? ?????? ?? ????? ???? Nessus. ?? ?? ???? ??????? ??? ??? ????? " "????? ?????? ?????. ????? ????? ???? ????? ???? ????? ????? ?? ?????." -#: nessus/prefs_dialog/prefs_help.h:53 +#: nessus/prefs_dialog/prefs_help.h:52 #, fuzzy msgid "" "Maximal of number of hosts that the OpenVAS Server will test at the same " @@ -1620,7 +1939,7 @@ "???? ????? ?????? ??????? ????? ??????. ??? ?? ??? ???? Nessus ???? ????? " "???? ????? ??????? ????? ?????? ??????? ??????. " -#: nessus/prefs_dialog/prefs_help.h:58 +#: nessus/prefs_dialog/prefs_help.h:57 #, fuzzy msgid "" "Maximal number of security checks that will be launched at the same time " @@ -1630,11 +1949,11 @@ "???? ?????? ????? ??????? ????? ??? ???? ?? ??? ????. ??? ?? ??? ???? Nessus " "???? ????? ???? ????? ??????? ????? ?????? ??????? ??????. " -#: nessus/prefs_dialog/prefs_help.h:63 +#: nessus/prefs_dialog/prefs_help.h:62 msgid "Name of the remote file that several plugins will attempt to read." msgstr "?? ????? ?????? ????? ?????? ???? ?????" -#: nessus/prefs_dialog/prefs_help.h:67 +#: nessus/prefs_dialog/prefs_help.h:66 #, fuzzy msgid "" "If this option is checked, then OpenVAS Server will send some TCP packets to " @@ -1646,7 +1965,7 @@ "?????. ???? ?? ?? ?????? ?ICMP ?????? ?ICMP ???? ?????? ????? ????? ????? " "?????? ????? ?????? ICMP echo.p " -#: nessus/prefs_dialog/prefs_help.h:73 +#: nessus/prefs_dialog/prefs_help.h:72 #, fuzzy msgid "" "If this option is set, OpenVAS Server will do a reverse lookup on the IP " @@ -1655,21 +1974,9 @@ "????? ???????? ?????? ,??? Nessus ???? ????? Reverse lookup ?? ?????? ?ip " "???? ????? ????. ?? ???? ???? ?? ?????? ????. " -#: nessus/prefs_dialog/prefs_help.h:78 +#: nessus/prefs_dialog/prefs_help.h:77 #, fuzzy msgid "" -"Are the target hosts protected by a firewall ? If so and if we are outside " -"the firewall, it is a good idea to turn this option ON, so that OpenVAS " -"Server will perform some additional tests to check that the remote firewall " -"is well configured (this option is still experimental)." -msgstr "" -"??? ?????? ?????? ?? ??? ????-??? ?? ?? ??? ????? ???? ????? ???, ?? ????? " -"??? ?????? ?? ??????? ????, ?? ???? Nessus ???? ?????? ?????? ??? ????? ?? " -"???? ??? ?????? ???? (?????? ??? ????? ????????)" - -#: nessus/prefs_dialog/prefs_help.h:86 -#, fuzzy -msgid "" "Security tests may ask the OpenVAS Server to be launched if and only if some " "information gathered by other test exist in the knowledge base, or if and " "only if a given port is open. This option speeds up the test, but may make " @@ -1679,7 +1986,7 @@ "????? ?????? ????? ????? ????? ???? Nessus ?? ??? ?? ???? ????? ?? ??? " "?????? ????? ???? ????? ????." -#: nessus/prefs_dialog/prefs_help.h:94 +#: nessus/prefs_dialog/prefs_help.h:85 #, fuzzy msgid "" "Some security checks may harm the target server, by disabling the remote " @@ -1696,7 +2003,7 @@ "?????? ?????? ??????? ???? ?? ??? ????? ????? ??????. ?????? ??? ?? ?????, " "??? ??????? ?????? ?? ??????? ????." -#: nessus/prefs_dialog/prefs_help.h:105 +#: nessus/prefs_dialog/prefs_help.h:96 #, fuzzy msgid "" "If you enable this option, the hosts on the local network will be designated " @@ -1708,7 +2015,7 @@ "????? ?????? ?IP. ?? ?????? ?????? ?????? ?? ???? ????? ?Nessus ???? DHCP. " "?? ???? ????, ??? ?????? ???." -#: nessus/prefs_dialog/prefs_help.h:111 +#: nessus/prefs_dialog/prefs_help.h:102 #, fuzzy msgid "" "Ports that will be scanned by OpenVAS Server. You can enter single ports, " @@ -1721,7 +2028,7 @@ "?????? ???? ????? ?????? ?? \"default\" ?? ?????? ????? ?? ??????? ???????? " "?????? ???? ????? ???????? ?? Nessus." -#: nessus/prefs_dialog/prefs_help.h:118 +#: nessus/prefs_dialog/prefs_help.h:109 #, fuzzy msgid "" "To save scanning time, you may ask OpenVAS Server to declare TCP ports it " @@ -1735,7 +2042,7 @@ "????? ?????? ??????? ??? ?????. ?? ?????? ?? ??????, ??? Nessus ?????? " "??????? ??? ???? ???? ???? ???????." -#: nessus/prefs_dialog/prefs_help.h:126 +#: nessus/prefs_dialog/prefs_help.h:117 #, fuzzy msgid "" "OpenVAS Server will perform an AXFR request (that is, a zone transfer) to " @@ -1745,7 +2052,7 @@ "Nessus ???? ???? AXFR (zone transfer) ???? ??? ?? ????? ????? ????? ?? ????? " "?????? ??????? ?? ?? ???? ????? ????? ??? ????? ?? ??? ????." -#: nessus/prefs_dialog/prefs_help.h:132 +#: nessus/prefs_dialog/prefs_help.h:123 #, fuzzy msgid "" "OpenVAS Server will determine which hosts can mount the filesystems exported " @@ -1754,7 +2061,7 @@ "??? Nessus ???? ????? ????? ????? ?????? ???? ???? ?? ????? ?????? ??????? " "?? ??? ??? ?????, ??? ????? ????. ??? ?? ????? ?? ??? ????????." -#: nessus/prefs_dialog/prefs_help.h:137 +#: nessus/prefs_dialog/prefs_help.h:128 #, fuzzy msgid "" "OpenVAS Server will test the whole subnet of the target host. If you select " @@ -1764,7 +2071,7 @@ "??? Nessus ????? ?? ?? ??-???? ?? ??? ?????. ?? ???? ?????? ???, ???? ????? " "???? Nessus ????? ???? ???? ????? ????. ?????? ??? ????? ?\"???????? ?????\"." -#: nessus/prefs_dialog/prefs_help.h:142 +#: nessus/prefs_dialog/prefs_help.h:133 #, fuzzy msgid "" "The first host(s) that will be attacked by OpenVAS Server. The options below " @@ -1776,7 +2083,7 @@ "?? ????? ????? ???? ???? ?? ??????. ???? ?????? ???? ????? ?????? ?? ??? " "?????? ????? ???? (,). ????: \"???1,???2\"" -#: nessus/prefs_dialog/prefs_help.h:148 +#: nessus/prefs_dialog/prefs_help.h:139 msgid "" "A textfile can be specified that contains the list of targets. This textfile " "may contain comma-separated lists of host and also may contain many of such " @@ -1785,7 +2092,7 @@ "???? ???? ???? ????? ????? ?????. ???? ?? ???? ????? ????? ????? ?????? ?? " "??? ???? ?????? ?????." -#: nessus/prefs_dialog/prefs_help.h:153 +#: nessus/prefs_dialog/prefs_help.h:144 msgid "" "It is possible to check for the presence of CGIs in multiple paths like /cgi-" "bin, /cgis, /home-cgis, and so on. In that case, put all your paths here " @@ -1795,7 +2102,7 @@ "??????. ????? ???, ??? ??? ?? ??????? ??????? ?? ??? ????. ????:/cgi-bin:/" "cgi-aws:/~deraison/cgi'." -#: nessus/prefs_dialog/prefs_help.h:159 +#: nessus/prefs_dialog/prefs_help.h:150 msgid "" "The warning sign means that this plugin may harm the target host by " "disabling the attacked service or by crashing the host. You should be " @@ -1806,17 +2113,18 @@ "?? ?? ??? ???? ???? ?????. ???? ????? ???? ?? ?? ????? ??? ?????? ??? ???? " "????? ?? ????? ?? ???? ??? ?? ?????? ????? ???? ???? ???????." -#: nessus/prefs_dialog/prefs_help.h:167 +#: nessus/prefs_dialog/prefs_help.h:158 #, fuzzy msgid "" "If you turn on this option, all the information collected about the target " "hosts will be saved on the side of OpenVAS Server for further re-use. See " -"http://www.nessus.org/doc/kb_saving.html for details." +"http://www.openvas.org/compendium/scan-options-knowledge-base.html for " +"details." msgstr "" "?? ????? ?? ??????? ????, ?? ????? ????? ????? ??? ???? ?? Nessus. ?????? " "?????, ??? ?http://www.nessus.org/doc/kb_saving.html for details ??????." -#: nessus/prefs_dialog/prefs_help.h:173 +#: nessus/prefs_dialog/prefs_help.h:164 #, fuzzy msgid "" "If you select this option, all the hosts selected in the 'Target' section of " @@ -1824,13 +2132,13 @@ msgstr "" "?? ???? ??????? ??? ?? ?????? ??????? ??????? \"????\" ?? ???? Nessus ?????." -#: nessus/prefs_dialog/prefs_help.h:177 +#: nessus/prefs_dialog/prefs_help.h:168 msgid "" "If you select this option, only the hosts to which a recent knowledge base " "is attached will be tested." msgstr "?? ???? ??????? ???, ?? ????? ?????? ????? ??? ?????? ??????? ?????." -#: nessus/prefs_dialog/prefs_help.h:181 +#: nessus/prefs_dialog/prefs_help.h:172 msgid "" "If you select this option, only the hosts which have no (or an outdated) " "knowledge base attached will be tested. Use this option to populate your " @@ -1839,7 +2147,7 @@ "?? ???? ??????? ??? ?? ????? ????? ??? ???? ??? (?? ???? ??? ?????) ?????. " "????? ??????? ??? ??? ???? ?? ????? ???? ???" -#: nessus/prefs_dialog/prefs_help.h:186 +#: nessus/prefs_dialog/prefs_help.h:177 #, fuzzy msgid "" "If you select this option, the knowledge bases of the target hosts will be " @@ -1852,7 +2160,7 @@ "???????. ???? ?????? ??????? ??? ???? ?? ????????? ????? ??? ????? ???? " "Nessus ????? ????? ???? ???? ?? ????? ?????? ?????? ???? ?????." -#: nessus/prefs_dialog/prefs_help.h:193 +#: nessus/prefs_dialog/prefs_help.h:184 msgid "" "If you select this option, the port scanners that were launched in the past " "against the targetted hosts will not be launched again and the data of the " @@ -1861,7 +2169,7 @@ "?? ???? ??????? ??? ???? ??????? ?????? ???? ??? ??? ????? ?? ????? ??? " "?????? ????? ????? ???? ???? ??????? ??????" -#: nessus/prefs_dialog/prefs_help.h:199 +#: nessus/prefs_dialog/prefs_help.h:190 msgid "" "If you select this option, all the plugins that performs information " "gathering and which have already been launched against the target hosts will " @@ -1870,7 +2178,7 @@ "?? ???? ??????? ??? ?? ??????? ??????? ?????? ???? ???? ??? ?????? ??? ??? " "????? ?? ???? ?????? ????" -#: nessus/prefs_dialog/prefs_help.h:204 +#: nessus/prefs_dialog/prefs_help.h:195 msgid "" "If you select this option, all the plugins that performs attacks and which " "have already been launched against the target hosts will not be launched " @@ -1879,7 +2187,7 @@ "?? ???? ??????? ??? ?? ??????? ??????? ?????? ???? ??? ?????? ??? ??? ????? " "?? ???? ?????? ????" -#: nessus/prefs_dialog/prefs_help.h:209 +#: nessus/prefs_dialog/prefs_help.h:200 msgid "" "If you select this option, all the plugins that may harm the target hosts " "and which have already been launched will not be launched again." @@ -1887,18 +2195,18 @@ "?? ???? ??????? ??? ?? ??????? ??????? ????? ???? ??? ?????? ??? ??? ????? " "?? ???? ?????? ????" -#: nessus/prefs_dialog/prefs_help.h:214 +#: nessus/prefs_dialog/prefs_help.h:205 msgid "This value defines the maximum age (in seconds) of a knowledge base." msgstr "???? ????? ?? ???? ???????? (??????) ?? ???? ????" -#: nessus/prefs_dialog/prefs_help.h:218 +#: nessus/prefs_dialog/prefs_help.h:209 msgid "" "If this option is set, the client will only report what has changed between " "the new scan and the last one." msgstr "" "?? ?????? ??? ?????? ????? ????? ?? ?? ???????? ??? ?????? ??????? ???????" -#: nessus/prefs_dialog/prefs_help.h:224 +#: nessus/prefs_dialog/prefs_help.h:215 #, fuzzy msgid "" "If you enable this option, then OpenVAS Server will enable the plugins that " @@ -1907,7 +2215,7 @@ "?? ?????? ??? ?????? ??? Nessus ????? ?? ??????? ??????? ?? ??? ????? " "??????? ?????" -#: nessus/prefs_dialog/prefs_help.h:228 +#: nessus/prefs_dialog/prefs_help.h:219 #, fuzzy msgid "" "If you enable this option, then openvasd will not report data coming from " @@ -1916,6 +2224,13 @@ "?? ?????? ??? ??????, ??? Nessusd ?? ????? ?? ???? ????? ???????? ??? ?????? " "?? ???." +#: nessus/prefs_dialog/prefs_help.h:223 +msgid "" +"If you enable this option, then new plugins (that you have not seen before " +"in this scope) are automatically enabled. In any case, a message will be " +"displayed when new plugins have been found, showing your choice." +msgstr "" + #: nessus/prefs_dialog/prefs_kb.c:37 msgid "Enable KB saving" msgstr "???? ????? ?\"?" @@ -1961,6 +2276,10 @@ msgid "Max age of a saved KB (in secs) : " msgstr "??? ??????? ?? ?\"? ?????(??????)" +#: nessus/prefs_dialog/prefs_plugins_tree.c:448 +msgid "Warning" +msgstr "?????" + #: nessus/prefs_dialog/prefs_report.c:141 #, c-format msgid "Scan took place from %s to %s" @@ -1983,7 +2302,7 @@ #: nessus/prefs_dialog/prefs_report.c:371 #, c-format msgid "" -"Reported by NVT \"%s\" (1.3.6.1.4.1.25623.1.0.%d):\n" +"Reported by NVT \"%s\" (%s):\n" "\n" msgstr "" @@ -2013,11 +2332,6 @@ msgid "Please enter a name for your task:" msgstr "?? ???? ?? ?? ??????" -#: nessus/prefs_dialog/prefs_scan_assistant.c:264 -#: nessus/prefs_dialog/prefs_scan_assistant.c:281 -msgid "Comment:" -msgstr "????:" - #: nessus/prefs_dialog/prefs_scan_assistant.c:269 msgid "Step 2: Scope" msgstr "??? 2:????" @@ -2195,39 +2509,39 @@ msgstr "on_scope_edited(): ????? ??? ?????" #: nessus/prefs_dialog/prefs_scope_tree.c:794 -msgid "Low" -msgstr "????" +msgid "High" +msgstr "????" #: nessus/prefs_dialog/prefs_scope_tree.c:806 msgid "Medium" msgstr "????" #: nessus/prefs_dialog/prefs_scope_tree.c:818 -msgid "High" -msgstr "????" +msgid "Low" +msgstr "????" -#: nessus/prefs_dialog/prefs_options.c:93 +#: nessus/prefs_dialog/prefs_options.c:94 msgid "General" msgstr "????" -#: nessus/prefs_dialog/prefs_options.c:97 +#: nessus/prefs_dialog/prefs_options.c:98 msgid "Plugins" msgstr "??????" -#: nessus/prefs_dialog/prefs_options.c:105 +#: nessus/prefs_dialog/prefs_options.c:106 #: nessus/prefs_dialog/prefs_target.c:49 msgid "Target selection" msgstr "????? ????" -#: nessus/prefs_dialog/prefs_options.c:109 +#: nessus/prefs_dialog/prefs_options.c:110 msgid "Access Rules" msgstr "???? ????" -#: nessus/prefs_dialog/prefs_options.c:113 +#: nessus/prefs_dialog/prefs_options.c:114 msgid "Prefs." msgstr "??????" -#: nessus/prefs_dialog/prefs_options.c:117 +#: nessus/prefs_dialog/prefs_options.c:118 msgid "KB" msgstr "?\"?" @@ -2286,6 +2600,11 @@ msgid "Silent" msgstr "???" +#: nessus/prefs_dialog/prefs_plugins.c:363 +#, fuzzy +msgid "Automatically enable new plugins" +msgstr "????? ????????" + #: nessus/prefs_dialog/prefs_target.c:65 msgid "Target(s):" msgstr "????:" @@ -2298,6 +2617,36 @@ msgid "Perform a DNS zone transfer" msgstr "??? ????? ???? DNS" +#~ msgid "Security hole found" +#~ msgstr "???? ??? ?????" + +#~ msgid "Security notes found" +#~ msgstr "????? ????? ?????" + +#~ msgid "Vulnerability" +#~ msgstr "????? ?????" + +#~ msgid "Informational" +#~ msgstr "????" + +#, fuzzy +#~ msgid "OpenVAS Plugin ID: %d" +#~ msgstr "???? ???? ????Nessus: %d" + +#~ msgid "Not yet implemented." +#~ msgstr "????? ?? ?????" + +#, fuzzy +#~ msgid "" +#~ "Are the target hosts protected by a firewall ? If so and if we are " +#~ "outside the firewall, it is a good idea to turn this option ON, so that " +#~ "OpenVAS Server will perform some additional tests to check that the " +#~ "remote firewall is well configured (this option is still experimental)." +#~ msgstr "" +#~ "??? ?????? ?????? ?? ??? ????-??? ?? ?? ??? ????? ???? ????? ???, ?? " +#~ "????? ??? ?????? ?? ??????? ????, ?? ???? Nessus ???? ?????? ?????? ??? " +#~ "????? ?? ???? ??? ?????? ???? (?????? ??? ????? ????????)" + #~ msgid "\tSSL used for client - server communication\n" #~ msgstr "\t???? ????? ?SSL ???? ????-???\n" Modified: trunk/openvas-client/po/hr.po =================================================================== --- trunk/openvas-client/po/hr.po 2009-01-01 22:32:37 UTC (rev 2128) +++ trunk/openvas-client/po/hr.po 2009-01-02 00:52:00 UTC (rev 2129) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: hr\n" "Report-Msgid-Bugs-To: openvas-devel at wald.intevation.org\n" -"POT-Creation-Date: 2008-07-30 06:58+0200\n" +"POT-Creation-Date: 2009-01-02 01:47+0100\n" "PO-Revision-Date: 2008-07-30 15:34+0200\n" "Last-Translator: Vlatko Kosturjak \n" "Language-Team: Croatian \n" @@ -17,6 +17,25 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" +#: src/openvas-lib/openvas_certificate_file.c:101 +#, fuzzy, c-format +msgid "Error adding comment to key file: %s" +msgstr "Ne mogu pro?itati iz %s: %s" + +#: src/openvas-lib/openvas_certificate_file.c:118 +msgid "Error accessing certificate file for report." +msgstr "" + +#: src/openvas-lib/openvas_certificate_file.c:126 +#, fuzzy, c-format +msgid "Error exporting key file: %s" +msgstr "Gre?ka prilikom pisanja %s: %s" + +#: src/openvas-lib/openvas_certificate_file.c:165 +#, fuzzy, c-format +msgid "Error loading certificate store %s: %s" +msgstr "Ne mogu pro?itati iz %s: %s" + #: src/gui/about_dlg.c:113 msgid "About OpenVAS-Client" msgstr "O OpenVAS klijentu" @@ -115,109 +134,223 @@ "error. Maybe a reboot will fix this." msgstr "" -#: nessus/comm.c:90 +#: src/gui/ssh_key_info_form.c:170 +#, fuzzy +msgid "Account name:" +msgstr "Ime ra?unala:" + +#: src/gui/ssh_key_info_form.c:178 +msgid "SSH login name:" +msgstr "" + +#: src/gui/ssh_key_info_form.c:185 +msgid "SSH public key:" +msgstr "" + +#: src/gui/ssh_key_info_form.c:193 +msgid "SSH private key:" +msgstr "" + +#: src/gui/ssh_key_info_form.c:201 +msgid "SSH key passphrase:" +msgstr "" + +#: src/gui/ssh_key_info_form.c:208 +#: nessus/prefs_dialog/prefs_scan_assistant.c:264 +#: nessus/prefs_dialog/prefs_scan_assistant.c:281 +msgid "Comment:" +msgstr "Komentar:" + +#: src/gui/ssh_key_info_form.c:234 +#, fuzzy +msgid "Please provide a better name." +msgstr "Molimo odaberite datoteku." + +#: src/gui/ssh_key_info_form.c:240 +#, fuzzy +msgid "Please provide a longer username." +msgstr "Molimo odaberite datoteku." + +#: src/gui/ssh_key_info_form.c:245 +msgid "Please provide a passphrase with more then 5 characters." +msgstr "" + +#: src/gui/ssh_key_info_form.c:251 +msgid "Please provide a better comment for public key." +msgstr "" + +#: src/gui/ssh_key_info_form.c:257 +msgid "Comment must not contain spaces." +msgstr "" + +#: src/gui/ssh_keys_dialog.c:98 src/gui/ssh_keys_dialog.c:161 +#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:597 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:276 +#, fuzzy +msgid "OpenVAS SSH Key Manager" +msgstr "OpenVAS poslu?itelj" + +#: src/gui/ssh_keys_dialog.c:191 +msgid "Create a new keypair" +msgstr "" + +#: nessus/comm.h:40 +msgid "Select SSH Login" +msgstr "" + +#: nessus/comm.c:92 #, c-format msgid "Receiving plugins: %d" msgstr "Preuzimam dodatke: %d" -#: nessus/comm.c:95 +#: nessus/comm.c:97 #, c-format msgid "Receiving dependencies: %d" msgstr "Preuzimam ovisnosti: %d" -#: nessus/comm.c:385 +#: nessus/comm.c:444 #, c-format msgid "Error : we received a preference (%s) for the plugin %s\n" msgstr "" -#: nessus/comm.c:388 +#: nessus/comm.c:447 #, c-format msgid "but apparently the server has not loaded it\n" msgstr "" -#: nessus/comm.c:754 +#: nessus/comm.c:870 #, c-format msgid "Can't open %s: %s" msgstr "Ne mogu otvoriti %s: %s" -#: nessus/comm.c:778 +#: nessus/comm.c:894 #, c-format msgid "Error reading from %s: %s" msgstr "Ne mogu pro?itati iz %s: %s" -#: nessus/comm.c:907 nessus/comm.c:1250 +#: nessus/comm.c:1015 nessus/comm.c:1401 msgid "The daemon shut down the communication" msgstr "Servis(daemon) je isklju?io vezu" -#: nessus/comm.c:932 +#: nessus/comm.c:1042 msgid "Error processing plugin information from the server" msgstr "Gre?ka prilikom procesiranja dodataka sa poslu?itelja" -#: nessus/comm.c:938 +#: nessus/comm.c:1048 msgid "Invalid SEND_PLUGINS_MD5 response from server" msgstr "" -#: nessus/comm.c:1099 +#: nessus/comm.c:1224 msgid "Invalid PLUGIN_INFO response from server" msgstr "" -#: nessus/comm.c:1198 +#: nessus/comm.c:1238 nessus/comm.c:1445 +msgid "Found and enabled one new plugin." +msgstr "" + +#: nessus/comm.c:1240 nessus/comm.c:1447 +msgid "Found and disabled one new plugin." +msgstr "" + +#: nessus/comm.c:1245 nessus/comm.c:1452 +#, c-format +msgid "Found and enabled %d new plugins." +msgstr "" + +#: nessus/comm.c:1247 nessus/comm.c:1454 +#, c-format +msgid "Found and disabled %d new plugins." +msgstr "" + +#: nessus/comm.c:1348 msgid "Invalid PLUGINS_MD5 information sent from server" msgstr "" -#: nessus/comm.c:1231 +#: nessus/comm.c:1381 msgid "Error while updating the cached plugin information" msgstr "" -#: nessus/context.c:222 +#: nessus/comm.c:1736 +#, c-format +msgid "Could not parse certificate: %s" +msgstr "" + +#: nessus/comm.c:1743 +#, c-format +msgid "Invalid response from server to certificate request: %s" +msgstr "" + +#: nessus/context.c:245 msgid "context_remove_child detected existing children." msgstr "" -#: nessus/context.c:362 nessus/prefs_dialog/prefs_scope_tree.c:273 +#: nessus/context.c:426 nessus/prefs_dialog/prefs_scope_tree.c:273 msgid "context_rename() called with illegal type" msgstr "" -#: nessus/context.c:379 nessus/context.c:410 +#: nessus/context.c:443 nessus/context.c:474 #, c-format msgid "Directory %s couldn't be renamed to %s: %s." msgstr "" -#: nessus/context.c:427 +#: nessus/context.c:491 #, c-format msgid "Can't move \"%s\" to \"%s\"." msgstr "" -#: nessus/context.c:450 nessus/context.c:489 +#: nessus/context.c:514 nessus/context.c:553 nessus/html_graph_output.c:1116 #, c-format msgid "Directory %s couldn't be created: %s." msgstr "" -#: nessus/context.c:475 nessus/prefs_dialog/prefs_scan_assistant.c:263 +#: nessus/context.c:539 nessus/prefs_dialog/prefs_scan_assistant.c:263 msgid "unnamed task" msgstr "bezimeni posao" -#: nessus/context.c:478 nessus/prefs_dialog/prefs_scan_assistant.c:280 +#: nessus/context.c:542 nessus/prefs_dialog/prefs_scan_assistant.c:280 msgid "unnamed scope" msgstr "bezimeni opseg" -#: nessus/context.c:481 +#: nessus/context.c:545 msgid "context_new(): No name provided for context" msgstr "" -#: nessus/context.c:526 +#: nessus/context.c:593 #, c-format msgid "File %s couldn't be deleted: %s." msgstr "" -#: nessus/context.c:532 +#: nessus/context.c:599 #, c-format msgid "Directory %s couldn't be deleted: %s." msgstr "" -#: nessus/context.c:553 +#: nessus/context.c:622 msgid "context_delete() deleted the current context." msgstr "" +#: nessus/backend.c:82 +msgid "No free tempfile!" +msgstr "" + +#: nessus/backend.c:105 +#, fuzzy, c-format +msgid "Can't create file %s: %s" +msgstr "Ne mogu otvoriti %s: %s" + +#: nessus/backend.c:115 +#, fuzzy, c-format +msgid "Can't open file %s: %s" +msgstr "Ne mogu otvoriti %s: %s" + +#: nessus/backend.c:622 +msgid "Unknown report type - please set an extension to the filename" +msgstr "" + +#: nessus/backend.c:631 +msgid "This file format can not be read back by the OpenVAS-Client" +msgstr "" + #: nessus/filter.c:67 nessus/filter.c:80 msgid "Filter plugins..." msgstr "Filtriraj dodatke..." @@ -236,11 +369,11 @@ msgid "Name" msgstr "Ime" -#: nessus/filter.c:116 nessus/pdf_output.c:952 +#: nessus/filter.c:116 nessus/pdf_output.c:799 msgid "Description" msgstr "Opis" -#: nessus/filter.c:122 nessus/pdf_output.c:804 nessus/pdf_output.c:941 +#: nessus/filter.c:122 nessus/pdf_output.c:580 nessus/pdf_output.c:784 msgid "Summary" msgstr "Sa?etak" @@ -252,15 +385,15 @@ msgid "ID number" msgstr "ID broj" -#: nessus/filter.c:140 nessus/pdf_output.c:942 +#: nessus/filter.c:140 nessus/pdf_output.c:785 msgid "Category" msgstr "Kategorija" -#: nessus/filter.c:146 nessus/pdf_output.c:945 +#: nessus/filter.c:146 nessus/pdf_output.c:789 msgid "CVE" msgstr "CVE" -#: nessus/filter.c:152 nessus/pdf_output.c:946 +#: nessus/filter.c:152 nessus/pdf_output.c:791 msgid "BID" msgstr "BID" @@ -277,6 +410,14 @@ msgid "Invalid regular expression" msgstr "" +#: nessus/parser.c:221 +msgid "Invalid port range" +msgstr "" + +#: nessus/parser.c:223 +msgid "These hosts could not be tested because you are not allowed to do so:" +msgstr "" + #: nessus/monitor_dialog.c:84 #, c-format msgid "is_server_present: fd(%d) out of range\n" @@ -287,32 +428,32 @@ msgid "idle_server: soc(%d) out of range\n" msgstr "" -#: nessus/monitor_dialog.c:221 +#: nessus/monitor_dialog.c:218 #, c-format msgid "Scanning network from %s" msgstr "" -#: nessus/monitor_dialog.c:222 +#: nessus/monitor_dialog.c:219 msgid "some host" msgstr "" -#: nessus/monitor_dialog.c:260 +#: nessus/monitor_dialog.c:257 msgid "Hostname" msgstr "Ime ra?unala" -#: nessus/monitor_dialog.c:266 +#: nessus/monitor_dialog.c:263 msgid "Portscan" msgstr "" -#: nessus/monitor_dialog.c:272 +#: nessus/monitor_dialog.c:269 msgid "Checks" msgstr "Provjera" -#: nessus/monitor_dialog.c:279 nessus/monitor_dialog.c:619 +#: nessus/monitor_dialog.c:276 nessus/monitor_dialog.c:621 msgid "Stop" msgstr "Zaustavi" -#: nessus/monitor_dialog.c:308 +#: nessus/monitor_dialog.c:305 msgid "Stop the whole test" msgstr "Zaustavi cijeli test" @@ -321,165 +462,177 @@ msgid "Error ! Null hostname in the list\n" msgstr "" -#: nessus/monitor_dialog.c:581 +#: nessus/monitor_dialog.c:583 msgid "Portscan:" msgstr "" -#: nessus/monitor_dialog.c:585 +#: nessus/monitor_dialog.c:587 msgid "Checks:" msgstr "Provjera:" -#: nessus/nessus.c:373 +#: nessus/nessus.c:379 msgid "Host not found!" msgstr "Ra?unalo nije prona?eno!" -#: nessus/nessus.c:376 +#: nessus/nessus.c:382 #, c-format msgid "Could not open a connection to %s\n" msgstr "" -#: nessus/nessus.c:402 +#: nessus/nessus.c:408 msgid "" "Could not initialize the OpenSSL library !\n" "Please launch openvasclient-mkrand(1) first !" msgstr "" -#: nessus/nessus.c:418 +#: nessus/nessus.c:424 #, c-format msgid "" "Unknown SSL version \"%s\"\n" "Using default: %s" msgstr "" -#: nessus/nessus.c:501 +#: nessus/nessus.c:507 #, c-format msgid "paranoia_level=%d but \"trusted_ca\" not set" msgstr "" -#: nessus/nessus.c:516 +#: nessus/nessus.c:514 #, c-format msgid "" +"paranoia_level=%d but \"trusted_ca\" file not found:\n" +"%s" +msgstr "" + +#: nessus/nessus.c:529 +#, c-format +msgid "" "Error while setting the trusted CA: %s\n" "SSL connections are likely to fail." msgstr "" -#: nessus/nessus.c:561 +#: nessus/nessus.c:574 msgid "SSL error: cannot get server certificate" msgstr "" -#: nessus/nessus.c:573 +#: nessus/nessus.c:586 msgid "Invalid server certificate" msgstr "" -#: nessus/nessus.c:577 +#: nessus/nessus.c:590 msgid "Could not save server certificate" msgstr "" -#: nessus/nessus.c:588 +#: nessus/nessus.c:601 msgid "Could not register the connection" msgstr "" -#: nessus/nessus.c:601 +#: nessus/nessus.c:614 msgid "" "Unable to establish a connection to the remote host using the specified " "protocol version!" msgstr "" -#: nessus/nessus.c:610 +#: nessus/nessus.c:623 msgid "Login failed" msgstr "Prijava neuspje?na" -#: nessus/nessus.c:670 +#: nessus/nessus.c:685 msgid "Display version information" msgstr "Prika?i informacije o ina?ici" -#: nessus/nessus.c:672 +#: nessus/nessus.c:687 msgid "No pixmaps" msgstr "Bez pixmapa" -#: nessus/nessus.c:674 +#: nessus/nessus.c:689 msgid "Batch-mode scan" msgstr "" -#: nessus/nessus.c:674 +#: nessus/nessus.c:689 msgid " " msgstr "" -#: nessus/nessus.c:676 +#: nessus/nessus.c:691 msgid "Configuration file" msgstr "Datoteka s postavkama" -#: nessus/nessus.c:676 +#: nessus/nessus.c:691 msgid "<.rcfile>" msgstr "" -#: nessus/nessus.c:677 +#: nessus/nessus.c:693 nessus/nessus.c:695 msgid "Output format" msgstr "Izlazni format" -#: nessus/nessus.c:677 +#: nessus/nessus.c:693 msgid "[nbe|html|html_graph|text|xml|tex]" msgstr "[nbe|html|html_graph|text|xml|tex]" -#: nessus/nessus.c:678 +#: nessus/nessus.c:695 +#, fuzzy +msgid "[nbe|html|text|xml|tex]" +msgstr "[nbe|html|html_graph|text|xml|tex]" + +#: nessus/nessus.c:697 msgid "Display status messages in batch mode" msgstr "" -#: nessus/nessus.c:679 +#: nessus/nessus.c:698 msgid "Obtain list of plugins installed on the server" msgstr "" -#: nessus/nessus.c:680 +#: nessus/nessus.c:699 msgid "Obtain list of server and plugin preferences" msgstr "" -#: nessus/nessus.c:681 +#: nessus/nessus.c:700 msgid "Input file (report conversion)" msgstr "Ulazna datoteka (konverzija izvje??a)" -#: nessus/nessus.c:681 +#: nessus/nessus.c:700 msgid "" msgstr "" -#: nessus/nessus.c:682 +#: nessus/nessus.c:701 msgid "Output file (report conversion)" msgstr "Izlazna datoteka (konverzija izvje?taja)" -#: nessus/nessus.c:682 +#: nessus/nessus.c:701 msgid "" msgstr "" -#: nessus/nessus.c:683 +#: nessus/nessus.c:702 msgid "" "Override SSL \"paranoia\" question preventing OpenVAS-Client from checking " "certificates" msgstr "" -#: nessus/nessus.c:684 +#: nessus/nessus.c:703 msgid "Issue SQL output for -p and -P (experimental)" msgstr "" -#: nessus/nessus.c:685 +#: nessus/nessus.c:704 msgid "List sessions" msgstr "Ispi?i sesije" -#: nessus/nessus.c:685 +#: nessus/nessus.c:704 msgid " " msgstr "" -#: nessus/nessus.c:686 +#: nessus/nessus.c:705 msgid "Restore session" msgstr "Povrati sesiju" -#: nessus/nessus.c:686 +#: nessus/nessus.c:705 msgid " " msgstr "" -#: nessus/nessus.c:691 +#: nessus/nessus.c:710 msgid "- client for the OpenVAS security scanner" msgstr "" -#: nessus/nessus.c:720 +#: nessus/nessus.c:739 #, c-format msgid "" "OpenVAS-Client (%s) %s for %s\n" @@ -488,98 +641,104 @@ "OpenVAS-Client (%s) %s za %s\n" "\n" -#: nessus/nessus.c:721 +#: nessus/nessus.c:740 #, c-format -msgid "NessusClient origin: (C) 1998 - 2003 Renaud Deraison \n" -msgstr "NessusClient izvor: (C) 1998 - 2003 Renaud Deraison \n" +msgid "" +"NessusClient origin: (C) 1998 - 2003 Renaud Deraison \n" +msgstr "" +"NessusClient izvor: (C) 1998 - 2003 Renaud Deraison \n" -#: nessus/nessus.c:722 +#: nessus/nessus.c:741 #, c-format msgid "New code since OpenVAS-Client: (C) 2007, 2008 Intevation GmbH\n" msgstr "Novi kod od OpenVAS-Client: (C) 2007, 2008 Intevation GmbH\n" -#: nessus/nessus.c:746 +#: nessus/nessus.c:766 #, c-format msgid "The session ID is required to restore a session.\n" msgstr "" -#: nessus/nessus.c:747 nessus/nessus.c:765 nessus/nessus.c:816 -#: nessus/nessus.c:900 nessus/nessus.c:926 +#: nessus/nessus.c:767 nessus/nessus.c:785 nessus/nessus.c:838 +#: nessus/nessus.c:922 nessus/nessus.c:957 #, c-format msgid "Please use %s --help for more information.\n" msgstr "" -#: nessus/nessus.c:764 +#: nessus/nessus.c:784 #, c-format msgid "" "You need to specify an input file as well as an output file for report " "conversion.\n" msgstr "" -#: nessus/nessus.c:799 +#: nessus/nessus.c:821 #, c-format msgid "Unsupported report type '%s'\n" msgstr "" -#: nessus/nessus.c:807 +#: nessus/nessus.c:829 #, c-format msgid "Could not import '%s' - is it a .nbe file?\n" msgstr "" -#: nessus/nessus.c:815 +#: nessus/nessus.c:837 #, c-format msgid "The option -make_config_file can only be used in batch mode.\n" msgstr "" -#: nessus/nessus.c:826 +#: nessus/nessus.c:848 #, c-format msgid "list-sessions requires %s\n" msgstr "" -#: nessus/nessus.c:832 +#: nessus/nessus.c:854 #, c-format -msgid "restore-session requires -q %s result\n" +msgid "restore-session requires -q %s \n" msgstr "" -#: nessus/nessus.c:838 +#: nessus/nessus.c:860 #, c-format msgid "--restore-session and --list-sessions are mutually exclusive\n" msgstr "" -#: nessus/nessus.c:876 +#: nessus/nessus.c:898 #, c-format msgid "Verbose mode can only be used in batch mode\n" msgstr "" -#: nessus/nessus.c:899 nessus/nessus.c:925 +#: nessus/nessus.c:921 nessus/nessus.c:956 #, c-format msgid "Batch mode requires login information.\n" msgstr "" -#: nessus/nessus.c:910 +#: nessus/nessus.c:932 msgid "list-sessions only requires " msgstr "" -#: nessus/nessus.c:919 +#: nessus/nessus.c:941 msgid "restore-session only requires " msgstr "" -#: nessus/nessus.c:950 nessus/nessus.c:965 +#: nessus/nessus.c:950 +msgid "list-prefs and list-plugins require " +msgstr "" + +#: nessus/nessus.c:981 nessus/nessus.c:996 #, c-format msgid "Could not connect to openvasd\n" msgstr "" -#: nessus/nessus.c:992 nessus/nessus.c:999 +#: nessus/nessus.c:1023 nessus/nessus.c:1030 #, c-format msgid "Missing parameter\n" msgstr "" -#: nessus/nessus.c:1027 +#: nessus/nessus.c:1058 #, c-format msgid "A new openvasrc file has been saved\n" msgstr "" -#: nessus/nessus.c:1070 +#: nessus/nessus.c:1101 #, c-format msgid "" "\n" @@ -589,309 +748,386 @@ " the --help option and in the OpenVAS documentation.\n" msgstr "" -#: nessus/pdf_output.c:381 +#: nessus/pdf_output.c:174 msgid "Could not fork (out of memory?)" msgstr "" -#: nessus/pdf_output.c:504 +#: nessus/pdf_output.c:306 msgid "" "PDF report export failed!\n" "Maybe HTMLDoc (required for PDF export) is not installed or in search path." msgstr "" -#: nessus/pdf_output.c:506 +#: nessus/pdf_output.c:308 #, c-format msgid "PDF report export failed! (htmldoc exit code: %d)" msgstr "" -#: nessus/pdf_output.c:537 +#: nessus/pdf_output.c:346 msgid "Could not create this file !" msgstr "" -#: nessus/pdf_output.c:551 +#: nessus/pdf_output.c:360 msgid "Reports per Host" msgstr "" -#: nessus/pdf_output.c:571 +#: nessus/pdf_output.c:379 #, c-format msgid "Scan of this host started at: %s
\n" msgstr "" -#: nessus/pdf_output.c:573 +#: nessus/pdf_output.c:381 #, c-format msgid "Scan of this host finished at: %s
\n" msgstr "" -#: nessus/pdf_output.c:583 +#: nessus/pdf_output.c:391 msgid "Service (Port)" msgstr "Servis (Port)" -#: nessus/pdf_output.c:586 +#: nessus/pdf_output.c:394 msgid "Issue regarding port" msgstr "" -#: nessus/pdf_output.c:610 -msgid "Security hole found" -msgstr "Sigurnosna rupa prona?ena" +#: nessus/pdf_output.c:417 nessus/pdf_output.c:624 +msgid "Security hole(s) found" +msgstr "" -#: nessus/pdf_output.c:615 nessus/pdf_output.c:853 +#: nessus/pdf_output.c:422 nessus/pdf_output.c:629 msgid "Security warning(s) found" msgstr "Prona?ena sigurnosna upozorenja" -#: nessus/pdf_output.c:620 -msgid "Security notes found" -msgstr "Prona?ene sigurnosne obavijesti" +#: nessus/pdf_output.c:427 nessus/pdf_output.c:634 +msgid "Security note(s) found" +msgstr "" -#: nessus/pdf_output.c:629 nessus/pdf_output.c:638 +#: nessus/pdf_output.c:436 nessus/pdf_output.c:445 msgid "No Information" msgstr "Nema informacija" -#: nessus/pdf_output.c:647 +#: nessus/pdf_output.c:454 msgid "[ return to summary ]" msgstr "" -#: nessus/pdf_output.c:651 +#: nessus/pdf_output.c:458 #, c-format msgid "Security Issues and Fixes - Host %s" msgstr "" -#: nessus/pdf_output.c:687 -msgid "Vulnerability" -msgstr "Ranjivost" - -#: nessus/pdf_output.c:712 nessus/prefs_dialog/prefs_plugins_tree.c:448 -msgid "Warning" -msgstr "Upozorenje" - -#: nessus/pdf_output.c:739 -msgid "Informational" -msgstr "Informacije" - -#: nessus/pdf_output.c:753 +#: nessus/pdf_output.c:528 #, c-format msgid "[ return to %s ]" msgstr "" -#: nessus/pdf_output.c:771 +#: nessus/pdf_output.c:546 msgid "" "This file was generated by OpenVAS, " "the free security scanner." msgstr "" -#: nessus/pdf_output.c:793 +#: nessus/pdf_output.c:569 msgid "OpenVAS Scan Report" msgstr "OpenVAS izvje??e o pretrazi" -#: nessus/pdf_output.c:808 +#: nessus/pdf_output.c:584 msgid "" "This report gives details on hosts that were tested and issues that were " -"found." +"found. " msgstr "" -#: nessus/pdf_output.c:809 +#: nessus/pdf_output.c:585 msgid "" "Please follow the recommended steps and procedures to eradicate these " "threats.\n" msgstr "" -#: nessus/pdf_output.c:813 +#: nessus/pdf_output.c:589 #, c-format msgid "Scan started at: %s
\n" msgstr "" -#: nessus/pdf_output.c:814 +#: nessus/pdf_output.c:590 #, c-format msgid "Scan finished at: %s
\n" msgstr "" -#: nessus/pdf_output.c:820 +#: nessus/pdf_output.c:596 msgid "Host" msgstr "Ra?unalo" -#: nessus/pdf_output.c:823 +#: nessus/pdf_output.c:599 msgid "Possible Issues" msgstr "" -#: nessus/pdf_output.c:826 +#: nessus/pdf_output.c:602 msgid "Holes" msgstr "Rupe" -#: nessus/pdf_output.c:829 +#: nessus/pdf_output.c:605 msgid "Warnings" msgstr "Upozorenja " -#: nessus/pdf_output.c:832 +#: nessus/pdf_output.c:608 msgid "Notes" msgstr "Bilje?ke " -#: nessus/pdf_output.c:848 -msgid "Security hole(s) found" +#: nessus/pdf_output.c:639 +msgid "No noticeable information found" msgstr "" -#: nessus/pdf_output.c:858 -msgid "Security note(s) found" +#: nessus/pdf_output.c:657 +msgid "Total" +msgstr "Ukupno" + +#: nessus/pdf_output.c:713 nessus/pdf_output.c:717 nessus/pdf_output.c:727 +msgid "Signed by" msgstr "" -#: nessus/pdf_output.c:863 -msgid "No noticeable information found" +#: nessus/pdf_output.c:713 +#, fuzzy +msgid "not signed" +msgstr "nije spojen" + +#: nessus/pdf_output.c:718 +msgid "unknown signature(s)" msgstr "" -#: nessus/pdf_output.c:881 -msgid "Total" -msgstr "Ukupno" +#: nessus/pdf_output.c:735 +msgid "trusted" +msgstr "" -#: nessus/pdf_output.c:943 +#: nessus/pdf_output.c:736 +msgid "not trusted" +msgstr "" + +#: nessus/pdf_output.c:749 +msgid "unknown signature" +msgstr "" + +#: nessus/pdf_output.c:786 msgid "Family" msgstr "" -#: nessus/pdf_output.c:944 +#: nessus/pdf_output.c:787 msgid "Version" msgstr "Ina?ica" -#: nessus/pdf_output.c:947 +#: nessus/pdf_output.c:793 msgid "XRefs" msgstr "" -#: nessus/pdf_output.c:962 +#: nessus/pdf_output.c:809 msgid "Parameters" msgstr "Parametri" -#: nessus/pdf_output.c:985 +#: nessus/pdf_output.c:839 msgid "Appendix: NVT Information" msgstr "" -#: nessus/plugin_infos.c:56 +#: nessus/plugin_infos.c:58 #, c-format msgid "Dependencies of Plugin '%s'" msgstr "" -#: nessus/plugin_infos.c:87 +#: nessus/plugin_infos.c:89 msgid "No dependencies found." msgstr "" -#: nessus/plugin_infos.c:112 +#: nessus/plugin_infos.c:114 msgid "), currently " msgstr "" -#: nessus/plugin_infos.c:114 +#: nessus/plugin_infos.c:116 msgid "enabled" msgstr "uklju?eno" -#: nessus/plugin_infos.c:116 +#: nessus/plugin_infos.c:118 msgid "disabled" msgstr "isklju?eno" -#: nessus/plugin_infos.c:177 nessus/plugin_infos.c:409 +#: nessus/plugin_infos.c:176 nessus/plugin_infos.c:578 msgid "Set plugin timeout..." msgstr "" -#: nessus/plugin_infos.c:194 +#: nessus/plugin_infos.c:193 msgid "Set plugin timeout:" msgstr "" -#: nessus/plugin_infos.c:281 +#: nessus/plugin_infos.c:265 #, c-format +msgid "Can not find certificate for: %s." +msgstr "" + +#: nessus/plugin_infos.c:269 +#, c-format +msgid "OpenVAS Certificate View: %s" +msgstr "" + +#: nessus/plugin_infos.c:283 +#, c-format +msgid "Owner Name: %s" +msgstr "" + +#: nessus/plugin_infos.c:288 +#, c-format +msgid "Fingeprint: %s" +msgstr "" + +#: nessus/plugin_infos.c:339 +#, c-format msgid "Error ! Plugin selected not found ?!\n" msgstr "" -#: nessus/plugin_infos.c:316 +#: nessus/plugin_infos.c:374 #, c-format msgid "Family: %s" msgstr "" -#: nessus/plugin_infos.c:323 +#: nessus/plugin_infos.c:381 #, c-format msgid "Category: %s" msgstr "Kategorija: %s" -#: nessus/plugin_infos.c:330 -#, c-format -msgid "OpenVAS Plugin ID: %d" -msgstr "OpenVAS ID dodatka: %d" +#: nessus/plugin_infos.c:388 +#, fuzzy, c-format +msgid "OpenVAS NVT OID: %s" +msgstr "OpenVAS ID-ovi:" -#: nessus/plugin_infos.c:340 +#: nessus/plugin_infos.c:398 #, c-format msgid "CVE: %s" msgstr "CVE: %s" -#: nessus/plugin_infos.c:351 +#: nessus/plugin_infos.c:409 #, c-format msgid "Bugtraq ID: %s" msgstr "Bugtraq ID: %s" -#: nessus/plugin_infos.c:362 +#: nessus/plugin_infos.c:420 #, c-format msgid "Other references: %s" msgstr "Druge reference: %s" -#: nessus/plugin_infos.c:381 +#: nessus/plugin_infos.c:431 +#, fuzzy, c-format +msgid "Plugin Version: %s" +msgstr "Opis dodatka:" + +#: nessus/plugin_infos.c:442 +#, c-format +msgid "Script tags: %s" +msgstr "" + +#: nessus/plugin_infos.c:455 msgid "Plugin description:" msgstr "Opis dodatka:" -#: nessus/plugin_infos.c:416 +#: nessus/plugin_infos.c:512 +#, c-format +msgid "Signature information available on server connection." +msgstr "" + +#: nessus/plugin_infos.c:516 +#, c-format +msgid "" +"Signatures:\n" +"\tUnknown signature(s)." +msgstr "" + +#: nessus/plugin_infos.c:520 +#, c-format +msgid "" +"Signatures:\n" +"\tNVT is not signed." +msgstr "" + +#: nessus/plugin_infos.c:529 +#, c-format +msgid "Signatures:" +msgstr "" + +#: nessus/plugin_infos.c:532 +#, c-format +msgid "Signatures (NOT verified):" +msgstr "" + +#: nessus/plugin_infos.c:549 +msgid "trusted" +msgstr "" + +#: nessus/plugin_infos.c:550 +msgid "untrusted" +msgstr "" + +#: nessus/plugin_infos.c:558 +#, fuzzy +msgid "View" +msgstr "_Pogled" + +#: nessus/plugin_infos.c:585 msgid "Show dependencies" msgstr "Prika?i ovisnosti" -#: nessus/preferences.c:156 +#: nessus/preferences.c:130 #, c-format msgid "Error writing %s: %s" msgstr "Gre?ka prilikom pisanja %s: %s" -#: nessus/preferences.c:163 +#: nessus/preferences.c:137 #, c-format msgid "" "# OpenVAS-Client Preferences File\n" "\n" msgstr "" -#: nessus/preferences.c:229 +#: nessus/preferences.c:203 #, c-format msgid "The OpenVAS-Client doesn't have the right to read %s\n" msgstr "" -#: nessus/preferences.c:243 +#: nessus/preferences.c:217 msgid "Couldn't find prefs file... Creating a new one..." msgstr "" -#: nessus/preferences.c:247 nessus/preferences.c:254 +#: nessus/preferences.c:221 nessus/preferences.c:228 #, c-format msgid "Error creating %s: %s" msgstr "Gre?ka prilikom pravljenja %s: %s" -#: nessus/preferences.c:262 +#: nessus/preferences.c:236 #, c-format msgid "Error reading %s: %s" msgstr "Gre?ka prilikom ?itanja %s: %s" -#: nessus/preferences.c:280 +#: nessus/preferences.c:255 #, c-format msgid "Parse error in %s: %s" msgstr "Gre?ka prilikom obrade %s: %s" -#: nessus/preferences.c:294 +#: nessus/preferences.c:269 #, c-format msgid "Missing 'end' in %s" msgstr "" -#: nessus/preferences.c:522 +#: nessus/preferences.c:507 #, c-format msgid "%s could not be opened write only" msgstr "" -#: nessus/preferences.c:526 +#: nessus/preferences.c:511 #, c-format msgid "# This file was automagically created by OpenVAS-Client\n" msgstr "" -#: nessus/preferences.c:643 +#: nessus/preferences.c:630 msgid "Global Settings" msgstr "Globalne postavke" -#: nessus/preferences.c:757 nessus/preferences.c:778 +#: nessus/preferences.c:745 nessus/preferences.c:766 msgid "prefs_set_value() called with illegal type" msgstr "" -#: nessus/read_target_file.c:41 nessus/report.c:204 +#: nessus/read_target_file.c:41 nessus/report.c:245 msgid "Load file" msgstr "U?itaj datoteku" @@ -916,77 +1152,153 @@ msgid "file mapping failed: %s\n" msgstr "" -#: nessus/report.c:117 +#: nessus/html_graph_output.c:1123 +#, fuzzy, c-format +msgid "Can't change to directory %s: %s." +msgstr "Ne mogu otvoriti %s: %s" + +#: nessus/html_graph_output.c:1130 +#, fuzzy, c-format +msgid "Can't write index: %s" +msgstr "Ne mogu otvoriti %s: %s" + +#: nessus/xml_output_ng.c:713 +#, fuzzy, c-format +msgid "Can't open %s for writing: %s." +msgstr "Ne mogu otvoriti %s: %s" + +#: nessus/report.c:143 msgid "report_save() called with illegal type" msgstr "" -#: nessus/report.c:136 +#: nessus/report.c:162 msgid "report_save() couldn't create context" msgstr "" -#: nessus/report.c:142 +#: nessus/report.c:168 msgid "report_save() couldn't find a report filename" msgstr "" -#: nessus/report.c:150 +#: nessus/report.c:176 msgid "report_save() couldn't save the report" msgstr "" -#: nessus/report.c:162 +#: nessus/report.c:188 msgid "report_save() couldn't save the plugin information" msgstr "" -#: nessus/sslui.c:85 +#: nessus/report.c:203 +msgid "report_save() couldn't save the certificate information" +msgstr "" + +#: nessus/report_save.c:178 +#, fuzzy +msgid "Export Report" +msgstr "Izvje??e" + +#: nessus/report_save.c:194 +#, fuzzy +msgid "Export Options" +msgstr "Opcije" + +#: nessus/report_save.c:203 +msgid "Report file format : " +msgstr "" + +#: nessus/report_save.c:239 +msgid "ASCII text" +msgstr "" + +#: nessus/report_save.c:245 +msgid "HTML with Pies and Graphs" +msgstr "" + +#: nessus/report_save.c:283 +#, c-format +msgid "PDF file %s not found." +msgstr "" + +#: nessus/report_save.c:289 +#, c-format +msgid "" +"You haven't configured a PDF viewer.\n" +"The report was saved as %s so you can manually open it." +msgstr "" + +#: nessus/report_save.c:300 +#, c-format +msgid "Can't launch PDF viewer: %s" +msgstr "" + +#: nessus/report_save.c:334 +#, fuzzy, c-format +msgid "" +"Can't open PDF file: %s:\n" +"%s" +msgstr "Ne mogu otvoriti %s: %s" + +#: nessus/sighand.c:53 +msgid "Connection closed by the server (SIGPIPE caught)" +msgstr "" + +#: nessus/sighand.c:59 +#, fuzzy +msgid "Connection timed out" +msgstr "Veza: korisnik %s" + +#: nessus/sslui.c:86 msgid "SSL Setup" msgstr "SSL Postavke" -#: nessus/sslui.c:128 +#: nessus/sslui.c:129 msgid "Display and remember the server certificate, do not care about the CA" msgstr "Prika?i i zapamti poslu?iteljski certifikat, ne brini o CA" -#: nessus/sslui.c:138 +#: nessus/sslui.c:139 msgid "" "Trust the server certificate if and only if it is valid and certified by the " "CA" -msgstr "Vjeruj poslu?iteljskom certifikatu samo i samo ako je ispravan i certificiran od strane CA" +msgstr "" +"Vjeruj poslu?iteljskom certifikatu samo i samo ako je ispravan i " +"certificiran od strane CA" -#: nessus/sslui.c:146 +#: nessus/sslui.c:147 msgid "Verify that the server certificate is valid *and* remember it" msgstr "Provjeri da li je poslu?iteljski certifikat ispravan i zapamti ga" -#: nessus/sslui.c:157 +#: nessus/sslui.c:158 msgid "OK" msgstr "U redu" -#: nessus/sslui.c:194 +#: nessus/sslui.c:195 msgid "" "Please choose your level of SSL paranoia (Hint: if you want to manage\n" "many servers from your client, choose 2. Otherwise, choose 1, or 3,\n" "if you are paranoid.\n" msgstr "" -#: nessus/sslui.c:280 +#: nessus/sslui.c:288 msgid "This certificate has never been shown before. Here it is:" msgstr "" -#: nessus/sslui.c:310 +#: nessus/sslui.c:319 msgid "Do you accept this certificate?" msgstr "Da li prihva?ate ovaj certifikat?" -#: nessus/sslui.c:320 +#: nessus/sslui.c:327 msgid "Yes" msgstr "Da" -#: nessus/sslui.c:326 +#: nessus/sslui.c:333 msgid "No" msgstr "Ne" -#: nessus/sslui.c:374 +#: nessus/sslui.c:384 #, c-format msgid "This certificate has never been seen before and can't be shown\n" msgstr "" -#: nessus/sslui.c:394 +#: nessus/sslui.c:404 #, c-format msgid "Do you accept it? (y/n) " msgstr "Da li prihva?ate (y/n) " @@ -1011,7 +1323,7 @@ msgstr "Veza: korisnik %s" #: nessus/prefs_dialog/prefs_context.c:291 -#: nessus/prefs_dialog/prefs_dialog.c:777 +#: nessus/prefs_dialog/prefs_dialog.c:761 msgid "not connected" msgstr "nije spojen" @@ -1034,158 +1346,154 @@ msgid "prefs_context_update called with illegal context." msgstr "" -#: nessus/prefs_dialog/prefs_dialog.c:111 +#: nessus/prefs_dialog/prefs_dialog.c:110 msgid "users-manual.pdf" msgstr "" -#: nessus/prefs_dialog/prefs_dialog.c:131 +#: nessus/prefs_dialog/prefs_dialog.c:130 msgid "The global settings have been saved." msgstr "" -#: nessus/prefs_dialog/prefs_dialog.c:187 -msgid "Not yet implemented." -msgstr "" - -#: nessus/prefs_dialog/prefs_dialog.c:362 +#: nessus/prefs_dialog/prefs_dialog.c:353 msgid "OpenVAS-Client" msgstr "OpenVAS-Client" -#: nessus/prefs_dialog/prefs_dialog.c:384 +#: nessus/prefs_dialog/prefs_dialog.c:375 msgid "_File" msgstr "_Datotekae" -#: nessus/prefs_dialog/prefs_dialog.c:389 +#: nessus/prefs_dialog/prefs_dialog.c:380 msgid "_Connect" msgstr "_Spoji se" -#: nessus/prefs_dialog/prefs_dialog.c:393 +#: nessus/prefs_dialog/prefs_dialog.c:384 msgid "_Disconnect" msgstr "O_dspoji se" -#: nessus/prefs_dialog/prefs_dialog.c:400 +#: nessus/prefs_dialog/prefs_dialog.c:391 msgid "SLAD _Install" msgstr "" -#: nessus/prefs_dialog/prefs_dialog.c:404 +#: nessus/prefs_dialog/prefs_dialog.c:395 msgid "_Scan Assistant" msgstr "" -#: nessus/prefs_dialog/prefs_dialog.c:412 +#: nessus/prefs_dialog/prefs_dialog.c:403 msgid "Save _Global Settings" msgstr "" -#: nessus/prefs_dialog/prefs_dialog.c:424 +#: nessus/prefs_dialog/prefs_dialog.c:415 msgid "_View" msgstr "_Pogled" -#: nessus/prefs_dialog/prefs_dialog.c:429 +#: nessus/prefs_dialog/prefs_dialog.c:420 msgid "_Toolbar" msgstr "" -#: nessus/prefs_dialog/prefs_dialog.c:433 +#: nessus/prefs_dialog/prefs_dialog.c:424 msgid "_Message log" msgstr "" -#: nessus/prefs_dialog/prefs_dialog.c:439 +#: nessus/prefs_dialog/prefs_dialog.c:430 msgid "_Task" msgstr "" -#: nessus/prefs_dialog/prefs_dialog.c:444 -#: nessus/prefs_dialog/prefs_dialog.c:476 +#: nessus/prefs_dialog/prefs_dialog.c:435 +#: nessus/prefs_dialog/prefs_dialog.c:460 msgid "_New" msgstr "_Novi" -#: nessus/prefs_dialog/prefs_dialog.c:448 -#: nessus/prefs_dialog/prefs_dialog.c:480 -#: nessus/prefs_dialog/prefs_dialog.c:512 +#: nessus/prefs_dialog/prefs_dialog.c:439 +#: nessus/prefs_dialog/prefs_dialog.c:464 +#: nessus/prefs_dialog/prefs_dialog.c:496 msgid "_Rename" msgstr "_Preimenuj " -#: nessus/prefs_dialog/prefs_dialog.c:458 +#: nessus/prefs_dialog/prefs_dialog.c:449 msgid "_Scope" msgstr "_Opseg" -#: nessus/prefs_dialog/prefs_dialog.c:489 +#: nessus/prefs_dialog/prefs_dialog.c:473 msgid "_Move to task" msgstr "" -#: nessus/prefs_dialog/prefs_dialog.c:507 +#: nessus/prefs_dialog/prefs_dialog.c:491 msgid "_Report" msgstr "_Izvje??e" -#: nessus/prefs_dialog/prefs_dialog.c:522 +#: nessus/prefs_dialog/prefs_dialog.c:506 msgid "_Import" msgstr "_Uvezi" -#: nessus/prefs_dialog/prefs_dialog.c:526 +#: nessus/prefs_dialog/prefs_dialog.c:510 msgid "E_xport" msgstr "_Izvezi" -#: nessus/prefs_dialog/prefs_dialog.c:536 +#: nessus/prefs_dialog/prefs_dialog.c:520 msgid "_Help" msgstr "_Pomo?" -#: nessus/prefs_dialog/prefs_dialog.c:541 +#: nessus/prefs_dialog/prefs_dialog.c:525 msgid "_Users Manual" msgstr "" -#: nessus/prefs_dialog/prefs_dialog.c:545 +#: nessus/prefs_dialog/prefs_dialog.c:529 msgid "_About" msgstr "_O programu" -#: nessus/prefs_dialog/prefs_dialog.c:581 -#: nessus/prefs_dialog/prefs_dialog.c:583 +#: nessus/prefs_dialog/prefs_dialog.c:565 +#: nessus/prefs_dialog/prefs_dialog.c:567 #: nessus/prefs_dialog/prefs_scan_assistant.c:238 msgid "Scan Assistant" msgstr "" -#: nessus/prefs_dialog/prefs_dialog.c:590 -#: nessus/prefs_dialog/prefs_dialog.c:592 +#: nessus/prefs_dialog/prefs_dialog.c:574 +#: nessus/prefs_dialog/prefs_dialog.c:576 msgid "New" msgstr "Novi" -#: nessus/prefs_dialog/prefs_dialog.c:599 -#: nessus/prefs_dialog/prefs_dialog.c:601 +#: nessus/prefs_dialog/prefs_dialog.c:583 +#: nessus/prefs_dialog/prefs_dialog.c:585 msgid "Delete" msgstr "Obri?i" -#: nessus/prefs_dialog/prefs_dialog.c:611 -#: nessus/prefs_dialog/prefs_dialog.c:613 +#: nessus/prefs_dialog/prefs_dialog.c:595 +#: nessus/prefs_dialog/prefs_dialog.c:597 msgid "Connect" msgstr "Spoji" -#: nessus/prefs_dialog/prefs_dialog.c:621 -#: nessus/prefs_dialog/prefs_dialog.c:623 +#: nessus/prefs_dialog/prefs_dialog.c:605 +#: nessus/prefs_dialog/prefs_dialog.c:607 msgid "Disconnect" msgstr "Odspoji" -#: nessus/prefs_dialog/prefs_dialog.c:633 -#: nessus/prefs_dialog/prefs_dialog.c:635 +#: nessus/prefs_dialog/prefs_dialog.c:617 +#: nessus/prefs_dialog/prefs_dialog.c:619 msgid "Execute" msgstr "Izvr?i" -#: nessus/prefs_dialog/prefs_dialog.c:656 +#: nessus/prefs_dialog/prefs_dialog.c:640 msgid "Context" msgstr "Kontekst" -#: nessus/prefs_dialog/prefs_dialog.c:686 +#: nessus/prefs_dialog/prefs_dialog.c:670 msgid "Comments" msgstr "Komentari" -#: nessus/prefs_dialog/prefs_dialog.c:692 +#: nessus/prefs_dialog/prefs_dialog.c:676 msgid "Options" msgstr "Opcije" -#: nessus/prefs_dialog/prefs_dialog.c:698 -#: nessus/prefs_dialog/prefs_dialog_prefs.c:187 +#: nessus/prefs_dialog/prefs_dialog.c:682 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:190 msgid "Report" msgstr "Izvje??e" -#: nessus/prefs_dialog/prefs_dialog.c:718 +#: nessus/prefs_dialog/prefs_dialog.c:702 msgid "Message log" msgstr "" -#: nessus/prefs_dialog/prefs_dialog.c:739 +#: nessus/prefs_dialog/prefs_dialog.c:723 msgid "" "Welcome to OpenVAS-Client, http://www.openvas.org/\n" "NessusClient origin: Copyright 1998-2007 by Renaud Deraison\n" @@ -1194,7 +1502,7 @@ "Herzog, Michel Arboi (SSL-Support), Bruce Verderaime (Pie/Charts)\n" msgstr "" -#: nessus/prefs_dialog/prefs_dialog.c:1519 +#: nessus/prefs_dialog/prefs_dialog.c:1449 msgid "" "You must enter the name of the primary target\n" "to attack in the 'target' section" @@ -1319,109 +1627,119 @@ msgid "Remember the set of plugins" msgstr "" -#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:88 +#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:95 msgid "Advanced Plugins preferences" msgstr "" -#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:95 -#: nessus/prefs_dialog/prefs_options.c:101 +#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:102 +#: nessus/prefs_dialog/prefs_options.c:102 msgid "Credentials" msgstr "" -#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:351 +#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:188 +#, c-format +msgid "%s asked for unknown preference type %s." +msgstr "" + +#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:388 msgid "Select file" msgstr "Odaberite datoteku" -#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:496 +#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:575 +#, fuzzy +msgid "SSH Key Information" +msgstr "Nema informacija" + +#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:709 msgid "Select..." msgstr "Odaberite..." -#: nessus/prefs_dialog/prefs_dialog_prefs.c:60 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:65 msgid "Preferences" msgstr "" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:80 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:85 msgid "User interface" msgstr "Korisni?ko su?elje" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:92 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:97 msgid "Auto expand tree elements" msgstr "" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:98 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:103 msgid "Order by:" msgstr "Sortiraj po:" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:108 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:113 #: nessus/prefs_dialog/prefs_report.c:499 msgid "Host/Port/Severity" msgstr "" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:110 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:115 #: nessus/prefs_dialog/prefs_report.c:501 msgid "Port/Host/Severity" msgstr "" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:116 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:121 msgid "Connection to OpenVAS Server" msgstr "" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:128 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:133 msgid "Automatically connect" msgstr "" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:134 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:139 msgid "Protocol version:" msgstr "Ina?ica protokola:" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:144 -msgid "NTP 1.2" -msgstr "NTP 1.2" - -#: nessus/prefs_dialog/prefs_dialog_prefs.c:146 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:149 msgid "OTP 1.0" msgstr "OTP 1.0" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:149 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:152 msgid "Plugin Cache" msgstr "" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:161 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:164 msgid "Cache plugin information when connecting" msgstr "" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:168 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:171 msgid "Use plugin cache with reports" msgstr "" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:176 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:179 msgid "Load plugin cache for scopes immediately" msgstr "" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:199 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:202 msgid "Include plugin details in PDF" msgstr "" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:207 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:210 msgid "Show script origin in report window" msgstr "" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:221 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:224 msgid "External Links in HTML/PDF" msgstr "" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:232 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:235 msgid "OpenVAS IDs:" msgstr "OpenVAS ID-ovi:" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:244 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:247 msgid "CVE IDs:" msgstr "CVE ID-ovi:" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:256 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:259 msgid "BugTraq IDs:" msgstr "BugTraq ID-ovi:" +#: nessus/prefs_dialog/prefs_dialog_prefs.c:272 +msgid "SSH Key Management" +msgstr "" + #: nessus/prefs_dialog/prefs_dialog_scan_opt.c:141 msgid "General scan options" msgstr "Op?e opcije pretrage" @@ -1523,40 +1841,40 @@ #: nessus/prefs_dialog/prefs_help.h:39 msgid "" -"Enter the port number where you will be serviced by the OpenVAS Server. With " -"older server systems, this is the port 3001, but the official port is 1241." +"Enter the port number where you will be serviced by the OpenVAS Server. " +"Usual is 1241." msgstr "" -#: nessus/prefs_dialog/prefs_help.h:44 +#: nessus/prefs_dialog/prefs_help.h:43 msgid "Set to default OpenVAS port 1241." msgstr "" -#: nessus/prefs_dialog/prefs_help.h:47 +#: nessus/prefs_dialog/prefs_help.h:46 msgid "" "Enter the user name where you are registerd with on the OpenVAS Server. If " "you log in for the first time, you will be asked for a password. Maybe you " "need to ask your OpenVAS Server administrator to create a login for you." msgstr "" -#: nessus/prefs_dialog/prefs_help.h:53 +#: nessus/prefs_dialog/prefs_help.h:52 msgid "" "Maximal of number of hosts that the OpenVAS Server will test at the same " "time. Be aware that the OpenVAS Server will spawn max_hosts x max_checks " "processes!" msgstr "" -#: nessus/prefs_dialog/prefs_help.h:58 +#: nessus/prefs_dialog/prefs_help.h:57 msgid "" "Maximal number of security checks that will be launched at the same time " "against each host. Be aware that the OpenVAS Server will spawn max_hosts x " "max_checks processes!" msgstr "" -#: nessus/prefs_dialog/prefs_help.h:63 +#: nessus/prefs_dialog/prefs_help.h:62 msgid "Name of the remote file that several plugins will attempt to read." msgstr "" -#: nessus/prefs_dialog/prefs_help.h:67 +#: nessus/prefs_dialog/prefs_help.h:66 msgid "" "If this option is checked, then OpenVAS Server will send some TCP packets to " "the target host to determine if the target host is alive. This method does " @@ -1564,22 +1882,14 @@ "ICMP echo requests." msgstr "" -#: nessus/prefs_dialog/prefs_help.h:73 +#: nessus/prefs_dialog/prefs_help.h:72 msgid "" "If this option is set, OpenVAS Server will do a reverse lookup on the IP " "addresses before it tests them. This may slow down the whole test." msgstr "" -#: nessus/prefs_dialog/prefs_help.h:78 +#: nessus/prefs_dialog/prefs_help.h:77 msgid "" -"Are the target hosts protected by a firewall ? If so and if we are outside " -"the firewall, it is a good idea to turn this option ON, so that OpenVAS " -"Server will perform some additional tests to check that the remote firewall " -"is well configured (this option is still experimental)." -msgstr "" - -#: nessus/prefs_dialog/prefs_help.h:86 -msgid "" "Security tests may ask the OpenVAS Server to be launched if and only if some " "information gathered by other test exist in the knowledge base, or if and " "only if a given port is open. This option speeds up the test, but may make " @@ -1587,7 +1897,7 @@ "option" msgstr "" -#: nessus/prefs_dialog/prefs_help.h:94 +#: nessus/prefs_dialog/prefs_help.h:85 msgid "" "Some security checks may harm the target server, by disabling the remote " "service temporarily or until a reboot. If you enable this option, OpenVAS " @@ -1598,7 +1908,7 @@ "enable it." msgstr "" -#: nessus/prefs_dialog/prefs_help.h:105 +#: nessus/prefs_dialog/prefs_help.h:96 msgid "" "If you enable this option, the hosts on the local network will be designated " "by their ethernet MAC address instead of their IP address. This is " @@ -1606,7 +1916,7 @@ "disable this option." msgstr "" -#: nessus/prefs_dialog/prefs_help.h:111 +#: nessus/prefs_dialog/prefs_help.h:102 msgid "" "Ports that will be scanned by OpenVAS Server. You can enter single ports, " "such as \"1-8000\"; or more complex sets, such as \"21,23,25,1024-2048,6000" @@ -1614,7 +1924,7 @@ "in the OpenVAS services file." msgstr "" -#: nessus/prefs_dialog/prefs_help.h:118 +#: nessus/prefs_dialog/prefs_help.h:109 msgid "" "To save scanning time, you may ask OpenVAS Server to declare TCP ports it " "did not scan as closed. This will result in an incomplete audit but it will " @@ -1623,27 +1933,27 @@ "will consider ports whose state it does not know as open." msgstr "" -#: nessus/prefs_dialog/prefs_help.h:126 +#: nessus/prefs_dialog/prefs_help.h:117 msgid "" "OpenVAS Server will perform an AXFR request (that is, a zone transfer) to " "the target name server and will attempt to obtain the list of the hosts of " "the target domain. Then, it will test each host." msgstr "" -#: nessus/prefs_dialog/prefs_help.h:132 +#: nessus/prefs_dialog/prefs_help.h:123 msgid "" "OpenVAS Server will determine which hosts can mount the filesystems exported " "by the target server, and will test them. Beware : this test is recursive." msgstr "" -#: nessus/prefs_dialog/prefs_help.h:137 +#: nessus/prefs_dialog/prefs_help.h:128 msgid "" "OpenVAS Server will test the whole subnet of the target host. If you select " "this option, you should allow OpenVAS Server to ping the hosts before " "scanning them in the 'Scan options' section." msgstr "" -#: nessus/prefs_dialog/prefs_help.h:142 +#: nessus/prefs_dialog/prefs_help.h:133 msgid "" "The first host(s) that will be attacked by OpenVAS Server. The options below " "allow you to extend the test to a larger set of computer. You may define " @@ -1651,21 +1961,21 @@ "host2\"." msgstr "" -#: nessus/prefs_dialog/prefs_help.h:148 +#: nessus/prefs_dialog/prefs_help.h:139 msgid "" "A textfile can be specified that contains the list of targets. This textfile " "may contain comma-separated lists of host and also may contain many of such " "lines." msgstr "" -#: nessus/prefs_dialog/prefs_help.h:153 +#: nessus/prefs_dialog/prefs_help.h:144 msgid "" "It is possible to check for the presence of CGIs in multiple paths like /cgi-" "bin, /cgis, /home-cgis, and so on. In that case, put all your paths here " "separated by colons. For instance: '/cgi-bin:/cgi-aws:/~deraison/cgi'." msgstr "" -#: nessus/prefs_dialog/prefs_help.h:159 +#: nessus/prefs_dialog/prefs_help.h:150 msgid "" "The warning sign means that this plugin may harm the target host by " "disabling the attacked service or by crashing the host. You should be " @@ -1673,33 +1983,34 @@ "restart some services manually." msgstr "" -#: nessus/prefs_dialog/prefs_help.h:167 +#: nessus/prefs_dialog/prefs_help.h:158 msgid "" "If you turn on this option, all the information collected about the target " "hosts will be saved on the side of OpenVAS Server for further re-use. See " -"http://www.nessus.org/doc/kb_saving.html for details." +"http://www.openvas.org/compendium/scan-options-knowledge-base.html for " +"details." msgstr "" -#: nessus/prefs_dialog/prefs_help.h:173 +#: nessus/prefs_dialog/prefs_help.h:164 msgid "" "If you select this option, all the hosts selected in the 'Target' section of " "the OpenVAS-Client will be tested." msgstr "" -#: nessus/prefs_dialog/prefs_help.h:177 +#: nessus/prefs_dialog/prefs_help.h:168 msgid "" "If you select this option, only the hosts to which a recent knowledge base " "is attached will be tested." msgstr "" -#: nessus/prefs_dialog/prefs_help.h:181 +#: nessus/prefs_dialog/prefs_help.h:172 msgid "" "If you select this option, only the hosts which have no (or an outdated) " "knowledge base attached will be tested. Use this option to populate your " "knowledge bases." msgstr "" -#: nessus/prefs_dialog/prefs_help.h:186 +#: nessus/prefs_dialog/prefs_help.h:177 msgid "" "If you select this option, the knowledge bases of the target hosts will be " "restored in memory if they are recent enough. You can use this option with " @@ -1708,55 +2019,62 @@ "in the past to be performed again." msgstr "" -#: nessus/prefs_dialog/prefs_help.h:193 +#: nessus/prefs_dialog/prefs_help.h:184 msgid "" "If you select this option, the port scanners that were launched in the past " "against the targetted hosts will not be launched again and the data of the " "knowledge base will be used as the result of the portscan." msgstr "" -#: nessus/prefs_dialog/prefs_help.h:199 +#: nessus/prefs_dialog/prefs_help.h:190 msgid "" "If you select this option, all the plugins that performs information " "gathering and which have already been launched against the target hosts will " "not be launched again." msgstr "" -#: nessus/prefs_dialog/prefs_help.h:204 +#: nessus/prefs_dialog/prefs_help.h:195 msgid "" "If you select this option, all the plugins that performs attacks and which " "have already been launched against the target hosts will not be launched " "again." msgstr "" -#: nessus/prefs_dialog/prefs_help.h:209 +#: nessus/prefs_dialog/prefs_help.h:200 msgid "" "If you select this option, all the plugins that may harm the target hosts " "and which have already been launched will not be launched again." msgstr "" -#: nessus/prefs_dialog/prefs_help.h:214 +#: nessus/prefs_dialog/prefs_help.h:205 msgid "This value defines the maximum age (in seconds) of a knowledge base." msgstr "" -#: nessus/prefs_dialog/prefs_help.h:218 +#: nessus/prefs_dialog/prefs_help.h:209 msgid "" "If this option is set, the client will only report what has changed between " "the new scan and the last one." msgstr "" -#: nessus/prefs_dialog/prefs_help.h:224 +#: nessus/prefs_dialog/prefs_help.h:215 msgid "" "If you enable this option, then OpenVAS Server will enable the plugins that " "are depended on by the set of plugins you selected." msgstr "" -#: nessus/prefs_dialog/prefs_help.h:228 +#: nessus/prefs_dialog/prefs_help.h:219 msgid "" "If you enable this option, then openvasd will not report data coming from " "the plugins that you did not specifically enable." msgstr "" +#: nessus/prefs_dialog/prefs_help.h:223 +msgid "" +"If you enable this option, then new plugins (that you have not seen before " +"in this scope) are automatically enabled. In any case, a message will be " +"displayed when new plugins have been found, showing your choice." +msgstr "" + #: nessus/prefs_dialog/prefs_kb.c:37 msgid "Enable KB saving" msgstr "" @@ -1801,6 +2119,10 @@ msgid "Max age of a saved KB (in secs) : " msgstr "" +#: nessus/prefs_dialog/prefs_plugins_tree.c:448 +msgid "Warning" +msgstr "Upozorenje" + #: nessus/prefs_dialog/prefs_report.c:141 #, c-format msgid "Scan took place from %s to %s" @@ -1823,7 +2145,7 @@ #: nessus/prefs_dialog/prefs_report.c:371 #, c-format msgid "" -"Reported by NVT \"%s\" (1.3.6.1.4.1.25623.1.0.%d):\n" +"Reported by NVT \"%s\" (%s):\n" "\n" msgstr "" @@ -1846,11 +2168,6 @@ msgid "Please enter a name for your task:" msgstr "" -#: nessus/prefs_dialog/prefs_scan_assistant.c:264 -#: nessus/prefs_dialog/prefs_scan_assistant.c:281 -msgid "Comment:" -msgstr "Komentar:" - #: nessus/prefs_dialog/prefs_scan_assistant.c:269 msgid "Step 2: Scope" msgstr "" @@ -1984,39 +2301,39 @@ msgstr "" #: nessus/prefs_dialog/prefs_scope_tree.c:794 -msgid "Low" -msgstr "Nisko" +msgid "High" +msgstr "Visoko" #: nessus/prefs_dialog/prefs_scope_tree.c:806 msgid "Medium" msgstr "Srednje" #: nessus/prefs_dialog/prefs_scope_tree.c:818 -msgid "High" -msgstr "Visoko" +msgid "Low" +msgstr "Nisko" -#: nessus/prefs_dialog/prefs_options.c:93 +#: nessus/prefs_dialog/prefs_options.c:94 msgid "General" msgstr "Op?e" -#: nessus/prefs_dialog/prefs_options.c:97 +#: nessus/prefs_dialog/prefs_options.c:98 msgid "Plugins" msgstr "Dodaci" -#: nessus/prefs_dialog/prefs_options.c:105 +#: nessus/prefs_dialog/prefs_options.c:106 #: nessus/prefs_dialog/prefs_target.c:49 msgid "Target selection" msgstr "Odabir mete" -#: nessus/prefs_dialog/prefs_options.c:109 +#: nessus/prefs_dialog/prefs_options.c:110 msgid "Access Rules" msgstr "" -#: nessus/prefs_dialog/prefs_options.c:113 +#: nessus/prefs_dialog/prefs_options.c:114 msgid "Prefs." msgstr "" -#: nessus/prefs_dialog/prefs_options.c:117 +#: nessus/prefs_dialog/prefs_options.c:118 msgid "KB" msgstr "KB" @@ -2075,6 +2392,10 @@ msgid "Silent" msgstr "Tiho" +#: nessus/prefs_dialog/prefs_plugins.c:363 +msgid "Automatically enable new plugins" +msgstr "" + #: nessus/prefs_dialog/prefs_target.c:65 msgid "Target(s):" msgstr "Mete:" @@ -2087,3 +2408,20 @@ msgid "Perform a DNS zone transfer" msgstr "" +#~ msgid "Security hole found" +#~ msgstr "Sigurnosna rupa prona?ena" + +#~ msgid "Security notes found" +#~ msgstr "Prona?ene sigurnosne obavijesti" + +#~ msgid "Vulnerability" +#~ msgstr "Ranjivost" + +#~ msgid "Informational" +#~ msgstr "Informacije" + +#~ msgid "OpenVAS Plugin ID: %d" +#~ msgstr "OpenVAS ID dodatka: %d" + +#~ msgid "NTP 1.2" +#~ msgstr "NTP 1.2" Modified: trunk/openvas-client/po/sv.po =================================================================== --- trunk/openvas-client/po/sv.po 2009-01-01 22:32:37 UTC (rev 2128) +++ trunk/openvas-client/po/sv.po 2009-01-02 00:52:00 UTC (rev 2129) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: OpenVAS-Client 1.0\n" "Report-Msgid-Bugs-To: openvas-devel at wald.intevation.org\n" -"POT-Creation-Date: 2008-06-25 14:05+0200\n" +"POT-Creation-Date: 2009-01-02 01:47+0100\n" "PO-Revision-Date: 2007-08-03 11:39+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -14,6 +14,25 @@ "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +#: src/openvas-lib/openvas_certificate_file.c:101 +#, fuzzy, c-format +msgid "Error adding comment to key file: %s" +msgstr "Fel vid l?sning fr?n %s: %s" + +#: src/openvas-lib/openvas_certificate_file.c:118 +msgid "Error accessing certificate file for report." +msgstr "" + +#: src/openvas-lib/openvas_certificate_file.c:126 +#, fuzzy, c-format +msgid "Error exporting key file: %s" +msgstr "Fel vid skrivning av %s: %s" + +#: src/openvas-lib/openvas_certificate_file.c:165 +#, fuzzy, c-format +msgid "Error loading certificate store %s: %s" +msgstr "Fel vid l?sning fr?n %s: %s" + #: src/gui/about_dlg.c:113 msgid "About OpenVAS-Client" msgstr "Om OpenVAS-Client" @@ -113,109 +132,224 @@ "processgreningsfel. kunde inte starta SLAD-installeraren. Det h?r ?r ett " "allvarligt operativsystemsfel. Kanske kan en omstart r?tta till det h?r." -#: nessus/comm.c:90 +#: src/gui/ssh_key_info_form.c:170 +#, fuzzy +msgid "Account name:" +msgstr "V?rdnamn:" + +#: src/gui/ssh_key_info_form.c:178 +msgid "SSH login name:" +msgstr "" + +#: src/gui/ssh_key_info_form.c:185 +msgid "SSH public key:" +msgstr "" + +#: src/gui/ssh_key_info_form.c:193 +msgid "SSH private key:" +msgstr "" + +#: src/gui/ssh_key_info_form.c:201 +msgid "SSH key passphrase:" +msgstr "" + +#: src/gui/ssh_key_info_form.c:208 +#: nessus/prefs_dialog/prefs_scan_assistant.c:264 +#: nessus/prefs_dialog/prefs_scan_assistant.c:281 +msgid "Comment:" +msgstr "Kommentar:" + +#: src/gui/ssh_key_info_form.c:234 +#, fuzzy +msgid "Please provide a better name." +msgstr "V?lj ett filnamn." + +#: src/gui/ssh_key_info_form.c:240 +#, fuzzy +msgid "Please provide a longer username." +msgstr "V?lj ett filnamn." + +#: src/gui/ssh_key_info_form.c:245 +msgid "Please provide a passphrase with more then 5 characters." +msgstr "" + +#: src/gui/ssh_key_info_form.c:251 +msgid "Please provide a better comment for public key." +msgstr "" + +#: src/gui/ssh_key_info_form.c:257 +msgid "Comment must not contain spaces." +msgstr "" + +#: src/gui/ssh_keys_dialog.c:98 src/gui/ssh_keys_dialog.c:161 +#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:597 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:276 +#, fuzzy +msgid "OpenVAS SSH Key Manager" +msgstr "OpenVAS Server" + +#: src/gui/ssh_keys_dialog.c:191 +msgid "Create a new keypair" +msgstr "" + +#: nessus/comm.h:40 +msgid "Select SSH Login" +msgstr "" + +#: nessus/comm.c:92 #, c-format msgid "Receiving plugins: %d" msgstr "Tar emot insticksmoduler: %d" -#: nessus/comm.c:95 +#: nessus/comm.c:97 #, c-format msgid "Receiving dependencies: %d" msgstr "Tar emot beroenden: %d" -#: nessus/comm.c:385 +#: nessus/comm.c:444 #, c-format msgid "Error : we received a preference (%s) for the plugin %s\n" msgstr "Fel : vi tog emot en inst?llning (%s) f?r insticksmodulen %s\n" -#: nessus/comm.c:388 +#: nessus/comm.c:447 #, c-format msgid "but apparently the server has not loaded it\n" msgstr "men tydligen har servern inte l?st in den\n" -#: nessus/comm.c:754 +#: nessus/comm.c:870 #, c-format msgid "Can't open %s: %s" msgstr "Kan inte ?ppna %s: %s" -#: nessus/comm.c:778 +#: nessus/comm.c:894 #, c-format msgid "Error reading from %s: %s" msgstr "Fel vid l?sning fr?n %s: %s" -#: nessus/comm.c:907 nessus/comm.c:1250 +#: nessus/comm.c:1015 nessus/comm.c:1401 msgid "The daemon shut down the communication" msgstr "Demonen kopplade ner anslutningen" -#: nessus/comm.c:932 +#: nessus/comm.c:1042 msgid "Error processing plugin information from the server" msgstr "Fel vid behandling av insticksmodulinformation fr?n servern" -#: nessus/comm.c:938 +#: nessus/comm.c:1048 msgid "Invalid SEND_PLUGINS_MD5 response from server" msgstr "Ogiltigt SEND_PLUGINS_MD5-svar fr?n servern" -#: nessus/comm.c:1099 +#: nessus/comm.c:1224 msgid "Invalid PLUGIN_INFO response from server" msgstr "Ogiltigt PLUGIN_INFO-svar fr?n servern" -#: nessus/comm.c:1198 +#: nessus/comm.c:1238 nessus/comm.c:1445 +msgid "Found and enabled one new plugin." +msgstr "" + +#: nessus/comm.c:1240 nessus/comm.c:1447 +msgid "Found and disabled one new plugin." +msgstr "" + +#: nessus/comm.c:1245 nessus/comm.c:1452 +#, c-format +msgid "Found and enabled %d new plugins." +msgstr "" + +#: nessus/comm.c:1247 nessus/comm.c:1454 +#, c-format +msgid "Found and disabled %d new plugins." +msgstr "" + +#: nessus/comm.c:1348 msgid "Invalid PLUGINS_MD5 information sent from server" msgstr "Ogiltig PLUGINS_MD5-information skickades fr?n servern" -#: nessus/comm.c:1231 +#: nessus/comm.c:1381 msgid "Error while updating the cached plugin information" msgstr "Fel vid uppdatering av mellanlagrad insticksmodulinformation" -#: nessus/context.c:222 +#: nessus/comm.c:1736 +#, fuzzy, c-format +msgid "Could not parse certificate: %s" +msgstr "Kunde inte spara servercertfikat" + +#: nessus/comm.c:1743 +#, fuzzy, c-format +msgid "Invalid response from server to certificate request: %s" +msgstr "Ogiltigt servercertifikat" + +#: nessus/context.c:245 msgid "context_remove_child detected existing children." msgstr "context_remove_child uppt?ckte existerande barnprocess(er)." -#: nessus/context.c:362 nessus/prefs_dialog/prefs_scope_tree.c:273 +#: nessus/context.c:426 nessus/prefs_dialog/prefs_scope_tree.c:273 msgid "context_rename() called with illegal type" msgstr "context_rename() anropad med otill?ten typ" -#: nessus/context.c:379 nessus/context.c:410 +#: nessus/context.c:443 nessus/context.c:474 #, c-format msgid "Directory %s couldn't be renamed to %s: %s." msgstr "Katalog %s kunde inte byta namn till %s: %s." -#: nessus/context.c:427 +#: nessus/context.c:491 #, c-format msgid "Can't move \"%s\" to \"%s\"." msgstr "Kan inte flytta \"%s\" till \"%s\"." -#: nessus/context.c:450 nessus/context.c:489 +#: nessus/context.c:514 nessus/context.c:553 nessus/html_graph_output.c:1116 #, c-format msgid "Directory %s couldn't be created: %s." msgstr "Katalog %s kunde inte skapas: %s." -#: nessus/context.c:475 nessus/prefs_dialog/prefs_scan_assistant.c:263 +#: nessus/context.c:539 nessus/prefs_dialog/prefs_scan_assistant.c:263 msgid "unnamed task" msgstr "namnl?s uppgift" -#: nessus/context.c:478 nessus/prefs_dialog/prefs_scan_assistant.c:280 +#: nessus/context.c:542 nessus/prefs_dialog/prefs_scan_assistant.c:280 msgid "unnamed scope" msgstr "namnl?st omf?ng" -#: nessus/context.c:481 +#: nessus/context.c:545 msgid "context_new(): No name provided for context" msgstr "context_new(): Inget namn angivet f?r kontext" -#: nessus/context.c:526 +#: nessus/context.c:593 #, c-format msgid "File %s couldn't be deleted: %s." msgstr "Fil %s kunde inte tas bort: %s." -#: nessus/context.c:532 +#: nessus/context.c:599 #, c-format msgid "Directory %s couldn't be deleted: %s." msgstr "Katalog %s kunde inte tas bort: %s." -#: nessus/context.c:553 +#: nessus/context.c:622 msgid "context_delete() deleted the current context." msgstr "context_delete() tog bort nuvarande kontext." +#: nessus/backend.c:82 +msgid "No free tempfile!" +msgstr "" + +#: nessus/backend.c:105 +#, fuzzy, c-format +msgid "Can't create file %s: %s" +msgstr "Kan inte ?ppna %s: %s" + +#: nessus/backend.c:115 +#, fuzzy, c-format +msgid "Can't open file %s: %s" +msgstr "Kan inte ?ppna %s: %s" + +#: nessus/backend.c:622 +msgid "Unknown report type - please set an extension to the filename" +msgstr "" + +#: nessus/backend.c:631 +#, fuzzy +msgid "This file format can not be read back by the OpenVAS-Client" +msgstr "# Denna fil skapades automatiskt av OpenVAS-Client\n" + #: nessus/filter.c:67 nessus/filter.c:80 msgid "Filter plugins..." msgstr "Filtrera insticksmoduler..." @@ -234,11 +368,11 @@ msgid "Name" msgstr "Namn" -#: nessus/filter.c:116 nessus/pdf_output.c:952 +#: nessus/filter.c:116 nessus/pdf_output.c:799 msgid "Description" msgstr "Beskrivning" -#: nessus/filter.c:122 nessus/pdf_output.c:804 nessus/pdf_output.c:941 +#: nessus/filter.c:122 nessus/pdf_output.c:580 nessus/pdf_output.c:784 msgid "Summary" msgstr "Sammanfattning" @@ -250,15 +384,15 @@ msgid "ID number" msgstr "ID-nummer" -#: nessus/filter.c:140 nessus/pdf_output.c:942 +#: nessus/filter.c:140 nessus/pdf_output.c:785 msgid "Category" msgstr "Kategori" -#: nessus/filter.c:146 nessus/pdf_output.c:945 +#: nessus/filter.c:146 nessus/pdf_output.c:789 msgid "CVE" msgstr "CVE" -#: nessus/filter.c:152 nessus/pdf_output.c:946 +#: nessus/filter.c:152 nessus/pdf_output.c:791 msgid "BID" msgstr "BID" @@ -275,6 +409,15 @@ msgid "Invalid regular expression" msgstr "Ogiltigt regulj?rt uttryck" +#: nessus/parser.c:221 +#, fuzzy +msgid "Invalid port range" +msgstr "Portomf?ng:" + +#: nessus/parser.c:223 +msgid "These hosts could not be tested because you are not allowed to do so:" +msgstr "" + #: nessus/monitor_dialog.c:84 #, c-format msgid "is_server_present: fd(%d) out of range\n" @@ -285,32 +428,32 @@ msgid "idle_server: soc(%d) out of range\n" msgstr "idle_server: soc(%d) utanf?r omf?ng\n" -#: nessus/monitor_dialog.c:221 +#: nessus/monitor_dialog.c:218 #, c-format msgid "Scanning network from %s" msgstr "Avs?ker n?tverk fr?n %s" -#: nessus/monitor_dialog.c:222 +#: nessus/monitor_dialog.c:219 msgid "some host" msgstr "n?gon v?rd" -#: nessus/monitor_dialog.c:260 +#: nessus/monitor_dialog.c:257 msgid "Hostname" msgstr "V?rdnamn" -#: nessus/monitor_dialog.c:266 +#: nessus/monitor_dialog.c:263 msgid "Portscan" msgstr "Portavs?kning" -#: nessus/monitor_dialog.c:272 +#: nessus/monitor_dialog.c:269 msgid "Checks" msgstr "Kontroller" -#: nessus/monitor_dialog.c:279 nessus/monitor_dialog.c:619 +#: nessus/monitor_dialog.c:276 nessus/monitor_dialog.c:621 msgid "Stop" msgstr "Stopp" -#: nessus/monitor_dialog.c:308 +#: nessus/monitor_dialog.c:305 msgid "Stop the whole test" msgstr "Stoppa hela testet" @@ -319,24 +462,24 @@ msgid "Error ! Null hostname in the list\n" msgstr "Fel! Inga v?rdnamn i listan\n" -#: nessus/monitor_dialog.c:581 +#: nessus/monitor_dialog.c:583 msgid "Portscan:" msgstr "Portavs?kning:" -#: nessus/monitor_dialog.c:585 +#: nessus/monitor_dialog.c:587 msgid "Checks:" msgstr "Kontroller:" -#: nessus/nessus.c:373 +#: nessus/nessus.c:379 msgid "Host not found!" msgstr "V?rden hittades inte!" -#: nessus/nessus.c:376 +#: nessus/nessus.c:382 #, c-format msgid "Could not open a connection to %s\n" msgstr "Kunde inte ?ppna en anslutning till %s\n" -#: nessus/nessus.c:402 +#: nessus/nessus.c:408 #, fuzzy msgid "" "Could not initialize the OpenSSL library !\n" @@ -345,7 +488,7 @@ "Kunde inte initiera OpenSSL-biblioteket!\n" "Starta nessusclient-mkrand(1) f?rst!" -#: nessus/nessus.c:418 +#: nessus/nessus.c:424 #, c-format msgid "" "Unknown SSL version \"%s\"\n" @@ -354,12 +497,19 @@ "Ok?nd SSL-version \"%s\"\n" "Anv?nder standard: %s" -#: nessus/nessus.c:501 +#: nessus/nessus.c:507 #, c-format msgid "paranoia_level=%d but \"trusted_ca\" not set" msgstr "paranoia_level=%d men \"trusted_ca\" ej satt" -#: nessus/nessus.c:516 +#: nessus/nessus.c:514 +#, fuzzy, c-format +msgid "" +"paranoia_level=%d but \"trusted_ca\" file not found:\n" +"%s" +msgstr "paranoia_level=%d men \"trusted_ca\" ej satt" + +#: nessus/nessus.c:529 #, c-format msgid "" "Error while setting the trusted CA: %s\n" @@ -368,46 +518,46 @@ "Fel vid inst?llning av p?litligt CA: %s\n" "SSL-anslutningar kommer antagligen misslyckas." -#: nessus/nessus.c:561 +#: nessus/nessus.c:574 msgid "SSL error: cannot get server certificate" msgstr "SSL-fel: kan inte h?mta servercertifikat" -#: nessus/nessus.c:573 +#: nessus/nessus.c:586 msgid "Invalid server certificate" msgstr "Ogiltigt servercertifikat" -#: nessus/nessus.c:577 +#: nessus/nessus.c:590 msgid "Could not save server certificate" msgstr "Kunde inte spara servercertfikat" -#: nessus/nessus.c:588 +#: nessus/nessus.c:601 msgid "Could not register the connection" msgstr "Kunde inte registrera anslutningen" -#: nessus/nessus.c:601 +#: nessus/nessus.c:614 msgid "" "Unable to establish a connection to the remote host using the specified " "protocol version!" msgstr "" -#: nessus/nessus.c:610 +#: nessus/nessus.c:623 msgid "Login failed" msgstr "Inloggning misslyckades" -#: nessus/nessus.c:670 +#: nessus/nessus.c:685 msgid "Display version information" msgstr "" -#: nessus/nessus.c:672 +#: nessus/nessus.c:687 #, fuzzy msgid "No pixmaps" msgstr "\t-n : Inga bilder\n" -#: nessus/nessus.c:674 +#: nessus/nessus.c:689 msgid "Batch-mode scan" msgstr "" -#: nessus/nessus.c:674 +#: nessus/nessus.c:689 #, fuzzy msgid " " msgstr "" @@ -415,55 +565,59 @@ "Satsl?geavs?kning:\n" " %s -q [-pPS] " -#: nessus/nessus.c:676 +#: nessus/nessus.c:691 #, fuzzy msgid "Configuration file" msgstr "Inloggning misslyckades" -#: nessus/nessus.c:676 +#: nessus/nessus.c:691 msgid "<.rcfile>" msgstr "" -#: nessus/nessus.c:677 +#: nessus/nessus.c:693 nessus/nessus.c:695 msgid "Output format" msgstr "" -#: nessus/nessus.c:677 +#: nessus/nessus.c:693 msgid "[nbe|html|html_graph|text|xml|tex]" msgstr "" -#: nessus/nessus.c:678 +#: nessus/nessus.c:695 +msgid "[nbe|html|text|xml|tex]" +msgstr "" + +#: nessus/nessus.c:697 msgid "Display status messages in batch mode" msgstr "" -#: nessus/nessus.c:679 +#: nessus/nessus.c:698 #, fuzzy msgid "Obtain list of plugins installed on the server" msgstr "\t-p : h?mta lista p? insticksmoduler installerade p? servern.\n" -#: nessus/nessus.c:680 +#: nessus/nessus.c:699 #, fuzzy msgid "Obtain list of server and plugin preferences" msgstr "" "\t-P : h?mta lista p? inst?llningar f?r server och insticksmoduler.\n" -#: nessus/nessus.c:681 +#: nessus/nessus.c:700 msgid "Input file (report conversion)" msgstr "" -#: nessus/nessus.c:681 +#: nessus/nessus.c:700 msgid "" msgstr "" -#: nessus/nessus.c:682 +#: nessus/nessus.c:701 msgid "Output file (report conversion)" msgstr "" -#: nessus/nessus.c:682 +#: nessus/nessus.c:701 msgid "" msgstr "" -#: nessus/nessus.c:683 +#: nessus/nessus.c:702 #, fuzzy msgid "" "Override SSL \"paranoia\" question preventing OpenVAS-Client from checking " @@ -473,16 +627,16 @@ "\t kontrollera certifikat.\n" "\n" -#: nessus/nessus.c:684 +#: nessus/nessus.c:703 #, fuzzy msgid "Issue SQL output for -p and -P (experimental)" msgstr "\t-S : aktivera SQL-utdata f?r -p och -P (experiment).\n" -#: nessus/nessus.c:685 +#: nessus/nessus.c:704 msgid "List sessions" msgstr "" -#: nessus/nessus.c:685 +#: nessus/nessus.c:704 #, fuzzy msgid " " msgstr "" @@ -490,11 +644,11 @@ "Lista sessioner :\n" " %s -s -q " -#: nessus/nessus.c:686 +#: nessus/nessus.c:705 msgid "Restore session" msgstr "" -#: nessus/nessus.c:686 +#: nessus/nessus.c:705 #, fuzzy msgid " " msgstr "" @@ -502,110 +656,115 @@ "?terst?ll session:\n" " %s -R -q " -#: nessus/nessus.c:691 +#: nessus/nessus.c:710 msgid "- client for the OpenVAS security scanner" msgstr "" -#: nessus/nessus.c:720 +#: nessus/nessus.c:739 #, fuzzy, c-format msgid "" "OpenVAS-Client (%s) %s for %s\n" "\n" msgstr "OpenVAS-Client" -#: nessus/nessus.c:721 +#: nessus/nessus.c:740 #, c-format msgid "" "NessusClient origin: (C) 1998 - 2003 Renaud Deraison \n" msgstr "" -#: nessus/nessus.c:722 +#: nessus/nessus.c:741 #, c-format msgid "New code since OpenVAS-Client: (C) 2007, 2008 Intevation GmbH\n" msgstr "" -#: nessus/nessus.c:746 +#: nessus/nessus.c:766 #, c-format msgid "The session ID is required to restore a session.\n" msgstr "" -#: nessus/nessus.c:747 nessus/nessus.c:765 nessus/nessus.c:816 -#: nessus/nessus.c:900 nessus/nessus.c:926 +#: nessus/nessus.c:767 nessus/nessus.c:785 nessus/nessus.c:838 +#: nessus/nessus.c:922 nessus/nessus.c:957 #, c-format msgid "Please use %s --help for more information.\n" msgstr "" -#: nessus/nessus.c:764 +#: nessus/nessus.c:784 #, c-format msgid "" "You need to specify an input file as well as an output file for report " "conversion.\n" msgstr "" -#: nessus/nessus.c:799 +#: nessus/nessus.c:821 #, c-format msgid "Unsupported report type '%s'\n" msgstr "Ej st?d f?r rapporttyp \"%s\"\n" -#: nessus/nessus.c:807 +#: nessus/nessus.c:829 #, fuzzy, c-format msgid "Could not import '%s' - is it a .nbe file?\n" msgstr "Kunde inte importera \"%s\" - ?r den en .nsr eller .nbe-fil?\n" -#: nessus/nessus.c:815 +#: nessus/nessus.c:837 #, fuzzy, c-format msgid "The option -make_config_file can only be used in batch mode.\n" msgstr "Informativt l?ge kan endast anv?ndas i satsl?ge\n" -#: nessus/nessus.c:826 +#: nessus/nessus.c:848 #, c-format msgid "list-sessions requires %s\n" msgstr "list-sessions kr?ver %s\n" -#: nessus/nessus.c:832 -#, c-format -msgid "restore-session requires -q %s result\n" +#: nessus/nessus.c:854 +#, fuzzy, c-format +msgid "restore-session requires -q %s \n" msgstr "restore-session kr?ver -q %s resultat\n" -#: nessus/nessus.c:838 +#: nessus/nessus.c:860 #, c-format msgid "--restore-session and --list-sessions are mutually exclusive\n" msgstr "--restore-session och --list-sessions ?r ?msesidigt uteslutande\n" -#: nessus/nessus.c:876 +#: nessus/nessus.c:898 #, c-format msgid "Verbose mode can only be used in batch mode\n" msgstr "Informativt l?ge kan endast anv?ndas i satsl?ge\n" -#: nessus/nessus.c:899 nessus/nessus.c:925 +#: nessus/nessus.c:921 nessus/nessus.c:956 #, c-format msgid "Batch mode requires login information.\n" msgstr "" -#: nessus/nessus.c:910 +#: nessus/nessus.c:932 msgid "list-sessions only requires " msgstr "list-sessions kr?ver endast " -#: nessus/nessus.c:919 +#: nessus/nessus.c:941 msgid "restore-session only requires " msgstr "restore-session kr?ver endast " -#: nessus/nessus.c:950 nessus/nessus.c:965 +#: nessus/nessus.c:950 +#, fuzzy +msgid "list-prefs and list-plugins require " +msgstr "list-sessions kr?ver %s\n" + +#: nessus/nessus.c:981 nessus/nessus.c:996 #, c-format msgid "Could not connect to openvasd\n" msgstr "Kunde inte ansluta till openvasd\n" -#: nessus/nessus.c:992 nessus/nessus.c:999 +#: nessus/nessus.c:1023 nessus/nessus.c:1030 #, c-format msgid "Missing parameter\n" msgstr "Saknar parameter\n" -#: nessus/nessus.c:1027 +#: nessus/nessus.c:1058 #, c-format msgid "A new openvasrc file has been saved\n" msgstr "En ny openvasrc-fil har sparats\n" -#: nessus/nessus.c:1070 +#: nessus/nessus.c:1101 #, c-format msgid "" "\n" @@ -615,11 +774,11 @@ " the --help option and in the OpenVAS documentation.\n" msgstr "" -#: nessus/pdf_output.c:381 +#: nessus/pdf_output.c:174 msgid "Could not fork (out of memory?)" msgstr "Kunde inte dela process (slut p? minne?)" -#: nessus/pdf_output.c:504 +#: nessus/pdf_output.c:306 msgid "" "PDF report export failed!\n" "Maybe HTMLDoc (required for PDF export) is not installed or in search path." @@ -627,80 +786,68 @@ "Export av PDF-rapport misslyckades!\n" "Kanske ?r HTMLDoc (kr?vs f?r PDF-export) inte installerad eller i s?kv?gen." -#: nessus/pdf_output.c:506 +#: nessus/pdf_output.c:308 #, c-format msgid "PDF report export failed! (htmldoc exit code: %d)" msgstr "Export av PDF-rapport misslyckades! (htmldoc felkod: %d)" -#: nessus/pdf_output.c:537 +#: nessus/pdf_output.c:346 msgid "Could not create this file !" msgstr "Kunde inte skapa denna fil!" -#: nessus/pdf_output.c:551 +#: nessus/pdf_output.c:360 msgid "Reports per Host" msgstr "Rapporter per v?rd" -#: nessus/pdf_output.c:571 +#: nessus/pdf_output.c:379 #, c-format msgid "Scan of this host started at: %s
\n" msgstr "Avs?kning av denna v?rd startade den: %s
\n" -#: nessus/pdf_output.c:573 +#: nessus/pdf_output.c:381 #, c-format msgid "Scan of this host finished at: %s
\n" msgstr "Avs?kning av denna v?rd avslutades den: %s
\n" -#: nessus/pdf_output.c:583 +#: nessus/pdf_output.c:391 msgid "Service (Port)" msgstr "Tj?nst (Port)" -#: nessus/pdf_output.c:586 +#: nessus/pdf_output.c:394 msgid "Issue regarding port" msgstr "Problem ang?ende port" -#: nessus/pdf_output.c:610 -msgid "Security hole found" +#: nessus/pdf_output.c:417 nessus/pdf_output.c:624 +msgid "Security hole(s) found" msgstr "S?kerhetsh?l hittades" -#: nessus/pdf_output.c:615 nessus/pdf_output.c:853 +#: nessus/pdf_output.c:422 nessus/pdf_output.c:629 msgid "Security warning(s) found" msgstr "S?kerhetsvarning(ar) hittades" -#: nessus/pdf_output.c:620 -msgid "Security notes found" +#: nessus/pdf_output.c:427 nessus/pdf_output.c:634 +msgid "Security note(s) found" msgstr "S?kerhetsnotering(ar) hittades" -#: nessus/pdf_output.c:629 nessus/pdf_output.c:638 +#: nessus/pdf_output.c:436 nessus/pdf_output.c:445 msgid "No Information" msgstr "Ingen information" -#: nessus/pdf_output.c:647 +#: nessus/pdf_output.c:454 msgid "[ return to summary ]" msgstr "[ ?terg? till sammanfattning ]" -#: nessus/pdf_output.c:651 +#: nessus/pdf_output.c:458 #, c-format msgid "Security Issues and Fixes - Host %s" msgstr "S?kerhetsproblem och felr?ttningar - V?rd %s" -#: nessus/pdf_output.c:687 -msgid "Vulnerability" -msgstr "S?rbarhet" - -#: nessus/pdf_output.c:712 nessus/prefs_dialog/prefs_plugins_tree.c:448 -msgid "Warning" -msgstr "Varning" - -#: nessus/pdf_output.c:739 -msgid "Informational" -msgstr "Informativ" - -#: nessus/pdf_output.c:753 +#: nessus/pdf_output.c:528 #, c-format msgid "[ return to %s ]" msgstr "[ ?terg? till %s ]" -#: nessus/pdf_output.c:771 +#: nessus/pdf_output.c:546 msgid "" "This file was generated by OpenVAS, " "the free security scanner." @@ -708,173 +855,264 @@ "Denna fil genererades av OpenVAS, den " "fria s?kerhetsavs?karen." -#: nessus/pdf_output.c:793 +#: nessus/pdf_output.c:569 msgid "OpenVAS Scan Report" msgstr "Avs?kningsrapport fr?n OpenVAS" -#: nessus/pdf_output.c:808 +#: nessus/pdf_output.c:584 +#, fuzzy msgid "" "This report gives details on hosts that were tested and issues that were " -"found." +"found. " msgstr "" "Den h?r rapporten ger detaljer f?r v?rdar som blev testade och problem som " "hittades." -#: nessus/pdf_output.c:809 +#: nessus/pdf_output.c:585 msgid "" "Please follow the recommended steps and procedures to eradicate these " "threats.\n" msgstr "" "F?lj de rekommenderade stegen och procedurerna f?r att minska dessa hot.\n" -#: nessus/pdf_output.c:813 +#: nessus/pdf_output.c:589 #, c-format msgid "Scan started at: %s
\n" msgstr "Avs?kning startades: %s
\n" -#: nessus/pdf_output.c:814 +#: nessus/pdf_output.c:590 #, c-format msgid "Scan finished at: %s
\n" msgstr "Avs?kning avslutades: %s
\n" -#: nessus/pdf_output.c:820 +#: nessus/pdf_output.c:596 msgid "Host" msgstr "V?rd" -#: nessus/pdf_output.c:823 +#: nessus/pdf_output.c:599 msgid "Possible Issues" msgstr "M?jliga problem" -#: nessus/pdf_output.c:826 +#: nessus/pdf_output.c:602 msgid "Holes" msgstr "H?l" -#: nessus/pdf_output.c:829 +#: nessus/pdf_output.c:605 msgid "Warnings" msgstr "Varningar" -#: nessus/pdf_output.c:832 +#: nessus/pdf_output.c:608 msgid "Notes" msgstr "Noteringar" -#: nessus/pdf_output.c:848 -msgid "Security hole(s) found" -msgstr "S?kerhetsh?l hittades" - -#: nessus/pdf_output.c:858 -msgid "Security note(s) found" -msgstr "S?kerhetsnotering(ar) hittades" - -#: nessus/pdf_output.c:863 +#: nessus/pdf_output.c:639 msgid "No noticeable information found" msgstr "Ingen noterbar information hittades" -#: nessus/pdf_output.c:881 +#: nessus/pdf_output.c:657 msgid "Total" msgstr "Totalt" -#: nessus/pdf_output.c:943 +#: nessus/pdf_output.c:713 nessus/pdf_output.c:717 nessus/pdf_output.c:727 +msgid "Signed by" +msgstr "" + +#: nessus/pdf_output.c:713 #, fuzzy +msgid "not signed" +msgstr "ej ansluten" + +#: nessus/pdf_output.c:718 +msgid "unknown signature(s)" +msgstr "" + +#: nessus/pdf_output.c:735 +#, fuzzy +msgid "trusted" +msgstr "P?litligt CA:" + +#: nessus/pdf_output.c:736 +msgid "not trusted" +msgstr "" + +#: nessus/pdf_output.c:749 +msgid "unknown signature" +msgstr "" + +#: nessus/pdf_output.c:786 +#, fuzzy msgid "Family" msgstr "Familj: %s" -#: nessus/pdf_output.c:944 +#: nessus/pdf_output.c:787 msgid "Version" msgstr "" -#: nessus/pdf_output.c:947 +#: nessus/pdf_output.c:793 #, fuzzy msgid "XRefs" msgstr "Regler" -#: nessus/pdf_output.c:962 +#: nessus/pdf_output.c:809 msgid "Parameters" msgstr "" -#: nessus/pdf_output.c:985 +#: nessus/pdf_output.c:839 #, fuzzy msgid "Appendix: NVT Information" msgstr "Ingen information" -#: nessus/plugin_infos.c:56 +#: nessus/plugin_infos.c:58 #, c-format msgid "Dependencies of Plugin '%s'" msgstr "Beroenden f?r insticksmodul \"%s\"" -#: nessus/plugin_infos.c:87 +#: nessus/plugin_infos.c:89 msgid "No dependencies found." msgstr "Inga beroenden funna." -#: nessus/plugin_infos.c:112 +#: nessus/plugin_infos.c:114 msgid "), currently " msgstr "), f?r n?rvarande " -#: nessus/plugin_infos.c:114 +#: nessus/plugin_infos.c:116 msgid "enabled" msgstr "aktiverad" -#: nessus/plugin_infos.c:116 +#: nessus/plugin_infos.c:118 msgid "disabled" msgstr "avst?ngd" -#: nessus/plugin_infos.c:177 nessus/plugin_infos.c:409 +#: nessus/plugin_infos.c:176 nessus/plugin_infos.c:578 msgid "Set plugin timeout..." msgstr "St?ll in timeout f?r insticksmodul..." -#: nessus/plugin_infos.c:194 +#: nessus/plugin_infos.c:193 msgid "Set plugin timeout:" msgstr "St?ll in timeout f?r insticksmodul:" -#: nessus/plugin_infos.c:281 +#: nessus/plugin_infos.c:265 #, c-format +msgid "Can not find certificate for: %s." +msgstr "" + +#: nessus/plugin_infos.c:269 +#, fuzzy, c-format +msgid "OpenVAS Certificate View: %s" +msgstr "Anv?ndarens certifikatfil:" + +#: nessus/plugin_infos.c:283 +#, c-format +msgid "Owner Name: %s" +msgstr "" + +#: nessus/plugin_infos.c:288 +#, c-format +msgid "Fingeprint: %s" +msgstr "" + +#: nessus/plugin_infos.c:339 +#, c-format msgid "Error ! Plugin selected not found ?!\n" msgstr "Fel! Vald insticksmodul hittades inte?!\n" -#: nessus/plugin_infos.c:316 +#: nessus/plugin_infos.c:374 #, c-format msgid "Family: %s" msgstr "Familj: %s" -#: nessus/plugin_infos.c:323 +#: nessus/plugin_infos.c:381 #, c-format msgid "Category: %s" msgstr "Kategori: %s" -#: nessus/plugin_infos.c:330 -#, c-format -msgid "OpenVAS Plugin ID: %d" -msgstr "OpenVAS insticks-id: %d" +#: nessus/plugin_infos.c:388 +#, fuzzy, c-format +msgid "OpenVAS NVT OID: %s" +msgstr "OpenVAS ID:" -#: nessus/plugin_infos.c:340 +#: nessus/plugin_infos.c:398 #, c-format msgid "CVE: %s" msgstr "CVE: %s" -#: nessus/plugin_infos.c:351 +#: nessus/plugin_infos.c:409 #, c-format msgid "Bugtraq ID: %s" msgstr "Bugtraq ID: %s" -#: nessus/plugin_infos.c:362 +#: nessus/plugin_infos.c:420 #, c-format msgid "Other references: %s" msgstr "Andra referenser: %s" -#: nessus/plugin_infos.c:381 +#: nessus/plugin_infos.c:431 +#, fuzzy, c-format +msgid "Plugin Version: %s" +msgstr "Val av insticksmoduler" + +#: nessus/plugin_infos.c:442 +#, c-format +msgid "Script tags: %s" +msgstr "" + +#: nessus/plugin_infos.c:455 #, fuzzy msgid "Plugin description:" msgstr "Val av insticksmoduler" -#: nessus/plugin_infos.c:416 +#: nessus/plugin_infos.c:512 +#, fuzzy, c-format +msgid "Signature information available on server connection." +msgstr "Denna sida ?r inte tillg?nglig i nuvarande kontext." + +#: nessus/plugin_infos.c:516 +#, c-format +msgid "" +"Signatures:\n" +"\tUnknown signature(s)." +msgstr "" + +#: nessus/plugin_infos.c:520 +#, c-format +msgid "" +"Signatures:\n" +"\tNVT is not signed." +msgstr "" + +#: nessus/plugin_infos.c:529 +#, c-format +msgid "Signatures:" +msgstr "" + +#: nessus/plugin_infos.c:532 +#, c-format +msgid "Signatures (NOT verified):" +msgstr "" + +#: nessus/plugin_infos.c:549 +msgid "trusted" +msgstr "" + +#: nessus/plugin_infos.c:550 +msgid "untrusted" +msgstr "" + +#: nessus/plugin_infos.c:558 +#, fuzzy +msgid "View" +msgstr "Vi_sa" + +#: nessus/plugin_infos.c:585 msgid "Show dependencies" msgstr "Visa beroenden" -#: nessus/preferences.c:156 +#: nessus/preferences.c:130 #, c-format msgid "Error writing %s: %s" msgstr "Fel vid skrivning av %s: %s" -#: nessus/preferences.c:163 +#: nessus/preferences.c:137 #, c-format msgid "" "# OpenVAS-Client Preferences File\n" @@ -883,54 +1121,54 @@ "# Inst?llningsfil f?r OpenVAS-Client\n" "\n" -#: nessus/preferences.c:229 +#: nessus/preferences.c:203 #, c-format msgid "The OpenVAS-Client doesn't have the right to read %s\n" msgstr "OpenVAS-Client har inte r?ttighet att l?sa %s\n" -#: nessus/preferences.c:243 +#: nessus/preferences.c:217 msgid "Couldn't find prefs file... Creating a new one..." msgstr "Kunde inte hitta inst?llningsfil... Skapar en ny..." -#: nessus/preferences.c:247 nessus/preferences.c:254 +#: nessus/preferences.c:221 nessus/preferences.c:228 #, c-format msgid "Error creating %s: %s" msgstr "Fel vid skapande av %s: %s" -#: nessus/preferences.c:262 +#: nessus/preferences.c:236 #, c-format msgid "Error reading %s: %s" msgstr "Fel vid l?sning av %s: %s" -#: nessus/preferences.c:280 +#: nessus/preferences.c:255 #, c-format msgid "Parse error in %s: %s" msgstr "Tolkningsfel i %s: %s" -#: nessus/preferences.c:294 +#: nessus/preferences.c:269 #, c-format msgid "Missing 'end' in %s" msgstr "Saknar 'end' i %s" -#: nessus/preferences.c:522 +#: nessus/preferences.c:507 #, c-format msgid "%s could not be opened write only" msgstr "%s kunde inte ?ppnas skrivbar" -#: nessus/preferences.c:526 +#: nessus/preferences.c:511 #, c-format msgid "# This file was automagically created by OpenVAS-Client\n" msgstr "# Denna fil skapades automatiskt av OpenVAS-Client\n" -#: nessus/preferences.c:643 +#: nessus/preferences.c:630 msgid "Global Settings" msgstr "Globala inst?llningar" -#: nessus/preferences.c:757 nessus/preferences.c:778 +#: nessus/preferences.c:745 nessus/preferences.c:766 msgid "prefs_set_value() called with illegal type" msgstr "prefs_set_value() anropad med ogiltig typ" -#: nessus/read_target_file.c:41 nessus/report.c:204 +#: nessus/read_target_file.c:41 nessus/report.c:245 msgid "Load file" msgstr "L?s in fil" @@ -957,35 +1195,110 @@ msgid "file mapping failed: %s\n" msgstr "filmappning misslyckades: %s\n" -#: nessus/report.c:117 +#: nessus/html_graph_output.c:1123 +#, fuzzy, c-format +msgid "Can't change to directory %s: %s." +msgstr "Kan inte ?ppna %s: %s" + +#: nessus/html_graph_output.c:1130 +#, fuzzy, c-format +msgid "Can't write index: %s" +msgstr "Kan inte ?ppna %s: %s" + +#: nessus/xml_output_ng.c:713 +#, fuzzy, c-format +msgid "Can't open %s for writing: %s." +msgstr "Kan inte ?ppna %s: %s" + +#: nessus/report.c:143 msgid "report_save() called with illegal type" msgstr "report_save() anropad med otill?ten typ" -#: nessus/report.c:136 +#: nessus/report.c:162 msgid "report_save() couldn't create context" msgstr "report_save() kunde inte skapa kontext" -#: nessus/report.c:142 +#: nessus/report.c:168 msgid "report_save() couldn't find a report filename" msgstr "report_save() kunde inte hitta ett filnamn f?r rapport" -#: nessus/report.c:150 +#: nessus/report.c:176 msgid "report_save() couldn't save the report" msgstr "report_save() kunde inte spara rapporten" -#: nessus/report.c:162 +#: nessus/report.c:188 msgid "report_save() couldn't save the plugin information" msgstr "report_save() kunde inte spara information om insticksmodul" -#: nessus/sslui.c:85 +#: nessus/report.c:203 +#, fuzzy +msgid "report_save() couldn't save the certificate information" +msgstr "report_save() kunde inte spara information om insticksmodul" + +#: nessus/report_save.c:178 +#, fuzzy +msgid "Export Report" +msgstr "Rapport" + +#: nessus/report_save.c:194 +#, fuzzy +msgid "Export Options" +msgstr "Alternativ" + +#: nessus/report_save.c:203 +msgid "Report file format : " +msgstr "" + +#: nessus/report_save.c:239 +msgid "ASCII text" +msgstr "" + +#: nessus/report_save.c:245 +msgid "HTML with Pies and Graphs" +msgstr "" + +#: nessus/report_save.c:283 +#, c-format +msgid "PDF file %s not found." +msgstr "" + +#: nessus/report_save.c:289 +#, c-format +msgid "" +"You haven't configured a PDF viewer.\n" +"The report was saved as %s so you can manually open it." +msgstr "" + +#: nessus/report_save.c:300 +#, c-format +msgid "Can't launch PDF viewer: %s" +msgstr "" + +#: nessus/report_save.c:334 +#, fuzzy, c-format +msgid "" +"Can't open PDF file: %s:\n" +"%s" +msgstr "Kan inte ?ppna %s: %s" + +#: nessus/sighand.c:53 +msgid "Connection closed by the server (SIGPIPE caught)" +msgstr "" + +#: nessus/sighand.c:59 +#, fuzzy +msgid "Connection timed out" +msgstr "Anslutning: anv?ndare %s %s" + +#: nessus/sslui.c:86 msgid "SSL Setup" msgstr "Inst?llning av SSL" -#: nessus/sslui.c:128 +#: nessus/sslui.c:129 msgid "Display and remember the server certificate, do not care about the CA" msgstr "Visa och kom ih?g servercertifikatet, inte bry sig om CA" -#: nessus/sslui.c:138 +#: nessus/sslui.c:139 msgid "" "Trust the server certificate if and only if it is valid and certified by the " "CA" @@ -993,15 +1306,15 @@ "Lita p? servercertifikatet om och endast om det ?r giltigt och certifierat " "av CA" -#: nessus/sslui.c:146 +#: nessus/sslui.c:147 msgid "Verify that the server certificate is valid *and* remember it" msgstr "Verifiera att servercertifikatet ?r giltigt *och* kom ih?g det" -#: nessus/sslui.c:157 +#: nessus/sslui.c:158 msgid "OK" msgstr "OK" -#: nessus/sslui.c:194 +#: nessus/sslui.c:195 msgid "" "Please choose your level of SSL paranoia (Hint: if you want to manage\n" "many servers from your client, choose 2. Otherwise, choose 1, or 3,\n" @@ -1010,28 +1323,28 @@ "V?lj din niv? f?r SSL-paranoia (Tips: om du vill hantera m?nga servrar\n" "fr?n din klient, v?lj 2. Om inte, v?lj 1, eller 3 om du ?r paranoid.)\n" -#: nessus/sslui.c:280 +#: nessus/sslui.c:288 msgid "This certificate has never been shown before. Here it is:" msgstr "Detta certifikat har aldrig visats h?r tidigare. H?r ?r det:" -#: nessus/sslui.c:310 +#: nessus/sslui.c:319 msgid "Do you accept this certificate?" msgstr "Accepterar du det h?r certifikatet?" -#: nessus/sslui.c:320 +#: nessus/sslui.c:327 msgid "Yes" msgstr "Ja" -#: nessus/sslui.c:326 +#: nessus/sslui.c:333 msgid "No" msgstr "Nej" -#: nessus/sslui.c:374 +#: nessus/sslui.c:384 #, c-format msgid "This certificate has never been seen before and can't be shown\n" msgstr "Detta certifikat har aldrig tidigare setts och kan inte visas\n" -#: nessus/sslui.c:394 +#: nessus/sslui.c:404 #, c-format msgid "Do you accept it? (y/n) " msgstr "Accepterar du det? (j/n) " @@ -1056,7 +1369,7 @@ msgstr "Anslutning: anv?ndare %s %s" #: nessus/prefs_dialog/prefs_context.c:291 -#: nessus/prefs_dialog/prefs_dialog.c:777 +#: nessus/prefs_dialog/prefs_dialog.c:761 msgid "not connected" msgstr "ej ansluten" @@ -1079,158 +1392,154 @@ msgid "prefs_context_update called with illegal context." msgstr "prefs_context_update anropad med otill?ten kontext." -#: nessus/prefs_dialog/prefs_dialog.c:111 +#: nessus/prefs_dialog/prefs_dialog.c:110 msgid "users-manual.pdf" msgstr "users-manual.pdf" -#: nessus/prefs_dialog/prefs_dialog.c:131 +#: nessus/prefs_dialog/prefs_dialog.c:130 msgid "The global settings have been saved." msgstr "Allm?nna inst?llningar har sparats." -#: nessus/prefs_dialog/prefs_dialog.c:187 -msgid "Not yet implemented." -msgstr "?nnu inte implementerad." - -#: nessus/prefs_dialog/prefs_dialog.c:362 +#: nessus/prefs_dialog/prefs_dialog.c:353 msgid "OpenVAS-Client" msgstr "OpenVAS-Client" -#: nessus/prefs_dialog/prefs_dialog.c:384 +#: nessus/prefs_dialog/prefs_dialog.c:375 msgid "_File" msgstr "_Arkiv" -#: nessus/prefs_dialog/prefs_dialog.c:389 +#: nessus/prefs_dialog/prefs_dialog.c:380 msgid "_Connect" msgstr "A_nslut" -#: nessus/prefs_dialog/prefs_dialog.c:393 +#: nessus/prefs_dialog/prefs_dialog.c:384 msgid "_Disconnect" msgstr "_Koppla ned" -#: nessus/prefs_dialog/prefs_dialog.c:400 +#: nessus/prefs_dialog/prefs_dialog.c:391 msgid "SLAD _Install" msgstr "_Installation av SLAD" -#: nessus/prefs_dialog/prefs_dialog.c:404 +#: nessus/prefs_dialog/prefs_dialog.c:395 msgid "_Scan Assistant" msgstr "Avs?kningsa_ssistent" -#: nessus/prefs_dialog/prefs_dialog.c:412 +#: nessus/prefs_dialog/prefs_dialog.c:403 msgid "Save _Global Settings" msgstr "Spara a_llm?nna inst?llningar" -#: nessus/prefs_dialog/prefs_dialog.c:424 +#: nessus/prefs_dialog/prefs_dialog.c:415 msgid "_View" msgstr "Vi_sa" -#: nessus/prefs_dialog/prefs_dialog.c:429 +#: nessus/prefs_dialog/prefs_dialog.c:420 msgid "_Toolbar" msgstr "_Verktygsrad" -#: nessus/prefs_dialog/prefs_dialog.c:433 +#: nessus/prefs_dialog/prefs_dialog.c:424 msgid "_Message log" msgstr "_Meddelandelogg" -#: nessus/prefs_dialog/prefs_dialog.c:439 +#: nessus/prefs_dialog/prefs_dialog.c:430 msgid "_Task" msgstr "_Uppgift" -#: nessus/prefs_dialog/prefs_dialog.c:444 -#: nessus/prefs_dialog/prefs_dialog.c:476 +#: nessus/prefs_dialog/prefs_dialog.c:435 +#: nessus/prefs_dialog/prefs_dialog.c:460 msgid "_New" msgstr "_Ny" -#: nessus/prefs_dialog/prefs_dialog.c:448 -#: nessus/prefs_dialog/prefs_dialog.c:480 -#: nessus/prefs_dialog/prefs_dialog.c:512 +#: nessus/prefs_dialog/prefs_dialog.c:439 +#: nessus/prefs_dialog/prefs_dialog.c:464 +#: nessus/prefs_dialog/prefs_dialog.c:496 msgid "_Rename" msgstr "_Byt namn" -#: nessus/prefs_dialog/prefs_dialog.c:458 +#: nessus/prefs_dialog/prefs_dialog.c:449 msgid "_Scope" msgstr "_Omf?ng" -#: nessus/prefs_dialog/prefs_dialog.c:489 +#: nessus/prefs_dialog/prefs_dialog.c:473 msgid "_Move to task" msgstr "_Flytta till uppgift" -#: nessus/prefs_dialog/prefs_dialog.c:507 +#: nessus/prefs_dialog/prefs_dialog.c:491 msgid "_Report" msgstr "_Rapport" -#: nessus/prefs_dialog/prefs_dialog.c:522 +#: nessus/prefs_dialog/prefs_dialog.c:506 msgid "_Import" msgstr "_Importera" -#: nessus/prefs_dialog/prefs_dialog.c:526 +#: nessus/prefs_dialog/prefs_dialog.c:510 msgid "E_xport" msgstr "E_xportera" -#: nessus/prefs_dialog/prefs_dialog.c:536 +#: nessus/prefs_dialog/prefs_dialog.c:520 msgid "_Help" msgstr "_Hj?lp" -#: nessus/prefs_dialog/prefs_dialog.c:541 +#: nessus/prefs_dialog/prefs_dialog.c:525 msgid "_Users Manual" msgstr "Anv?ndar_manual" -#: nessus/prefs_dialog/prefs_dialog.c:545 +#: nessus/prefs_dialog/prefs_dialog.c:529 msgid "_About" msgstr "_Om" -#: nessus/prefs_dialog/prefs_dialog.c:581 -#: nessus/prefs_dialog/prefs_dialog.c:583 +#: nessus/prefs_dialog/prefs_dialog.c:565 +#: nessus/prefs_dialog/prefs_dialog.c:567 #: nessus/prefs_dialog/prefs_scan_assistant.c:238 msgid "Scan Assistant" msgstr "Avs?kningsassistent" -#: nessus/prefs_dialog/prefs_dialog.c:590 -#: nessus/prefs_dialog/prefs_dialog.c:592 +#: nessus/prefs_dialog/prefs_dialog.c:574 +#: nessus/prefs_dialog/prefs_dialog.c:576 msgid "New" msgstr "Ny" -#: nessus/prefs_dialog/prefs_dialog.c:599 -#: nessus/prefs_dialog/prefs_dialog.c:601 +#: nessus/prefs_dialog/prefs_dialog.c:583 +#: nessus/prefs_dialog/prefs_dialog.c:585 msgid "Delete" msgstr "Ta bort" -#: nessus/prefs_dialog/prefs_dialog.c:611 -#: nessus/prefs_dialog/prefs_dialog.c:613 +#: nessus/prefs_dialog/prefs_dialog.c:595 +#: nessus/prefs_dialog/prefs_dialog.c:597 msgid "Connect" msgstr "Anslut" -#: nessus/prefs_dialog/prefs_dialog.c:621 -#: nessus/prefs_dialog/prefs_dialog.c:623 +#: nessus/prefs_dialog/prefs_dialog.c:605 +#: nessus/prefs_dialog/prefs_dialog.c:607 msgid "Disconnect" msgstr "Koppla ned" -#: nessus/prefs_dialog/prefs_dialog.c:633 -#: nessus/prefs_dialog/prefs_dialog.c:635 +#: nessus/prefs_dialog/prefs_dialog.c:617 +#: nessus/prefs_dialog/prefs_dialog.c:619 msgid "Execute" msgstr "K?r" -#: nessus/prefs_dialog/prefs_dialog.c:656 +#: nessus/prefs_dialog/prefs_dialog.c:640 msgid "Context" msgstr "Kontext" -#: nessus/prefs_dialog/prefs_dialog.c:686 +#: nessus/prefs_dialog/prefs_dialog.c:670 msgid "Comments" msgstr "Kommentarer" -#: nessus/prefs_dialog/prefs_dialog.c:692 +#: nessus/prefs_dialog/prefs_dialog.c:676 msgid "Options" msgstr "Alternativ" -#: nessus/prefs_dialog/prefs_dialog.c:698 -#: nessus/prefs_dialog/prefs_dialog_prefs.c:187 +#: nessus/prefs_dialog/prefs_dialog.c:682 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:190 msgid "Report" msgstr "Rapport" -#: nessus/prefs_dialog/prefs_dialog.c:718 +#: nessus/prefs_dialog/prefs_dialog.c:702 msgid "Message log" msgstr "Meddelandelogg" -#: nessus/prefs_dialog/prefs_dialog.c:739 +#: nessus/prefs_dialog/prefs_dialog.c:723 msgid "" "Welcome to OpenVAS-Client, http://www.openvas.org/\n" "NessusClient origin: Copyright 1998-2007 by Renaud Deraison\n" @@ -1244,7 +1553,7 @@ "Upphovsm?n: Renaud Deraison, Thomas Arendsen Hein, Jan-Oliver Wagner, " "Bernhard Herzog, Michel Arboi (SSL-st?d), Bruce Verderaime (diagram)\n" -#: nessus/prefs_dialog/prefs_dialog.c:1519 +#: nessus/prefs_dialog/prefs_dialog.c:1449 msgid "" "You must enter the name of the primary target\n" "to attack in the 'target' section" @@ -1372,111 +1681,121 @@ msgid "Remember the set of plugins" msgstr "Kom ih?g insticksupps?ttningar" -#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:88 +#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:95 msgid "Advanced Plugins preferences" msgstr "Avancerade inst?llning f?r insticksmoduler" -#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:95 -#: nessus/prefs_dialog/prefs_options.c:101 +#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:102 +#: nessus/prefs_dialog/prefs_options.c:102 msgid "Credentials" msgstr "Befogenheter" -#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:351 +#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:188 +#, c-format +msgid "%s asked for unknown preference type %s." +msgstr "" + +#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:388 msgid "Select file" msgstr "V?lj fil" -#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:496 +#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:575 +#, fuzzy +msgid "SSH Key Information" +msgstr "Ingen information" + +#: nessus/prefs_dialog/prefs_dialog_plugins_prefs.c:709 msgid "Select..." msgstr "V?lj..." -#: nessus/prefs_dialog/prefs_dialog_prefs.c:60 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:65 msgid "Preferences" msgstr "Inst?llningar" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:80 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:85 msgid "User interface" msgstr "Anv?ndargr?nssnitt" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:92 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:97 msgid "Auto expand tree elements" msgstr "F?ll automatiskt ut tr?delement" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:98 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:103 msgid "Order by:" msgstr "" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:108 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:113 #: nessus/prefs_dialog/prefs_report.c:499 msgid "Host/Port/Severity" msgstr "V?rd/Port/Allvarlighet" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:110 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:115 #: nessus/prefs_dialog/prefs_report.c:501 msgid "Port/Host/Severity" msgstr "Port/V?rd/Allvarlighet" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:116 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:121 msgid "Connection to OpenVAS Server" msgstr "Anslutning till OpenVAS-server" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:128 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:133 msgid "Automatically connect" msgstr "Anslut automatiskt" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:134 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:139 msgid "Protocol version:" msgstr "" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:144 -msgid "NTP 1.2" -msgstr "" - -#: nessus/prefs_dialog/prefs_dialog_prefs.c:146 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:149 msgid "OTP 1.0" msgstr "" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:149 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:152 msgid "Plugin Cache" msgstr "Insticksmodulcache" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:161 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:164 msgid "Cache plugin information when connecting" msgstr "Mellanlagra information om insticksmoduler vid anslutning" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:168 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:171 msgid "Use plugin cache with reports" msgstr "Anv?nd insticksmodulcache med rapporter" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:176 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:179 msgid "Load plugin cache for scopes immediately" msgstr "L?s omedelbart in insticksmodulcache f?r omf?ng " -#: nessus/prefs_dialog/prefs_dialog_prefs.c:199 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:202 msgid "Include plugin details in PDF" msgstr "Inkludera detaljer om insticksmoduler i PDF" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:207 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:210 msgid "Show script origin in report window" msgstr "" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:221 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:224 msgid "External Links in HTML/PDF" msgstr "Externa l?nkar i HTML/PDF" -#: nessus/prefs_dialog/prefs_dialog_prefs.c:232 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:235 msgid "OpenVAS IDs:" msgstr "OpenVAS ID:" # -#: nessus/prefs_dialog/prefs_dialog_prefs.c:244 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:247 msgid "CVE IDs:" msgstr "CVE ID:" # -#: nessus/prefs_dialog/prefs_dialog_prefs.c:256 +#: nessus/prefs_dialog/prefs_dialog_prefs.c:259 msgid "BugTraq IDs:" msgstr "BugTraq ID:" +#: nessus/prefs_dialog/prefs_dialog_prefs.c:272 +msgid "SSH Key Management" +msgstr "" + #: nessus/prefs_dialog/prefs_dialog_scan_opt.c:141 msgid "General scan options" msgstr "Allm?nna avs?kningsalternativ" @@ -1580,18 +1899,19 @@ "eller en IP-adress." #: nessus/prefs_dialog/prefs_help.h:39 +#, fuzzy msgid "" -"Enter the port number where you will be serviced by the OpenVAS Server. With " -"older server systems, this is the port 3001, but the official port is 1241." +"Enter the port number where you will be serviced by the OpenVAS Server. " +"Usual is 1241." msgstr "" "Ange portnumret d?r du vill bli emottagen av OpenVAS-servern. P? ?ldre " "serversystem ?r denna port 3001 men den officiella porten ?r 1241." -#: nessus/prefs_dialog/prefs_help.h:44 +#: nessus/prefs_dialog/prefs_help.h:43 msgid "Set to default OpenVAS port 1241." msgstr "St?ll in till standardporten 1241 f?r OpenVAS." -#: nessus/prefs_dialog/prefs_help.h:47 +#: nessus/prefs_dialog/prefs_help.h:46 msgid "" "Enter the user name where you are registerd with on the OpenVAS Server. If " "you log in for the first time, you will be asked for a password. Maybe you " @@ -1601,7 +1921,7 @@ "loggar in f?r f?rsta g?ngen kommer du att fr?gas efter ett l?senord. Kanske " "beh?ver du be administrat?ren av OpenVAS-servern att skapa ett konto ?t dig." -#: nessus/prefs_dialog/prefs_help.h:53 +#: nessus/prefs_dialog/prefs_help.h:52 msgid "" "Maximal of number of hosts that the OpenVAS Server will test at the same " "time. Be aware that the OpenVAS Server will spawn max_hosts x max_checks " @@ -1610,7 +1930,7 @@ "Maximalt antal v?rdar som OpenVAS-servern ska testa samtidigt. T?nk p? att " "OpenVAS-servern kommer att starta upp max_v?rdar x max_kontroller processer!" -#: nessus/prefs_dialog/prefs_help.h:58 +#: nessus/prefs_dialog/prefs_help.h:57 msgid "" "Maximal number of security checks that will be launched at the same time " "against each host. Be aware that the OpenVAS Server will spawn max_hosts x " @@ -1620,12 +1940,12 @@ "T?nk p? att OpenVAS-servern kommer att starta max_v?rdar x max_kontroller " "processer!" -#: nessus/prefs_dialog/prefs_help.h:63 +#: nessus/prefs_dialog/prefs_help.h:62 msgid "Name of the remote file that several plugins will attempt to read." msgstr "" "Namn p? den fil p? fj?rrsystemet som flera insticksmoduler ska f?rs?ka l?sa. " -#: nessus/prefs_dialog/prefs_help.h:67 +#: nessus/prefs_dialog/prefs_help.h:66 msgid "" "If this option is checked, then OpenVAS Server will send some TCP packets to " "the target host to determine if the target host is alive. This method does " @@ -1637,7 +1957,7 @@ "inte ICMP eftersom ICMP ?r op?litligt d? f?rre och f?rre v?rdar svarar p? " "ICMP-paket." -#: nessus/prefs_dialog/prefs_help.h:73 +#: nessus/prefs_dialog/prefs_help.h:72 msgid "" "If this option is set, OpenVAS Server will do a reverse lookup on the IP " "addresses before it tests them. This may slow down the whole test." @@ -1646,21 +1966,8 @@ "uppslagning av IP-adresserna f?re de testas. Detta kan g?ra hela testet " "l?ngsammare." -#: nessus/prefs_dialog/prefs_help.h:78 +#: nessus/prefs_dialog/prefs_help.h:77 msgid "" -"Are the target hosts protected by a firewall ? If so and if we are outside " -"the firewall, it is a good idea to turn this option ON, so that OpenVAS " -"Server will perform some additional tests to check that the remote firewall " -"is well configured (this option is still experimental)." -msgstr "" -"?r m?lv?rdarna skyddade av en brandv?gg? Om det ?r s? och vi ?r utanf?r " -"brandv?ggen ?r det en bra id? att sl? P? detta alternativ s? att OpenVAS-" -"server kan genomf?ra ytterligare tester f?r att kontrollera att " -"fj?rrbrandv?ggen ?r riktigt konfigurerad (detta alternativ ?r fortfarande " -"experimentell)." - -#: nessus/prefs_dialog/prefs_help.h:86 -msgid "" "Security tests may ask the OpenVAS Server to be launched if and only if some " "information gathered by other test exist in the knowledge base, or if and " "only if a given port is open. This option speeds up the test, but may make " @@ -1673,7 +1980,7 @@ "att OpenVAS-servern missar n?gra s?rbarheter. Om du ?r paranoid, st?ng av " "detta alternativ." -#: nessus/prefs_dialog/prefs_help.h:94 +#: nessus/prefs_dialog/prefs_help.h:85 msgid "" "Some security checks may harm the target server, by disabling the remote " "service temporarily or until a reboot. If you enable this option, OpenVAS " @@ -1692,7 +1999,7 @@ "s?kerhetssynvinkel rekommenderar vi att du st?nger av detta alternativ. Fr?n " "en systemadministrat?rs synvinkel rekommenderar vi att du aktiverar det." -#: nessus/prefs_dialog/prefs_help.h:105 +#: nessus/prefs_dialog/prefs_help.h:96 msgid "" "If you enable this option, the hosts on the local network will be designated " "by their ethernet MAC address instead of their IP address. This is " @@ -1704,7 +2011,7 @@ "Detta ?r speciellt anv?ndbart om du anv?nder OpenVAS p? ett DHCP-n?tverk. Om " "du ?r os?ker, st?ng av detta alternativ." -#: nessus/prefs_dialog/prefs_help.h:111 +#: nessus/prefs_dialog/prefs_help.h:102 msgid "" "Ports that will be scanned by OpenVAS Server. You can enter single ports, " "such as \"1-8000\"; or more complex sets, such as \"21,23,25,1024-2048,6000" @@ -1716,7 +2023,7 @@ "\". Skriv \"-1\" f?r att inte avs?ka portar eller skriv \"default\" f?r att " "avs?ka de f?rvalda portarna i OpenVAS tj?nstefil." -#: nessus/prefs_dialog/prefs_help.h:118 +#: nessus/prefs_dialog/prefs_help.h:109 msgid "" "To save scanning time, you may ask OpenVAS Server to declare TCP ports it " "did not scan as closed. This will result in an incomplete audit but it will " @@ -1731,7 +2038,7 @@ "alternativ ?r avst?ngt kommer OpenVAS-server att anse att portar vars " "tillst?nd inte ?r k?nt ska anses som ?ppna." -#: nessus/prefs_dialog/prefs_help.h:126 +#: nessus/prefs_dialog/prefs_help.h:117 msgid "" "OpenVAS Server will perform an AXFR request (that is, a zone transfer) to " "the target name server and will attempt to obtain the list of the hosts of " @@ -1741,7 +2048,7 @@ "zon?verf?ring) till m?lnamnservern och f?rs?ka att h?mta listan av v?rdar i " "m?ldom?nen. Sedan kommer den testa varje v?rd." -#: nessus/prefs_dialog/prefs_help.h:132 +#: nessus/prefs_dialog/prefs_help.h:123 msgid "" "OpenVAS Server will determine which hosts can mount the filesystems exported " "by the target server, and will test them. Beware : this test is recursive." @@ -1750,7 +2057,7 @@ "som exporteras av m?lservern och testa dem. T?nk p? att detta test ?r " "rekursivt." -#: nessus/prefs_dialog/prefs_help.h:137 +#: nessus/prefs_dialog/prefs_help.h:128 msgid "" "OpenVAS Server will test the whole subnet of the target host. If you select " "this option, you should allow OpenVAS Server to ping the hosts before " @@ -1760,7 +2067,7 @@ "detta alternativ b?r du till?ta OpenVAS-servern att pinga v?rdar f?re de " "avs?ks i sektionen \"Avs?kningsalternativ\"." -#: nessus/prefs_dialog/prefs_help.h:142 +#: nessus/prefs_dialog/prefs_help.h:133 msgid "" "The first host(s) that will be attacked by OpenVAS Server. The options below " "allow you to extend the test to a larger set of computer. You may define " @@ -1772,7 +2079,7 @@ "prim?ra m?l genom att separera dem med ett kommatecken (,), allts? \"v?rd1," "v?rd2\"." -#: nessus/prefs_dialog/prefs_help.h:148 +#: nessus/prefs_dialog/prefs_help.h:139 msgid "" "A textfile can be specified that contains the list of targets. This textfile " "may contain comma-separated lists of host and also may contain many of such " @@ -1782,7 +2089,7 @@ "inneh?lla en kommaseparerad lista av v?rdar och kan ?ven inneh?lla m?nga " "s?dana rader." -#: nessus/prefs_dialog/prefs_help.h:153 +#: nessus/prefs_dialog/prefs_help.h:144 msgid "" "It is possible to check for the presence of CGIs in multiple paths like /cgi-" "bin, /cgis, /home-cgis, and so on. In that case, put all your paths here " @@ -1793,7 +2100,7 @@ "dina s?kv?gar h?r, separerade med kolon. Till exempel: \"/cgi-bin:/cgi-aws:/" "~deraison/cgi\"." -#: nessus/prefs_dialog/prefs_help.h:159 +#: nessus/prefs_dialog/prefs_help.h:150 msgid "" "The warning sign means that this plugin may harm the target host by " "disabling the attacked service or by crashing the host. You should be " @@ -1805,17 +2112,19 @@ "b?r vara f?rsiktig n?r du aktiverar den eftersom den kan tvinga dig att " "starta om dina servrar eller starta om vissa tj?nster manuellt." -#: nessus/prefs_dialog/prefs_help.h:167 +#: nessus/prefs_dialog/prefs_help.h:158 +#, fuzzy msgid "" "If you turn on this option, all the information collected about the target " "hosts will be saved on the side of OpenVAS Server for further re-use. See " -"http://www.nessus.org/doc/kb_saving.html for details." +"http://www.openvas.org/compendium/scan-options-knowledge-base.html for " +"details." msgstr "" "Om du sl?r p? detta alternativ kommer all den information som samlats in om " "m?lv?rdarna att sparas p? sidan av OpenVAS-server f?r framtida bruk. Se " "http://www.nessus.org/doc/kb_saving.html f?r detaljer." -#: nessus/prefs_dialog/prefs_help.h:173 +#: nessus/prefs_dialog/prefs_help.h:164 msgid "" "If you select this option, all the hosts selected in the 'Target' section of " "the OpenVAS-Client will be tested." @@ -1823,7 +2132,7 @@ "Om du v?ljer detta alternativ kommer alla valda v?rdar i \"M?l\"-sektionen i " "OpenVAS-klienten att testas." -#: nessus/prefs_dialog/prefs_help.h:177 +#: nessus/prefs_dialog/prefs_help.h:168 msgid "" "If you select this option, only the hosts to which a recent knowledge base " "is attached will be tested." @@ -1831,7 +2140,7 @@ "Om du v?ljer detta alternativ kommer endast de v?rdar som det finns en " "tidigare kunskapsbas bifogad, att testas." -#: nessus/prefs_dialog/prefs_help.h:181 +#: nessus/prefs_dialog/prefs_help.h:172 msgid "" "If you select this option, only the hosts which have no (or an outdated) " "knowledge base attached will be tested. Use this option to populate your " @@ -1841,7 +2150,7 @@ "f?r?ldrad) n?gon kunskapsbas bifogad att testas. Anv?nd detta alternativ f?r " "att befolka dina kunskapsbaser." -#: nessus/prefs_dialog/prefs_help.h:186 +#: nessus/prefs_dialog/prefs_help.h:177 msgid "" "If you select this option, the knowledge bases of the target hosts will be " "restored in memory if they are recent enough. You can use this option with " @@ -1855,7 +2164,7 @@ "v?rd som blev avs?kt tidigare eller f?r att f?rhindra upprepning av " "s?kerhetskontroller som redan genomf?rts tidigare." -#: nessus/prefs_dialog/prefs_help.h:193 +#: nessus/prefs_dialog/prefs_help.h:184 msgid "" "If you select this option, the port scanners that were launched in the past " "against the targetted hosts will not be launched again and the data of the " @@ -1865,7 +2174,7 @@ "mot de utvalda m?lv?rdarna inte att startas igen och datan fr?n " "kunskapsbasen kommer att anv?ndas som resultat f?r portavs?kningen." -#: nessus/prefs_dialog/prefs_help.h:199 +#: nessus/prefs_dialog/prefs_help.h:190 msgid "" "If you select this option, all the plugins that performs information " "gathering and which have already been launched against the target hosts will " @@ -1875,7 +2184,7 @@ "informationsinsamling och som redan har startats mot m?lv?rdarna inte att " "startas igen." -#: nessus/prefs_dialog/prefs_help.h:204 +#: nessus/prefs_dialog/prefs_help.h:195 msgid "" "If you select this option, all the plugins that performs attacks and which " "have already been launched against the target hosts will not be launched " @@ -1884,7 +2193,7 @@ "Om du v?ljer detta alternativ kommer alla insticksmoduler som genomf?r " "attacker och som redan har startats mot m?lv?rdarna inte att startas igen." -#: nessus/prefs_dialog/prefs_help.h:209 +#: nessus/prefs_dialog/prefs_help.h:200 msgid "" "If you select this option, all the plugins that may harm the target hosts " "and which have already been launched will not be launched again." @@ -1892,11 +2201,11 @@ "Om du v?ljer detta alternativ kommer alla insticksmoduler som kan skada " "m?lv?rdarna och som redan har startats inte startas igen." -#: nessus/prefs_dialog/prefs_help.h:214 +#: nessus/prefs_dialog/prefs_help.h:205 msgid "This value defines the maximum age (in seconds) of a knowledge base." msgstr "Detta v?rde anger maximal ?lder (i sekunder) f?r en kunskapsbas." -#: nessus/prefs_dialog/prefs_help.h:218 +#: nessus/prefs_dialog/prefs_help.h:209 msgid "" "If this option is set, the client will only report what has changed between " "the new scan and the last one." @@ -1904,7 +2213,7 @@ "Om detta alternativ ?r valt kommer klienten endast att rapportera vad som " "har ?ndrats mellan den nya avs?kningen och den tidigare." -#: nessus/prefs_dialog/prefs_help.h:224 +#: nessus/prefs_dialog/prefs_help.h:215 msgid "" "If you enable this option, then OpenVAS Server will enable the plugins that " "are depended on by the set of plugins you selected." @@ -1913,7 +2222,7 @@ "insticksmoduler som den upps?ttning insticksmoduler du har valt ?r beroende " "av." -#: nessus/prefs_dialog/prefs_help.h:228 +#: nessus/prefs_dialog/prefs_help.h:219 msgid "" "If you enable this option, then openvasd will not report data coming from " "the plugins that you did not specifically enable." @@ -1921,6 +2230,13 @@ "Om du v?ljer detta alternativ kommer openvasd inte att rapportera data som " "kommer fr?n insticksmoduler som du inte specifikt har aktiverat." +#: nessus/prefs_dialog/prefs_help.h:223 +msgid "" +"If you enable this option, then new plugins (that you have not seen before " +"in this scope) are automatically enabled. In any case, a message will be " +"displayed when new plugins have been found, showing your choice." +msgstr "" + #: nessus/prefs_dialog/prefs_kb.c:37 msgid "Enable KB saving" msgstr "Aktivera skrivning av kunskapsbas" @@ -1965,6 +2281,10 @@ msgid "Max age of a saved KB (in secs) : " msgstr "Max ?lder f?r en sparad KB (i sek) : " +#: nessus/prefs_dialog/prefs_plugins_tree.c:448 +msgid "Warning" +msgstr "Varning" + #: nessus/prefs_dialog/prefs_report.c:141 #, c-format msgid "Scan took place from %s to %s" @@ -1987,7 +2307,7 @@ #: nessus/prefs_dialog/prefs_report.c:371 #, c-format msgid "" -"Reported by NVT \"%s\" (1.3.6.1.4.1.25623.1.0.%d):\n" +"Reported by NVT \"%s\" (%s):\n" "\n" msgstr "" @@ -2017,11 +2337,6 @@ msgid "Please enter a name for your task:" msgstr "Ange ett namn f?r din uppgift:" -#: nessus/prefs_dialog/prefs_scan_assistant.c:264 -#: nessus/prefs_dialog/prefs_scan_assistant.c:281 -msgid "Comment:" -msgstr "Kommentar:" - #: nessus/prefs_dialog/prefs_scan_assistant.c:269 msgid "Step 2: Scope" msgstr "Steg 2: Omf?ng" @@ -2199,39 +2514,39 @@ msgstr "on_scope_edited(): menypost saknar etikett." #: nessus/prefs_dialog/prefs_scope_tree.c:794 -msgid "Low" -msgstr "L?g" +msgid "High" +msgstr "H?g" #: nessus/prefs_dialog/prefs_scope_tree.c:806 msgid "Medium" msgstr "Medel" #: nessus/prefs_dialog/prefs_scope_tree.c:818 -msgid "High" -msgstr "H?g" +msgid "Low" +msgstr "L?g" -#: nessus/prefs_dialog/prefs_options.c:93 +#: nessus/prefs_dialog/prefs_options.c:94 msgid "General" msgstr "Allm?nt" -#: nessus/prefs_dialog/prefs_options.c:97 +#: nessus/prefs_dialog/prefs_options.c:98 msgid "Plugins" msgstr "Insticksmoduler" -#: nessus/prefs_dialog/prefs_options.c:105 +#: nessus/prefs_dialog/prefs_options.c:106 #: nessus/prefs_dialog/prefs_target.c:49 msgid "Target selection" msgstr "Val av m?l" -#: nessus/prefs_dialog/prefs_options.c:109 +#: nessus/prefs_dialog/prefs_options.c:110 msgid "Access Rules" msgstr "Tillg?ngsregler" -#: nessus/prefs_dialog/prefs_options.c:113 +#: nessus/prefs_dialog/prefs_options.c:114 msgid "Prefs." msgstr "Inst?llningar" -#: nessus/prefs_dialog/prefs_options.c:117 +#: nessus/prefs_dialog/prefs_options.c:118 msgid "KB" msgstr "KB" @@ -2290,6 +2605,11 @@ msgid "Silent" msgstr "Tyst" +#: nessus/prefs_dialog/prefs_plugins.c:363 +#, fuzzy +msgid "Automatically enable new plugins" +msgstr "Anslut automatiskt" + #: nessus/prefs_dialog/prefs_target.c:65 msgid "Target(s):" msgstr "M?l:" @@ -2302,6 +2622,36 @@ msgid "Perform a DNS zone transfer" msgstr "Genomf?r ?verf?ring av DNS-zon" +#~ msgid "Security hole found" +#~ msgstr "S?kerhetsh?l hittades" + +#~ msgid "Security notes found" +#~ msgstr "S?kerhetsnotering(ar) hittades" + +#~ msgid "Vulnerability" +#~ msgstr "S?rbarhet" + +#~ msgid "Informational" +#~ msgstr "Informativ" + +#~ msgid "OpenVAS Plugin ID: %d" +#~ msgstr "OpenVAS insticks-id: %d" + +#~ msgid "Not yet implemented." +#~ msgstr "?nnu inte implementerad." + +#~ msgid "" +#~ "Are the target hosts protected by a firewall ? If so and if we are " +#~ "outside the firewall, it is a good idea to turn this option ON, so that " +#~ "OpenVAS Server will perform some additional tests to check that the " +#~ "remote firewall is well configured (this option is still experimental)." +#~ msgstr "" +#~ "?r m?lv?rdarna skyddade av en brandv?gg? Om det ?r s? och vi ?r utanf?r " +#~ "brandv?ggen ?r det en bra id? att sl? P? detta alternativ s? att OpenVAS-" +#~ "server kan genomf?ra ytterligare tester f?r att kontrollera att " +#~ "fj?rrbrandv?ggen ?r riktigt konfigurerad (detta alternativ ?r fortfarande " +#~ "experimentell)." + #~ msgid "\tSSL used for client - server communication\n" #~ msgstr "\tSSL anv?nds f?r kommunikation mellan klient och server\n" From scm-commit at wald.intevation.org Fri Jan 2 12:05:05 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Fri, 2 Jan 2009 12:05:05 +0100 (CET) Subject: [Openvas-commits] r2134 - trunk/openvas-server Message-ID: <20090102110505.2A05340777@pyrosoma.intevation.org> Author: mwiegand Date: 2009-01-02 12:05:04 +0100 (Fri, 02 Jan 2009) New Revision: 2134 Removed: trunk/openvas-server/ltmain.sh Modified: trunk/openvas-server/ChangeLog trunk/openvas-server/Makefile Log: * ltmain.sh: Removed since libtool is not used in the build process. * Makefile: Removed obsolete references to libtool. Modified: trunk/openvas-server/ChangeLog =================================================================== --- trunk/openvas-server/ChangeLog 2009-01-02 10:53:36 UTC (rev 2133) +++ trunk/openvas-server/ChangeLog 2009-01-02 11:05:04 UTC (rev 2134) @@ -1,3 +1,9 @@ +2009-01-02 Michael Wiegand + + * ltmain.sh: Removed since libtool is not used in the build process. + + * Makefile: Removed obsolete references to libtool. + 2008-12-30 Felix Wolfsteller * openvasd/attack.c: Replaced K&R header, added comment to attack_host. Modified: trunk/openvas-server/Makefile =================================================================== --- trunk/openvas-server/Makefile 2009-01-02 10:53:36 UTC (rev 2133) +++ trunk/openvas-server/Makefile 2009-01-02 11:05:04 UTC (rev 2134) @@ -121,7 +121,7 @@ [ -z "${rootdir}" ] || rm -f ${rootdir}/include/config.h ${rootdir}/include/corevers.h rm -f openvas.tmpl doc/openvas.1.cat doc/openvasd.8.cat [ -z "${make_bindir}" ] || rm -f $(make_bindir)/openvas* - rm -f libtool config.cache config.status config.log + rm -f config.cache config.status config.log rm -f openvas-adduser rm -f openvas-rmuser rm -f openvas-mkcert @@ -142,7 +142,6 @@ distcheck: find . -type f | sed -e 's/^.\///' -e '/~$$/d' -e '/CVS/d' \ -e '/\.o$$/d' -e '/^openvas.tmpl$$/d' \ - -e '/^libtool$$/d' \ -e '/^openvasd\/OBJ\/openvasd$$/d' \ -e '/^bin\/openvasd$$/d' \ -e '/^config\.cache$$/d' \ Deleted: trunk/openvas-server/ltmain.sh =================================================================== --- trunk/openvas-server/ltmain.sh 2009-01-02 10:53:36 UTC (rev 2133) +++ trunk/openvas-server/ltmain.sh 2009-01-02 11:05:04 UTC (rev 2134) @@ -1,6871 +0,0 @@ -# ltmain.sh - Provide generalized library-building support services. -# NOTE: Changing this file will not affect anything until you rerun configure. -# -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 -# Free Software Foundation, Inc. -# Originally by Gordon Matzigkeit , 1996 -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 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. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -basename="s,^.*/,,g" - -# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh -# is ksh but when the shell is invoked as "sh" and the current value of -# the _XPG environment variable is not equal to 1 (one), the special -# positional parameter $0, within a function call, is the name of the -# function. -progpath="$0" - -# The name of this program: -progname=`echo "$progpath" | $SED $basename` -modename="$progname" - -# Global variables: -EXIT_SUCCESS=0 -EXIT_FAILURE=1 - -PROGRAM=ltmain.sh -PACKAGE=libtool -VERSION="1.5.22 Debian 1.5.22-4" -TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)" - -# See if we are running on zsh, and set the options which allow our -# commands through without removal of \ escapes. -if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -fi - -# Check that we have a working $echo. -if test "X$1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift -elif test "X$1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : -elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then - # Yippee, $echo works! - : -else - # Restart under the correct shell, and then maybe $echo will work. - exec $SHELL "$progpath" --no-reexec ${1+"$@"} -fi - -if test "X$1" = X--fallback-echo; then - # used as fallback echo - shift - cat <&2 - $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 - exit $EXIT_FAILURE -fi - -# Global variables. -mode=$default_mode -nonopt= -prev= -prevopt= -run= -show="$echo" -show_help= -execute_dlfiles= -duplicate_deps=no -preserve_args= -lo2o="s/\\.lo\$/.${objext}/" -o2lo="s/\\.${objext}\$/.lo/" - -##################################### -# Shell function definitions: -# This seems to be the best place for them - -# func_mktempdir [string] -# Make a temporary directory that won't clash with other running -# libtool processes, and avoids race conditions if possible. If -# given, STRING is the basename for that directory. -func_mktempdir () -{ - my_template="${TMPDIR-/tmp}/${1-$progname}" - - if test "$run" = ":"; then - # Return a directory name, but don't create it in dry-run mode - my_tmpdir="${my_template}-$$" - else - - # If mktemp works, use that first and foremost - my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` - - if test ! -d "$my_tmpdir"; then - # Failing that, at least try and use $RANDOM to avoid a race - my_tmpdir="${my_template}-${RANDOM-0}$$" - - save_mktempdir_umask=`umask` - umask 0077 - $mkdir "$my_tmpdir" - umask $save_mktempdir_umask - fi - - # If we're not in dry-run mode, bomb out on failure - test -d "$my_tmpdir" || { - $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2 - exit $EXIT_FAILURE - } - fi - - $echo "X$my_tmpdir" | $Xsed -} - - -# func_win32_libid arg -# return the library type of file 'arg' -# -# Need a lot of goo to handle *both* DLLs and import libs -# Has to be a shell function in order to 'eat' the argument -# that is supplied when $file_magic_command is called. -func_win32_libid () -{ - win32_libid_type="unknown" - win32_fileres=`file -L $1 2>/dev/null` - case $win32_fileres in - *ar\ archive\ import\ library*) # definitely import - win32_libid_type="x86 archive import" - ;; - *ar\ archive*) # could be an import, or static - if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \ - $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then - win32_nmres=`eval $NM -f posix -A $1 | \ - $SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'` - case $win32_nmres in - import*) win32_libid_type="x86 archive import";; - *) win32_libid_type="x86 archive static";; - esac - fi - ;; - *DLL*) - win32_libid_type="x86 DLL" - ;; - *executable*) # but shell scripts are "executable" too... - case $win32_fileres in - *MS\ Windows\ PE\ Intel*) - win32_libid_type="x86 DLL" - ;; - esac - ;; - esac - $echo $win32_libid_type -} - - -# func_infer_tag arg -# Infer tagged configuration to use if any are available and -# if one wasn't chosen via the "--tag" command line option. -# Only attempt this if the compiler in the base compile -# command doesn't match the default compiler. -# arg is usually of the form 'gcc ...' -func_infer_tag () -{ - if test -n "$available_tags" && test -z "$tagname"; then - CC_quoted= - for arg in $CC; do - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - CC_quoted="$CC_quoted $arg" - done - case $@ in - # Blanks in the command may have been stripped by the calling shell, - # but not from the CC environment variable when configure was run. - " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;; - # Blanks at the start of $base_compile will cause this to fail - # if we don't check for them as well. - *) - for z in $available_tags; do - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then - # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" - CC_quoted= - for arg in $CC; do - # Double-quote args containing other shell metacharacters. - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - CC_quoted="$CC_quoted $arg" - done - case "$@ " in - " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) - # The compiler in the base compile command matches - # the one in the tagged configuration. - # Assume this is the tagged configuration we want. - tagname=$z - break - ;; - esac - fi - done - # If $tagname still isn't set, then no tagged configuration - # was found and let the user know that the "--tag" command - # line option must be used. - if test -z "$tagname"; then - $echo "$modename: unable to infer tagged configuration" - $echo "$modename: specify a tag with \`--tag'" 1>&2 - exit $EXIT_FAILURE -# else -# $echo "$modename: using $tagname tagged configuration" - fi - ;; - esac - fi -} - - -# func_extract_an_archive dir oldlib -func_extract_an_archive () -{ - f_ex_an_ar_dir="$1"; shift - f_ex_an_ar_oldlib="$1" - - $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)" - $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $? - if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then - : - else - $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2 - exit $EXIT_FAILURE - fi -} - -# func_extract_archives gentop oldlib ... -func_extract_archives () -{ - my_gentop="$1"; shift - my_oldlibs=${1+"$@"} - my_oldobjs="" - my_xlib="" - my_xabs="" - my_xdir="" - my_status="" - - $show "${rm}r $my_gentop" - $run ${rm}r "$my_gentop" - $show "$mkdir $my_gentop" - $run $mkdir "$my_gentop" - my_status=$? - if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then - exit $my_status - fi - - for my_xlib in $my_oldlibs; do - # Extract the objects. - case $my_xlib in - [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; - *) my_xabs=`pwd`"/$my_xlib" ;; - esac - my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'` - my_xdir="$my_gentop/$my_xlib" - - $show "${rm}r $my_xdir" - $run ${rm}r "$my_xdir" - $show "$mkdir $my_xdir" - $run $mkdir "$my_xdir" - exit_status=$? - if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then - exit $exit_status - fi - case $host in - *-darwin*) - $show "Extracting $my_xabs" - # Do not bother doing anything if just a dry run - if test -z "$run"; then - darwin_orig_dir=`pwd` - cd $my_xdir || exit $? - darwin_archive=$my_xabs - darwin_curdir=`pwd` - darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'` - darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null` - if test -n "$darwin_arches"; then - darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'` - darwin_arch= - $show "$darwin_base_archive has multiple architectures $darwin_arches" - for darwin_arch in $darwin_arches ; do - mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}" - lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" - cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" - func_extract_an_archive "`pwd`" "${darwin_base_archive}" - cd "$darwin_curdir" - $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" - done # $darwin_arches - ## Okay now we have a bunch of thin objects, gotta fatten them up :) - darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP` - darwin_file= - darwin_files= - for darwin_file in $darwin_filelist; do - darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` - lipo -create -output "$darwin_file" $darwin_files - done # $darwin_filelist - ${rm}r unfat-$$ - cd "$darwin_orig_dir" - else - cd "$darwin_orig_dir" - func_extract_an_archive "$my_xdir" "$my_xabs" - fi # $darwin_arches - fi # $run - ;; - *) - func_extract_an_archive "$my_xdir" "$my_xabs" - ;; - esac - my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` - done - func_extract_archives_result="$my_oldobjs" -} -# End of Shell function definitions -##################################### - -# Darwin sucks -eval std_shrext=\"$shrext_cmds\" - -disable_libs=no - -# Parse our command line options once, thoroughly. -while test "$#" -gt 0 -do - arg="$1" - shift - - case $arg in - -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;; - *) optarg= ;; - esac - - # If the previous option needs an argument, assign it. - if test -n "$prev"; then - case $prev in - execute_dlfiles) - execute_dlfiles="$execute_dlfiles $arg" - ;; - tag) - tagname="$arg" - preserve_args="${preserve_args}=$arg" - - # Check whether tagname contains only valid characters - case $tagname in - *[!-_A-Za-z0-9,/]*) - $echo "$progname: invalid tag name: $tagname" 1>&2 - exit $EXIT_FAILURE - ;; - esac - - case $tagname in - CC) - # Don't test for the "default" C tag, as we know, it's there, but - # not specially marked. - ;; - *) - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then - taglist="$taglist $tagname" - # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`" - else - $echo "$progname: ignoring unknown tag $tagname" 1>&2 - fi - ;; - esac - ;; - *) - eval "$prev=\$arg" - ;; - esac - - prev= - prevopt= - continue - fi - - # Have we seen a non-optional argument yet? - case $arg in - --help) - show_help=yes - ;; - - --version) - $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP" - $echo - $echo "Copyright (C) 2005 Free Software Foundation, Inc." - $echo "This is free software; see the source for copying conditions. There is NO" - $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - exit $? - ;; - - --config) - ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath - # Now print the configurations for the tags. - for tagname in $taglist; do - ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath" - done - exit $? - ;; - - --debug) - $echo "$progname: enabling shell trace mode" - set -x - preserve_args="$preserve_args $arg" - ;; - - --dry-run | -n) - run=: - ;; - - --features) - $echo "host: $host" - if test "$build_libtool_libs" = yes; then - $echo "enable shared libraries" - else - $echo "disable shared libraries" - fi - if test "$build_old_libs" = yes; then - $echo "enable static libraries" - else - $echo "disable static libraries" - fi - exit $? - ;; - - --finish) mode="finish" ;; - - --mode) prevopt="--mode" prev=mode ;; - --mode=*) mode="$optarg" ;; - - --preserve-dup-deps) duplicate_deps="yes" ;; - - --quiet | --silent) - show=: - preserve_args="$preserve_args $arg" - ;; - - --tag) - prevopt="--tag" - prev=tag - preserve_args="$preserve_args --tag" - ;; - --tag=*) - set tag "$optarg" ${1+"$@"} - shift - prev=tag - preserve_args="$preserve_args --tag" - ;; - - -dlopen) - prevopt="-dlopen" - prev=execute_dlfiles - ;; - - -*) - $echo "$modename: unrecognized option \`$arg'" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - ;; - - *) - nonopt="$arg" - break - ;; - esac -done - -if test -n "$prevopt"; then - $echo "$modename: option \`$prevopt' requires an argument" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE -fi - -case $disable_libs in -no) - ;; -shared) - build_libtool_libs=no - build_old_libs=yes - ;; -static) - build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` - ;; -esac - -# If this variable is set in any of the actions, the command in it -# will be execed at the end. This prevents here-documents from being -# left over by shells. -exec_cmd= - -if test -z "$show_help"; then - - # Infer the operation mode. - if test -z "$mode"; then - $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2 - $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2 - case $nonopt in - *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*) - mode=link - for arg - do - case $arg in - -c) - mode=compile - break - ;; - esac - done - ;; - *db | *dbx | *strace | *truss) - mode=execute - ;; - *install*|cp|mv) - mode=install - ;; - *rm) - mode=uninstall - ;; - *) - # If we have no mode, but dlfiles were specified, then do execute mode. - test -n "$execute_dlfiles" && mode=execute - - # Just use the default operation mode. - if test -z "$mode"; then - if test -n "$nonopt"; then - $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2 - else - $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2 - fi - fi - ;; - esac - fi - - # Only execute mode is allowed to have -dlopen flags. - if test -n "$execute_dlfiles" && test "$mode" != execute; then - $echo "$modename: unrecognized option \`-dlopen'" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - # Change the help message to a mode-specific one. - generic_help="$help" - help="Try \`$modename --help --mode=$mode' for more information." - - # These modes are in order of execution frequency so that they run quickly. - case $mode in - # libtool compile mode - compile) - modename="$modename: compile" - # Get the compilation command and the source file. - base_compile= - srcfile="$nonopt" # always keep a non-empty value in "srcfile" - suppress_opt=yes - suppress_output= - arg_mode=normal - libobj= - later= - - for arg - do - case $arg_mode in - arg ) - # do not "continue". Instead, add this to base_compile - lastarg="$arg" - arg_mode=normal - ;; - - target ) - libobj="$arg" - arg_mode=normal - continue - ;; - - normal ) - # Accept any command-line options. - case $arg in - -o) - if test -n "$libobj" ; then - $echo "$modename: you cannot specify \`-o' more than once" 1>&2 - exit $EXIT_FAILURE - fi - arg_mode=target - continue - ;; - - -static | -prefer-pic | -prefer-non-pic) - later="$later $arg" - continue - ;; - - -no-suppress) - suppress_opt=no - continue - ;; - - -Xcompiler) - arg_mode=arg # the next one goes into the "base_compile" arg list - continue # The current "srcfile" will either be retained or - ;; # replaced later. I would guess that would be a bug. - - -Wc,*) - args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"` - lastarg= - save_ifs="$IFS"; IFS=',' - for arg in $args; do - IFS="$save_ifs" - - # Double-quote args containing other shell metacharacters. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - lastarg="$lastarg $arg" - done - IFS="$save_ifs" - lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"` - - # Add the arguments to base_compile. - base_compile="$base_compile $lastarg" - continue - ;; - - * ) - # Accept the current argument as the source file. - # The previous "srcfile" becomes the current argument. - # - lastarg="$srcfile" - srcfile="$arg" - ;; - esac # case $arg - ;; - esac # case $arg_mode - - # Aesthetically quote the previous argument. - lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"` - - case $lastarg in - # Double-quote args containing other shell metacharacters. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, and some SunOS ksh mistreat backslash-escaping - # in scan sets (worked around with variable expansion), - # and furthermore cannot handle '|' '&' '(' ')' in scan sets - # at all, so we specify them separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - lastarg="\"$lastarg\"" - ;; - esac - - base_compile="$base_compile $lastarg" - done # for arg - - case $arg_mode in - arg) - $echo "$modename: you must specify an argument for -Xcompile" - exit $EXIT_FAILURE - ;; - target) - $echo "$modename: you must specify a target with \`-o'" 1>&2 - exit $EXIT_FAILURE - ;; - *) - # Get the name of the library object. - [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'` - ;; - esac - - # Recognize several different file suffixes. - # If the user specifies -o file.o, it is replaced with file.lo - xform='[cCFSifmso]' - case $libobj in - *.ada) xform=ada ;; - *.adb) xform=adb ;; - *.ads) xform=ads ;; - *.asm) xform=asm ;; - *.c++) xform=c++ ;; - *.cc) xform=cc ;; - *.ii) xform=ii ;; - *.class) xform=class ;; - *.cpp) xform=cpp ;; - *.cxx) xform=cxx ;; - *.f90) xform=f90 ;; - *.for) xform=for ;; - *.java) xform=java ;; - esac - - libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` - - case $libobj in - *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;; - *) - $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2 - exit $EXIT_FAILURE - ;; - esac - - func_infer_tag $base_compile - - for arg in $later; do - case $arg in - -static) - build_old_libs=yes - continue - ;; - - -prefer-pic) - pic_mode=yes - continue - ;; - - -prefer-non-pic) - pic_mode=no - continue - ;; - esac - done - - qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"` - case $qlibobj in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - qlibobj="\"$qlibobj\"" ;; - esac - test "X$libobj" != "X$qlibobj" \ - && $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' &()|`$[]' \ - && $echo "$modename: libobj name \`$libobj' may not contain shell special characters." - objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` - xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$obj"; then - xdir= - else - xdir=$xdir/ - fi - lobj=${xdir}$objdir/$objname - - if test -z "$base_compile"; then - $echo "$modename: you must specify a compilation command" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - # Delete any leftover library objects. - if test "$build_old_libs" = yes; then - removelist="$obj $lobj $libobj ${libobj}T" - else - removelist="$lobj $libobj ${libobj}T" - fi - - $run $rm $removelist - trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15 - - # On Cygwin there's no "real" PIC flag so we must build both object types - case $host_os in - cygwin* | mingw* | pw32* | os2*) - pic_mode=default - ;; - esac - if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then - # non-PIC code in shared libraries is not supported - pic_mode=default - fi - - # Calculate the filename of the output object if compiler does - # not support -o with -c - if test "$compiler_c_o" = no; then - output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} - lockfile="$output_obj.lock" - removelist="$removelist $output_obj $lockfile" - trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15 - else - output_obj= - need_locks=no - lockfile= - fi - - # Lock this critical section if it is needed - # We use this script file to make the link, it avoids creating a new file - if test "$need_locks" = yes; then - until $run ln "$progpath" "$lockfile" 2>/dev/null; do - $show "Waiting for $lockfile to be removed" - sleep 2 - done - elif test "$need_locks" = warn; then - if test -f "$lockfile"; then - $echo "\ -*** ERROR, $lockfile exists and contains: -`cat $lockfile 2>/dev/null` - -This indicates that another process is trying to use the same -temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you -repeat this compilation, it may succeed, by chance, but you had better -avoid parallel builds (make -j) in this platform, or get a better -compiler." - - $run $rm $removelist - exit $EXIT_FAILURE - fi - $echo "$srcfile" > "$lockfile" - fi - - if test -n "$fix_srcfile_path"; then - eval srcfile=\"$fix_srcfile_path\" - fi - qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"` - case $qsrcfile in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - qsrcfile="\"$qsrcfile\"" ;; - esac - - $run $rm "$libobj" "${libobj}T" - - # Create a libtool object file (analogous to a ".la" file), - # but don't create it if we're doing a dry run. - test -z "$run" && cat > ${libobj}T </dev/null`" != "X$srcfile"; then - $echo "\ -*** ERROR, $lockfile contains: -`cat $lockfile 2>/dev/null` - -but it should contain: -$srcfile - -This indicates that another process is trying to use the same -temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you -repeat this compilation, it may succeed, by chance, but you had better -avoid parallel builds (make -j) in this platform, or get a better -compiler." - - $run $rm $removelist - exit $EXIT_FAILURE - fi - - # Just move the object if needed, then go on to compile the next one - if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then - $show "$mv $output_obj $lobj" - if $run $mv $output_obj $lobj; then : - else - error=$? - $run $rm $removelist - exit $error - fi - fi - - # Append the name of the PIC object to the libtool object file. - test -z "$run" && cat >> ${libobj}T <> ${libobj}T </dev/null`" != "X$srcfile"; then - $echo "\ -*** ERROR, $lockfile contains: -`cat $lockfile 2>/dev/null` - -but it should contain: -$srcfile - -This indicates that another process is trying to use the same -temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you -repeat this compilation, it may succeed, by chance, but you had better -avoid parallel builds (make -j) in this platform, or get a better -compiler." - - $run $rm $removelist - exit $EXIT_FAILURE - fi - - # Just move the object if needed - if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then - $show "$mv $output_obj $obj" - if $run $mv $output_obj $obj; then : - else - error=$? - $run $rm $removelist - exit $error - fi - fi - - # Append the name of the non-PIC object the libtool object file. - # Only append if the libtool object file exists. - test -z "$run" && cat >> ${libobj}T <> ${libobj}T <&2 - fi - if test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - prefer_static_libs=yes - else - if test -z "$pic_flag" && test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - prefer_static_libs=built - fi - build_libtool_libs=no - build_old_libs=yes - break - ;; - esac - done - - # See if our shared archives depend on static archives. - test -n "$old_archive_from_new_cmds" && build_old_libs=yes - - # Go through the arguments, transforming them on the way. - while test "$#" -gt 0; do - arg="$1" - shift - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test - ;; - *) qarg=$arg ;; - esac - libtool_args="$libtool_args $qarg" - - # If the previous option needs an argument, assign it. - if test -n "$prev"; then - case $prev in - output) - compile_command="$compile_command @OUTPUT@" - finalize_command="$finalize_command @OUTPUT@" - ;; - esac - - case $prev in - dlfiles|dlprefiles) - if test "$preload" = no; then - # Add the symbol object into the linking commands. - compile_command="$compile_command @SYMFILE@" - finalize_command="$finalize_command @SYMFILE@" - preload=yes - fi - case $arg in - *.la | *.lo) ;; # We handle these cases below. - force) - if test "$dlself" = no; then - dlself=needless - export_dynamic=yes - fi - prev= - continue - ;; - self) - if test "$prev" = dlprefiles; then - dlself=yes - elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then - dlself=yes - else - dlself=needless - export_dynamic=yes - fi - prev= - continue - ;; - *) - if test "$prev" = dlfiles; then - dlfiles="$dlfiles $arg" - else - dlprefiles="$dlprefiles $arg" - fi - prev= - continue - ;; - esac - ;; - expsyms) - export_symbols="$arg" - if test ! -f "$arg"; then - $echo "$modename: symbol file \`$arg' does not exist" - exit $EXIT_FAILURE - fi - prev= - continue - ;; - expsyms_regex) - export_symbols_regex="$arg" - prev= - continue - ;; - inst_prefix) - inst_prefix_dir="$arg" - prev= - continue - ;; - precious_regex) - precious_files_regex="$arg" - prev= - continue - ;; - release) - release="-$arg" - prev= - continue - ;; - objectlist) - if test -f "$arg"; then - save_arg=$arg - moreargs= - for fil in `cat $save_arg` - do -# moreargs="$moreargs $fil" - arg=$fil - # A libtool-controlled object. - - # Check to see that this really is a libtool object. - if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - pic_object= - non_pic_object= - - # Read the .lo file - # If there is no directory component, then add one. - case $arg in - */* | *\\*) . $arg ;; - *) . ./$arg ;; - esac - - if test -z "$pic_object" || \ - test -z "$non_pic_object" || - test "$pic_object" = none && \ - test "$non_pic_object" = none; then - $echo "$modename: cannot find name of object for \`$arg'" 1>&2 - exit $EXIT_FAILURE - fi - - # Extract subdirectory from the argument. - xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$arg"; then - xdir= - else - xdir="$xdir/" - fi - - if test "$pic_object" != none; then - # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" - - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - dlfiles="$dlfiles $pic_object" - prev= - continue - else - # If libtool objects are unsupported, then we need to preload. - prev=dlprefiles - fi - fi - - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. - dlprefiles="$dlprefiles $pic_object" - prev= - fi - - # A PIC object. - libobjs="$libobjs $pic_object" - arg="$pic_object" - fi - - # Non-PIC object. - if test "$non_pic_object" != none; then - # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" - - # A standard non-PIC object - non_pic_objects="$non_pic_objects $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" - fi - else - # If the PIC object exists, use it instead. - # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" - non_pic_objects="$non_pic_objects $non_pic_object" - fi - else - # Only an error if not doing a dry-run. - if test -z "$run"; then - $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 - exit $EXIT_FAILURE - else - # Dry-run case. - - # Extract subdirectory from the argument. - xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$arg"; then - xdir= - else - xdir="$xdir/" - fi - - pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"` - non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"` - libobjs="$libobjs $pic_object" - non_pic_objects="$non_pic_objects $non_pic_object" - fi - fi - done - else - $echo "$modename: link input file \`$save_arg' does not exist" - exit $EXIT_FAILURE - fi - arg=$save_arg - prev= - continue - ;; - rpath | xrpath) - # We need an absolute path. - case $arg in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - $echo "$modename: only absolute run-paths are allowed" 1>&2 - exit $EXIT_FAILURE - ;; - esac - if test "$prev" = rpath; then - case "$rpath " in - *" $arg "*) ;; - *) rpath="$rpath $arg" ;; - esac - else - case "$xrpath " in - *" $arg "*) ;; - *) xrpath="$xrpath $arg" ;; - esac - fi - prev= - continue - ;; - xcompiler) - compiler_flags="$compiler_flags $qarg" - prev= - compile_command="$compile_command $qarg" - finalize_command="$finalize_command $qarg" - continue - ;; - xlinker) - linker_flags="$linker_flags $qarg" - compiler_flags="$compiler_flags $wl$qarg" - prev= - compile_command="$compile_command $wl$qarg" - finalize_command="$finalize_command $wl$qarg" - continue - ;; - xcclinker) - linker_flags="$linker_flags $qarg" - compiler_flags="$compiler_flags $qarg" - prev= - compile_command="$compile_command $qarg" - finalize_command="$finalize_command $qarg" - continue - ;; - shrext) - shrext_cmds="$arg" - prev= - continue - ;; - darwin_framework|darwin_framework_skip) - test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg" - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - prev= - continue - ;; - *) - eval "$prev=\"\$arg\"" - prev= - continue - ;; - esac - fi # test -n "$prev" - - prevarg="$arg" - - case $arg in - -all-static) - if test -n "$link_static_flag"; then - compile_command="$compile_command $link_static_flag" - finalize_command="$finalize_command $link_static_flag" - fi - continue - ;; - - -allow-undefined) - # FIXME: remove this flag sometime in the future. - $echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2 - continue - ;; - - -avoid-version) - avoid_version=yes - continue - ;; - - -dlopen) - prev=dlfiles - continue - ;; - - -dlpreopen) - prev=dlprefiles - continue - ;; - - -export-dynamic) - export_dynamic=yes - continue - ;; - - -export-symbols | -export-symbols-regex) - if test -n "$export_symbols" || test -n "$export_symbols_regex"; then - $echo "$modename: more than one -exported-symbols argument is not allowed" - exit $EXIT_FAILURE - fi - if test "X$arg" = "X-export-symbols"; then - prev=expsyms - else - prev=expsyms_regex - fi - continue - ;; - - -framework|-arch|-isysroot) - case " $CC " in - *" ${arg} ${1} "* | *" ${arg} ${1} "*) - prev=darwin_framework_skip ;; - *) compiler_flags="$compiler_flags $arg" - prev=darwin_framework ;; - esac - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - continue - ;; - - -inst-prefix-dir) - prev=inst_prefix - continue - ;; - - # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* - # so, if we see these flags be careful not to treat them like -L - -L[A-Z][A-Z]*:*) - case $with_gcc/$host in - no/*-*-irix* | /*-*-irix*) - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - ;; - esac - continue - ;; - - -L*) - dir=`$echo "X$arg" | $Xsed -e 's/^-L//'` - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - absdir=`cd "$dir" && pwd` - if test -z "$absdir"; then - $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 - absdir="$dir" - notinst_path="$notinst_path $dir" - fi - dir="$absdir" - ;; - esac - case "$deplibs " in - *" -L$dir "*) ;; - *) - deplibs="$deplibs -L$dir" - lib_search_path="$lib_search_path $dir" - ;; - esac - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) - testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'` - case :$dllsearchpath: in - *":$dir:"*) ;; - *) dllsearchpath="$dllsearchpath:$dir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - *) dllsearchpath="$dllsearchpath:$testbindir";; - esac - ;; - esac - continue - ;; - - -l*) - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*) - # These systems don't actually have a C or math library (as such) - continue - ;; - *-*-os2*) - # These systems don't actually have a C library (as such) - test "X$arg" = "X-lc" && continue - ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) - # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C and math libraries are in the System framework - deplibs="$deplibs -framework System" - continue - ;; - *-*-sco3.2v5* | *-*-sco5v6*) - # Causes problems with __ctype - test "X$arg" = "X-lc" && continue - ;; - *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) - # Compiler inserts libc in the correct place for threads to work - test "X$arg" = "X-lc" && continue - ;; - esac - elif test "X$arg" = "X-lc_r"; then - case $host in - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; - esac - fi - deplibs="$deplibs $arg" - continue - ;; - - # Tru64 UNIX uses -model [arg] to determine the layout of C++ - # classes, name mangling, and exception handling. - -model) - compile_command="$compile_command $arg" - compiler_flags="$compiler_flags $arg" - finalize_command="$finalize_command $arg" - prev=xcompiler - continue - ;; - - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) - compiler_flags="$compiler_flags $arg" - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - continue - ;; - - -module) - module=yes - continue - ;; - - # -64, -mips[0-9] enable 64-bit mode on the SGI compiler - # -r[0-9][0-9]* specifies the processor on the SGI compiler - # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler - # +DA*, +DD* enable 64-bit mode on the HP compiler - # -q* pass through compiler args for the IBM compiler - # -m* pass through architecture-specific compiler args for GCC - # -m*, -t[45]*, -txscale* pass through architecture-specific - # compiler args for GCC - # -pg pass through profiling flag for GCC - # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ - -t[45]*|-txscale*|@*) - - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - compiler_flags="$compiler_flags $arg" - continue - ;; - - -shrext) - prev=shrext - continue - ;; - - -no-fast-install) - fast_install=no - continue - ;; - - -no-install) - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) - # The PATH hackery in wrapper scripts is required on Windows - # in order for the loader to find any dlls it needs. - $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2 - $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2 - fast_install=no - ;; - *) no_install=yes ;; - esac - continue - ;; - - -no-undefined) - allow_undefined=no - continue - ;; - - -objectlist) - prev=objectlist - continue - ;; - - -o) prev=output ;; - - -precious-files-regex) - prev=precious_regex - continue - ;; - - -release) - prev=release - continue - ;; - - -rpath) - prev=rpath - continue - ;; - - -R) - prev=xrpath - continue - ;; - - -R*) - dir=`$echo "X$arg" | $Xsed -e 's/^-R//'` - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - $echo "$modename: only absolute run-paths are allowed" 1>&2 - exit $EXIT_FAILURE - ;; - esac - case "$xrpath " in - *" $dir "*) ;; - *) xrpath="$xrpath $dir" ;; - esac - continue - ;; - - -static) - # The effects of -static are defined in a previous loop. - # We used to do the same as -all-static on platforms that - # didn't have a PIC flag, but the assumption that the effects - # would be equivalent was wrong. It would break on at least - # Digital Unix and AIX. - continue - ;; - - -thread-safe) - thread_safe=yes - continue - ;; - - -version-info) - prev=vinfo - continue - ;; - -version-number) - prev=vinfo - vinfo_number=yes - continue - ;; - - -Wc,*) - args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'` - arg= - save_ifs="$IFS"; IFS=',' - for flag in $args; do - IFS="$save_ifs" - case $flag in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - flag="\"$flag\"" - ;; - esac - arg="$arg $wl$flag" - compiler_flags="$compiler_flags $flag" - done - IFS="$save_ifs" - arg=`$echo "X$arg" | $Xsed -e "s/^ //"` - ;; - - -Wl,*) - args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'` - arg= - save_ifs="$IFS"; IFS=',' - for flag in $args; do - IFS="$save_ifs" - case $flag in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - flag="\"$flag\"" - ;; - esac - arg="$arg $wl$flag" - compiler_flags="$compiler_flags $wl$flag" - linker_flags="$linker_flags $flag" - done - IFS="$save_ifs" - arg=`$echo "X$arg" | $Xsed -e "s/^ //"` - ;; - - -Xcompiler) - prev=xcompiler - continue - ;; - - -Xlinker) - prev=xlinker - continue - ;; - - -XCClinker) - prev=xcclinker - continue - ;; - - # Some other compiler flag. - -* | +*) - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - ;; - - *.$objext) - # A standard object. - objs="$objs $arg" - ;; - - *.lo) - # A libtool-controlled object. - - # Check to see that this really is a libtool object. - if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - pic_object= - non_pic_object= - - # Read the .lo file - # If there is no directory component, then add one. - case $arg in - */* | *\\*) . $arg ;; - *) . ./$arg ;; - esac - - if test -z "$pic_object" || \ - test -z "$non_pic_object" || - test "$pic_object" = none && \ - test "$non_pic_object" = none; then - $echo "$modename: cannot find name of object for \`$arg'" 1>&2 - exit $EXIT_FAILURE - fi - - # Extract subdirectory from the argument. - xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$arg"; then - xdir= - else - xdir="$xdir/" - fi - - if test "$pic_object" != none; then - # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" - - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - dlfiles="$dlfiles $pic_object" - prev= - continue - else - # If libtool objects are unsupported, then we need to preload. - prev=dlprefiles - fi - fi - - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. - dlprefiles="$dlprefiles $pic_object" - prev= - fi - - # A PIC object. - libobjs="$libobjs $pic_object" - arg="$pic_object" - fi - - # Non-PIC object. - if test "$non_pic_object" != none; then - # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" - - # A standard non-PIC object - non_pic_objects="$non_pic_objects $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" - fi - else - # If the PIC object exists, use it instead. - # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" - non_pic_objects="$non_pic_objects $non_pic_object" - fi - else - # Only an error if not doing a dry-run. - if test -z "$run"; then - $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 - exit $EXIT_FAILURE - else - # Dry-run case. - - # Extract subdirectory from the argument. - xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$arg"; then - xdir= - else - xdir="$xdir/" - fi - - pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"` - non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"` - libobjs="$libobjs $pic_object" - non_pic_objects="$non_pic_objects $non_pic_object" - fi - fi - ;; - - *.$libext) - # An archive. - deplibs="$deplibs $arg" - old_deplibs="$old_deplibs $arg" - continue - ;; - - *.la) - # A libtool-controlled library. - - if test "$prev" = dlfiles; then - # This library was specified with -dlopen. - dlfiles="$dlfiles $arg" - prev= - elif test "$prev" = dlprefiles; then - # The library was specified with -dlpreopen. - dlprefiles="$dlprefiles $arg" - prev= - else - deplibs="$deplibs $arg" - fi - continue - ;; - - # Some other compiler argument. - *) - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - ;; - esac # arg - - # Now actually substitute the argument into the commands. - if test -n "$arg"; then - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - fi - done # argument parsing loop - - if test -n "$prev"; then - $echo "$modename: the \`$prevarg' option requires an argument" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then - eval arg=\"$export_dynamic_flag_spec\" - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - fi - - oldlibs= - # calculate the name of the file, without its directory - outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'` - libobjs_save="$libobjs" - - if test -n "$shlibpath_var"; then - # get the directories listed in $shlibpath_var - eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\` - else - shlib_search_path= - fi - eval sys_lib_search_path=\"$sys_lib_search_path_spec\" - eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" - - output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'` - if test "X$output_objdir" = "X$output"; then - output_objdir="$objdir" - else - output_objdir="$output_objdir/$objdir" - fi - # Create the object directory. - if test ! -d "$output_objdir"; then - $show "$mkdir $output_objdir" - $run $mkdir $output_objdir - exit_status=$? - if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then - exit $exit_status - fi - fi - - # Determine the type of output - case $output in - "") - $echo "$modename: you must specify an output file" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - ;; - *.$libext) linkmode=oldlib ;; - *.lo | *.$objext) linkmode=obj ;; - *.la) linkmode=lib ;; - *) linkmode=prog ;; # Anything else should be a program. - esac - - case $host in - *cygwin* | *mingw* | *pw32*) - # don't eliminate duplications in $postdeps and $predeps - duplicate_compiler_generated_deps=yes - ;; - *) - duplicate_compiler_generated_deps=$duplicate_deps - ;; - esac - specialdeplibs= - - libs= - # Find all interdependent deplibs by searching for libraries - # that are linked more than once (e.g. -la -lb -la) - for deplib in $deplibs; do - if test "X$duplicate_deps" = "Xyes" ; then - case "$libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - libs="$libs $deplib" - done - - if test "$linkmode" = lib; then - libs="$predeps $libs $compiler_lib_search_path $postdeps" - - # Compute libraries that are listed more than once in $predeps - # $postdeps and mark them as special (i.e., whose duplicates are - # not to be eliminated). - pre_post_deps= - if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then - for pre_post_dep in $predeps $postdeps; do - case "$pre_post_deps " in - *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; - esac - pre_post_deps="$pre_post_deps $pre_post_dep" - done - fi - pre_post_deps= - fi - - deplibs= - newdependency_libs= - newlib_search_path= - need_relink=no # whether we're linking any uninstalled libtool libraries - notinst_deplibs= # not-installed libtool libraries - case $linkmode in - lib) - passes="conv link" - for file in $dlfiles $dlprefiles; do - case $file in - *.la) ;; - *) - $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2 - exit $EXIT_FAILURE - ;; - esac - done - ;; - prog) - compile_deplibs= - finalize_deplibs= - alldeplibs=no - newdlfiles= - newdlprefiles= - passes="conv scan dlopen dlpreopen link" - ;; - *) passes="conv" - ;; - esac - for pass in $passes; do - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan"; then - libs="$deplibs" - deplibs= - fi - if test "$linkmode" = prog; then - case $pass in - dlopen) libs="$dlfiles" ;; - dlpreopen) libs="$dlprefiles" ;; - link) - libs="$deplibs %DEPLIBS%" - test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" - ;; - esac - fi - if test "$pass" = dlopen; then - # Collect dlpreopened libraries - save_deplibs="$deplibs" - deplibs= - fi - for deplib in $libs; do - lib= - found=no - case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - compiler_flags="$compiler_flags $deplib" - fi - continue - ;; - -l*) - if test "$linkmode" != lib && test "$linkmode" != prog; then - $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2 - continue - fi - name=`$echo "X$deplib" | $Xsed -e 's/^-l//'` - for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do - for search_ext in .la $std_shrext .so .a; do - # Search the libtool library - lib="$searchdir/lib${name}${search_ext}" - if test -f "$lib"; then - if test "$search_ext" = ".la"; then - found=yes - else - found=no - fi - break 2 - fi - done - done - if test "$found" != yes; then - # deplib doesn't seem to be a libtool library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue - else # deplib is a libtool library - # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, - # We need to do some special things here, and not later. - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $deplib "*) - if (${SED} -e '2q' $lib | - grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - library_names= - old_library= - case $lib in - */* | *\\*) . $lib ;; - *) . ./$lib ;; - esac - for l in $old_library $library_names; do - ll="$l" - done - if test "X$ll" = "X$old_library" ; then # only static version available - found=no - ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'` - test "X$ladir" = "X$lib" && ladir="." - lib=$ladir/$old_library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue - fi - fi - ;; - *) ;; - esac - fi - fi - ;; # -l - -L*) - case $linkmode in - lib) - deplibs="$deplib $deplibs" - test "$pass" = conv && continue - newdependency_libs="$deplib $newdependency_libs" - newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` - ;; - prog) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - continue - fi - if test "$pass" = scan; then - deplibs="$deplib $deplibs" - else - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - fi - newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` - ;; - *) - $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2 - ;; - esac # linkmode - continue - ;; # -L - -R*) - if test "$pass" = link; then - dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'` - # Make sure the xrpath contains only unique directories. - case "$xrpath " in - *" $dir "*) ;; - *) xrpath="$xrpath $dir" ;; - esac - fi - deplibs="$deplib $deplibs" - continue - ;; - *.la) lib="$deplib" ;; - *.$libext) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - continue - fi - case $linkmode in - lib) - valid_a_lib=no - case $deplibs_check_method in - match_pattern*) - set dummy $deplibs_check_method - match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` - if eval $echo \"$deplib\" 2>/dev/null \ - | $SED 10q \ - | $EGREP "$match_pattern_regex" > /dev/null; then - valid_a_lib=yes - fi - ;; - pass_all) - valid_a_lib=yes - ;; - esac - if test "$valid_a_lib" != yes; then - $echo - $echo "*** Warning: Trying to link with static lib archive $deplib." - $echo "*** I have the capability to make that library automatically link in when" - $echo "*** you link to this library. But I can only do this if you have a" - $echo "*** shared version of the library, which you do not appear to have" - $echo "*** because the file extensions .$libext of this argument makes me believe" - $echo "*** that it is just a static archive that I should not used here." - else - $echo - $echo "*** Warning: Linking the shared library $output against the" - $echo "*** static library $deplib is not portable!" - deplibs="$deplib $deplibs" - fi - continue - ;; - prog) - if test "$pass" != link; then - deplibs="$deplib $deplibs" - else - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - fi - continue - ;; - esac # linkmode - ;; # *.$libext - *.lo | *.$objext) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - elif test "$linkmode" = prog; then - if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then - # If there is no dlopen support or we're linking statically, - # we need to preload. - newdlprefiles="$newdlprefiles $deplib" - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - newdlfiles="$newdlfiles $deplib" - fi - fi - continue - ;; - %DEPLIBS%) - alldeplibs=yes - continue - ;; - esac # case $deplib - if test "$found" = yes || test -f "$lib"; then : - else - $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2 - exit $EXIT_FAILURE - fi - - # Check to see that this really is a libtool archive. - if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : - else - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - exit $EXIT_FAILURE - fi - - ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'` - test "X$ladir" = "X$lib" && ladir="." - - dlname= - dlopen= - dlpreopen= - libdir= - library_names= - old_library= - # If the library was installed with an old release of libtool, - # it will not redefine variables installed, or shouldnotlink - installed=yes - shouldnotlink=no - avoidtemprpath= - - - # Read the .la file - case $lib in - */* | *\\*) . $lib ;; - *) . ./$lib ;; - esac - - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan" || - { test "$linkmode" != prog && test "$linkmode" != lib; }; then - test -n "$dlopen" && dlfiles="$dlfiles $dlopen" - test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" - fi - - if test "$pass" = conv; then - # Only check for convenience libraries - deplibs="$lib $deplibs" - if test -z "$libdir"; then - if test -z "$old_library"; then - $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 - exit $EXIT_FAILURE - fi - # It is a libtool convenience library, so add in its objects. - convenience="$convenience $ladir/$objdir/$old_library" - old_convenience="$old_convenience $ladir/$objdir/$old_library" - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if test "X$duplicate_deps" = "Xyes" ; then - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - tmp_libs="$tmp_libs $deplib" - done - elif test "$linkmode" != prog && test "$linkmode" != lib; then - $echo "$modename: \`$lib' is not a convenience library" 1>&2 - exit $EXIT_FAILURE - fi - continue - fi # $pass = conv - - - # Get the name of the library we link against. - linklib= - for l in $old_library $library_names; do - linklib="$l" - done - if test -z "$linklib"; then - $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 - exit $EXIT_FAILURE - fi - - # This library was specified with -dlopen. - if test "$pass" = dlopen; then - if test -z "$libdir"; then - $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2 - exit $EXIT_FAILURE - fi - if test -z "$dlname" || - test "$dlopen_support" != yes || - test "$build_libtool_libs" = no; then - # If there is no dlname, no dlopen support or we're linking - # statically, we need to preload. We also need to preload any - # dependent libraries so libltdl's deplib preloader doesn't - # bomb out in the load deplibs phase. - dlprefiles="$dlprefiles $lib $dependency_libs" - else - newdlfiles="$newdlfiles $lib" - fi - continue - fi # $pass = dlopen - - # We need an absolute path. - case $ladir in - [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; - *) - abs_ladir=`cd "$ladir" && pwd` - if test -z "$abs_ladir"; then - $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2 - $echo "$modename: passing it literally to the linker, although it might fail" 1>&2 - abs_ladir="$ladir" - fi - ;; - esac - laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` - - # Find the relevant object directory and library name. - if test "X$installed" = Xyes; then - if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then - $echo "$modename: warning: library \`$lib' was moved." 1>&2 - dir="$ladir" - absdir="$abs_ladir" - libdir="$abs_ladir" - else - dir="$libdir" - absdir="$libdir" - fi - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes - else - if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then - dir="$ladir" - absdir="$abs_ladir" - # Remove this search path later - notinst_path="$notinst_path $abs_ladir" - else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" - # Remove this search path later - notinst_path="$notinst_path $abs_ladir" - fi - fi # $installed = yes - name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` - - # This library was specified with -dlpreopen. - if test "$pass" = dlpreopen; then - if test -z "$libdir"; then - $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2 - exit $EXIT_FAILURE - fi - # Prefer using a static library (so that no silly _DYNAMIC symbols - # are required to link). - if test -n "$old_library"; then - newdlprefiles="$newdlprefiles $dir/$old_library" - # Otherwise, use the dlname, so that lt_dlopen finds it. - elif test -n "$dlname"; then - newdlprefiles="$newdlprefiles $dir/$dlname" - else - newdlprefiles="$newdlprefiles $dir/$linklib" - fi - fi # $pass = dlpreopen - - if test -z "$libdir"; then - # Link the convenience library - if test "$linkmode" = lib; then - deplibs="$dir/$old_library $deplibs" - elif test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$dir/$old_library $compile_deplibs" - finalize_deplibs="$dir/$old_library $finalize_deplibs" - else - deplibs="$lib $deplibs" # used for prog,scan pass - fi - continue - fi - - - if test "$linkmode" = prog && test "$pass" != link; then - newlib_search_path="$newlib_search_path $ladir" - deplibs="$lib $deplibs" - - linkalldeplibs=no - if test "$link_all_deplibs" != no || test -z "$library_names" || - test "$build_libtool_libs" = no; then - linkalldeplibs=yes - fi - - tmp_libs= - for deplib in $dependency_libs; do - case $deplib in - -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test - esac - # Need to link against all dependency_libs? - if test "$linkalldeplibs" = yes; then - deplibs="$deplib $deplibs" - else - # Need to hardcode shared library paths - # or/and link against static libraries - newdependency_libs="$deplib $newdependency_libs" - fi - if test "X$duplicate_deps" = "Xyes" ; then - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - tmp_libs="$tmp_libs $deplib" - done # for deplib - continue - fi # $linkmode = prog... - - if test "$linkmode,$pass" = "prog,link"; then - if test -n "$library_names" && - { test "$prefer_static_libs" = no || test -z "$old_library"; }; then - # We need to hardcode the library path - if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then - # Make sure the rpath contains only unique directories. - case "$temp_rpath " in - *" $dir "*) ;; - *" $absdir "*) ;; - *) temp_rpath="$temp_rpath $absdir" ;; - esac - fi - - # Hardcode the library path. - # Skip directories that are in the system default run-time - # search path. - case " $sys_lib_dlsearch_path " in - *" $absdir "*) ;; - *) - case "$compile_rpath " in - *" $absdir "*) ;; - *) compile_rpath="$compile_rpath $absdir" - esac - ;; - esac - case " $sys_lib_dlsearch_path " in - *" $libdir "*) ;; - *) - case "$finalize_rpath " in - *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" - esac - ;; - esac - fi # $linkmode,$pass = prog,link... - - if test "$alldeplibs" = yes && - { test "$deplibs_check_method" = pass_all || - { test "$build_libtool_libs" = yes && - test -n "$library_names"; }; }; then - # We only need to search for static libraries - continue - fi - fi - - link_static=no # Whether the deplib will be linked statically - use_static_libs=$prefer_static_libs - if test "$use_static_libs" = built && test "$installed" = yes ; then - use_static_libs=no - fi - if test -n "$library_names" && - { test "$use_static_libs" = no || test -z "$old_library"; }; then - if test "$installed" = no; then - notinst_deplibs="$notinst_deplibs $lib" - need_relink=yes - fi - # This is a shared library - - # Warn about portability, can't link against -module's on - # some systems (darwin) - if test "$shouldnotlink" = yes && test "$pass" = link ; then - $echo - if test "$linkmode" = prog; then - $echo "*** Warning: Linking the executable $output against the loadable module" - else - $echo "*** Warning: Linking the shared library $output against the loadable module" - fi - $echo "*** $linklib is not portable!" - fi - if test "$linkmode" = lib && - test "$hardcode_into_libs" = yes; then - # Hardcode the library path. - # Skip directories that are in the system default run-time - # search path. - case " $sys_lib_dlsearch_path " in - *" $absdir "*) ;; - *) - case "$compile_rpath " in - *" $absdir "*) ;; - *) compile_rpath="$compile_rpath $absdir" - esac - ;; - esac - case " $sys_lib_dlsearch_path " in - *" $libdir "*) ;; - *) - case "$finalize_rpath " in - *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" - esac - ;; - esac - fi - - if test -n "$old_archive_from_expsyms_cmds"; then - # figure out the soname - set dummy $library_names - realname="$2" - shift; shift - libname=`eval \\$echo \"$libname_spec\"` - # use dlname if we got it. it's perfectly good, no? - if test -n "$dlname"; then - soname="$dlname" - elif test -n "$soname_spec"; then - # bleh windows - case $host in - *cygwin* | mingw*) - major=`expr $current - $age` - versuffix="-$major" - ;; - esac - eval soname=\"$soname_spec\" - else - soname="$realname" - fi - - # Make a new name for the extract_expsyms_cmds to use - soroot="$soname" - soname=`$echo $soroot | ${SED} -e 's/^.*\///'` - newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a" - - # If the library has no export list, then create one now - if test -f "$output_objdir/$soname-def"; then : - else - $show "extracting exported symbol list from \`$soname'" - save_ifs="$IFS"; IFS='~' - cmds=$extract_expsyms_cmds - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - fi - - # Create $newlib - if test -f "$output_objdir/$newlib"; then :; else - $show "generating import library for \`$soname'" - save_ifs="$IFS"; IFS='~' - cmds=$old_archive_from_expsyms_cmds - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - fi - # make sure the library variables are pointing to the new library - dir=$output_objdir - linklib=$newlib - fi # test -n "$old_archive_from_expsyms_cmds" - - if test "$linkmode" = prog || test "$mode" != relink; then - add_shlibpath= - add_dir= - add= - lib_linked=yes - case $hardcode_action in - immediate | unsupported) - if test "$hardcode_direct" = no; then - add="$dir/$linklib" - case $host in - *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; - *-*-sysv4*uw2*) add_dir="-L$dir" ;; - *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ - *-*-unixware7*) add_dir="-L$dir" ;; - *-*-darwin* ) - # if the lib is a module then we can not link against - # it, someone is ignoring the new warnings I added - if /usr/bin/file -L $add 2> /dev/null | - $EGREP ": [^:]* bundle" >/dev/null ; then - $echo "** Warning, lib $linklib is a module, not a shared library" - if test -z "$old_library" ; then - $echo - $echo "** And there doesn't seem to be a static archive available" - $echo "** The link will probably fail, sorry" - else - add="$dir/$old_library" - fi - fi - esac - elif test "$hardcode_minus_L" = no; then - case $host in - *-*-sunos*) add_shlibpath="$dir" ;; - esac - add_dir="-L$dir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = no; then - add_shlibpath="$dir" - add="-l$name" - else - lib_linked=no - fi - ;; - relink) - if test "$hardcode_direct" = yes; then - add="$dir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$dir" - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) - add_dir="$add_dir -L$inst_prefix_dir$libdir" - ;; - esac - fi - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - add_shlibpath="$dir" - add="-l$name" - else - lib_linked=no - fi - ;; - *) lib_linked=no ;; - esac - - if test "$lib_linked" != yes; then - $echo "$modename: configuration error: unsupported hardcode properties" - exit $EXIT_FAILURE - fi - - if test -n "$add_shlibpath"; then - case :$compile_shlibpath: in - *":$add_shlibpath:"*) ;; - *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; - esac - fi - if test "$linkmode" = prog; then - test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" - test -n "$add" && compile_deplibs="$add $compile_deplibs" - else - test -n "$add_dir" && deplibs="$add_dir $deplibs" - test -n "$add" && deplibs="$add $deplibs" - if test "$hardcode_direct" != yes && \ - test "$hardcode_minus_L" != yes && \ - test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; - esac - fi - fi - fi - - if test "$linkmode" = prog || test "$mode" = relink; then - add_shlibpath= - add_dir= - add= - # Finalize command for both is simple: just hardcode it. - if test "$hardcode_direct" = yes; then - add="$libdir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$libdir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; - esac - add="-l$name" - elif test "$hardcode_automatic" = yes; then - if test -n "$inst_prefix_dir" && - test -f "$inst_prefix_dir$libdir/$linklib" ; then - add="$inst_prefix_dir$libdir/$linklib" - else - add="$libdir/$linklib" - fi - else - # We cannot seem to hardcode it, guess we'll fake it. - add_dir="-L$libdir" - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) - add_dir="$add_dir -L$inst_prefix_dir$libdir" - ;; - esac - fi - add="-l$name" - fi - - if test "$linkmode" = prog; then - test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" - test -n "$add" && finalize_deplibs="$add $finalize_deplibs" - else - test -n "$add_dir" && deplibs="$add_dir $deplibs" - test -n "$add" && deplibs="$add $deplibs" - fi - fi - elif test "$linkmode" = prog; then - # Here we assume that one of hardcode_direct or hardcode_minus_L - # is not unsupported. This is valid on all known static and - # shared platforms. - if test "$hardcode_direct" != unsupported; then - test -n "$old_library" && linklib="$old_library" - compile_deplibs="$dir/$linklib $compile_deplibs" - finalize_deplibs="$dir/$linklib $finalize_deplibs" - else - compile_deplibs="-l$name -L$dir $compile_deplibs" - finalize_deplibs="-l$name -L$dir $finalize_deplibs" - fi - elif test "$build_libtool_libs" = yes; then - # Not a shared library - if test "$deplibs_check_method" != pass_all; then - # We're trying link a shared library against a static one - # but the system doesn't support it. - - # Just print a warning and add the library to dependency_libs so - # that the program can be linked against the static library. - $echo - $echo "*** Warning: This system can not link to static lib archive $lib." - $echo "*** I have the capability to make that library automatically link in when" - $echo "*** you link to this library. But I can only do this if you have a" - $echo "*** shared version of the library, which you do not appear to have." - if test "$module" = yes; then - $echo "*** But as you try to build a module library, libtool will still create " - $echo "*** a static module, that should work as long as the dlopening application" - $echo "*** is linked with the -dlopen flag to resolve symbols at runtime." - if test -z "$global_symbol_pipe"; then - $echo - $echo "*** However, this would only work if libtool was able to extract symbol" - $echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - $echo "*** not find such a program. So, this module is probably useless." - $echo "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - fi - else - deplibs="$dir/$old_library $deplibs" - link_static=yes - fi - fi # link shared/static library? - - if test "$linkmode" = lib; then - if test -n "$dependency_libs" && - { test "$hardcode_into_libs" != yes || - test "$build_old_libs" = yes || - test "$link_static" = yes; }; then - # Extract -R from dependency_libs - temp_deplibs= - for libdir in $dependency_libs; do - case $libdir in - -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'` - case " $xrpath " in - *" $temp_xrpath "*) ;; - *) xrpath="$xrpath $temp_xrpath";; - esac;; - *) temp_deplibs="$temp_deplibs $libdir";; - esac - done - dependency_libs="$temp_deplibs" - fi - - newlib_search_path="$newlib_search_path $absdir" - # Link against this library - test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" - # ... and its dependency_libs - tmp_libs= - for deplib in $dependency_libs; do - newdependency_libs="$deplib $newdependency_libs" - if test "X$duplicate_deps" = "Xyes" ; then - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - tmp_libs="$tmp_libs $deplib" - done - - if test "$link_all_deplibs" != no; then - # Add the search paths of all dependency libraries - for deplib in $dependency_libs; do - case $deplib in - -L*) path="$deplib" ;; - *.la) - dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'` - test "X$dir" = "X$deplib" && dir="." - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; - *) - absdir=`cd "$dir" && pwd` - if test -z "$absdir"; then - $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2 - absdir="$dir" - fi - ;; - esac - if grep "^installed=no" $deplib > /dev/null; then - path="$absdir/$objdir" - else - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - if test -z "$libdir"; then - $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 - exit $EXIT_FAILURE - fi - if test "$absdir" != "$libdir"; then - $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2 - fi - path="$absdir" - fi - depdepl= - case $host in - *-*-darwin*) - # we do not want to link against static libs, - # but need to link against shared - eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` - if test -n "$deplibrary_names" ; then - for tmp in $deplibrary_names ; do - depdepl=$tmp - done - if test -f "$path/$depdepl" ; then - depdepl="$path/$depdepl" - fi - # do not add paths which are already there - case " $newlib_search_path " in - *" $path "*) ;; - *) newlib_search_path="$newlib_search_path $path";; - esac - fi - path="" - ;; - *) - path="-L$path" - ;; - esac - ;; - -l*) - case $host in - *-*-darwin*) - # Again, we only want to link against shared libraries - eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"` - for tmp in $newlib_search_path ; do - if test -f "$tmp/lib$tmp_libs.dylib" ; then - eval depdepl="$tmp/lib$tmp_libs.dylib" - break - fi - done - path="" - ;; - *) continue ;; - esac - ;; - *) continue ;; - esac - case " $deplibs " in - *" $path "*) ;; - *) deplibs="$path $deplibs" ;; - esac - case " $deplibs " in - *" $depdepl "*) ;; - *) deplibs="$depdepl $deplibs" ;; - esac - done - fi # link_all_deplibs != no - fi # linkmode = lib - done # for deplib in $libs - dependency_libs="$newdependency_libs" - if test "$pass" = dlpreopen; then - # Link the dlpreopened libraries before other libraries - for deplib in $save_deplibs; do - deplibs="$deplib $deplibs" - done - fi - if test "$pass" != dlopen; then - if test "$pass" != conv; then - # Make sure lib_search_path contains only unique directories. - lib_search_path= - for dir in $newlib_search_path; do - case "$lib_search_path " in - *" $dir "*) ;; - *) lib_search_path="$lib_search_path $dir" ;; - esac - done - newlib_search_path= - fi - - if test "$linkmode,$pass" != "prog,link"; then - vars="deplibs" - else - vars="compile_deplibs finalize_deplibs" - fi - for var in $vars dependency_libs; do - # Add libraries to $var in reverse order - eval tmp_libs=\"\$$var\" - new_libs= - for deplib in $tmp_libs; do - # FIXME: Pedantically, this is the right thing to do, so - # that some nasty dependency loop isn't accidentally - # broken: - #new_libs="$deplib $new_libs" - # Pragmatically, this seems to cause very few problems in - # practice: - case $deplib in - -L*) new_libs="$deplib $new_libs" ;; - -R*) ;; - *) - # And here is the reason: when a library appears more - # than once as an explicit dependence of a library, or - # is implicitly linked in more than once by the - # compiler, it is considered special, and multiple - # occurrences thereof are not removed. Compare this - # with having the same library being listed as a - # dependency of multiple other libraries: in this case, - # we know (pedantically, we assume) the library does not - # need to be listed more than once, so we keep only the - # last copy. This is not always right, but it is rare - # enough that we require users that really mean to play - # such unportable linking tricks to link the library - # using -Wl,-lname, so that libtool does not consider it - # for duplicate removal. - case " $specialdeplibs " in - *" $deplib "*) new_libs="$deplib $new_libs" ;; - *) - case " $new_libs " in - *" $deplib "*) ;; - *) new_libs="$deplib $new_libs" ;; - esac - ;; - esac - ;; - esac - done - tmp_libs= - for deplib in $new_libs; do - case $deplib in - -L*) - case " $tmp_libs " in - *" $deplib "*) ;; - *) tmp_libs="$tmp_libs $deplib" ;; - esac - ;; - *) tmp_libs="$tmp_libs $deplib" ;; - esac - done - eval $var=\"$tmp_libs\" - done # for var - fi - # Last step: remove runtime libs from dependency_libs - # (they stay in deplibs) - tmp_libs= - for i in $dependency_libs ; do - case " $predeps $postdeps $compiler_lib_search_path " in - *" $i "*) - i="" - ;; - esac - if test -n "$i" ; then - tmp_libs="$tmp_libs $i" - fi - done - dependency_libs=$tmp_libs - done # for pass - if test "$linkmode" = prog; then - dlfiles="$newdlfiles" - dlprefiles="$newdlprefiles" - fi - - case $linkmode in - oldlib) - if test -n "$deplibs"; then - $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 - fi - - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2 - fi - - if test -n "$rpath"; then - $echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2 - fi - - if test -n "$xrpath"; then - $echo "$modename: warning: \`-R' is ignored for archives" 1>&2 - fi - - if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2 - fi - - if test -n "$release"; then - $echo "$modename: warning: \`-release' is ignored for archives" 1>&2 - fi - - if test -n "$export_symbols" || test -n "$export_symbols_regex"; then - $echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2 - fi - - # Now set the variables for building old libraries. - build_libtool_libs=no - oldlibs="$output" - objs="$objs$old_deplibs" - ;; - - lib) - # Make sure we only generate libraries of the form `libNAME.la'. - case $outputname in - lib*) - name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` - eval shared_ext=\"$shrext_cmds\" - eval libname=\"$libname_spec\" - ;; - *) - if test "$module" = no; then - $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - if test "$need_lib_prefix" != no; then - # Add the "lib" prefix for modules if required - name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` - eval shared_ext=\"$shrext_cmds\" - eval libname=\"$libname_spec\" - else - libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` - fi - ;; - esac - - if test -n "$objs"; then - if test "$deplibs_check_method" != pass_all; then - $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1 - exit $EXIT_FAILURE - else - $echo - $echo "*** Warning: Linking the shared library $output against the non-libtool" - $echo "*** objects $objs is not portable!" - libobjs="$libobjs $objs" - fi - fi - - if test "$dlself" != no; then - $echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2 - fi - - set dummy $rpath - if test "$#" -gt 2; then - $echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2 - fi - install_libdir="$2" - - oldlibs= - if test -z "$rpath"; then - if test "$build_libtool_libs" = yes; then - # Building a libtool convenience library. - # Some compilers have problems with a `.al' extension so - # convenience libraries should have the same extension an - # archive normally would. - oldlibs="$output_objdir/$libname.$libext $oldlibs" - build_libtool_libs=convenience - build_old_libs=yes - fi - - if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2 - fi - - if test -n "$release"; then - $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2 - fi - else - - # Parse the version information argument. - save_ifs="$IFS"; IFS=':' - set dummy $vinfo 0 0 0 - IFS="$save_ifs" - - if test -n "$8"; then - $echo "$modename: too many parameters to \`-version-info'" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - # convert absolute version numbers to libtool ages - # this retains compatibility with .la files and attempts - # to make the code below a bit more comprehensible - - case $vinfo_number in - yes) - number_major="$2" - number_minor="$3" - number_revision="$4" - # - # There are really only two kinds -- those that - # use the current revision as the major version - # and those that subtract age and use age as - # a minor version. But, then there is irix - # which has an extra 1 added just for fun - # - case $version_type in - darwin|linux|osf|windows) - current=`expr $number_major + $number_minor` - age="$number_minor" - revision="$number_revision" - ;; - freebsd-aout|freebsd-elf|sunos) - current="$number_major" - revision="$number_minor" - age="0" - ;; - irix|nonstopux) - current=`expr $number_major + $number_minor - 1` - age="$number_minor" - revision="$number_minor" - ;; - *) - $echo "$modename: unknown library version type \`$version_type'" 1>&2 - $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 - exit $EXIT_FAILURE - ;; - esac - ;; - no) - current="$2" - revision="$3" - age="$4" - ;; - esac - - # Check that each of the things are valid numbers. - case $current in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) - $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit $EXIT_FAILURE - ;; - esac - - case $revision in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) - $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit $EXIT_FAILURE - ;; - esac - - case $age in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) - $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit $EXIT_FAILURE - ;; - esac - - if test "$age" -gt "$current"; then - $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit $EXIT_FAILURE - fi - - # Calculate the version variables. - major= - versuffix= - verstring= - case $version_type in - none) ;; - - darwin) - # Like Linux, but with the current version available in - # verstring for coding it into the library header - major=.`expr $current - $age` - versuffix="$major.$age.$revision" - # Darwin ld doesn't like 0 for these options... - minor_current=`expr $current + 1` - verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" - ;; - - freebsd-aout) - major=".$current" - versuffix=".$current.$revision"; - ;; - - freebsd-elf) - major=".$current" - versuffix=".$current"; - ;; - - irix | nonstopux) - major=`expr $current - $age + 1` - - case $version_type in - nonstopux) verstring_prefix=nonstopux ;; - *) verstring_prefix=sgi ;; - esac - verstring="$verstring_prefix$major.$revision" - - # Add in all the interfaces that we are compatible with. - loop=$revision - while test "$loop" -ne 0; do - iface=`expr $revision - $loop` - loop=`expr $loop - 1` - verstring="$verstring_prefix$major.$iface:$verstring" - done - - # Before this point, $major must not contain `.'. - major=.$major - versuffix="$major.$revision" - ;; - - linux) - major=.`expr $current - $age` - versuffix="$major.$age.$revision" - ;; - - osf) - major=.`expr $current - $age` - versuffix=".$current.$age.$revision" - verstring="$current.$age.$revision" - - # Add in all the interfaces that we are compatible with. - loop=$age - while test "$loop" -ne 0; do - iface=`expr $current - $loop` - loop=`expr $loop - 1` - verstring="$verstring:${iface}.0" - done - - # Make executables depend on our current version. - verstring="$verstring:${current}.0" - ;; - - sunos) - major=".$current" - versuffix=".$current.$revision" - ;; - - windows) - # Use '-' rather than '.', since we only want one - # extension on DOS 8.3 filesystems. - major=`expr $current - $age` - versuffix="-$major" - ;; - - *) - $echo "$modename: unknown library version type \`$version_type'" 1>&2 - $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 - exit $EXIT_FAILURE - ;; - esac - - # Clear the version info if we defaulted, and they specified a release. - if test -z "$vinfo" && test -n "$release"; then - major= - case $version_type in - darwin) - # we can't check for "0.0" in archive_cmds due to quoting - # problems, so we reset it completely - verstring= - ;; - *) - verstring="0.0" - ;; - esac - if test "$need_version" = no; then - versuffix= - else - versuffix=".0.0" - fi - fi - - # Remove version info from name if versioning should be avoided - if test "$avoid_version" = yes && test "$need_version" = no; then - major= - versuffix= - verstring="" - fi - - # Check to see if the archive will have undefined symbols. - if test "$allow_undefined" = yes; then - if test "$allow_undefined_flag" = unsupported; then - $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2 - build_libtool_libs=no - build_old_libs=yes - fi - else - # Don't allow undefined symbols. - allow_undefined_flag="$no_undefined_flag" - fi - fi - - if test "$mode" != relink; then - # Remove our outputs, but don't remove object files since they - # may have been created when compiling PIC objects. - removelist= - tempremovelist=`$echo "$output_objdir/*"` - for p in $tempremovelist; do - case $p in - *.$objext) - ;; - $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) - if test "X$precious_files_regex" != "X"; then - if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 - then - continue - fi - fi - removelist="$removelist $p" - ;; - *) ;; - esac - done - if test -n "$removelist"; then - $show "${rm}r $removelist" - $run ${rm}r $removelist - fi - fi - - # Now set the variables for building old libraries. - if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then - oldlibs="$oldlibs $output_objdir/$libname.$libext" - - # Transform .lo files to .o files. - oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` - fi - - # Eliminate all temporary directories. - for path in $notinst_path; do - lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"` - deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"` - dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"` - done - - if test -n "$xrpath"; then - # If the user specified any rpath flags, then add them. - temp_xrpath= - for libdir in $xrpath; do - temp_xrpath="$temp_xrpath -R$libdir" - case "$finalize_rpath " in - *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" ;; - esac - done - if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then - dependency_libs="$temp_xrpath $dependency_libs" - fi - fi - - # Make sure dlfiles contains only unique files that won't be dlpreopened - old_dlfiles="$dlfiles" - dlfiles= - for lib in $old_dlfiles; do - case " $dlprefiles $dlfiles " in - *" $lib "*) ;; - *) dlfiles="$dlfiles $lib" ;; - esac - done - - # Make sure dlprefiles contains only unique files - old_dlprefiles="$dlprefiles" - dlprefiles= - for lib in $old_dlprefiles; do - case "$dlprefiles " in - *" $lib "*) ;; - *) dlprefiles="$dlprefiles $lib" ;; - esac - done - - if test "$build_libtool_libs" = yes; then - if test -n "$rpath"; then - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*) - # these systems don't actually have a c library (as such)! - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C library is in the System framework - deplibs="$deplibs -framework System" - ;; - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. - ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) - # Do not include libc due to us having libc/libc_r. - ;; - *-*-sco3.2v5* | *-*-sco5v6*) - # Causes problems with __ctype - ;; - *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) - # Compiler inserts libc in the correct place for threads to work - ;; - *) - # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then - deplibs="$deplibs -lc" - fi - ;; - esac - fi - - # Transform deplibs into only deplibs that can be linked in shared. - name_save=$name - libname_save=$libname - release_save=$release - versuffix_save=$versuffix - major_save=$major - # I'm not sure if I'm treating the release correctly. I think - # release should show up in the -l (ie -lgmp5) so we don't want to - # add it in twice. Is that correct? - release="" - versuffix="" - major="" - newdeplibs= - droppeddeps=no - case $deplibs_check_method in - pass_all) - # Don't check for shared/static. Everything works. - # This might be a little naive. We might want to check - # whether the library exists or not. But this is on - # osf3 & osf4 and I'm not really sure... Just - # implementing what was already the behavior. - newdeplibs=$deplibs - ;; - test_compile) - # This code stresses the "libraries are programs" paradigm to its - # limits. Maybe even breaks it. We compile a program, linking it - # against the deplibs as a proxy for the library. Then we can check - # whether they linked in statically or dynamically with ldd. - $rm conftest.c - cat > conftest.c </dev/null` - for potent_lib in $potential_libs; do - # Follow soft links. - if ls -lLd "$potent_lib" 2>/dev/null \ - | grep " -> " >/dev/null; then - continue - fi - # The statement above tries to avoid entering an - # endless loop below, in case of cyclic links. - # We might still enter an endless loop, since a link - # loop can be closed while we follow links, - # but so what? - potlib="$potent_lib" - while test -h "$potlib" 2>/dev/null; do - potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` - case $potliblink in - [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; - *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; - esac - done - if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \ - | ${SED} 10q \ - | $EGREP "$file_magic_regex" > /dev/null; then - newdeplibs="$newdeplibs $a_deplib" - a_deplib="" - break 2 - fi - done - done - fi - if test -n "$a_deplib" ; then - droppeddeps=yes - $echo - $echo "*** Warning: linker path does not have real file for library $a_deplib." - $echo "*** I have the capability to make that library automatically link in when" - $echo "*** you link to this library. But I can only do this if you have a" - $echo "*** shared version of the library, which you do not appear to have" - $echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then - $echo "*** with $libname but no candidates were found. (...for file magic test)" - else - $echo "*** with $libname and none of the candidates passed a file format test" - $echo "*** using a file magic. Last file checked: $potlib" - fi - fi - else - # Add a -L argument. - newdeplibs="$newdeplibs $a_deplib" - fi - done # Gone through all deplibs. - ;; - match_pattern*) - set dummy $deplibs_check_method - match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` - for a_deplib in $deplibs; do - name=`expr $a_deplib : '-l\(.*\)'` - # If $name is empty we are operating on a -L argument. - if test -n "$name" && test "$name" != "0"; then - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $a_deplib "*) - newdeplibs="$newdeplibs $a_deplib" - a_deplib="" - ;; - esac - fi - if test -n "$a_deplib" ; then - libname=`eval \\$echo \"$libname_spec\"` - for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - potential_libs=`ls $i/$libname[.-]* 2>/dev/null` - for potent_lib in $potential_libs; do - potlib="$potent_lib" # see symlink-check above in file_magic test - if eval $echo \"$potent_lib\" 2>/dev/null \ - | ${SED} 10q \ - | $EGREP "$match_pattern_regex" > /dev/null; then - newdeplibs="$newdeplibs $a_deplib" - a_deplib="" - break 2 - fi - done - done - fi - if test -n "$a_deplib" ; then - droppeddeps=yes - $echo - $echo "*** Warning: linker path does not have real file for library $a_deplib." - $echo "*** I have the capability to make that library automatically link in when" - $echo "*** you link to this library. But I can only do this if you have a" - $echo "*** shared version of the library, which you do not appear to have" - $echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then - $echo "*** with $libname but no candidates were found. (...for regex pattern test)" - else - $echo "*** with $libname and none of the candidates passed a file format test" - $echo "*** using a regex pattern. Last file checked: $potlib" - fi - fi - else - # Add a -L argument. - newdeplibs="$newdeplibs $a_deplib" - fi - done # Gone through all deplibs. - ;; - none | unknown | *) - newdeplibs="" - tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \ - -e 's/ -[LR][^ ]*//g'` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - for i in $predeps $postdeps ; do - # can't use Xsed below, because $i might contain '/' - tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"` - done - fi - if $echo "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' \ - | grep . >/dev/null; then - $echo - if test "X$deplibs_check_method" = "Xnone"; then - $echo "*** Warning: inter-library dependencies are not supported in this platform." - else - $echo "*** Warning: inter-library dependencies are not known to be supported." - fi - $echo "*** All declared inter-library dependencies are being dropped." - droppeddeps=yes - fi - ;; - esac - versuffix=$versuffix_save - major=$major_save - release=$release_save - libname=$libname_save - name=$name_save - - case $host in - *-*-rhapsody* | *-*-darwin1.[012]) - # On Rhapsody replace the C library is the System framework - newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'` - ;; - esac - - if test "$droppeddeps" = yes; then - if test "$module" = yes; then - $echo - $echo "*** Warning: libtool could not satisfy all declared inter-library" - $echo "*** dependencies of module $libname. Therefore, libtool will create" - $echo "*** a static module, that should work as long as the dlopening" - $echo "*** application is linked with the -dlopen flag." - if test -z "$global_symbol_pipe"; then - $echo - $echo "*** However, this would only work if libtool was able to extract symbol" - $echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - $echo "*** not find such a program. So, this module is probably useless." - $echo "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - else - $echo "*** The inter-library dependencies that have been dropped here will be" - $echo "*** automatically added whenever a program is linked with this library" - $echo "*** or is declared to -dlopen it." - - if test "$allow_undefined" = no; then - $echo - $echo "*** Since this library must not contain undefined symbols," - $echo "*** because either the platform does not support them or" - $echo "*** it was explicitly requested with -no-undefined," - $echo "*** libtool will only create a static version of it." - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - fi - fi - fi - # Done checking deplibs! - deplibs=$newdeplibs - fi - - - # move library search paths that coincide with paths to not yet - # installed libraries to the beginning of the library search list - new_libs= - for path in $notinst_path; do - case " $new_libs " in - *" -L$path/$objdir "*) ;; - *) - case " $deplibs " in - *" -L$path/$objdir "*) - new_libs="$new_libs -L$path/$objdir" ;; - esac - ;; - esac - done - for deplib in $deplibs; do - case $deplib in - -L*) - case " $new_libs " in - *" $deplib "*) ;; - *) new_libs="$new_libs $deplib" ;; - esac - ;; - *) new_libs="$new_libs $deplib" ;; - esac - done - deplibs="$new_libs" - - - # All the library-specific variables (install_libdir is set above). - library_names= - old_library= - dlname= - - # Test again, we may have decided not to build it any more - if test "$build_libtool_libs" = yes; then - if test "$hardcode_into_libs" = yes; then - # Hardcode the library paths - hardcode_libdirs= - dep_rpath= - rpath="$finalize_rpath" - test "$mode" != relink && rpath="$compile_rpath$rpath" - for libdir in $rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - dep_rpath="$dep_rpath $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; - *) perm_rpath="$perm_rpath $libdir" ;; - esac - fi - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - if test -n "$hardcode_libdir_flag_spec_ld"; then - eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" - else - eval dep_rpath=\"$hardcode_libdir_flag_spec\" - fi - fi - if test -n "$runpath_var" && test -n "$perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do - rpath="$rpath$dir:" - done - eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" - fi - test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" - fi - - shlibpath="$finalize_shlibpath" - test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" - if test -n "$shlibpath"; then - eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" - fi - - # Get the real and link names of the library. - eval shared_ext=\"$shrext_cmds\" - eval library_names=\"$library_names_spec\" - set dummy $library_names - realname="$2" - shift; shift - - if test -n "$soname_spec"; then - eval soname=\"$soname_spec\" - else - soname="$realname" - fi - if test -z "$dlname"; then - dlname=$soname - fi - - lib="$output_objdir/$realname" - linknames= - for link - do - linknames="$linknames $link" - done - - # Use standard objects if they are pic - test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - - # Prepare the list of exported symbols - if test -z "$export_symbols"; then - if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then - $show "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" - $run $rm $export_symbols - cmds=$export_symbols_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - if len=`expr "X$cmd" : ".*"` && - test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then - $show "$cmd" - $run eval "$cmd" || exit $? - skipped_export=false - else - # The command line is too long to execute in one step. - $show "using reloadable object file for export list..." - skipped_export=: - # Break out early, otherwise skipped_export may be - # set to false by a later but shorter cmd. - break - fi - done - IFS="$save_ifs" - if test -n "$export_symbols_regex"; then - $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\"" - $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' - $show "$mv \"${export_symbols}T\" \"$export_symbols\"" - $run eval '$mv "${export_symbols}T" "$export_symbols"' - fi - fi - fi - - if test -n "$export_symbols" && test -n "$include_expsyms"; then - $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"' - fi - - tmp_deplibs= - for test_deplib in $deplibs; do - case " $convenience " in - *" $test_deplib "*) ;; - *) - tmp_deplibs="$tmp_deplibs $test_deplib" - ;; - esac - done - deplibs="$tmp_deplibs" - - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec"; then - save_libobjs=$libobjs - eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - else - gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" - - func_extract_archives $gentop $convenience - libobjs="$libobjs $func_extract_archives_result" - fi - fi - - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then - eval flag=\"$thread_safe_flag_spec\" - linker_flags="$linker_flags $flag" - fi - - # Make a backup of the uninstalled library when relinking - if test "$mode" = relink; then - $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $? - fi - - # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then - if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then - eval test_cmds=\"$module_expsym_cmds\" - cmds=$module_expsym_cmds - else - eval test_cmds=\"$module_cmds\" - cmds=$module_cmds - fi - else - if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then - eval test_cmds=\"$archive_expsym_cmds\" - cmds=$archive_expsym_cmds - else - eval test_cmds=\"$archive_cmds\" - cmds=$archive_cmds - fi - fi - - if test "X$skipped_export" != "X:" && - len=`expr "X$test_cmds" : ".*" 2>/dev/null` && - test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then - : - else - # The command line is too long to link in one step, link piecewise. - $echo "creating reloadable object files..." - - # Save the value of $output and $libobjs because we want to - # use them later. If we have whole_archive_flag_spec, we - # want to use save_libobjs as it was before - # whole_archive_flag_spec was expanded, because we can't - # assume the linker understands whole_archive_flag_spec. - # This may have to be revisited, in case too many - # convenience libraries get linked in and end up exceeding - # the spec. - if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then - save_libobjs=$libobjs - fi - save_output=$output - output_la=`$echo "X$output" | $Xsed -e "$basename"` - - # Clear the reloadable object creation command queue and - # initialize k to one. - test_cmds= - concat_cmds= - objlist= - delfiles= - last_robj= - k=1 - output=$output_objdir/$output_la-${k}.$objext - # Loop over the list of objects to be linked. - for obj in $save_libobjs - do - eval test_cmds=\"$reload_cmds $objlist $last_robj\" - if test "X$objlist" = X || - { len=`expr "X$test_cmds" : ".*" 2>/dev/null` && - test "$len" -le "$max_cmd_len"; }; then - objlist="$objlist $obj" - else - # The command $test_cmds is almost too long, add a - # command to the queue. - if test "$k" -eq 1 ; then - # The first file doesn't have a previous command to add. - eval concat_cmds=\"$reload_cmds $objlist $last_robj\" - else - # All subsequent reloadable object files will link in - # the last one created. - eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\" - fi - last_robj=$output_objdir/$output_la-${k}.$objext - k=`expr $k + 1` - output=$output_objdir/$output_la-${k}.$objext - objlist=$obj - len=1 - fi - done - # Handle the remaining objects by creating one last - # reloadable object file. All subsequent reloadable object - # files will link in the last one created. - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\" - - if ${skipped_export-false}; then - $show "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" - $run $rm $export_symbols - libobjs=$output - # Append the command to create the export file. - eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\" - fi - - # Set up a command to remove the reloadable object files - # after they are used. - i=0 - while test "$i" -lt "$k" - do - i=`expr $i + 1` - delfiles="$delfiles $output_objdir/$output_la-${i}.$objext" - done - - $echo "creating a temporary reloadable object file: $output" - - # Loop through the commands generated above and execute them. - save_ifs="$IFS"; IFS='~' - for cmd in $concat_cmds; do - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - - libobjs=$output - # Restore the value of output. - output=$save_output - - if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then - eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - fi - # Expand the library linking commands again to reset the - # value of $libobjs for piecewise linking. - - # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then - if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then - cmds=$module_expsym_cmds - else - cmds=$module_cmds - fi - else - if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then - cmds=$archive_expsym_cmds - else - cmds=$archive_cmds - fi - fi - - # Append the command to remove the reloadable object files - # to the just-reset $cmds. - eval cmds=\"\$cmds~\$rm $delfiles\" - fi - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || { - lt_exit=$? - - # Restore the uninstalled library and exit - if test "$mode" = relink; then - $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)' - fi - - exit $lt_exit - } - done - IFS="$save_ifs" - - # Restore the uninstalled library and exit - if test "$mode" = relink; then - $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $? - - if test -n "$convenience"; then - if test -z "$whole_archive_flag_spec"; then - $show "${rm}r $gentop" - $run ${rm}r "$gentop" - fi - fi - - exit $EXIT_SUCCESS - fi - - # Create links to the real library. - for linkname in $linknames; do - if test "$realname" != "$linkname"; then - $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)" - $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $? - fi - done - - # If -module or -export-dynamic was specified, set the dlname. - if test "$module" = yes || test "$export_dynamic" = yes; then - # On all known operating systems, these are identical. - dlname="$soname" - fi - fi - ;; - - obj) - if test -n "$deplibs"; then - $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 - fi - - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2 - fi - - if test -n "$rpath"; then - $echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2 - fi - - if test -n "$xrpath"; then - $echo "$modename: warning: \`-R' is ignored for objects" 1>&2 - fi - - if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2 - fi - - if test -n "$release"; then - $echo "$modename: warning: \`-release' is ignored for objects" 1>&2 - fi - - case $output in - *.lo) - if test -n "$objs$old_deplibs"; then - $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2 - exit $EXIT_FAILURE - fi - libobj="$output" - obj=`$echo "X$output" | $Xsed -e "$lo2o"` - ;; - *) - libobj= - obj="$output" - ;; - esac - - # Delete the old objects. - $run $rm $obj $libobj - - # Objects from convenience libraries. This assumes - # single-version convenience libraries. Whenever we create - # different ones for PIC/non-PIC, this we'll have to duplicate - # the extraction. - reload_conv_objs= - gentop= - # reload_cmds runs $LD directly, so let us get rid of - # -Wl from whole_archive_flag_spec - wl= - - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec"; then - eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\" - else - gentop="$output_objdir/${obj}x" - generated="$generated $gentop" - - func_extract_archives $gentop $convenience - reload_conv_objs="$reload_objs $func_extract_archives_result" - fi - fi - - # Create the old-style object. - reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test - - output="$obj" - cmds=$reload_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - - # Exit if we aren't doing a library object file. - if test -z "$libobj"; then - if test -n "$gentop"; then - $show "${rm}r $gentop" - $run ${rm}r $gentop - fi - - exit $EXIT_SUCCESS - fi - - if test "$build_libtool_libs" != yes; then - if test -n "$gentop"; then - $show "${rm}r $gentop" - $run ${rm}r $gentop - fi - - # Create an invalid libtool object if no PIC, so that we don't - # accidentally link it into a program. - # $show "echo timestamp > $libobj" - # $run eval "echo timestamp > $libobj" || exit $? - exit $EXIT_SUCCESS - fi - - if test -n "$pic_flag" || test "$pic_mode" != default; then - # Only do commands if we really have different PIC objects. - reload_objs="$libobjs $reload_conv_objs" - output="$libobj" - cmds=$reload_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - fi - - if test -n "$gentop"; then - $show "${rm}r $gentop" - $run ${rm}r $gentop - fi - - exit $EXIT_SUCCESS - ;; - - prog) - case $host in - *cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;; - esac - if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2 - fi - - if test -n "$release"; then - $echo "$modename: warning: \`-release' is ignored for programs" 1>&2 - fi - - if test "$preload" = yes; then - if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown && - test "$dlopen_self_static" = unknown; then - $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support." - fi - fi - - case $host in - *-*-rhapsody* | *-*-darwin1.[012]) - # On Rhapsody replace the C library is the System framework - compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'` - finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'` - ;; - esac - - case $host in - *darwin*) - # Don't allow lazy linking, it breaks C++ global constructors - if test "$tagname" = CXX ; then - compile_command="$compile_command ${wl}-bind_at_load" - finalize_command="$finalize_command ${wl}-bind_at_load" - fi - ;; - esac - - - # move library search paths that coincide with paths to not yet - # installed libraries to the beginning of the library search list - new_libs= - for path in $notinst_path; do - case " $new_libs " in - *" -L$path/$objdir "*) ;; - *) - case " $compile_deplibs " in - *" -L$path/$objdir "*) - new_libs="$new_libs -L$path/$objdir" ;; - esac - ;; - esac - done - for deplib in $compile_deplibs; do - case $deplib in - -L*) - case " $new_libs " in - *" $deplib "*) ;; - *) new_libs="$new_libs $deplib" ;; - esac - ;; - *) new_libs="$new_libs $deplib" ;; - esac - done - compile_deplibs="$new_libs" - - - compile_command="$compile_command $compile_deplibs" - finalize_command="$finalize_command $finalize_deplibs" - - if test -n "$rpath$xrpath"; then - # If the user specified any rpath flags, then add them. - for libdir in $rpath $xrpath; do - # This is the magic to use -rpath. - case "$finalize_rpath " in - *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" ;; - esac - done - fi - - # Now hardcode the library paths - rpath= - hardcode_libdirs= - for libdir in $compile_rpath $finalize_rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - rpath="$rpath $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; - *) perm_rpath="$perm_rpath $libdir" ;; - esac - fi - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) - testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'` - case :$dllsearchpath: in - *":$libdir:"*) ;; - *) dllsearchpath="$dllsearchpath:$libdir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - *) dllsearchpath="$dllsearchpath:$testbindir";; - esac - ;; - esac - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - eval rpath=\" $hardcode_libdir_flag_spec\" - fi - compile_rpath="$rpath" - - rpath= - hardcode_libdirs= - for libdir in $finalize_rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - rpath="$rpath $flag" - fi - elif test -n "$runpath_var"; then - case "$finalize_perm_rpath " in - *" $libdir "*) ;; - *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; - esac - fi - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - eval rpath=\" $hardcode_libdir_flag_spec\" - fi - finalize_rpath="$rpath" - - if test -n "$libobjs" && test "$build_old_libs" = yes; then - # Transform all the library objects into standard objects. - compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - fi - - dlsyms= - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - if test -n "$NM" && test -n "$global_symbol_pipe"; then - dlsyms="${outputname}S.c" - else - $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2 - fi - fi - - if test -n "$dlsyms"; then - case $dlsyms in - "") ;; - *.c) - # Discover the nlist of each of the dlfiles. - nlist="$output_objdir/${outputname}.nm" - - $show "$rm $nlist ${nlist}S ${nlist}T" - $run $rm "$nlist" "${nlist}S" "${nlist}T" - - # Parse the name list into a source file. - $show "creating $output_objdir/$dlsyms" - - test -z "$run" && $echo > "$output_objdir/$dlsyms" "\ -/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */ -/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */ - -#ifdef __cplusplus -extern \"C\" { -#endif - -/* Prevent the only kind of declaration conflicts we can make. */ -#define lt_preloaded_symbols some_other_symbol - -/* External symbol declarations for the compiler. */\ -" - - if test "$dlself" = yes; then - $show "generating symbol list for \`$output'" - - test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist" - - # Add our own program objects to the symbol list. - progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - for arg in $progfiles; do - $show "extracting global C symbols from \`$arg'" - $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" - done - - if test -n "$exclude_expsyms"; then - $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' - $run eval '$mv "$nlist"T "$nlist"' - fi - - if test -n "$export_symbols_regex"; then - $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' - $run eval '$mv "$nlist"T "$nlist"' - fi - - # Prepare the list of exported symbols - if test -z "$export_symbols"; then - export_symbols="$output_objdir/$outputname.exp" - $run $rm $export_symbols - $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' - case $host in - *cygwin* | *mingw* ) - $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' - $run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' - ;; - esac - else - $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' - $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' - $run eval 'mv "$nlist"T "$nlist"' - case $host in - *cygwin* | *mingw* ) - $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' - $run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' - ;; - esac - fi - fi - - for arg in $dlprefiles; do - $show "extracting global C symbols from \`$arg'" - name=`$echo "$arg" | ${SED} -e 's%^.*/%%'` - $run eval '$echo ": $name " >> "$nlist"' - $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" - done - - if test -z "$run"; then - # Make sure we have at least an empty file. - test -f "$nlist" || : > "$nlist" - - if test -n "$exclude_expsyms"; then - $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T - $mv "$nlist"T "$nlist" - fi - - # Try sorting and uniquifying the output. - if grep -v "^: " < "$nlist" | - if sort -k 3 /dev/null 2>&1; then - sort -k 3 - else - sort +2 - fi | - uniq > "$nlist"S; then - : - else - grep -v "^: " < "$nlist" > "$nlist"S - fi - - if test -f "$nlist"S; then - eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"' - else - $echo '/* NONE */' >> "$output_objdir/$dlsyms" - fi - - $echo >> "$output_objdir/$dlsyms" "\ - -#undef lt_preloaded_symbols - -#if defined (__STDC__) && __STDC__ -# define lt_ptr void * -#else -# define lt_ptr char * -# define const -#endif - -/* The mapping between symbol names and symbols. */ -" - - case $host in - *cygwin* | *mingw* ) - $echo >> "$output_objdir/$dlsyms" "\ -/* DATA imports from DLLs on WIN32 can't be const, because - runtime relocations are performed -- see ld's documentation - on pseudo-relocs */ -struct { -" - ;; - * ) - $echo >> "$output_objdir/$dlsyms" "\ -const struct { -" - ;; - esac - - - $echo >> "$output_objdir/$dlsyms" "\ - const char *name; - lt_ptr address; -} -lt_preloaded_symbols[] = -{\ -" - - eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms" - - $echo >> "$output_objdir/$dlsyms" "\ - {0, (lt_ptr) 0} -}; - -/* This works around a problem in FreeBSD linker */ -#ifdef FREEBSD_WORKAROUND -static const void *lt_preloaded_setup() { - return lt_preloaded_symbols; -} -#endif - -#ifdef __cplusplus -} -#endif\ -" - fi - - pic_flag_for_symtable= - case $host in - # compiling the symbol table file with pic_flag works around - # a FreeBSD bug that causes programs to crash when -lm is - # linked before any other PIC object. But we must not use - # pic_flag when linking with -static. The problem exists in - # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. - *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) - case "$compile_command " in - *" -static "*) ;; - *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";; - esac;; - *-*-hpux*) - case "$compile_command " in - *" -static "*) ;; - *) pic_flag_for_symtable=" $pic_flag";; - esac - esac - - # Now compile the dynamic symbol file. - $show "(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" - $run eval '(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? - - # Clean up the generated files. - $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T" - $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T" - - # Transform the symbol file into the correct name. - case $host in - *cygwin* | *mingw* ) - if test -f "$output_objdir/${outputname}.def" ; then - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` - else - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` - fi - ;; - * ) - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` - ;; - esac - ;; - *) - $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 - exit $EXIT_FAILURE - ;; - esac - else - # We keep going just in case the user didn't refer to - # lt_preloaded_symbols. The linker will fail if global_symbol_pipe - # really was required. - - # Nullify the symbol file. - compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` - fi - - if test "$need_relink" = no || test "$build_libtool_libs" != yes; then - # Replace the output file specification. - compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` - link_command="$compile_command$compile_rpath" - - # We have no uninstalled library dependencies, so finalize right now. - $show "$link_command" - $run eval "$link_command" - exit_status=$? - - # Delete the generated files. - if test -n "$dlsyms"; then - $show "$rm $output_objdir/${outputname}S.${objext}" - $run $rm "$output_objdir/${outputname}S.${objext}" - fi - - exit $exit_status - fi - - if test -n "$shlibpath_var"; then - # We should set the shlibpath_var - rpath= - for dir in $temp_rpath; do - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) - # Absolute path. - rpath="$rpath$dir:" - ;; - *) - # Relative path: add a thisdir entry. - rpath="$rpath\$thisdir/$dir:" - ;; - esac - done - temp_rpath="$rpath" - fi - - if test -n "$compile_shlibpath$finalize_shlibpath"; then - compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" - fi - if test -n "$finalize_shlibpath"; then - finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command" - fi - - compile_var= - finalize_var= - if test -n "$runpath_var"; then - if test -n "$perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do - rpath="$rpath$dir:" - done - compile_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi - if test -n "$finalize_perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $finalize_perm_rpath; do - rpath="$rpath$dir:" - done - finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi - fi - - if test "$no_install" = yes; then - # We don't need to create a wrapper script. - link_command="$compile_var$compile_command$compile_rpath" - # Replace the output file specification. - link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` - # Delete the old output file. - $run $rm $output - # Link the executable and exit - $show "$link_command" - $run eval "$link_command" || exit $? - exit $EXIT_SUCCESS - fi - - if test "$hardcode_action" = relink; then - # Fast installation is not supported - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - - $echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2 - $echo "$modename: \`$output' will be relinked during installation" 1>&2 - else - if test "$fast_install" != no; then - link_command="$finalize_var$compile_command$finalize_rpath" - if test "$fast_install" = yes; then - relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'` - else - # fast_install is set to needless - relink_command= - fi - else - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - fi - fi - - # Replace the output file specification. - link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` - - # Delete the old output files. - $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname - - $show "$link_command" - $run eval "$link_command" || exit $? - - # Now create the wrapper script. - $show "creating $output" - - # Quote the relink command for shipping. - if test -n "$relink_command"; then - # Preserve any variables that may affect compiler behavior - for var in $variables_saved_for_relink; do - if eval test -z \"\${$var+set}\"; then - relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command" - elif eval var_value=\$$var; test -z "$var_value"; then - relink_command="$var=; export $var; $relink_command" - else - var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"` - relink_command="$var=\"$var_value\"; export $var; $relink_command" - fi - done - relink_command="(cd `pwd`; $relink_command)" - relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` - fi - - # Quote $echo for shipping. - if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then - case $progpath in - [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";; - *) qecho="$SHELL `pwd`/$progpath --fallback-echo";; - esac - qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"` - else - qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"` - fi - - # Only actually do things if our run command is non-null. - if test -z "$run"; then - # win32 will think the script is a binary if it has - # a .exe suffix, so we strip it off here. - case $output in - *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;; - esac - # test for cygwin because mv fails w/o .exe extensions - case $host in - *cygwin*) - exeext=.exe - outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;; - *) exeext= ;; - esac - case $host in - *cygwin* | *mingw* ) - output_name=`basename $output` - output_path=`dirname $output` - cwrappersource="$output_path/$objdir/lt-$output_name.c" - cwrapper="$output_path/$output_name.exe" - $rm $cwrappersource $cwrapper - trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 - - cat > $cwrappersource <> $cwrappersource<<"EOF" -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#if defined(PATH_MAX) -# define LT_PATHMAX PATH_MAX -#elif defined(MAXPATHLEN) -# define LT_PATHMAX MAXPATHLEN -#else -# define LT_PATHMAX 1024 -#endif - -#ifndef DIR_SEPARATOR -# define DIR_SEPARATOR '/' -# define PATH_SEPARATOR ':' -#endif - -#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ - defined (__OS2__) -# define HAVE_DOS_BASED_FILE_SYSTEM -# ifndef DIR_SEPARATOR_2 -# define DIR_SEPARATOR_2 '\\' -# endif -# ifndef PATH_SEPARATOR_2 -# define PATH_SEPARATOR_2 ';' -# endif -#endif - -#ifndef DIR_SEPARATOR_2 -# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) -#else /* DIR_SEPARATOR_2 */ -# define IS_DIR_SEPARATOR(ch) \ - (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) -#endif /* DIR_SEPARATOR_2 */ - -#ifndef PATH_SEPARATOR_2 -# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) -#else /* PATH_SEPARATOR_2 */ -# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) -#endif /* PATH_SEPARATOR_2 */ - -#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) -#define XFREE(stale) do { \ - if (stale) { free ((void *) stale); stale = 0; } \ -} while (0) - -/* -DDEBUG is fairly common in CFLAGS. */ -#undef DEBUG -#if defined DEBUGWRAPPER -# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__) -#else -# define DEBUG(format, ...) -#endif - -const char *program_name = NULL; - -void * xmalloc (size_t num); -char * xstrdup (const char *string); -const char * base_name (const char *name); -char * find_executable(const char *wrapper); -int check_executable(const char *path); -char * strendzap(char *str, const char *pat); -void lt_fatal (const char *message, ...); - -int -main (int argc, char *argv[]) -{ - char **newargz; - int i; - - program_name = (char *) xstrdup (base_name (argv[0])); - DEBUG("(main) argv[0] : %s\n",argv[0]); - DEBUG("(main) program_name : %s\n",program_name); - newargz = XMALLOC(char *, argc+2); -EOF - - cat >> $cwrappersource <> $cwrappersource <<"EOF" - newargz[1] = find_executable(argv[0]); - if (newargz[1] == NULL) - lt_fatal("Couldn't find %s", argv[0]); - DEBUG("(main) found exe at : %s\n",newargz[1]); - /* we know the script has the same name, without the .exe */ - /* so make sure newargz[1] doesn't end in .exe */ - strendzap(newargz[1],".exe"); - for (i = 1; i < argc; i++) - newargz[i+1] = xstrdup(argv[i]); - newargz[argc+1] = NULL; - - for (i=0; i> $cwrappersource <> $cwrappersource <> $cwrappersource <<"EOF" - return 127; -} - -void * -xmalloc (size_t num) -{ - void * p = (void *) malloc (num); - if (!p) - lt_fatal ("Memory exhausted"); - - return p; -} - -char * -xstrdup (const char *string) -{ - return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL -; -} - -const char * -base_name (const char *name) -{ - const char *base; - -#if defined (HAVE_DOS_BASED_FILE_SYSTEM) - /* Skip over the disk name in MSDOS pathnames. */ - if (isalpha ((unsigned char)name[0]) && name[1] == ':') - name += 2; -#endif - - for (base = name; *name; name++) - if (IS_DIR_SEPARATOR (*name)) - base = name + 1; - return base; -} - -int -check_executable(const char * path) -{ - struct stat st; - - DEBUG("(check_executable) : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!"); - if ((!path) || (!*path)) - return 0; - - if ((stat (path, &st) >= 0) && - ( - /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */ -#if defined (S_IXOTH) - ((st.st_mode & S_IXOTH) == S_IXOTH) || -#endif -#if defined (S_IXGRP) - ((st.st_mode & S_IXGRP) == S_IXGRP) || -#endif - ((st.st_mode & S_IXUSR) == S_IXUSR)) - ) - return 1; - else - return 0; -} - -/* Searches for the full path of the wrapper. Returns - newly allocated full path name if found, NULL otherwise */ -char * -find_executable (const char* wrapper) -{ - int has_slash = 0; - const char* p; - const char* p_next; - /* static buffer for getcwd */ - char tmp[LT_PATHMAX + 1]; - int tmp_len; - char* concat_name; - - DEBUG("(find_executable) : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"); - - if ((wrapper == NULL) || (*wrapper == '\0')) - return NULL; - - /* Absolute path? */ -#if defined (HAVE_DOS_BASED_FILE_SYSTEM) - if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':') - { - concat_name = xstrdup (wrapper); - if (check_executable(concat_name)) - return concat_name; - XFREE(concat_name); - } - else - { -#endif - if (IS_DIR_SEPARATOR (wrapper[0])) - { - concat_name = xstrdup (wrapper); - if (check_executable(concat_name)) - return concat_name; - XFREE(concat_name); - } -#if defined (HAVE_DOS_BASED_FILE_SYSTEM) - } -#endif - - for (p = wrapper; *p; p++) - if (*p == '/') - { - has_slash = 1; - break; - } - if (!has_slash) - { - /* no slashes; search PATH */ - const char* path = getenv ("PATH"); - if (path != NULL) - { - for (p = path; *p; p = p_next) - { - const char* q; - size_t p_len; - for (q = p; *q; q++) - if (IS_PATH_SEPARATOR(*q)) - break; - p_len = q - p; - p_next = (*q == '\0' ? q : q + 1); - if (p_len == 0) - { - /* empty path: current directory */ - if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal ("getcwd failed"); - tmp_len = strlen(tmp); - concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); - memcpy (concat_name, tmp, tmp_len); - concat_name[tmp_len] = '/'; - strcpy (concat_name + tmp_len + 1, wrapper); - } - else - { - concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1); - memcpy (concat_name, p, p_len); - concat_name[p_len] = '/'; - strcpy (concat_name + p_len + 1, wrapper); - } - if (check_executable(concat_name)) - return concat_name; - XFREE(concat_name); - } - } - /* not found in PATH; assume curdir */ - } - /* Relative path | not found in path: prepend cwd */ - if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal ("getcwd failed"); - tmp_len = strlen(tmp); - concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); - memcpy (concat_name, tmp, tmp_len); - concat_name[tmp_len] = '/'; - strcpy (concat_name + tmp_len + 1, wrapper); - - if (check_executable(concat_name)) - return concat_name; - XFREE(concat_name); - return NULL; -} - -char * -strendzap(char *str, const char *pat) -{ - size_t len, patlen; - - assert(str != NULL); - assert(pat != NULL); - - len = strlen(str); - patlen = strlen(pat); - - if (patlen <= len) - { - str += len - patlen; - if (strcmp(str, pat) == 0) - *str = '\0'; - } - return str; -} - -static void -lt_error_core (int exit_status, const char * mode, - const char * message, va_list ap) -{ - fprintf (stderr, "%s: %s: ", program_name, mode); - vfprintf (stderr, message, ap); - fprintf (stderr, ".\n"); - - if (exit_status >= 0) - exit (exit_status); -} - -void -lt_fatal (const char *message, ...) -{ - va_list ap; - va_start (ap, message); - lt_error_core (EXIT_FAILURE, "FATAL", message, ap); - va_end (ap); -} -EOF - # we should really use a build-platform specific compiler - # here, but OTOH, the wrappers (shell script and this C one) - # are only useful if you want to execute the "real" binary. - # Since the "real" binary is built for $host, then this - # wrapper might as well be built for $host, too. - $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource - ;; - esac - $rm $output - trap "$rm $output; exit $EXIT_FAILURE" 1 2 15 - - $echo > $output "\ -#! $SHELL - -# $output - temporary wrapper script for $objdir/$outputname -# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP -# -# The $output program cannot be directly executed until all the libtool -# libraries that it depends on are installed. -# -# This wrapper script should never be moved out of the build directory. -# If it is, it will not operate correctly. - -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed='${SED} -e 1s/^X//' -sed_quote_subst='$sed_quote_subst' - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -relink_command=\"$relink_command\" - -# This environment variable determines our operation mode. -if test \"\$libtool_install_magic\" = \"$magic\"; then - # install mode needs the following variable: - notinst_deplibs='$notinst_deplibs' -else - # When we are sourced in execute mode, \$file and \$echo are already set. - if test \"\$libtool_execute_magic\" != \"$magic\"; then - echo=\"$qecho\" - file=\"\$0\" - # Make sure echo works. - if test \"X\$1\" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift - elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then - # Yippee, \$echo works! - : - else - # Restart under the correct shell, and then maybe \$echo will work. - exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"} - fi - fi\ -" - $echo >> $output "\ - - # Find the directory that this script lives in. - thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` - test \"x\$thisdir\" = \"x\$file\" && thisdir=. - - # Follow symbolic links until we get to the real thisdir. - file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\` - while test -n \"\$file\"; do - destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` - - # If there was a directory component, then change thisdir. - if test \"x\$destdir\" != \"x\$file\"; then - case \"\$destdir\" in - [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;; - *) thisdir=\"\$thisdir/\$destdir\" ;; - esac - fi - - file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\` - file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` - done - - # Try to get the absolute directory name. - absdir=\`cd \"\$thisdir\" && pwd\` - test -n \"\$absdir\" && thisdir=\"\$absdir\" -" - - if test "$fast_install" = yes; then - $echo >> $output "\ - program=lt-'$outputname'$exeext - progdir=\"\$thisdir/$objdir\" - - if test ! -f \"\$progdir/\$program\" || \\ - { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ - test \"X\$file\" != \"X\$progdir/\$program\"; }; then - - file=\"\$\$-\$program\" - - if test ! -d \"\$progdir\"; then - $mkdir \"\$progdir\" - else - $rm \"\$progdir/\$file\" - fi" - - $echo >> $output "\ - - # relink executable if necessary - if test -n \"\$relink_command\"; then - if relink_command_output=\`eval \$relink_command 2>&1\`; then : - else - $echo \"\$relink_command_output\" >&2 - $rm \"\$progdir/\$file\" - exit $EXIT_FAILURE - fi - fi - - $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null || - { $rm \"\$progdir/\$program\"; - $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; } - $rm \"\$progdir/\$file\" - fi" - else - $echo >> $output "\ - program='$outputname' - progdir=\"\$thisdir/$objdir\" -" - fi - - $echo >> $output "\ - - if test -f \"\$progdir/\$program\"; then" - - # Export our shlibpath_var if we have one. - if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then - $echo >> $output "\ - # Add our own library path to $shlibpath_var - $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" - - # Some systems cannot cope with colon-terminated $shlibpath_var - # The second colon is a workaround for a bug in BeOS R4 sed - $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` - - export $shlibpath_var -" - fi - - # fixup the dll searchpath if we need to. - if test -n "$dllsearchpath"; then - $echo >> $output "\ - # Add the dll search path components to the executable PATH - PATH=$dllsearchpath:\$PATH -" - fi - - $echo >> $output "\ - if test \"\$libtool_execute_magic\" != \"$magic\"; then - # Run the actual program with our arguments. -" - case $host in - # Backslashes separate directories on plain windows - *-*-mingw | *-*-os2*) - $echo >> $output "\ - exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} -" - ;; - - *) - $echo >> $output "\ - exec \"\$progdir/\$program\" \${1+\"\$@\"} -" - ;; - esac - $echo >> $output "\ - \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\" - exit $EXIT_FAILURE - fi - else - # The program doesn't exist. - \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 - \$echo \"This script is just a wrapper for \$program.\" 1>&2 - $echo \"See the $PACKAGE documentation for more information.\" 1>&2 - exit $EXIT_FAILURE - fi -fi\ -" - chmod +x $output - fi - exit $EXIT_SUCCESS - ;; - esac - - # See if we need to build an old-fashioned archive. - for oldlib in $oldlibs; do - - if test "$build_libtool_libs" = convenience; then - oldobjs="$libobjs_save" - addlibs="$convenience" - build_libtool_libs=no - else - if test "$build_libtool_libs" = module; then - oldobjs="$libobjs_save" - build_libtool_libs=no - else - oldobjs="$old_deplibs $non_pic_objects" - fi - addlibs="$old_convenience" - fi - - if test -n "$addlibs"; then - gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" - - func_extract_archives $gentop $addlibs - oldobjs="$oldobjs $func_extract_archives_result" - fi - - # Do each command in the archive commands. - if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then - cmds=$old_archive_from_new_cmds - else - # POSIX demands no paths to be encoded in archives. We have - # to avoid creating archives with duplicate basenames if we - # might have to extract them afterwards, e.g., when creating a - # static archive out of a convenience library, or when linking - # the entirety of a libtool archive into another (currently - # not supported by libtool). - if (for obj in $oldobjs - do - $echo "X$obj" | $Xsed -e 's%^.*/%%' - done | sort | sort -uc >/dev/null 2>&1); then - : - else - $echo "copying selected object files to avoid basename conflicts..." - - if test -z "$gentop"; then - gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" - - $show "${rm}r $gentop" - $run ${rm}r "$gentop" - $show "$mkdir $gentop" - $run $mkdir "$gentop" - exit_status=$? - if test "$exit_status" -ne 0 && test ! -d "$gentop"; then - exit $exit_status - fi - fi - - save_oldobjs=$oldobjs - oldobjs= - counter=1 - for obj in $save_oldobjs - do - objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` - case " $oldobjs " in - " ") oldobjs=$obj ;; - *[\ /]"$objbase "*) - while :; do - # Make sure we don't pick an alternate name that also - # overlaps. - newobj=lt$counter-$objbase - counter=`expr $counter + 1` - case " $oldobjs " in - *[\ /]"$newobj "*) ;; - *) if test ! -f "$gentop/$newobj"; then break; fi ;; - esac - done - $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" - $run ln "$obj" "$gentop/$newobj" || - $run cp "$obj" "$gentop/$newobj" - oldobjs="$oldobjs $gentop/$newobj" - ;; - *) oldobjs="$oldobjs $obj" ;; - esac - done - fi - - eval cmds=\"$old_archive_cmds\" - - if len=`expr "X$cmds" : ".*"` && - test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then - cmds=$old_archive_cmds - else - # the command line is too long to link in one step, link in parts - $echo "using piecewise archive linking..." - save_RANLIB=$RANLIB - RANLIB=: - objlist= - concat_cmds= - save_oldobjs=$oldobjs - - # Is there a better way of finding the last object in the list? - for obj in $save_oldobjs - do - last_oldobj=$obj - done - for obj in $save_oldobjs - do - oldobjs="$objlist $obj" - objlist="$objlist $obj" - eval test_cmds=\"$old_archive_cmds\" - if len=`expr "X$test_cmds" : ".*" 2>/dev/null` && - test "$len" -le "$max_cmd_len"; then - : - else - # the above command should be used before it gets too long - oldobjs=$objlist - if test "$obj" = "$last_oldobj" ; then - RANLIB=$save_RANLIB - fi - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" - objlist= - fi - done - RANLIB=$save_RANLIB - oldobjs=$objlist - if test "X$oldobjs" = "X" ; then - eval cmds=\"\$concat_cmds\" - else - eval cmds=\"\$concat_cmds~\$old_archive_cmds\" - fi - fi - fi - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - eval cmd=\"$cmd\" - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - done - - if test -n "$generated"; then - $show "${rm}r$generated" - $run ${rm}r$generated - fi - - # Now create the libtool archive. - case $output in - *.la) - old_library= - test "$build_old_libs" = yes && old_library="$libname.$libext" - $show "creating $output" - - # Preserve any variables that may affect compiler behavior - for var in $variables_saved_for_relink; do - if eval test -z \"\${$var+set}\"; then - relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command" - elif eval var_value=\$$var; test -z "$var_value"; then - relink_command="$var=; export $var; $relink_command" - else - var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"` - relink_command="$var=\"$var_value\"; export $var; $relink_command" - fi - done - # Quote the link command for shipping. - relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" - relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` - if test "$hardcode_automatic" = yes ; then - relink_command= - fi - - - # Only create the output if not a dry run. - if test -z "$run"; then - for installed in no yes; do - if test "$installed" = yes; then - if test -z "$install_libdir"; then - break - fi - output="$output_objdir/$outputname"i - # Replace all uninstalled libtool libraries with the installed ones - newdependency_libs= - for deplib in $dependency_libs; do - case $deplib in - *.la) - name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'` - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - if test -z "$libdir"; then - $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 - exit $EXIT_FAILURE - fi - newdependency_libs="$newdependency_libs $libdir/$name" - ;; - *) newdependency_libs="$newdependency_libs $deplib" ;; - esac - done - dependency_libs="$newdependency_libs" - newdlfiles= - for lib in $dlfiles; do - name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - if test -z "$libdir"; then - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - exit $EXIT_FAILURE - fi - newdlfiles="$newdlfiles $libdir/$name" - done - dlfiles="$newdlfiles" - newdlprefiles= - for lib in $dlprefiles; do - name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - if test -z "$libdir"; then - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - exit $EXIT_FAILURE - fi - newdlprefiles="$newdlprefiles $libdir/$name" - done - dlprefiles="$newdlprefiles" - else - newdlfiles= - for lib in $dlfiles; do - case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac - newdlfiles="$newdlfiles $abs" - done - dlfiles="$newdlfiles" - newdlprefiles= - for lib in $dlprefiles; do - case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac - newdlprefiles="$newdlprefiles $abs" - done - dlprefiles="$newdlprefiles" - fi - $rm $output - # place dlname in correct position for cygwin - tdlname=$dlname - case $host,$output,$installed,$module,$dlname in - *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; - esac - $echo > $output "\ -# $outputname - a libtool library file -# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# The name that we can dlopen(3). -dlname='$tdlname' - -# Names of this library. -library_names='$library_names' - -# The name of the static archive. -old_library='$old_library' - -# Libraries that this one depends upon. -dependency_libs='$dependency_libs' - -# Version information for $libname. -current=$current -age=$age -revision=$revision - -# Is this an already installed library? -installed=$installed - -# Should we warn about portability when linking against -modules? -shouldnotlink=$module - -# Files to dlopen/dlpreopen -dlopen='$dlfiles' -dlpreopen='$dlprefiles' - -# Directory that this library needs to be installed in: -libdir='$install_libdir'" - if test "$installed" = no && test "$need_relink" = yes; then - $echo >> $output "\ -relink_command=\"$relink_command\"" - fi - done - fi - - # Do a symbolic link so that the libtool archive can be found in - # LD_LIBRARY_PATH before the program is installed. - $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)" - $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $? - ;; - esac - exit $EXIT_SUCCESS - ;; - - # libtool install mode - install) - modename="$modename: install" - - # There may be an optional sh(1) argument at the beginning of - # install_prog (especially on Windows NT). - if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || - # Allow the use of GNU shtool's install command. - $echo "X$nonopt" | grep shtool > /dev/null; then - # Aesthetically quote it. - arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - install_prog="$arg " - arg="$1" - shift - else - install_prog= - arg=$nonopt - fi - - # The real first argument should be the name of the installation program. - # Aesthetically quote it. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - install_prog="$install_prog$arg" - - # We need to accept at least all the BSD install flags. - dest= - files= - opts= - prev= - install_type= - isdir=no - stripme= - for arg - do - if test -n "$dest"; then - files="$files $dest" - dest=$arg - continue - fi - - case $arg in - -d) isdir=yes ;; - -f) - case " $install_prog " in - *[\\\ /]cp\ *) ;; - *) prev=$arg ;; - esac - ;; - -g | -m | -o) prev=$arg ;; - -s) - stripme=" -s" - continue - ;; - -*) - ;; - *) - # If the previous option needed an argument, then skip it. - if test -n "$prev"; then - prev= - else - dest=$arg - continue - fi - ;; - esac - - # Aesthetically quote the argument. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - install_prog="$install_prog $arg" - done - - if test -z "$install_prog"; then - $echo "$modename: you must specify an install program" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - if test -n "$prev"; then - $echo "$modename: the \`$prev' option requires an argument" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - if test -z "$files"; then - if test -z "$dest"; then - $echo "$modename: no file or destination specified" 1>&2 - else - $echo "$modename: you must specify a destination" 1>&2 - fi - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - # Strip any trailing slash from the destination. - dest=`$echo "X$dest" | $Xsed -e 's%/$%%'` - - # Check to see that the destination is a directory. - test -d "$dest" && isdir=yes - if test "$isdir" = yes; then - destdir="$dest" - destname= - else - destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'` - test "X$destdir" = "X$dest" && destdir=. - destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'` - - # Not a directory, so check to see that there is only one file specified. - set dummy $files - if test "$#" -gt 2; then - $echo "$modename: \`$dest' is not a directory" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - fi - case $destdir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - for file in $files; do - case $file in - *.lo) ;; - *) - $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - ;; - esac - done - ;; - esac - - # This variable tells wrapper scripts just to set variables rather - # than running their programs. - libtool_install_magic="$magic" - - staticlibs= - future_libdirs= - current_libdirs= - for file in $files; do - - # Do each installation. - case $file in - *.$libext) - # Do the static libraries later. - staticlibs="$staticlibs $file" - ;; - - *.la) - # Check to see that this really is a libtool archive. - if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : - else - $echo "$modename: \`$file' is not a valid libtool archive" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - library_names= - old_library= - relink_command= - # If there is no directory component, then add one. - case $file in - */* | *\\*) . $file ;; - *) . ./$file ;; - esac - - # Add the libdir to current_libdirs if it is the destination. - if test "X$destdir" = "X$libdir"; then - case "$current_libdirs " in - *" $libdir "*) ;; - *) current_libdirs="$current_libdirs $libdir" ;; - esac - else - # Note the libdir as a future libdir. - case "$future_libdirs " in - *" $libdir "*) ;; - *) future_libdirs="$future_libdirs $libdir" ;; - esac - fi - - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/ - test "X$dir" = "X$file/" && dir= - dir="$dir$objdir" - - if test -n "$relink_command"; then - # Determine the prefix the user has applied to our future dir. - inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"` - - # Don't allow the user to place us outside of our expected - # location b/c this prevents finding dependent libraries that - # are installed to the same prefix. - # At present, this check doesn't affect windows .dll's that - # are installed into $libdir/../bin (currently, that works fine) - # but it's something to keep an eye on. - if test "$inst_prefix_dir" = "$destdir"; then - $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 - exit $EXIT_FAILURE - fi - - if test -n "$inst_prefix_dir"; then - # Stick the inst_prefix_dir data into the link command. - relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` - else - relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"` - fi - - $echo "$modename: warning: relinking \`$file'" 1>&2 - $show "$relink_command" - if $run eval "$relink_command"; then : - else - $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 - exit $EXIT_FAILURE - fi - fi - - # See the names of the shared library. - set dummy $library_names - if test -n "$2"; then - realname="$2" - shift - shift - - srcname="$realname" - test -n "$relink_command" && srcname="$realname"T - - # Install the shared library and build the symlinks. - $show "$install_prog $dir/$srcname $destdir/$realname" - $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $? - if test -n "$stripme" && test -n "$striplib"; then - $show "$striplib $destdir/$realname" - $run eval "$striplib $destdir/$realname" || exit $? - fi - - if test "$#" -gt 0; then - # Delete the old symlinks, and create new ones. - # Try `ln -sf' first, because the `ln' binary might depend on - # the symlink we replace! Solaris /bin/ln does not understand -f, - # so we also need to try rm && ln -s. - for linkname - do - if test "$linkname" != "$realname"; then - $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })" - $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })" - fi - done - fi - - # Do each command in the postinstall commands. - lib="$destdir/$realname" - cmds=$postinstall_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || { - lt_exit=$? - - # Restore the uninstalled library and exit - if test "$mode" = relink; then - $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)' - fi - - exit $lt_exit - } - done - IFS="$save_ifs" - fi - - # Install the pseudo-library for information purposes. - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" - ;; - - *.lo) - # Install (i.e. copy) a libtool object. - - # Figure out destination file name, if it wasn't already specified. - if test -n "$destname"; then - destfile="$destdir/$destname" - else - destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - destfile="$destdir/$destfile" - fi - - # Deduce the name of the destination old-style object file. - case $destfile in - *.lo) - staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"` - ;; - *.$objext) - staticdest="$destfile" - destfile= - ;; - *) - $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - ;; - esac - - # Install the libtool object if requested. - if test -n "$destfile"; then - $show "$install_prog $file $destfile" - $run eval "$install_prog $file $destfile" || exit $? - fi - - # Install the old object if enabled. - if test "$build_old_libs" = yes; then - # Deduce the name of the old-style object file. - staticobj=`$echo "X$file" | $Xsed -e "$lo2o"` - - $show "$install_prog $staticobj $staticdest" - $run eval "$install_prog \$staticobj \$staticdest" || exit $? - fi - exit $EXIT_SUCCESS - ;; - - *) - # Figure out destination file name, if it wasn't already specified. - if test -n "$destname"; then - destfile="$destdir/$destname" - else - destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - destfile="$destdir/$destfile" - fi - - # If the file is missing, and there is a .exe on the end, strip it - # because it is most likely a libtool script we actually want to - # install - stripped_ext="" - case $file in - *.exe) - if test ! -f "$file"; then - file=`$echo $file|${SED} 's,.exe$,,'` - stripped_ext=".exe" - fi - ;; - esac - - # Do a test to see if this is really a libtool program. - case $host in - *cygwin*|*mingw*) - wrapper=`$echo $file | ${SED} -e 's,.exe$,,'` - ;; - *) - wrapper=$file - ;; - esac - if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then - notinst_deplibs= - relink_command= - - # Note that it is not necessary on cygwin/mingw to append a dot to - # foo even if both foo and FILE.exe exist: automatic-append-.exe - # behavior happens only for exec(3), not for open(2)! Also, sourcing - # `FILE.' does not work on cygwin managed mounts. - # - # If there is no directory component, then add one. - case $wrapper in - */* | *\\*) . ${wrapper} ;; - *) . ./${wrapper} ;; - esac - - # Check the variables that should have been set. - if test -z "$notinst_deplibs"; then - $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2 - exit $EXIT_FAILURE - fi - - finalize=yes - for lib in $notinst_deplibs; do - # Check to see that each library is installed. - libdir= - if test -f "$lib"; then - # If there is no directory component, then add one. - case $lib in - */* | *\\*) . $lib ;; - *) . ./$lib ;; - esac - fi - libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test - if test -n "$libdir" && test ! -f "$libfile"; then - $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2 - finalize=no - fi - done - - relink_command= - # Note that it is not necessary on cygwin/mingw to append a dot to - # foo even if both foo and FILE.exe exist: automatic-append-.exe - # behavior happens only for exec(3), not for open(2)! Also, sourcing - # `FILE.' does not work on cygwin managed mounts. - # - # If there is no directory component, then add one. - case $wrapper in - */* | *\\*) . ${wrapper} ;; - *) . ./${wrapper} ;; - esac - - outputname= - if test "$fast_install" = no && test -n "$relink_command"; then - if test "$finalize" = yes && test -z "$run"; then - tmpdir=`func_mktempdir` - file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'` - outputname="$tmpdir/$file" - # Replace the output file specification. - relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` - - $show "$relink_command" - if $run eval "$relink_command"; then : - else - $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 - ${rm}r "$tmpdir" - continue - fi - file="$outputname" - else - $echo "$modename: warning: cannot relink \`$file'" 1>&2 - fi - else - # Install the binary that we compiled earlier. - file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` - fi - fi - - # remove .exe since cygwin /usr/bin/install will append another - # one anyway - case $install_prog,$host in - */usr/bin/install*,*cygwin*) - case $file:$destfile in - *.exe:*.exe) - # this is ok - ;; - *.exe:*) - destfile=$destfile.exe - ;; - *:*.exe) - destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'` - ;; - esac - ;; - esac - $show "$install_prog$stripme $file $destfile" - $run eval "$install_prog\$stripme \$file \$destfile" || exit $? - test -n "$outputname" && ${rm}r "$tmpdir" - ;; - esac - done - - for file in $staticlibs; do - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - - # Set up the ranlib parameters. - oldlib="$destdir/$name" - - $show "$install_prog $file $oldlib" - $run eval "$install_prog \$file \$oldlib" || exit $? - - if test -n "$stripme" && test -n "$old_striplib"; then - $show "$old_striplib $oldlib" - $run eval "$old_striplib $oldlib" || exit $? - fi - - # Do each command in the postinstall commands. - cmds=$old_postinstall_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - done - - if test -n "$future_libdirs"; then - $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2 - fi - - if test -n "$current_libdirs"; then - # Maybe just do a dry run. - test -n "$run" && current_libdirs=" -n$current_libdirs" - exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' - else - exit $EXIT_SUCCESS - fi - ;; - - # libtool finish mode - finish) - modename="$modename: finish" - libdirs="$nonopt" - admincmds= - - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - for dir - do - libdirs="$libdirs $dir" - done - - for libdir in $libdirs; do - if test -n "$finish_cmds"; then - # Do each command in the finish commands. - cmds=$finish_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || admincmds="$admincmds - $cmd" - done - IFS="$save_ifs" - fi - if test -n "$finish_eval"; then - # Do the single finish_eval. - eval cmds=\"$finish_eval\" - $run eval "$cmds" || admincmds="$admincmds - $cmds" - fi - done - fi - - # Exit here if they wanted silent mode. - test "$show" = : && exit $EXIT_SUCCESS - - $echo "X----------------------------------------------------------------------" | $Xsed - $echo "Libraries have been installed in:" - for libdir in $libdirs; do - $echo " $libdir" - done - $echo - $echo "If you ever happen to want to link against installed libraries" - $echo "in a given directory, LIBDIR, you must either use libtool, and" - $echo "specify the full pathname of the library, or use the \`-LLIBDIR'" - $echo "flag during linking and do at least one of the following:" - if test -n "$shlibpath_var"; then - $echo " - add LIBDIR to the \`$shlibpath_var' environment variable" - $echo " during execution" - fi - if test -n "$runpath_var"; then - $echo " - add LIBDIR to the \`$runpath_var' environment variable" - $echo " during linking" - fi - if test -n "$hardcode_libdir_flag_spec"; then - libdir=LIBDIR - eval flag=\"$hardcode_libdir_flag_spec\" - - $echo " - use the \`$flag' linker flag" - fi - if test -n "$admincmds"; then - $echo " - have your system administrator run these commands:$admincmds" - fi - if test -f /etc/ld.so.conf; then - $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" - fi - $echo - $echo "See any operating system documentation about shared libraries for" - $echo "more information, such as the ld(1) and ld.so(8) manual pages." - $echo "X----------------------------------------------------------------------" | $Xsed - exit $EXIT_SUCCESS - ;; - - # libtool execute mode - execute) - modename="$modename: execute" - - # The first argument is the command name. - cmd="$nonopt" - if test -z "$cmd"; then - $echo "$modename: you must specify a COMMAND" 1>&2 - $echo "$help" - exit $EXIT_FAILURE - fi - - # Handle -dlopen flags immediately. - for file in $execute_dlfiles; do - if test ! -f "$file"; then - $echo "$modename: \`$file' is not a file" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - dir= - case $file in - *.la) - # Check to see that this really is a libtool archive. - if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : - else - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - # Read the libtool library. - dlname= - library_names= - - # If there is no directory component, then add one. - case $file in - */* | *\\*) . $file ;; - *) . ./$file ;; - esac - - # Skip this library if it cannot be dlopened. - if test -z "$dlname"; then - # Warn if it was a shared library. - test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'" - continue - fi - - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` - test "X$dir" = "X$file" && dir=. - - if test -f "$dir/$objdir/$dlname"; then - dir="$dir/$objdir" - else - $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 - exit $EXIT_FAILURE - fi - ;; - - *.lo) - # Just add the directory containing the .lo file. - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` - test "X$dir" = "X$file" && dir=. - ;; - - *) - $echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2 - continue - ;; - esac - - # Get the absolute pathname. - absdir=`cd "$dir" && pwd` - test -n "$absdir" && dir="$absdir" - - # Now add the directory to shlibpath_var. - if eval "test -z \"\$$shlibpath_var\""; then - eval "$shlibpath_var=\"\$dir\"" - else - eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" - fi - done - - # This variable tells wrapper scripts just to set shlibpath_var - # rather than running their programs. - libtool_execute_magic="$magic" - - # Check if any of the arguments is a wrapper script. - args= - for file - do - case $file in - -*) ;; - *) - # Do a test to see if this is really a libtool program. - if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - # If there is no directory component, then add one. - case $file in - */* | *\\*) . $file ;; - *) . ./$file ;; - esac - - # Transform arg to wrapped name. - file="$progdir/$program" - fi - ;; - esac - # Quote arguments (to preserve shell metacharacters). - file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"` - args="$args \"$file\"" - done - - if test -z "$run"; then - if test -n "$shlibpath_var"; then - # Export the shlibpath_var. - eval "export $shlibpath_var" - fi - - # Restore saved environment variables - if test "${save_LC_ALL+set}" = set; then - LC_ALL="$save_LC_ALL"; export LC_ALL - fi - if test "${save_LANG+set}" = set; then - LANG="$save_LANG"; export LANG - fi - - # Now prepare to actually exec the command. - exec_cmd="\$cmd$args" - else - # Display what would be done. - if test -n "$shlibpath_var"; then - eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\"" - $echo "export $shlibpath_var" - fi - $echo "$cmd$args" - exit $EXIT_SUCCESS - fi - ;; - - # libtool clean and uninstall mode - clean | uninstall) - modename="$modename: $mode" - rm="$nonopt" - files= - rmforce= - exit_status=0 - - # This variable tells wrapper scripts just to set variables rather - # than running their programs. - libtool_install_magic="$magic" - - for arg - do - case $arg in - -f) rm="$rm $arg"; rmforce=yes ;; - -*) rm="$rm $arg" ;; - *) files="$files $arg" ;; - esac - done - - if test -z "$rm"; then - $echo "$modename: you must specify an RM program" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - rmdirs= - - origobjdir="$objdir" - for file in $files; do - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` - if test "X$dir" = "X$file"; then - dir=. - objdir="$origobjdir" - else - objdir="$dir/$origobjdir" - fi - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - test "$mode" = uninstall && objdir="$dir" - - # Remember objdir for removal later, being careful to avoid duplicates - if test "$mode" = clean; then - case " $rmdirs " in - *" $objdir "*) ;; - *) rmdirs="$rmdirs $objdir" ;; - esac - fi - - # Don't error if the file doesn't exist and rm -f was used. - if (test -L "$file") >/dev/null 2>&1 \ - || (test -h "$file") >/dev/null 2>&1 \ - || test -f "$file"; then - : - elif test -d "$file"; then - exit_status=1 - continue - elif test "$rmforce" = yes; then - continue - fi - - rmfiles="$file" - - case $name in - *.la) - # Possibly a libtool archive, so verify it. - if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - . $dir/$name - - # Delete the libtool libraries and symlinks. - for n in $library_names; do - rmfiles="$rmfiles $objdir/$n" - done - test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" - - case "$mode" in - clean) - case " $library_names " in - # " " in the beginning catches empty $dlname - *" $dlname "*) ;; - *) rmfiles="$rmfiles $objdir/$dlname" ;; - esac - test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" - ;; - uninstall) - if test -n "$library_names"; then - # Do each command in the postuninstall commands. - cmds=$postuninstall_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" - if test "$?" -ne 0 && test "$rmforce" != yes; then - exit_status=1 - fi - done - IFS="$save_ifs" - fi - - if test -n "$old_library"; then - # Do each command in the old_postuninstall commands. - cmds=$old_postuninstall_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" - if test "$?" -ne 0 && test "$rmforce" != yes; then - exit_status=1 - fi - done - IFS="$save_ifs" - fi - # FIXME: should reinstall the best remaining shared library. - ;; - esac - fi - ;; - - *.lo) - # Possibly a libtool object, so verify it. - if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - - # Read the .lo file - . $dir/$name - - # Add PIC object to the list of files to remove. - if test -n "$pic_object" \ - && test "$pic_object" != none; then - rmfiles="$rmfiles $dir/$pic_object" - fi - - # Add non-PIC object to the list of files to remove. - if test -n "$non_pic_object" \ - && test "$non_pic_object" != none; then - rmfiles="$rmfiles $dir/$non_pic_object" - fi - fi - ;; - - *) - if test "$mode" = clean ; then - noexename=$name - case $file in - *.exe) - file=`$echo $file|${SED} 's,.exe$,,'` - noexename=`$echo $name|${SED} 's,.exe$,,'` - # $file with .exe has already been added to rmfiles, - # add $file without .exe - rmfiles="$rmfiles $file" - ;; - esac - # Do a test to see if this is a libtool program. - if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - relink_command= - . $dir/$noexename - - # note $name still contains .exe if it was in $file originally - # as does the version of $file that was added into $rmfiles - rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" - if test "$fast_install" = yes && test -n "$relink_command"; then - rmfiles="$rmfiles $objdir/lt-$name" - fi - if test "X$noexename" != "X$name" ; then - rmfiles="$rmfiles $objdir/lt-${noexename}.c" - fi - fi - fi - ;; - esac - $show "$rm $rmfiles" - $run $rm $rmfiles || exit_status=1 - done - objdir="$origobjdir" - - # Try to remove the ${objdir}s in the directories where we deleted files - for dir in $rmdirs; do - if test -d "$dir"; then - $show "rmdir $dir" - $run rmdir $dir >/dev/null 2>&1 - fi - done - - exit $exit_status - ;; - - "") - $echo "$modename: you must specify a MODE" 1>&2 - $echo "$generic_help" 1>&2 - exit $EXIT_FAILURE - ;; - esac - - if test -z "$exec_cmd"; then - $echo "$modename: invalid operation mode \`$mode'" 1>&2 - $echo "$generic_help" 1>&2 - exit $EXIT_FAILURE - fi -fi # test -z "$show_help" - -if test -n "$exec_cmd"; then - eval exec $exec_cmd - exit $EXIT_FAILURE -fi - -# We need to display help for each of the modes. -case $mode in -"") $echo \ -"Usage: $modename [OPTION]... [MODE-ARG]... - -Provide generalized library-building support services. - - --config show all configuration variables - --debug enable verbose shell tracing --n, --dry-run display commands without modifying any files - --features display basic configuration information and exit - --finish same as \`--mode=finish' - --help display this help message and exit - --mode=MODE use operation mode MODE [default=inferred from MODE-ARGS] - --quiet same as \`--silent' - --silent don't print informational messages - --tag=TAG use configuration variables from tag TAG - --version print version information - -MODE must be one of the following: - - clean remove files from the build directory - compile compile a source file into a libtool object - execute automatically set library path, then run a program - finish complete the installation of libtool libraries - install install libraries or executables - link create a library or an executable - uninstall remove libraries from an installed directory - -MODE-ARGS vary depending on the MODE. Try \`$modename --help --mode=MODE' for -a more detailed description of MODE. - -Report bugs to ." - exit $EXIT_SUCCESS - ;; - -clean) - $echo \ -"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE... - -Remove files from the build directory. - -RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed -to RM. - -If FILE is a libtool library, object or program, all the files associated -with it are deleted. Otherwise, only FILE itself is deleted using RM." - ;; - -compile) - $echo \ -"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE - -Compile a source file into a libtool library object. - -This mode accepts the following additional options: - - -o OUTPUT-FILE set the output file name to OUTPUT-FILE - -prefer-pic try to building PIC objects only - -prefer-non-pic try to building non-PIC objects only - -static always build a \`.o' file suitable for static linking - -COMPILE-COMMAND is a command to be used in creating a \`standard' object file -from the given SOURCEFILE. - -The output file name is determined by removing the directory component from -SOURCEFILE, then substituting the C source code suffix \`.c' with the -library object suffix, \`.lo'." - ;; - -execute) - $echo \ -"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]... - -Automatically set library path, then run a program. - -This mode accepts the following additional options: - - -dlopen FILE add the directory containing FILE to the library path - -This mode sets the library path environment variable according to \`-dlopen' -flags. - -If any of the ARGS are libtool executable wrappers, then they are translated -into their corresponding uninstalled binary, and any of their required library -directories are added to the library path. - -Then, COMMAND is executed, with ARGS as arguments." - ;; - -finish) - $echo \ -"Usage: $modename [OPTION]... --mode=finish [LIBDIR]... - -Complete the installation of libtool libraries. - -Each LIBDIR is a directory that contains libtool libraries. - -The commands that this mode executes may require superuser privileges. Use -the \`--dry-run' option if you just want to see what would be executed." - ;; - -install) - $echo \ -"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND... - -Install executables or libraries. - -INSTALL-COMMAND is the installation command. The first component should be -either the \`install' or \`cp' program. - -The rest of the components are interpreted as arguments to that command (only -BSD-compatible install options are recognized)." - ;; - -link) - $echo \ -"Usage: $modename [OPTION]... --mode=link LINK-COMMAND... - -Link object files or libraries together to form another library, or to -create an executable program. - -LINK-COMMAND is a command using the C compiler that you would use to create -a program from several object files. - -The following components of LINK-COMMAND are treated specially: - - -all-static do not do any dynamic linking at all - -avoid-version do not add a version suffix if possible - -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime - -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols - -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) - -export-symbols SYMFILE - try to export only the symbols listed in SYMFILE - -export-symbols-regex REGEX - try to export only the symbols matching REGEX - -LLIBDIR search LIBDIR for required installed libraries - -lNAME OUTPUT-FILE requires the installed library libNAME - -module build a library that can dlopened - -no-fast-install disable the fast-install mode - -no-install link a not-installable executable - -no-undefined declare that a library does not refer to external symbols - -o OUTPUT-FILE create OUTPUT-FILE from the specified objects - -objectlist FILE Use a list of object files found in FILE to specify objects - -precious-files-regex REGEX - don't remove output files matching REGEX - -release RELEASE specify package release information - -rpath LIBDIR the created library will eventually be installed in LIBDIR - -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries - -static do not do any dynamic linking of libtool libraries - -version-info CURRENT[:REVISION[:AGE]] - specify library version info [each variable defaults to 0] - -All other options (arguments beginning with \`-') are ignored. - -Every other argument is treated as a filename. Files ending in \`.la' are -treated as uninstalled libtool libraries, other files are standard or library -object files. - -If the OUTPUT-FILE ends in \`.la', then a libtool library is created, -only library objects (\`.lo' files) may be specified, and \`-rpath' is -required, except when creating a convenience library. - -If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created -using \`ar' and \`ranlib', or on Windows using \`lib'. - -If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file -is created, otherwise an executable program is created." - ;; - -uninstall) - $echo \ -"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE... - -Remove libraries from an installation directory. - -RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed -to RM. - -If FILE is a libtool library, all the files associated with it are deleted. -Otherwise, only FILE itself is deleted using RM." - ;; - -*) - $echo "$modename: invalid operation mode \`$mode'" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - ;; -esac - -$echo -$echo "Try \`$modename --help' for more information about other modes." - -exit $? - -# The TAGs below are defined such that we never get into a situation -# in which we disable both kinds of libraries. Given conflicting -# choices, we go for a static library, that is the most portable, -# since we can't tell whether shared libraries were disabled because -# the user asked for that or because the platform doesn't support -# them. This is particularly important on AIX, because we don't -# support having both static and shared libraries enabled at the same -# time on that platform, so we default to a shared-only configuration. -# If a disable-shared tag is given, we'll fallback to a static-only -# configuration. But we'll never go from static-only to shared-only. - -# ### BEGIN LIBTOOL TAG CONFIG: disable-shared -disable_libs=shared -# ### END LIBTOOL TAG CONFIG: disable-shared - -# ### BEGIN LIBTOOL TAG CONFIG: disable-static -disable_libs=static -# ### END LIBTOOL TAG CONFIG: disable-static - -# Local Variables: -# mode:shell-script -# sh-indentation:2 -# End: From scm-commit at wald.intevation.org Fri Jan 2 14:46:33 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Fri, 2 Jan 2009 14:46:33 +0100 (CET) Subject: [Openvas-commits] r2139 - in trunk/openvas-server: . doc include openvasd packaging/debian Message-ID: <20090102134633.E231C4077F@pyrosoma.intevation.org> Author: mwiegand Date: 2009-01-02 14:46:32 +0100 (Fri, 02 Jan 2009) New Revision: 2139 Modified: trunk/openvas-server/ChangeLog trunk/openvas-server/doc/openvasd.8.in trunk/openvas-server/include/config.h.in trunk/openvas-server/openvas-services trunk/openvas-server/openvasd/openvasd.c trunk/openvas-server/packaging/debian/README.Debian trunk/openvas-server/packaging/debian/openvas-server.default Log: Modified openvasd to use the freshly allocated IANA port 9390 instead of the Nessus port 1241. * include/config.h.in: Removed NESIANA_PORT define, added OPENVASD_IANA_OTP_PORT define. Updated IANA URL. * openvasd/openvasd.c: Changed to use OPENVASD_IANA_OTP_PORT, fixed references to port 1241 in comment. * doc/openvasd.8.in: Mention that the default port is now 9390. * openvas-services: Added otp on port 9390 to the list of known services. * packaging/debian/openvas-server.default: Changed Debian defaults to 9390. * packaging/debian/README.Debian: Mention that the default port in 9390. Modified: trunk/openvas-server/ChangeLog =================================================================== --- trunk/openvas-server/ChangeLog 2009-01-02 12:06:04 UTC (rev 2138) +++ trunk/openvas-server/ChangeLog 2009-01-02 13:46:32 UTC (rev 2139) @@ -1,5 +1,26 @@ 2009-01-02 Michael Wiegand + Modified openvasd to use the freshly allocated IANA port 9390 instead of + the Nessus port 1241. + + * include/config.h.in: Removed NESIANA_PORT define, added + OPENVASD_IANA_OTP_PORT define. Updated IANA URL. + + * openvasd/openvasd.c: Changed to use OPENVASD_IANA_OTP_PORT, fixed + references to port 1241 in comment. + + * doc/openvasd.8.in: Mention that the default port is now 9390. + + * openvas-services: Added otp on port 9390 to the list of known + services. + + * packaging/debian/openvas-server.default: Changed Debian defaults to + 9390. + + * packaging/debian/README.Debian: Mention that the default port in 9390. + +2009-01-02 Michael Wiegand + * ltmain.sh: Removed since libtool is not used in the build process. * Makefile: Removed obsolete references to libtool. Modified: trunk/openvas-server/doc/openvasd.8.in =================================================================== --- trunk/openvas-server/doc/openvasd.8.in 2009-01-02 12:06:04 UTC (rev 2138) +++ trunk/openvas-server/doc/openvasd.8.in 2009-01-02 13:46:32 UTC (rev 2139) @@ -59,7 +59,7 @@ .TP .BI "-p " ", --port=" Tell the server to listen on connection on the port rather -than listening on port 1241 (default). +than listening on port 9390 (default). .TP .B "-D, --background" Modified: trunk/openvas-server/include/config.h.in =================================================================== --- trunk/openvas-server/include/config.h.in 2009-01-02 12:06:04 UTC (rev 2138) +++ trunk/openvas-server/include/config.h.in 2009-01-02 13:46:32 UTC (rev 2139) @@ -102,9 +102,9 @@ /* Obsolete: the port 3001 on which openvasd will be listening */ #undef DEFAULT_PORT -/* The default port assigned to nessus by the iana is 1241, see - http://www.isi.edu/in-notes/iana/assignments/port-numbers */ -#define NESIANA_PORT 1241 +/* The default port assigned to OpenVAS for OTP by the iana is 9390, see + http://www.iana.org/assignments/port-numbers */ +#define OPENVASD_IANA_OTP_PORT 9390 /* The max number of client connections/sec */ #define OPENVASD_CONNECT_RATE 4 Modified: trunk/openvas-server/openvas-services =================================================================== --- trunk/openvas-server/openvas-services 2009-01-02 12:06:04 UTC (rev 2138) +++ trunk/openvas-server/openvas-services 2009-01-02 13:46:32 UTC (rev 2139) @@ -8117,6 +8117,8 @@ logitech-messenger 9370/udp fjdmimgr 9374/tcp fjdmimgr 9374/udp +otp 9390/tcp +otp 9390/udp fjinvmgr 9396/tcp fjinvmgr 9396/udp mpidcagt 9397/tcp Modified: trunk/openvas-server/openvasd/openvasd.c =================================================================== --- trunk/openvas-server/openvasd/openvasd.c 2009-01-02 12:06:04 UTC (rev 2138) +++ trunk/openvas-server/openvasd/openvasd.c 2009-01-02 13:46:32 UTC (rev 2139) @@ -682,9 +682,8 @@ /* * Initialization of the network : - * we setup the socket that will listen for - * incoming connections on port on address - * (which are set to 1241 and INADDR_ANY by + * we setup the socket that will listen for incoming connections on port + * on address (which are set to OPENVASD_IANA_OTP_PORT and INADDR_ANY by * default) */ static int @@ -954,7 +953,7 @@ bpf_server_pid = bpf_server(); - if(iana_port == -1)iana_port = NESIANA_PORT; + if(iana_port == -1)iana_port = OPENVASD_IANA_OTP_PORT; if (!config_file) { config_file = emalloc(strlen(OPENVASD_CONF) + 1); Modified: trunk/openvas-server/packaging/debian/README.Debian =================================================================== --- trunk/openvas-server/packaging/debian/README.Debian 2009-01-02 12:06:04 UTC (rev 2138) +++ trunk/openvas-server/packaging/debian/README.Debian 2009-01-02 13:46:32 UTC (rev 2139) @@ -98,7 +98,7 @@ local security checks since you are (effectively) given console access to remote servers. Always use a non-root account for this. -4.- Also be aware that by default openvasd only listens on port 1241 on +4.- Also be aware that by default openvasd only listens on port 9390 on 127.0.0.1. If you wish to change this, then check out /etc/default/openvas-server. ------------------------------- Modified: trunk/openvas-server/packaging/debian/openvas-server.default =================================================================== --- trunk/openvas-server/packaging/debian/openvas-server.default 2009-01-02 12:06:04 UTC (rev 2138) +++ trunk/openvas-server/packaging/debian/openvas-server.default 2009-01-02 13:46:32 UTC (rev 2139) @@ -1,6 +1,6 @@ # Additional options for the daemon # -q prevents OpenVAS server from listing all the plugins it loads -DAEMONOPTS="-q -p 1241 -a 127.0.0.1" +DAEMONOPTS="-q -p 9390 -a 127.0.0.1" # Time to wait for the daemon to die before restarting it # (in seconds) From scm-commit at wald.intevation.org Fri Jan 2 14:52:36 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Fri, 2 Jan 2009 14:52:36 +0100 (CET) Subject: [Openvas-commits] r2140 - in trunk/openvas-server: . include openvasd Message-ID: <20090102135236.0A8AA4077F@pyrosoma.intevation.org> Author: mwiegand Date: 2009-01-02 14:52:35 +0100 (Fri, 02 Jan 2009) New Revision: 2140 Modified: trunk/openvas-server/ChangeLog trunk/openvas-server/include/config.h.in trunk/openvas-server/openvasd/openvasd.c Log: * include/config.h.in, openvasd/openvasd.c: Changed OPENVASD_IANA_OTP_PORT to OPENVAS_IANA_OTP_PORT. Modified: trunk/openvas-server/ChangeLog =================================================================== --- trunk/openvas-server/ChangeLog 2009-01-02 13:46:32 UTC (rev 2139) +++ trunk/openvas-server/ChangeLog 2009-01-02 13:52:35 UTC (rev 2140) @@ -1,5 +1,10 @@ 2009-01-02 Michael Wiegand + * include/config.h.in, openvasd/openvasd.c: Changed + OPENVASD_IANA_OTP_PORT to OPENVAS_IANA_OTP_PORT. + +2009-01-02 Michael Wiegand + Modified openvasd to use the freshly allocated IANA port 9390 instead of the Nessus port 1241. Modified: trunk/openvas-server/include/config.h.in =================================================================== --- trunk/openvas-server/include/config.h.in 2009-01-02 13:46:32 UTC (rev 2139) +++ trunk/openvas-server/include/config.h.in 2009-01-02 13:52:35 UTC (rev 2140) @@ -104,7 +104,7 @@ /* The default port assigned to OpenVAS for OTP by the iana is 9390, see http://www.iana.org/assignments/port-numbers */ -#define OPENVASD_IANA_OTP_PORT 9390 +#define OPENVAS_IANA_OTP_PORT 9390 /* The max number of client connections/sec */ #define OPENVASD_CONNECT_RATE 4 Modified: trunk/openvas-server/openvasd/openvasd.c =================================================================== --- trunk/openvas-server/openvasd/openvasd.c 2009-01-02 13:46:32 UTC (rev 2139) +++ trunk/openvas-server/openvasd/openvasd.c 2009-01-02 13:52:35 UTC (rev 2140) @@ -683,7 +683,7 @@ /* * Initialization of the network : * we setup the socket that will listen for incoming connections on port - * on address (which are set to OPENVASD_IANA_OTP_PORT and INADDR_ANY by + * on address (which are set to OPENVAS_IANA_OTP_PORT and INADDR_ANY by * default) */ static int @@ -953,7 +953,7 @@ bpf_server_pid = bpf_server(); - if(iana_port == -1)iana_port = OPENVASD_IANA_OTP_PORT; + if(iana_port == -1)iana_port = OPENVAS_IANA_OTP_PORT; if (!config_file) { config_file = emalloc(strlen(OPENVASD_CONF) + 1); From scm-commit at wald.intevation.org Fri Jan 2 15:17:26 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Fri, 2 Jan 2009 15:17:26 +0100 (CET) Subject: [Openvas-commits] r2141 - in trunk/openvas-client: . doc include nessus nessus/prefs_dialog Message-ID: <20090102141726.D33284077F@pyrosoma.intevation.org> Author: mwiegand Date: 2009-01-02 15:17:25 +0100 (Fri, 02 Jan 2009) New Revision: 2141 Modified: trunk/openvas-client/ChangeLog trunk/openvas-client/doc/OpenVAS-Client.1 trunk/openvas-client/include/config.h.in trunk/openvas-client/nessus/nessus.h trunk/openvas-client/nessus/preferences.c trunk/openvas-client/nessus/prefs_dialog/prefs_help.h Log: Modified openvas-client to use the freshly allocated IANA port 9390 instead of the Nessus port 1241. * include/config.h.in: Removed NESIANA_PORT define, added OPENVAS_IANA_OTP_PORT define. Updated IANA URL. * nessus/nessus.h: Removed NESIANA_PORT define, added OPENVAS_IANA_OTP_PORT define. * nessus/preferences.c (prefs_get_default): Changed to use OPENVAS_IANA_OTP_PORT. * nessus/prefs_dialog/prefs_help.h: Mention port 9390 instead of 1241 in tooltips. * doc/OpenVAS-Client.1: Changed example port to 9390. Modified: trunk/openvas-client/ChangeLog =================================================================== --- trunk/openvas-client/ChangeLog 2009-01-02 13:52:35 UTC (rev 2140) +++ trunk/openvas-client/ChangeLog 2009-01-02 14:17:25 UTC (rev 2141) @@ -1,3 +1,22 @@ +2009-01-02 Michael Wiegand + + Modified openvas-client to use the freshly allocated IANA port 9390 + instead of the Nessus port 1241. + + * include/config.h.in: Removed NESIANA_PORT define, added + OPENVAS_IANA_OTP_PORT define. Updated IANA URL. + + * nessus/nessus.h: Removed NESIANA_PORT define, added + OPENVAS_IANA_OTP_PORT define. + + * nessus/preferences.c (prefs_get_default): Changed to use + OPENVAS_IANA_OTP_PORT. + + * nessus/prefs_dialog/prefs_help.h: Mention port 9390 instead of 1241 in + tooltips. + + * doc/OpenVAS-Client.1: Changed example port to 9390. + 2009-01-02 Felix Wolfsteller * TODO: Added wish to rename prefs_dialog/prefs_dialog_plugins_prefs and Modified: trunk/openvas-client/doc/OpenVAS-Client.1 =================================================================== --- trunk/openvas-client/doc/OpenVAS-Client.1 2009-01-02 13:52:35 UTC (rev 2140) +++ trunk/openvas-client/doc/OpenVAS-Client.1 2009-01-02 14:17:25 UTC (rev 2141) @@ -215,7 +215,7 @@ .B /var/www/html/openvas/ ) try the following: .P -.B OpenVAS-Client -c /root/openvas/openvas.rc -T html -qx localhost 1241 batch batch1 +.B OpenVAS-Client -c /root/openvas/openvas.rc -T html -qx localhost 9390 batch batch1 .B /root/openvas/target /var/www/html/openvas/results.html .P Make sure that paranoia level is Modified: trunk/openvas-client/include/config.h.in =================================================================== --- trunk/openvas-client/include/config.h.in 2009-01-02 13:52:35 UTC (rev 2140) +++ trunk/openvas-client/include/config.h.in 2009-01-02 14:17:25 UTC (rev 2141) @@ -40,9 +40,9 @@ /* Obsolete: the port 3001 on which nessusd will be listening */ #undef DEFAULT_PORT -/* The default port assigned to nessus by the iana is 1241, see - http://www.isi.edu/in-notes/iana/assignments/port-numbers */ -#define NESIANA_PORT 1241 +/* The default port assigned to OpenVAS for OTP by the iana is 9390, see + http://www.iana.org/assignments/port-numbers */ +#define OPENVAS_IANA_OTP_PORT 9390 /* * How much time before closing Modified: trunk/openvas-client/nessus/nessus.h =================================================================== --- trunk/openvas-client/nessus/nessus.h 2009-01-02 13:52:35 UTC (rev 2140) +++ trunk/openvas-client/nessus/nessus.h 2009-01-02 14:17:25 UTC (rev 2141) @@ -29,11 +29,11 @@ #ifndef _NESSUSC_NESSUS_H #define _NESSUSC_NESSUS_H -/* The default port assigned to nessus by the iana is 1241, see - http://www.isi.edu/in-notes/iana/assignments/port-numbers */ +/* The default port assigned to OpenVAS for OTP by the iana is 9390, see + http://www.iana.org/assignments/port-numbers */ #ifdef _WIN32 -#ifndef NESIANA_PORT -#define NESIANA_PORT 1241 +#ifndef OPENVAS_IANA_OTP_PORT +#define OPENVAS_IANA_OTP_PORT 9390 #endif #endif Modified: trunk/openvas-client/nessus/preferences.c =================================================================== --- trunk/openvas-client/nessus/preferences.c 2009-01-02 13:52:35 UTC (rev 2140) +++ trunk/openvas-client/nessus/preferences.c 2009-01-02 14:17:25 UTC (rev 2141) @@ -645,7 +645,7 @@ else if(!strcmp(name, "nessusd_user")) return get_username(); else if(!strcmp(name, "nessusd_port")) - return (void *)NESIANA_PORT; + return (void *)OPENVAS_IANA_OTP_PORT; else if(!strcmp(name, "ssl_version")) return SSL_VER_DEF_NAME; else if(!strcmp(name, "nessus_dir")) Modified: trunk/openvas-client/nessus/prefs_dialog/prefs_help.h =================================================================== --- trunk/openvas-client/nessus/prefs_dialog/prefs_help.h 2009-01-02 13:52:35 UTC (rev 2140) +++ trunk/openvas-client/nessus/prefs_dialog/prefs_help.h 2009-01-02 14:17:25 UTC (rev 2141) @@ -37,10 +37,10 @@ #define HLP_AUTH_PORT \ _("Enter the port number where you will be serviced by \ -the OpenVAS Server. Usual is 1241.") +the OpenVAS Server. Usual is 9390.") #define HLP_AUTH_PORT_DEFAULT \ -_("Set to default OpenVAS port 1241.") +_("Set to default OpenVAS port 9390.") #define HLP_LOGIN_USER \ _("Enter the user name where you are registerd with on the \ From scm-commit at wald.intevation.org Fri Jan 2 16:10:10 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Fri, 2 Jan 2009 16:10:10 +0100 (CET) Subject: [Openvas-commits] r2142 - in trunk/openvas-server: . openvasd Message-ID: <20090102151010.B0A554077F@pyrosoma.intevation.org> Author: jan Date: 2009-01-02 16:10:09 +0100 (Fri, 02 Jan 2009) New Revision: 2142 Modified: trunk/openvas-server/ChangeLog trunk/openvas-server/openvasd/openvasd.c Log: * openvasd/openvasd.c (server_thread): Removed initialization of user-specific store (which happened after the fork) and lead to create of directory ".desc" in the /var/lib/openvas/users/USER/plugins. This code are remains of the unsecure feature of plugin upload. Apart from this, the OpenVAS Server should eventually not be responisble anymore for user-specific data storage. Modified: trunk/openvas-server/ChangeLog =================================================================== --- trunk/openvas-server/ChangeLog 2009-01-02 14:17:25 UTC (rev 2141) +++ trunk/openvas-server/ChangeLog 2009-01-02 15:10:09 UTC (rev 2142) @@ -1,3 +1,13 @@ +2009-01-02 Jan-Oliver Wagner + + * openvasd/openvasd.c (server_thread): Removed initialization + of user-specific store (which happened after the fork) and + lead to create of directory ".desc" in the + /var/lib/openvas/users/USER/plugins. + This code are remains of the unsecure feature of plugin + upload. Apart from this, the OpenVAS Server should eventually + not be responisble anymore for user-specific data storage. + 2009-01-02 Michael Wiegand * include/config.h.in, openvasd/openvasd.c: Changed Modified: trunk/openvas-server/openvasd/openvasd.c =================================================================== --- trunk/openvas-server/openvasd/openvasd.c 2009-01-02 14:17:25 UTC (rev 2141) +++ trunk/openvas-server/openvasd/openvasd.c 2009-01-02 15:10:09 UTC (rev 2142) @@ -408,8 +408,6 @@ goto shutdown_and_exit; } else { - char * uhome ; - char * phome; efree(&asciiaddr); if(perms){ rules_add(&rules, &perms, NULL); @@ -420,13 +418,7 @@ #endif arg_set_value(globals, "rules", -1, rules); } - - uhome = user_home(globals); - phome = emalloc(strlen(uhome) + strlen("plugins") + 2); - sprintf(phome, "%s/plugins", uhome); - store_init_user(phome); - efree(&uhome); - efree(&phome); + plugins = plugins_reload_user(globals, prefs, plugins); arg_set_value(globals, "plugins", -1, plugins); From scm-commit at wald.intevation.org Fri Jan 2 16:26:10 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Fri, 2 Jan 2009 16:26:10 +0100 (CET) Subject: [Openvas-commits] r2143 - in trunk/openvas-libraries: . libopenvas Message-ID: <20090102152610.ECCE64077F@pyrosoma.intevation.org> Author: jan Date: 2009-01-02 16:26:08 +0100 (Fri, 02 Jan 2009) New Revision: 2143 Modified: trunk/openvas-libraries/ChangeLog trunk/openvas-libraries/libopenvas/store.c trunk/openvas-libraries/libopenvas/store.h Log: * Further patches by Stjepan Gros in preparation of Change Request #24 (subdirs for NVTs, http://www.openvas.org/openvas-cr-24.html). * libopenvas/store.c (store_init_sys): Marked as deprecated. (store_init): New. Simply sets the "sys_store_dir" without appending ".desc". (store_get_plugin): Renamed param "name" to "desc_file". * libopenvas/store.h: Added proto for store_init. Modified: trunk/openvas-libraries/ChangeLog =================================================================== --- trunk/openvas-libraries/ChangeLog 2009-01-02 15:10:09 UTC (rev 2142) +++ trunk/openvas-libraries/ChangeLog 2009-01-02 15:26:08 UTC (rev 2143) @@ -1,3 +1,16 @@ +2009-01-02 Jan-Oliver Wagner + + * Further patches by Stjepan Gros in preparation of + Change Request #24 (subdirs for NVTs, + http://www.openvas.org/openvas-cr-24.html). + + * libopenvas/store.c (store_init_sys): Marked as deprecated. + (store_init): New. Simply sets the "sys_store_dir" without appending + ".desc". + (store_get_plugin): Renamed param "name" to "desc_file". + + * libopenvas/store.h: Added proto for store_init. + 2009-01-02 Michael Wiegand Added missing includes to enable compilation on Darwin and NetBSD, Modified: trunk/openvas-libraries/libopenvas/store.c =================================================================== --- trunk/openvas-libraries/libopenvas/store.c 2009-01-02 15:10:09 UTC (rev 2142) +++ trunk/openvas-libraries/libopenvas/store.c 2009-01-02 15:26:08 UTC (rev 2143) @@ -144,21 +144,44 @@ static int current_mode = -1; +/** + * @brief Inits the sys_store_dir string to the default value. + * + * @param dir Path to the (cache)-directory + * + * @return 0 in case of success, -1 if the directory does not exist and could + * not be created. + * + * sys_store_dir holds the cache directory name. If run with older + * installations of OpenVAS (<=2.0.0), then it is the NVT directory + * and ends with "/.desc/" for compatibility. Else it is the directory + * specified as server preference "cache_folder". + * The directory will be created if it doesn't exist. + */ +int store_init(char * dir) +{ + strncpy(sys_store_dir, dir, MAXPATHLEN); + if((mkdir(sys_store_dir, 0755) < 0) && (errno != EEXIST)) + { + fprintf(stderr, "mkdir(%s) : %s\n", sys_store_dir, strerror(errno)); + return -1; + } + return 0; +} + /** - * Inits the sys_store_dir string to the default value. sys_store_dir holds the - * path of the .desc (~server-side plugin cache) directory which is a subfolder - * of the plugin- directory. If the .desc directory does not exist, it will be - * created. Also sets the mode to MODE_SYS. - * @param dir Path to the (plugin)- directory - * @return 0 in case of success, -1 if the directory does not exist and could - * not be created. + * @brief Deprecated funtion to set the directory where the plugin cache files are placed. + * + * Don't use this method anymore. It is here only for legacy to be compatible with + * openvas-server <= 2.0.0. + * The new method to use is @ref store_init . */ int store_init_sys(char * dir) { current_mode = MODE_SYS; - + snprintf(sys_store_dir, sizeof(sys_store_dir), "%s/.desc", dir); /* RATS: ignore */ if((mkdir(sys_store_dir, 0755) < 0) && (errno != EEXIST)) { @@ -263,11 +286,11 @@ } -int store_get_plugin(struct plugin * p, char * name) +int store_get_plugin(struct plugin * p, char * desc_file) { - int e = store_get_plugin_f(p, NULL, usr_store_dir, name); + int e = store_get_plugin_f(p, NULL, usr_store_dir, desc_file); if(p->id < 0) - return store_get_plugin_f(p, NULL, sys_store_dir, name); + return store_get_plugin_f(p, NULL, sys_store_dir, desc_file); else return e; } Modified: trunk/openvas-libraries/libopenvas/store.h =================================================================== --- trunk/openvas-libraries/libopenvas/store.h 2009-01-02 15:10:09 UTC (rev 2142) +++ trunk/openvas-libraries/libopenvas/store.h 2009-01-02 15:26:08 UTC (rev 2143) @@ -28,6 +28,7 @@ struct arglist * store_plugin(struct arglist *, char *); struct arglist * store_load_plugin(char *, char *, struct arglist*); +int store_init(char *); int store_init_sys(char *); int store_init_user(char *); From scm-commit at wald.intevation.org Fri Jan 2 16:52:28 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Fri, 2 Jan 2009 16:52:28 +0100 (CET) Subject: [Openvas-commits] r2144 - in trunk/openvas-libraries: . libopenvas Message-ID: <20090102155228.F07AC40781@pyrosoma.intevation.org> Author: jan Date: 2009-01-02 16:52:27 +0100 (Fri, 02 Jan 2009) New Revision: 2144 Modified: trunk/openvas-libraries/ChangeLog trunk/openvas-libraries/libopenvas/store.c Log: Removing the handling of separate user-specific cache dir. This code are remains of the unsecure feature of plugin upload. Apart from this, the OpenVAS Server should eventually not be responsible anymore for user-specific data storage. * libopenvas/store.c (usr_store_dir, sys_store_dir, current_mode): Removed these static variables as they are not needed anymore. (store_dir): New. Static variable to hold the cache dir. (MODE_SYS, MODE_USR): Removed these macros as they are not needed any more. (store_init, store_init_sys): Use store_dir instead of sys_store_dir. (store_init_user): Removed functionality and marked as deprecated. Now it simply calls store_init_sys(). (store_get_plugin): Reduced functionality to direct call of store_get_plugin_f(), because distinction between user and sys not necessary anymore. (store_plugin): Removed distinction between sys and user. Modified: trunk/openvas-libraries/ChangeLog =================================================================== --- trunk/openvas-libraries/ChangeLog 2009-01-02 15:26:08 UTC (rev 2143) +++ trunk/openvas-libraries/ChangeLog 2009-01-02 15:52:27 UTC (rev 2144) @@ -1,6 +1,26 @@ 2009-01-02 Jan-Oliver Wagner - * Further patches by Stjepan Gros in preparation of + Removing the handling of separate user-specific cache dir. + This code are remains of the unsecure feature of plugin + upload. Apart from this, the OpenVAS Server should eventually + not be responsible anymore for user-specific data storage. + + * libopenvas/store.c (usr_store_dir, sys_store_dir, current_mode): + Removed these static variables as they are not needed anymore. + (store_dir): New. Static variable to hold the cache dir. + (MODE_SYS, MODE_USR): Removed these macros as they are not needed any + more. + (store_init, store_init_sys): Use store_dir instead of sys_store_dir. + (store_init_user): Removed functionality and marked as deprecated. + Now it simply calls store_init_sys(). + (store_get_plugin): Reduced functionality to direct call of + store_get_plugin_f(), because distinction between user and sys + not necessary anymore. + (store_plugin): Removed distinction between sys and user. + +2009-01-02 Jan-Oliver Wagner + + Further patches by Stjepan Gros in preparation of Change Request #24 (subdirs for NVTs, http://www.openvas.org/openvas-cr-24.html). Modified: trunk/openvas-libraries/libopenvas/store.c =================================================================== --- trunk/openvas-libraries/libopenvas/store.c 2009-01-02 15:26:08 UTC (rev 2143) +++ trunk/openvas-libraries/libopenvas/store.c 2009-01-02 15:52:27 UTC (rev 2144) @@ -135,24 +135,17 @@ } /*-----------------------------------------------------------------------------*/ +static char store_dir[MAXPATHLEN+1]; -#define MODE_SYS 0 -#define MODE_USR 1 - -static char sys_store_dir[MAXPATHLEN+1]; -static char usr_store_dir[MAXPATHLEN+1]; - -static int current_mode = -1; - /** - * @brief Inits the sys_store_dir string to the default value. + * @brief Inits the store_dir string to the default value. * * @param dir Path to the (cache)-directory * * @return 0 in case of success, -1 if the directory does not exist and could * not be created. * - * sys_store_dir holds the cache directory name. If run with older + * store_dir holds the cache directory name. If run with older * installations of OpenVAS (<=2.0.0), then it is the NVT directory * and ends with "/.desc/" for compatibility. Else it is the directory * specified as server preference "cache_folder". @@ -160,11 +153,11 @@ */ int store_init(char * dir) { - strncpy(sys_store_dir, dir, MAXPATHLEN); + strncpy(store_dir, dir, MAXPATHLEN); - if((mkdir(sys_store_dir, 0755) < 0) && (errno != EEXIST)) + if((mkdir(store_dir, 0755) < 0) && (errno != EEXIST)) { - fprintf(stderr, "mkdir(%s) : %s\n", sys_store_dir, strerror(errno)); + fprintf(stderr, "mkdir(%s) : %s\n", store_dir, strerror(errno)); return -1; } @@ -172,7 +165,7 @@ } /** - * @brief Deprecated funtion to set the directory where the plugin cache files are placed. + * @brief Deprecated function to set the directory where the plugin cache files are placed. * * Don't use this method anymore. It is here only for legacy to be compatible with * openvas-server <= 2.0.0. @@ -180,12 +173,10 @@ */ int store_init_sys(char * dir) { - current_mode = MODE_SYS; - - snprintf(sys_store_dir, sizeof(sys_store_dir), "%s/.desc", dir); /* RATS: ignore */ - if((mkdir(sys_store_dir, 0755) < 0) && (errno != EEXIST)) + snprintf(store_dir, sizeof(store_dir), "%s/.desc", dir); /* RATS: ignore */ + if((mkdir(store_dir, 0755) < 0) && (errno != EEXIST)) { - fprintf(stderr, "mkdir(%s) : %s\n", sys_store_dir, strerror(errno)); + fprintf(stderr, "mkdir(%s) : %s\n", store_dir, strerror(errno)); return -1; } @@ -193,29 +184,17 @@ } /** - * Inits the sys_store_dir string to the default value. sys_store_dir holds the - * path of the .desc (~server-side plugin cache) directory which is a subfolder - * of the plugin- directory. If the .desc directory does not exist, it will be - * created. Also sets the mode to MODE_USR. - * @param dir Path to the (plugin)- directory - * @return 0 in case of success, -1 if the directory does not exist and could - * not be created. + * @brief Deprecated function to set the directory where the plugin cache files are placed. + * + * Don't use this method anymore. It is here only for legacy to be compatible with + * openvas-server <= 2.0.0. + * The new method to use is @ref store_init . */ int store_init_user(char * dir) { - current_mode = MODE_USR; - snprintf(usr_store_dir, sizeof(usr_store_dir), "%s/.desc", dir); /* RATS: ignore */ - if((mkdir(usr_store_dir, 0755) < 0) && (errno != EEXIST)) - { - fprintf(stderr, "mkdir(%s) : %s\n", usr_store_dir, strerror(errno)); - return -1; - } - - return 0; + return store_init_sys(dir); } - - /*--------------------------------------------------------------------------------*/ @@ -288,11 +267,7 @@ int store_get_plugin(struct plugin * p, char * desc_file) { - int e = store_get_plugin_f(p, NULL, usr_store_dir, desc_file); - if(p->id < 0) - return store_get_plugin_f(p, NULL, sys_store_dir, desc_file); - else - return e; + return store_get_plugin_f(p, NULL, store_dir, desc_file); } /*--------------------------------------------------------------------------------*/ @@ -441,21 +416,15 @@ struct plugin plug; struct pprefs pp[MAX_PREFS+1]; char * str; - char * dir; struct arglist * arglist, * prefs; int e; int fd; int num_plugin_prefs = 0; - - if( current_mode == MODE_SYS ) - dir = sys_store_dir; - else - dir = usr_store_dir; - + if(strlen(file) + 2 > sizeof(path)) return NULL; - strncpy(path, dir, sizeof(path) - 2 - strlen(file)); + strncpy(path, store_dir, sizeof(path) - 2 - strlen(file)); str = strrchr(path, '/'); if(str != NULL) { @@ -466,7 +435,7 @@ - snprintf(desc_file, sizeof(desc_file), "%s/%s", dir, file); /* RATS: ignore */ + snprintf(desc_file, sizeof(desc_file), "%s/%s", store_dir, file); /* RATS: ignore */ str = strrchr(desc_file, '.'); if( str != NULL ) { From scm-commit at wald.intevation.org Fri Jan 2 18:22:56 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Fri, 2 Jan 2009 18:22:56 +0100 (CET) Subject: [Openvas-commits] r2145 - in trunk/openvas-plugins: . scripts Message-ID: <20090102172256.1858A4077F@pyrosoma.intevation.org> Author: reinke Date: 2009-01-02 18:22:54 +0100 (Fri, 02 Jan 2009) New Revision: 2145 Added: trunk/openvas-plugins/scripts/fcore_2008_11736.nasl trunk/openvas-plugins/scripts/freebsd_mplayer10.nasl trunk/openvas-plugins/scripts/freebsd_mysql-server15.nasl trunk/openvas-plugins/scripts/freebsd_roundcube.nasl trunk/openvas-plugins/scripts/freebsd_twiki2.nasl trunk/openvas-plugins/scripts/freebsd_vim3.nasl trunk/openvas-plugins/scripts/freebsd_vinagre.nasl Modified: trunk/openvas-plugins/ChangeLog Log: Modified: trunk/openvas-plugins/ChangeLog =================================================================== --- trunk/openvas-plugins/ChangeLog 2009-01-02 15:52:27 UTC (rev 2144) +++ trunk/openvas-plugins/ChangeLog 2009-01-02 17:22:54 UTC (rev 2145) @@ -1,3 +1,9 @@ +2009-01-02 Thomas Reinke + * freebsd_mplayer10.nasl freebsd_mysql-server15.nasl + freebsd_roundcube.nasl freebsd_twiki2.nasl freebsd_vim3.nasl + freebsd_vinagre.nasl fcore_2008_11736.nasl + New scripts + 2008-12-31 Chandan S * secpod_ms_ie_arg_inj_vuln.nasl: Added IE New Script @@ -22,6 +28,9 @@ scripts/secpod_nms_dvd_burning_sdk_actvx_vuln_900132.nasl 2008-12-29 Thomas Reinke + * Various new OS releases supported in gather-package-list.nasl + +2008-12-29 Thomas Reinke * deb_1678_2.nasl deb_1688_2.nasl deb_1689_1.nasl deb_1690_1.nasl deb_1691_1.nasl deb_1692_1.nasl deb_1693_1.nasl freebsd_ampache.nasl freebsdsa_ftpd.nasl freebsdsa_protosw.nasl Added: trunk/openvas-plugins/scripts/fcore_2008_11736.nasl =================================================================== --- trunk/openvas-plugins/scripts/fcore_2008_11736.nasl 2009-01-02 15:52:27 UTC (rev 2144) +++ trunk/openvas-plugins/scripts/fcore_2008_11736.nasl 2009-01-02 17:22:54 UTC (rev 2145) @@ -0,0 +1,221 @@ +# OpenVAS Vulnerability Test +# $Id$ +# Description: Auto-generated from advisory FEDORA-2008-11736 (perl) +# +# Authors: +# Thomas Reinke +# +# Copyright: +# Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com +# Text descriptions are largely excerpted from the referenced +# advisory, and are Copyright (c) the respective author(s) +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2, +# or at your option, GNU General Public License version 3, +# as published by the Free Software Foundation +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +# + +if(description) +{ + script_id(63089); + script_cve_id("CVE-2007-4829"); + script_version ("$"); + name["english"] = "Fedora Core 10 FEDORA-2008-11736 (perl)"; + script_name(english:name["english"]); + + desc["english"] = " +The remote host is missing an update to perl +announced via advisory FEDORA-2008-11736. + +Update Information: + +CVE-2007-4829 perl-Archive-Tar directory traversal flaws. Update of Pod::Simple +with better html support. + +ChangeLog: + +* Mon Dec 22 2008 Marcela Ma?l??ov? - 4:5.10.0-52 +- add missing XHTML.pm into Pod::Simple +- 295021 CVE-2007-4829 perl-Archive-Tar directory traversal flaws +- add another source for binary files, which test untaring links +* Fri Nov 28 2008 Tom spot Callaway - 4:5.10.0-51 +- to fix Fedora bz 473223, which is really perl bug #54186 (http://rt.perl.org/rt3//Public/Bug/Display.html?id=54186) +we apply Changes 33640, 33881, 33896, 33897 +* Mon Nov 24 2008 Marcela Ma?l??ov? - 4:5.10.0-50 +- change summary according to RFC fix summary discussion at fedora-devel :) + +References: + +[ 1 ] Bug #295021 - CVE-2007-4829 perl-Archive-Tar directory traversal flaws +https://bugzilla.redhat.com/show_bug.cgi?id=295021 + +Solution: Apply the appropriate updates. + +This update can be installed with the yum update program. Use +su -c 'yum update perl' at the command line. +For more information, refer to Managing Software with yum, +available at http://docs.fedoraproject.org/yum/. + +https://secure1.securityspace.com/smysecure/catid.html?in=FEDORA-2008-11736 + +Risk factor : High"; + + script_description(english:desc["english"]); + + summary["english"] = "Fedora Core 10 FEDORA-2008-11736 (perl)"; + script_summary(english:summary["english"]); + + script_category(ACT_GATHER_INFO); + + script_copyright(english:"Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com"); + family["english"] = "Fedora Local Security Checks"; + script_family(english:family["english"]); + script_dependencies("gather-package-list.nasl"); + script_require_keys("ssh/login/rpms"); + exit(0); +} + +# +# The script code starts here +# + +include("revisions-lib.inc"); +include("pkg-lib-rpm.inc"); +vuln = 0; +if(isrpmvuln(pkg:"perl", rpm:"perl~5.10.0~52.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"perl-Archive-Extract", rpm:"perl-Archive-Extract~0.24~52.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"perl-Archive-Tar", rpm:"perl-Archive-Tar~1.40~52.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"perl-CPAN", rpm:"perl-CPAN~1.9205~52.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"perl-CPANPLUS", rpm:"perl-CPANPLUS~0.84~52.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"perl-Compress-Raw", rpm:"perl-Compress-Raw~Zlib~2.008", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"perl-Compress-Zlib", rpm:"perl-Compress-Zlib~2.008~52.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"perl-Digest-SHA", rpm:"perl-Digest-SHA~5.45~52.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"perl-ExtUtils-CBuilder", rpm:"perl-ExtUtils-CBuilder~0.21~52.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"perl-ExtUtils-Embed", rpm:"perl-ExtUtils-Embed~1.28~52.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"perl-ExtUtils-MakeMaker", rpm:"perl-ExtUtils-MakeMaker~6.36~52.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"perl-ExtUtils-ParseXS", rpm:"perl-ExtUtils-ParseXS~2.18~52.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"perl-File-Fetch", rpm:"perl-File-Fetch~0.14~52.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"perl-IO-Compress", rpm:"perl-IO-Compress~Base~2.008", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"perl-IO-Compress", rpm:"perl-IO-Compress~Zlib~2.008", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"perl-IO-Zlib", rpm:"perl-IO-Zlib~1.07~52.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"perl-IPC-Cmd", rpm:"perl-IPC-Cmd~0.40~52.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"perl-Locale-Maketext", rpm:"perl-Locale-Maketext~Simple~0.18", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"perl-Log-Message", rpm:"perl-Log-Message~0.01~52.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"perl-Log-Message", rpm:"perl-Log-Message~Simple~0.04", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"perl-Module-Build", rpm:"perl-Module-Build~0.2808~52.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"perl-Module-CoreList", rpm:"perl-Module-CoreList~2.15~52.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"perl-Module-Load", rpm:"perl-Module-Load~0.12~52.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"perl-Module-Load", rpm:"perl-Module-Load~Conditional~0.24", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"perl-Module-Loaded", rpm:"perl-Module-Loaded~0.01~52.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"perl-Module-Pluggable", rpm:"perl-Module-Pluggable~3.60~52.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"perl-Object-Accessor", rpm:"perl-Object-Accessor~0.32~52.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"perl-Package-Constants", rpm:"perl-Package-Constants~0.01~52.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"perl-Params-Check", rpm:"perl-Params-Check~0.26~52.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"perl-Pod-Escapes", rpm:"perl-Pod-Escapes~1.04~52.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"perl-Pod-Simple", rpm:"perl-Pod-Simple~3.07~52.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"perl-Term-UI", rpm:"perl-Term-UI~0.18~52.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"perl-Test-Harness", rpm:"perl-Test-Harness~3.12~52.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"perl-Test-Simple", rpm:"perl-Test-Simple~0.80~52.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"perl-Time-Piece", rpm:"perl-Time-Piece~1.12~52.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"perl-core", rpm:"perl-core~5.10.0~52.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"perl-devel", rpm:"perl-devel~5.10.0~52.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"perl-libs", rpm:"perl-libs~5.10.0~52.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"perl-suidperl", rpm:"perl-suidperl~5.10.0~52.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"perl-version", rpm:"perl-version~0.74~52.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"perl-debuginfo", rpm:"perl-debuginfo~5.10.0~52.fc10", rls:"FC10")) { + vuln = 1; +} + +if(vuln) { + security_hole(0); +} Added: trunk/openvas-plugins/scripts/freebsd_mplayer10.nasl =================================================================== --- trunk/openvas-plugins/scripts/freebsd_mplayer10.nasl 2009-01-02 15:52:27 UTC (rev 2144) +++ trunk/openvas-plugins/scripts/freebsd_mplayer10.nasl 2009-01-02 17:22:54 UTC (rev 2145) @@ -0,0 +1,119 @@ +# +#VID 7c5bd5b8-d652-11dd-a765-0030843d3802 +# OpenVAS Vulnerability Test +# $ +# Description: Auto generated from VID 7c5bd5b8-d652-11dd-a765-0030843d3802 +# +# Authors: +# Thomas Reinke +# +# Copyright: +# Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com +# Text descriptions are largely excerpted from the referenced +# advisories, and are Copyright (c) the respective author(s) +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2, +# as published by the Free Software Foundation +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +# + +if(description) +{ + script_id(63096); + script_cve_id("CVE-2008-5616"); + script_version ("$"); + name["english"] = "mplayer -- twinvq processing buffer overflow vulnerability"; + script_name(english:name["english"]); + + desc["english"] = " +The remote host is missing an update to the system +as announced in the referenced advisory. + +The following packages are affected: + mplayer + mplayer-esound + mplayer-gtk + mplayer-gtk-esound + mplayer-gtk2 + mplayer-gtk2-esound + +CVE-2008-5616 +Stack-based buffer overflow in the demux_open_vqf function in +libmpdemux/demux_vqf.c in MPlayer 1.0 rc2 before r28150 allows remote +attackers to execute arbitrary code via a malformed TwinVQ file. + +Solution: +Update your system with the appropriate patches or +software upgrades. + +http://secunia.com/advisories/33136/ +http://trapkit.de/advisories/TKADV2008-014.txt +http://www.vuxml.org/freebsd/7c5bd5b8-d652-11dd-a765-0030843d3802.html + +Risk factor : High"; + + script_description(english:desc["english"]); + + summary["english"] = "mplayer -- twinvq processing buffer overflow vulnerability"; + script_summary(english:summary["english"]); + + script_category(ACT_GATHER_INFO); + + script_copyright(english:"Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com"); + family["english"] = "FreeBSD Local Security Checks"; + script_family(english:family["english"]); + script_dependencies("gather-package-list.nasl"); + script_require_keys("ssh/login/freebsdrel"); + exit(0); +} + +# +# The script code starts here +# + +include("revisions-lib.inc"); +include("pkg-lib-bsd.inc"); +vuln = 0; +bver = portver(pkg:"mplayer"); +if(!isnull(bver) && revcomp(a:bver, b:"0.99.11_9")<0) { + security_note(0, data:"Package mplayer version " + bver + " is installed which is known to be vulnerable."); + vuln = 1; +} +bver = portver(pkg:"mplayer-esound"); +if(!isnull(bver) && revcomp(a:bver, b:"0.99.11_9")<0) { + security_note(0, data:"Package mplayer-esound version " + bver + " is installed which is known to be vulnerable."); + vuln = 1; +} +bver = portver(pkg:"mplayer-gtk"); +if(!isnull(bver) && revcomp(a:bver, b:"0.99.11_9")<0) { + security_note(0, data:"Package mplayer-gtk version " + bver + " is installed which is known to be vulnerable."); + vuln = 1; +} +bver = portver(pkg:"mplayer-gtk-esound"); +if(!isnull(bver) && revcomp(a:bver, b:"0.99.11_9")<0) { + security_note(0, data:"Package mplayer-gtk-esound version " + bver + " is installed which is known to be vulnerable."); + vuln = 1; +} +bver = portver(pkg:"mplayer-gtk2"); +if(!isnull(bver) && revcomp(a:bver, b:"0.99.11_9")<0) { + security_note(0, data:"Package mplayer-gtk2 version " + bver + " is installed which is known to be vulnerable."); + vuln = 1; +} +bver = portver(pkg:"mplayer-gtk2-esound"); +if(!isnull(bver) && revcomp(a:bver, b:"0.99.11_9")<0) { + security_note(0, data:"Package mplayer-gtk2-esound version " + bver + " is installed which is known to be vulnerable."); + vuln = 1; +} + +if(vuln) { + security_hole(0); +} Added: trunk/openvas-plugins/scripts/freebsd_mysql-server15.nasl =================================================================== --- trunk/openvas-plugins/scripts/freebsd_mysql-server15.nasl 2009-01-02 15:52:27 UTC (rev 2144) +++ trunk/openvas-plugins/scripts/freebsd_mysql-server15.nasl 2009-01-02 17:22:54 UTC (rev 2145) @@ -0,0 +1,124 @@ +# +#VID 738f8f9e-d661-11dd-a765-0030843d3802 +# OpenVAS Vulnerability Test +# $ +# Description: Auto generated from VID 738f8f9e-d661-11dd-a765-0030843d3802 +# +# Authors: +# Thomas Reinke +# +# Copyright: +# Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com +# Text descriptions are largely excerpted from the referenced +# advisories, and are Copyright (c) the respective author(s) +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2, +# as published by the Free Software Foundation +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +# + +if(description) +{ + script_id(63095); + script_cve_id("CVE-2008-2079", "CVE-2008-4097", "CVE-2008-4098"); + script_version ("$"); + name["english"] = "FreeBSD Ports: mysql-server"; + script_name(english:name["english"]); + + desc["english"] = " +The remote host is missing an update to the system +as announced in the referenced advisory. + +The following package is affected: mysql-server + +CVE-2008-2079 +MySQL 4.1.x before 4.1.24, 5.0.x before 5.0.60, 5.1.x before 5.1.24, +and 6.0.x before 6.0.5 allows local users to bypass certain privilege +checks by calling CREATE TABLE on a MyISAM table with modified (1) +DATA DIRECTORY or (2) INDEX DIRECTORY arguments that are within the +MySQL home data directory, which can point to tables that are created +in the future. +CVE-2008-4097 +MySQL 5.0.51a allows local users to bypass certain privilege checks by +calling CREATE TABLE on a MyISAM table with modified (1) DATA +DIRECTORY or (2) INDEX DIRECTORY arguments that are associated with +symlinks within pathnames for subdirectories of the MySQL home data +directory, which are followed when tables are created in the future. +NOTE: this vulnerability exists because of an incomplete fix for +CVE-2008-2079. +CVE-2008-4098 +MySQL before 5.0.67 allows local users to bypass certain privilege +checks by calling CREATE TABLE on a MyISAM table with modified (1) +DATA DIRECTORY or (2) INDEX DIRECTORY arguments that are originally +associated with pathnames without symlinks, and that can point to +tables created at a future time at which a pathname is modified to +contain a symlink to a subdirectory of the MySQL home data directory. +NOTE: this vulnerability exists because of an incomplete fix for +CVE-2008-4097. + +Solution: +Update your system with the appropriate patches or +software upgrades. + +http://bugs.mysql.com/bug.php?id=32167 +http://dev.mysql.com/doc/refman/4.1/en/news-4-1-25.html +http://dev.mysql.com/doc/refman/5.0/en/releasenotes-cs-5-0-75.html +http://dev.mysql.com/doc/refman/5.1/en/news-5-1-28.html +http://dev.mysql.com/doc/refman/6.0/en/news-6-0-6.html +http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=480292#25 +http://www.vuxml.org/freebsd/738f8f9e-d661-11dd-a765-0030843d3802.html + +Risk factor : High"; + + script_description(english:desc["english"]); + + summary["english"] = "FreeBSD Ports: mysql-server"; + script_summary(english:summary["english"]); + + script_category(ACT_GATHER_INFO); + + script_copyright(english:"Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com"); + family["english"] = "FreeBSD Local Security Checks"; + script_family(english:family["english"]); + script_dependencies("gather-package-list.nasl"); + script_require_keys("ssh/login/freebsdrel"); + exit(0); +} + +# +# The script code starts here +# + +include("revisions-lib.inc"); +include("pkg-lib-bsd.inc"); +vuln = 0; +bver = portver(pkg:"mysql-server"); +if(!isnull(bver) && revcomp(a:bver, b:"4.1")>=0 && revcomp(a:bver, b:"4.1.25")<0) { + security_note(0, data:"Package mysql-server version " + bver + " is installed which is known to be vulnerable."); + vuln = 1; +} +if(!isnull(bver) && revcomp(a:bver, b:"5.0")>=0 && revcomp(a:bver, b:"5.0.75")<0) { + security_note(0, data:"Package mysql-server version " + bver + " is installed which is known to be vulnerable."); + vuln = 1; +} +if(!isnull(bver) && revcomp(a:bver, b:"5.1")>=0 && revcomp(a:bver, b:"5.1.28")<0) { + security_note(0, data:"Package mysql-server version " + bver + " is installed which is known to be vulnerable."); + vuln = 1; +} +if(!isnull(bver) && revcomp(a:bver, b:"6.0")>=0 && revcomp(a:bver, b:"6.0.6")<0) { + security_note(0, data:"Package mysql-server version " + bver + " is installed which is known to be vulnerable."); + vuln = 1; +} + +if(vuln) { + security_hole(0); +} Added: trunk/openvas-plugins/scripts/freebsd_roundcube.nasl =================================================================== --- trunk/openvas-plugins/scripts/freebsd_roundcube.nasl 2009-01-02 15:52:27 UTC (rev 2144) +++ trunk/openvas-plugins/scripts/freebsd_roundcube.nasl 2009-01-02 17:22:54 UTC (rev 2145) @@ -0,0 +1,88 @@ +# +#VID 8f483746-d45d-11dd-84ec-001fc66e7203 +# OpenVAS Vulnerability Test +# $ +# Description: Auto generated from VID 8f483746-d45d-11dd-84ec-001fc66e7203 +# +# Authors: +# Thomas Reinke +# +# Copyright: +# Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com +# Text descriptions are largely excerpted from the referenced +# advisories, and are Copyright (c) the respective author(s) +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2, +# as published by the Free Software Foundation +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +# + +if(description) +{ + script_id(63094); + script_cve_id("CVE-2008-5619"); + script_version ("$"); + name["english"] = "FreeBSD Ports: roundcube"; + script_name(english:name["english"]); + + desc["english"] = " +The remote host is missing an update to the system +as announced in the referenced advisory. + +The following package is affected: roundcube + +CVE-2008-5619 +html2text.php in RoundCube Webmail (roundcubemail) 0.2-1.alpha and +0.2-3.beta allows remote attackers to execute arbitrary code via +crafted input that is processed by the preg_replace function with the +eval switch. + +Solution: +Update your system with the appropriate patches or +software upgrades. + +http://trac.roundcube.net/ticket/1485618 +http://www.vuxml.org/freebsd/8f483746-d45d-11dd-84ec-001fc66e7203.html + +Risk factor : High"; + + script_description(english:desc["english"]); + + summary["english"] = "FreeBSD Ports: roundcube"; + script_summary(english:summary["english"]); + + script_category(ACT_GATHER_INFO); + + script_copyright(english:"Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com"); + family["english"] = "FreeBSD Local Security Checks"; + script_family(english:family["english"]); + script_dependencies("gather-package-list.nasl"); + script_require_keys("ssh/login/freebsdrel"); + exit(0); +} + +# +# The script code starts here +# + +include("revisions-lib.inc"); +include("pkg-lib-bsd.inc"); +vuln = 0; +bver = portver(pkg:"roundcube"); +if(!isnull(bver) && revcomp(a:bver, b:"0.2.b2,1")<0) { + security_note(0, data:"Package roundcube version " + bver + " is installed which is known to be vulnerable."); + vuln = 1; +} + +if(vuln) { + security_hole(0); +} Added: trunk/openvas-plugins/scripts/freebsd_twiki2.nasl =================================================================== --- trunk/openvas-plugins/scripts/freebsd_twiki2.nasl 2009-01-02 15:52:27 UTC (rev 2144) +++ trunk/openvas-plugins/scripts/freebsd_twiki2.nasl 2009-01-02 17:22:54 UTC (rev 2145) @@ -0,0 +1,97 @@ +# +#VID f98dea27-d687-11dd-abd1-0050568452ac +# OpenVAS Vulnerability Test +# $ +# Description: Auto generated from VID f98dea27-d687-11dd-abd1-0050568452ac +# +# Authors: +# Thomas Reinke +# +# Copyright: +# Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com +# Text descriptions are largely excerpted from the referenced +# advisories, and are Copyright (c) the respective author(s) +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2, +# as published by the Free Software Foundation +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +# + +if(description) +{ + script_id(63093); + script_cve_id("CVE-2008-5304", "CVE-2008-5305"); + script_bugtraq_id(32668,32669); + script_version ("$"); + name["english"] = "FreeBSD Ports: twiki"; + script_name(english:name["english"]); + + desc["english"] = " +The remote host is missing an update to the system +as announced in the referenced advisory. + +The following package is affected: twiki + +CVE-2008-5304 +Cross-site scripting (XSS) vulnerability in TWiki before 4.2.4 allows +remote attackers to inject arbitrary web script or HTML via the +%URLPARAM{}% variable. +CVE-2008-5305 +Eval injection vulnerability in TWiki before 4.2.4 allows remote +attackers to execute arbitrary Perl code via the %SEARCH{}% variable. + +Solution: +Update your system with the appropriate patches or +software upgrades. + +http://secunia.com/advisories/33040 +http://twiki.org/cgi-bin/view/Codev/SecurityAlert-CVE-2008-5304 +http://twiki.org/cgi-bin/view/Codev/SecurityAlert-CVE-2008-5305 +http://www.securitytracker.com/alerts/2008/Dec/1021351.html +http://www.securitytracker.com/alerts/2008/Dec/1021352.html +https://www.it-isac.org/postings/cyber/alertdetail.php?id=4513 +http://xforce.iss.net/xforce/xfdb/45293 +http://www.vuxml.org/freebsd/f98dea27-d687-11dd-abd1-0050568452ac.html + +Risk factor : High"; + + script_description(english:desc["english"]); + + summary["english"] = "FreeBSD Ports: twiki"; + script_summary(english:summary["english"]); + + script_category(ACT_GATHER_INFO); + + script_copyright(english:"Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com"); + family["english"] = "FreeBSD Local Security Checks"; + script_family(english:family["english"]); + script_dependencies("gather-package-list.nasl"); + script_require_keys("ssh/login/freebsdrel"); + exit(0); +} + +# +# The script code starts here +# + +include("revisions-lib.inc"); +include("pkg-lib-bsd.inc"); +vuln = 0; +bver = portver(pkg:"twiki"); +if(!isnull(bver) && revcomp(a:bver, b:"4.2.4,1")<0) { + security_note(0, data:"Package twiki version " + bver + " is installed which is known to be vulnerable."); + vuln = 1; +} + +if(vuln) { + security_hole(0); +} Added: trunk/openvas-plugins/scripts/freebsd_vim3.nasl =================================================================== --- trunk/openvas-plugins/scripts/freebsd_vim3.nasl 2009-01-02 15:52:27 UTC (rev 2144) +++ trunk/openvas-plugins/scripts/freebsd_vim3.nasl 2009-01-02 17:22:54 UTC (rev 2145) @@ -0,0 +1,112 @@ +# +#VID 0e1e3789-d87f-11dd-8ecd-00163e000016 +# OpenVAS Vulnerability Test +# $ +# Description: Auto generated from VID 0e1e3789-d87f-11dd-8ecd-00163e000016 +# +# Authors: +# Thomas Reinke +# +# Copyright: +# Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com +# Text descriptions are largely excerpted from the referenced +# advisories, and are Copyright (c) the respective author(s) +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2, +# as published by the Free Software Foundation +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +# + +if(description) +{ + script_id(63091); + script_cve_id("CVE-2008-3076"); + script_version ("$"); + name["english"] = "FreeBSD Ports: vim, vim-lite, vim-gtk2, vim-gnome"; + script_name(english:name["english"]); + + desc["english"] = " +The remote host is missing an update to the system +as announced in the referenced advisory. + +The following packages are affected: + vim + vim-lite + vim-gtk2 + vim-gnome + +CVE-2008-3076 +** RESERVED ** +This candidate has been reserved by an organization or individual that +will use it when announcing a new security problem. When the +candidate has been publicized, the details for this candidate will be +provided. + +Solution: +Update your system with the appropriate patches or +software upgrades. + +http://www.rdancer.org/vulnerablevim-netrw.html +http://www.rdancer.org/vulnerablevim-netrw.v2.html +http://www.rdancer.org/vulnerablevim-netrw.v5.html +http://www.rdancer.org/vulnerablevim-netrw-credentials-dis.html +http://www.openwall.com/lists/oss-security/2008/10/16/2 +http://www.vuxml.org/freebsd/0e1e3789-d87f-11dd-8ecd-00163e000016.html + +Risk factor : High"; + + script_description(english:desc["english"]); + + summary["english"] = "FreeBSD Ports: vim, vim-lite, vim-gtk2, vim-gnome"; + script_summary(english:summary["english"]); + + script_category(ACT_GATHER_INFO); + + script_copyright(english:"Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com"); + family["english"] = "FreeBSD Local Security Checks"; + script_family(english:family["english"]); + script_dependencies("gather-package-list.nasl"); + script_require_keys("ssh/login/freebsdrel"); + exit(0); +} + +# +# The script code starts here +# + +include("revisions-lib.inc"); +include("pkg-lib-bsd.inc"); +vuln = 0; +bver = portver(pkg:"vim"); +if(!isnull(bver) && revcomp(a:bver, b:"7.0")>=0 && revcomp(a:bver, b:"7.2")<0) { + security_note(0, data:"Package vim version " + bver + " is installed which is known to be vulnerable."); + vuln = 1; +} +bver = portver(pkg:"vim-lite"); +if(!isnull(bver) && revcomp(a:bver, b:"7.0")>=0 && revcomp(a:bver, b:"7.2")<0) { + security_note(0, data:"Package vim-lite version " + bver + " is installed which is known to be vulnerable."); + vuln = 1; +} +bver = portver(pkg:"vim-gtk2"); +if(!isnull(bver) && revcomp(a:bver, b:"7.0")>=0 && revcomp(a:bver, b:"7.2")<0) { + security_note(0, data:"Package vim-gtk2 version " + bver + " is installed which is known to be vulnerable."); + vuln = 1; +} +bver = portver(pkg:"vim-gnome"); +if(!isnull(bver) && revcomp(a:bver, b:"7.0")>=0 && revcomp(a:bver, b:"7.2")<0) { + security_note(0, data:"Package vim-gnome version " + bver + " is installed which is known to be vulnerable."); + vuln = 1; +} + +if(vuln) { + security_hole(0); +} Added: trunk/openvas-plugins/scripts/freebsd_vinagre.nasl =================================================================== --- trunk/openvas-plugins/scripts/freebsd_vinagre.nasl 2009-01-02 15:52:27 UTC (rev 2144) +++ trunk/openvas-plugins/scripts/freebsd_vinagre.nasl 2009-01-02 17:22:54 UTC (rev 2145) @@ -0,0 +1,85 @@ +# +#VID 214e8e07-d369-11dd-b800-001b77d09812 +# OpenVAS Vulnerability Test +# $ +# Description: Auto generated from VID 214e8e07-d369-11dd-b800-001b77d09812 +# +# Authors: +# Thomas Reinke +# +# Copyright: +# Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com +# Text descriptions are largely excerpted from the referenced +# advisories, and are Copyright (c) the respective author(s) +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2, +# as published by the Free Software Foundation +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +# + +if(description) +{ + script_id(63092); + script_bugtraq_id(32682); + script_version ("$"); + name["english"] = "FreeBSD Ports: vinagre"; + script_name(english:name["english"]); + + desc["english"] = " +The remote host is missing an update to the system +as announced in the referenced advisory. + +The following package is affected: vinagre + +===== + +Solution: +Update your system with the appropriate patches or +software upgrades. + +http://www.coresecurity.com/content/vinagre-format-string +http://ftp.gnome.org/pub/GNOME/sources/vinagre/0.5/vinagre-0.5.2.news +http://www.vuxml.org/freebsd/214e8e07-d369-11dd-b800-001b77d09812.html + +Risk factor : High"; + + script_description(english:desc["english"]); + + summary["english"] = "FreeBSD Ports: vinagre"; + script_summary(english:summary["english"]); + + script_category(ACT_GATHER_INFO); + + script_copyright(english:"Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com"); + family["english"] = "FreeBSD Local Security Checks"; + script_family(english:family["english"]); + script_dependencies("gather-package-list.nasl"); + script_require_keys("ssh/login/freebsdrel"); + exit(0); +} + +# +# The script code starts here +# + +include("revisions-lib.inc"); +include("pkg-lib-bsd.inc"); +vuln = 0; +bver = portver(pkg:"vinagre"); +if(!isnull(bver) && revcomp(a:bver, b:"0.5.2")<0) { + security_note(0, data:"Package vinagre version " + bver + " is installed which is known to be vulnerable."); + vuln = 1; +} + +if(vuln) { + security_hole(0); +} From scm-commit at wald.intevation.org Sat Jan 3 00:26:02 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Sat, 3 Jan 2009 00:26:02 +0100 (CET) Subject: [Openvas-commits] r2146 - in trunk/openvas-libraries: . libopenvas Message-ID: <20090102232602.7AD2E4077F@pyrosoma.intevation.org> Author: jan Date: 2009-01-03 00:26:01 +0100 (Sat, 03 Jan 2009) New Revision: 2146 Modified: trunk/openvas-libraries/ChangeLog trunk/openvas-libraries/libopenvas/store.c trunk/openvas-libraries/libopenvas/store.h Log: * libopenvas/store.c (store_plugin): change return value to void, because the function never returns something else than NULL. Also any use of the method does not consider a return value at all. Thus cleaning up this method. * libopenvas/store.h: Updated proto of store_plugin accordingly. Modified: trunk/openvas-libraries/ChangeLog =================================================================== --- trunk/openvas-libraries/ChangeLog 2009-01-02 17:22:54 UTC (rev 2145) +++ trunk/openvas-libraries/ChangeLog 2009-01-02 23:26:01 UTC (rev 2146) @@ -1,3 +1,12 @@ +2009-01-03 Jan-Oliver Wagner + + * libopenvas/store.c (store_plugin): change return value to + void, because the function never returns something else than + NULL. Also any use of the method does not consider a return value + at all. Thus cleaning up this method. + + * libopenvas/store.h: Updated proto of store_plugin accordingly. + 2009-01-02 Jan-Oliver Wagner Removing the handling of separate user-specific cache dir. Modified: trunk/openvas-libraries/libopenvas/store.c =================================================================== --- trunk/openvas-libraries/libopenvas/store.c 2009-01-02 17:22:54 UTC (rev 2145) +++ trunk/openvas-libraries/libopenvas/store.c 2009-01-02 23:26:01 UTC (rev 2146) @@ -409,7 +409,7 @@ return ret; } -struct arglist * store_plugin(struct arglist * plugin, char * file) +void store_plugin(struct arglist * plugin, char * file) { char desc_file[MAXPATHLEN+1]; char path[MAXPATHLEN+1]; @@ -422,7 +422,7 @@ int num_plugin_prefs = 0; if(strlen(file) + 2 > sizeof(path)) - return NULL; + return; strncpy(path, store_dir, sizeof(path) - 2 - strlen(file)); str = strrchr(path, '/'); @@ -452,11 +452,11 @@ plug.magic = MAGIC; plug.id = plug_get_id(plugin); e = safe_copy(path, plug.path, sizeof(plug.path), path, "path"); - if(e < 0)return NULL; + if(e < 0) return; str = plug_get_oid(plugin); e = safe_copy(str, plug.oid, sizeof(plug.oid), path, "oid"); - if(e < 0)return NULL; + if(e < 0) return; plug.timeout = plug_get_timeout(plugin); @@ -464,81 +464,81 @@ str = plug_get_name(plugin); e = safe_copy(str, plug.name, sizeof(plug.name), path, "name"); - if(e < 0)return NULL; + if(e < 0) return; str = _plug_get_version(plugin); e = safe_copy(str, plug.version, sizeof(plug.version), path, "version"); - if(e < 0)return NULL; + if(e < 0) return; str = _plug_get_summary(plugin); e = safe_copy(str, plug.summary, sizeof(plug.summary), path, "summary"); - if(e < 0)return NULL; + if(e < 0) return; str = _plug_get_description(plugin); e = safe_copy(str, plug.description, sizeof(plug.description), path, "description"); - if(e < 0)return NULL; + if(e < 0) return; str = _plug_get_copyright(plugin); e = safe_copy(str, plug.copyright, sizeof(plug.copyright), path, "copyright"); - if(e < 0)return NULL; + if(e < 0) return; str = _plug_get_family(plugin); e = safe_copy(str, plug.family, sizeof(plug.family), path, "family"); - if(e < 0)return NULL; + if(e < 0) return; str = _plug_get_cve_id(plugin); e = safe_copy(str, plug.cve_id, sizeof(plug.cve_id), path, "cve_id"); - if(e < 0)return NULL; + if(e < 0) return; str = _plug_get_bugtraq_id(plugin); e = safe_copy(str, plug.bid, sizeof(plug.bid), path, "bugtraq id"); - if(e < 0)return NULL; + if(e < 0) return; str = _plug_get_xref(plugin); e = safe_copy(str, plug.xref, sizeof(plug.xref), path, "xref id"); - if(e < 0)return NULL; + if(e < 0) return; str = _plug_get_tag(plugin); e = safe_copy(str, plug.tag, sizeof(plug.tag), path, "tag"); - if(e < 0)return NULL; + if(e < 0) return; arglist = plug_get_deps(plugin); str = arglist2str(arglist); e = safe_copy(str, plug.dependencies, sizeof(plug.dependencies), path, "dependencies"); efree(&str); - if(e < 0)return NULL; + if(e < 0) return; arglist = plug_get_required_keys(plugin); str = arglist2str(arglist); e = safe_copy(str, plug.required_keys, sizeof(plug.required_keys), path, "required keys"); efree(&str); - if(e < 0)return NULL; + if(e < 0) return; arglist = plug_get_excluded_keys(plugin); str = arglist2str(arglist); e = safe_copy(str, plug.excluded_keys, sizeof(plug.excluded_keys), path, "excluded_keys"); efree(&str); - if(e < 0)return NULL; + if(e < 0) return; arglist = plug_get_required_ports(plugin); str = arglist2str(arglist); e = safe_copy(str, plug.required_ports, sizeof(plug.required_ports), path, "required ports"); efree(&str); - if(e < 0)return NULL; + if(e < 0) return; arglist = plug_get_required_udp_ports(plugin); str = arglist2str(arglist); e = safe_copy(str, plug.required_udp_ports, sizeof(plug.required_udp_ports), path, "required udp ports"); efree(&str); - if(e < 0)return NULL; + if(e < 0) return; str = plug_get_sign_key_ids(plugin); e = safe_copy(str, plug.sign_key_ids, sizeof(plug.sign_key_ids), path, "key ids of signatures"); //efree(&str); - if(e < 0)return NULL; + if(e < 0) return; prefs = arg_get_value(plugin, "preferences"); @@ -559,18 +559,18 @@ str[0] = '\0'; name = str + 1; e = safe_copy(type, pp[num_plugin_prefs].type, sizeof(pp[num_plugin_prefs].type), path, "preference-type"); - if(e < 0)return NULL; + if(e < 0) return; e = safe_copy(name, pp[num_plugin_prefs].name, sizeof(pp[num_plugin_prefs].name), path, "preference-name"); - if(e < 0)return NULL; + if(e < 0) return; e = safe_copy(dfl, pp[num_plugin_prefs].dfl, sizeof(pp[num_plugin_prefs].dfl), path, "preference-default"); - if(e < 0)return NULL; + if(e < 0) return; num_plugin_prefs ++; if(num_plugin_prefs >= MAX_PREFS) { fprintf(stderr, "%s: too many preferences\n", path); - return NULL; + return; } _add_plugin_preference(prefs, p_name, name, type, dfl); str[0] = '/'; @@ -582,27 +582,17 @@ plug.has_prefs = 1; fd = open(desc_file, O_RDWR|O_CREAT|O_TRUNC, 0644); - if(fd < 0) - { - return NULL; - } + if(fd < 0) return; - if(write(fd, &plug, sizeof(plug)) < 0) - { - perror("write "); - } + if(write(fd, &plug, sizeof(plug)) < 0) + perror("write "); - if(num_plugin_prefs > 0) - { - write(fd, pp, sizeof(pp)); - } - close(fd); + if(num_plugin_prefs > 0) + write(fd, pp, sizeof(pp)); + close(fd); - - arg_set_value(plugin, "preferences", -1, NULL); arg_free_all(plugin); - return NULL; } Modified: trunk/openvas-libraries/libopenvas/store.h =================================================================== --- trunk/openvas-libraries/libopenvas/store.h 2009-01-02 17:22:54 UTC (rev 2145) +++ trunk/openvas-libraries/libopenvas/store.h 2009-01-02 23:26:01 UTC (rev 2146) @@ -26,7 +26,7 @@ #ifndef OPENVAS_STORE_H #define OPENVAS_STORE_H -struct arglist * store_plugin(struct arglist *, char *); +void store_plugin(struct arglist *, char *); struct arglist * store_load_plugin(char *, char *, struct arglist*); int store_init(char *); int store_init_sys(char *); From scm-commit at wald.intevation.org Sun Jan 4 01:38:16 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Sun, 4 Jan 2009 01:38:16 +0100 (CET) Subject: [Openvas-commits] r2147 - in trunk/openvas-libraries: . libopenvas Message-ID: <20090104003816.5898D40732@pyrosoma.intevation.org> Author: jan Date: 2009-01-04 01:38:09 +0100 (Sun, 04 Jan 2009) New Revision: 2147 Modified: trunk/openvas-libraries/ChangeLog trunk/openvas-libraries/libopenvas/store.c Log: Name change for cached ("description") files for NVTs. They used to have the suffix ".desc" instead of ".nasl" but they now have the very same name as the corresponding NVT plus additional suffix ".desc", e.g. "x.nasl" will be "x.nasl.desc". This also prevents that e.g. "x.nasl" and "x.nes" (or "x.oval") will overwrite each others' cache. It is recommendable to clean the .desc directory to avoid unnecessary old cache files. * libopenvas/store.c (store_plugin): Added doc string and now uses g_build_filename to assemble filenames instead of doing this on our own. Append ".desc" rather than replace a present suffix. (store_load_plugin): Updated doc string and now uses g_build_filename to assemble filenames instead of doing this on our own. Append ".desc" rather than replace a present suffix. Set the full path as cachefile. (store_get_plugin_f): Aggregated params "dir" and "file" into "desc_file". Thus removed code to assemble name on our own. (store_get_plugin): Adapted call of store_get_plugin_f accordingly, assuming the given desc_file is the full path to the cache file. Modified: trunk/openvas-libraries/ChangeLog =================================================================== --- trunk/openvas-libraries/ChangeLog 2009-01-02 23:26:01 UTC (rev 2146) +++ trunk/openvas-libraries/ChangeLog 2009-01-04 00:38:09 UTC (rev 2147) @@ -1,3 +1,31 @@ +2009-01-04 Jan-Oliver Wagner + + Name change for cached ("description") files for NVTs. + They used to have the suffix ".desc" instead of ".nasl" + but they now have the very same name as the corresponding NVT + plus additional suffix ".desc", e.g. "x.nasl" will be "x.nasl.desc". + This also prevents that e.g. "x.nasl" and "x.nes" (or "x.oval") + will overwrite each others' cache. + + It is recommendable to clean the .desc directory to + avoid unnecessary old cache files. + + * libopenvas/store.c (store_plugin): Added doc string and + now uses g_build_filename to assemble filenames instead + of doing this on our own. Append ".desc" rather than replace + a present suffix. + (store_load_plugin): Updated doc string and now uses + g_build_filename to assemble filenames instead + of doing this on our own. Append ".desc" rather than replace + a present suffix. + Set the full path as cachefile. + (store_get_plugin_f): Aggregated params "dir" and "file" + into "desc_file". Thus removed code to assemble name on + our own. + (store_get_plugin): Adapted call of store_get_plugin_f + accordingly, assuming the given desc_file is the full path + to the cache file. + 2009-01-03 Jan-Oliver Wagner * libopenvas/store.c (store_plugin): change return value to Modified: trunk/openvas-libraries/libopenvas/store.c =================================================================== --- trunk/openvas-libraries/libopenvas/store.c 2009-01-02 23:26:01 UTC (rev 2146) +++ trunk/openvas-libraries/libopenvas/store.c 2009-01-04 00:38:09 UTC (rev 2147) @@ -195,37 +195,35 @@ return store_init_sys(dir); } -/*--------------------------------------------------------------------------------*/ +/** + * @brief Internal function to load plugin description from cache file + * + * @param plugin This structure is filled with the loaded plugin data + * + * @param pprefs This structure is filled with the loaded + * plugin preferences. + * + * @param prefs Plugin preference arglist. + * + * @param desc_file The full path to the cache file. - -static int store_get_plugin_f(struct plugin * plugin, struct pprefs * pprefs, char * dir, char * file) + * @return -1 upon failure, 0 for success. + */ +static int store_get_plugin_f(struct plugin * plugin, struct pprefs * pprefs, + gchar * desc_file) { int fd; struct plugin * p; struct stat st; int len; - char file_name[MAXPATHLEN+1]; - char * str; bzero(plugin, sizeof(*plugin)); plugin->id = -1; - if(dir == NULL || dir[0] == '\0' || file == NULL || file[0] == '\0') - return -1; - - snprintf(file_name, sizeof(file_name), "%s/%s", dir, file); /* RATS: ignore */ - str = strrchr(file_name, '.'); - if(str != NULL) - { - str[0] = '\0'; - if(strlen(file_name) + 6 < sizeof(file_name)) - strncat(file_name, ".desc", MAXPATHLEN); /* RATS: ignore */ - } + if(desc_file == NULL || desc_file[0] == '\0') + return -1; - if(file == NULL) - return -1; - - fd = open(file_name, O_RDONLY); + fd = open(desc_file, O_RDONLY); if(fd < 0) return -1; @@ -267,29 +265,36 @@ int store_get_plugin(struct plugin * p, char * desc_file) { - return store_get_plugin_f(p, NULL, store_dir, desc_file); + return store_get_plugin_f(p, NULL, desc_file); } -/*--------------------------------------------------------------------------------*/ -/* Returns a (plugin) arglist assembled from the description file .desc or NULL - * if +/** + * @brief Returns a (plugin) arglist assembled from the cached description file + * + * @param dir Path to location of plugin file + * + * @param file Filename of the plugin (e.g. detect_openvas.nasl ). + * + * @param prefs Plugin preference arglist. + * + * NULL is returned in either of these cases: * 1) the .desc does not exist * 2) Nvt definition file (e.g. xyz.nasl) or nvt signature (xyz.asc) file is * newer than the .desc file * 3) the magic number test failed (other file format expected). - * 4) an error occured. - * @param dir Path to parent directory of the .desc directory. - * @param file File name of the plugin (e.g. detect_openvas.nasl ). - * @param prefs Plugin preference arglist. - * @return Pointer to plugin as arglist or NULL (see above). + * 4) an internal error occured. + * + * TODO: In case of errors (returning NULL), memory is not cleanly released. + * + * @return Pointer to plugin as arglist or NULL. */ -struct arglist * store_load_plugin(char * dir, char * file, struct arglist * prefs) +struct arglist * store_load_plugin(char * dir, char * file, + struct arglist * prefs) { - char desc_file[MAXPATHLEN+1]; - char plug_file[MAXPATHLEN+1]; - char asc_file[MAXPATHLEN+1]; - char * str; - char store_dir[MAXPATHLEN+1]; + gchar * dummy = g_build_filename(store_dir, file, NULL); + gchar * desc_file = g_strconcat(dummy, ".desc", NULL); + gchar * plug_file = g_build_filename(dir, file, NULL); + gchar * asc_file = g_strconcat(dummy, ".asc", NULL); struct plugin p; struct pprefs pp[MAX_PREFS]; @@ -300,37 +305,16 @@ stat_asc; struct arglist * al; - bzero(pp, sizeof(pp)); + g_free(dummy); - /* Assemble file paths to stat them later */ - snprintf(desc_file, sizeof(desc_file), "%s/.desc/%s", dir, file); /* RATS: ignore */ - str = strrchr(desc_file, '.'); - if( str != NULL ) - { - str[0] = '\0'; - if( strlen(desc_file) + 6 < sizeof(desc_file) ) - strncat(desc_file, ".desc", MAXPATHLEN); /* RATS: ignore */ - } + if (desc_file == NULL || asc_file == NULL || plug_file == NULL) + return NULL; // g_build_filename failed - snprintf(asc_file, sizeof(asc_file), "%s/%s", dir, file); /* RATS: ignore */ + bzero(pp, sizeof(pp)); - if( strlen(asc_file) + 5 < sizeof(desc_file) ) - { - strncat(asc_file, ".asc", MAXPATHLEN); /* RATS: ignore */ - } - else - { - /* Certificate file name is longer than MAXPATHLEN, should not happen */ - return NULL; - } - - snprintf(plug_file, sizeof(plug_file), "%s/%s", dir, file); /* RATS: ignore */ - /* Plugin and cache file have to exist */ if ( stat(plug_file, &stat_plug) < 0 || stat(desc_file, &stat_desc) < 0) - { return NULL; - } /* * Look if the plugin (.nasl/.oval etc) or the signature (.asc) is newer than @@ -339,9 +323,7 @@ */ if( stat_plug.st_mtime > stat_desc.st_mtime && stat_asc.st_mtime > stat_desc.st_mtime ) - { - return NULL; - } + return NULL; /* * Look if a signature file (.asc) exists. If so and it is newer than @@ -350,26 +332,19 @@ if( stat(asc_file, &stat_asc) && stat_asc.st_mtime > stat_desc.st_mtime && stat_asc.st_mtime <= time(NULL) ) - { return NULL; - } - - snprintf(store_dir, sizeof(store_dir), "%s/.desc", dir); /* RATS: ignore */ - if(store_get_plugin_f(&p, pp, store_dir, file) < 0) + if(store_get_plugin_f(&p, pp, desc_file) < 0) return NULL; + if(p.magic != MAGIC) return NULL; - if(p.magic != MAGIC) - return NULL; - if(p.oid == NULL) return NULL; - ret = emalloc(sizeof(struct arglist)); plug_set_oid(ret, p.oid); plug_set_category(ret, p.category); - plug_set_cachefile(ret, file); + plug_set_cachefile(ret, desc_file); plug_set_path(ret, p.path); plug_set_family(ret, p.family, NULL); plug_set_sign_key_ids(ret, p.sign_key_ids); @@ -406,13 +381,27 @@ } } + g_free(desc_file); + g_free(asc_file); + g_free(plug_file); + return ret; } +/** + * @brief Creates a entry in the store for data of "plugin" into cache file "file" + * which is placed in the cache directory. + * + * @param plugin Data structure that contains a plugin description + * @param file Name of corresponding plugin file (e.g. x.nasl, x.nes or x.oval) + */ void store_plugin(struct arglist * plugin, char * file) { - char desc_file[MAXPATHLEN+1]; - char path[MAXPATHLEN+1]; + gchar * dummy = g_build_filename(store_dir, file, NULL); + gchar * desc_file = g_strconcat(dummy, ".desc", NULL); + // assume there is a ".desc" at the end in the store_dir path + // in order to guess the path of the actual plugin: + gchar * path = g_build_filename(store_dir, "..", file, NULL); struct plugin plug; struct pprefs pp[MAX_PREFS+1]; char * str; @@ -421,31 +410,10 @@ int fd; int num_plugin_prefs = 0; - if(strlen(file) + 2 > sizeof(path)) - return; - - strncpy(path, store_dir, sizeof(path) - 2 - strlen(file)); - str = strrchr(path, '/'); - if(str != NULL) - { - str[0] = '\0'; - } - strcat(path, "/"); - strcat(path, file); /* RATS: ignore */ + g_free(dummy); - - - snprintf(desc_file, sizeof(desc_file), "%s/%s", store_dir, file); /* RATS: ignore */ - str = strrchr(desc_file, '.'); - if( str != NULL ) - { - str[0] = '\0'; - if(strlen(desc_file) + 6 < sizeof(desc_file) ) - strncat(desc_file, ".desc", MAXPATHLEN); /* RATS: ignore */ - } + if (desc_file == NULL || path == NULL) return; // g_build_filename failed - - bzero(&plug, sizeof(plug)); bzero(pp, sizeof(pp)); @@ -593,9 +561,11 @@ arg_set_value(plugin, "preferences", -1, NULL); arg_free_all(plugin); + + g_free(desc_file); + g_free(path); } - /*---------------------------------------------------------------------*/ From scm-commit at wald.intevation.org Sun Jan 4 04:59:17 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Sun, 4 Jan 2009 04:59:17 +0100 (CET) Subject: [Openvas-commits] r2148 - trunk/openvas-compendium Message-ID: <20090104035917.CEB4540730@pyrosoma.intevation.org> Author: timb Date: 2009-01-04 04:59:15 +0100 (Sun, 04 Jan 2009) New Revision: 2148 Modified: trunk/openvas-compendium/ChangeLog trunk/openvas-compendium/openvas-compendium.de.tex trunk/openvas-compendium/openvas-compendium.tex Log: Updated to reflect IANA's port assignment Modified: trunk/openvas-compendium/ChangeLog =================================================================== --- trunk/openvas-compendium/ChangeLog 2009-01-04 00:38:09 UTC (rev 2147) +++ trunk/openvas-compendium/ChangeLog 2009-01-04 03:59:15 UTC (rev 2148) @@ -1,3 +1,8 @@ +2009-01-04 Tim Brown + + * openvas-compendium.de.tex, openvas-compendium.tex: Updated to reflect + IANA's port assignment. + 2008-29-03 Felix Wolfsteller * openvas-compendium.de.tex, openvas-compendium.tex: Updated style guide @@ -15,11 +20,11 @@ 2008-12-03 Felix Wolfsteller - * openvas-compendium.de.tex, openvas-compendium.tex : escapes added. + * openvas-compendium.de.tex, openvas-compendium.tex: Escapes added. 2008-12-03 Felix Wolfsteller - * openvas-compendium.de.tex, openvas-compendium.tex : Included + * openvas-compendium.de.tex, openvas-compendium.tex: Included documentation of symbolic values that is sent in case of non-existance of certain plugin informations (NOCVE, NOBID ...) in OTP section. Modified: trunk/openvas-compendium/openvas-compendium.de.tex =================================================================== --- trunk/openvas-compendium/openvas-compendium.de.tex 2009-01-04 00:38:09 UTC (rev 2147) +++ trunk/openvas-compendium/openvas-compendium.de.tex 2009-01-04 03:59:15 UTC (rev 2148) @@ -1685,7 +1685,7 @@ \paragraph{Port} Der Port, an dem der OpenVAS Server auf Verbindungen wartet. OpenVAS -nutzt momentan noch den von Nessus geerbten Port 1241, dieser Standardport +nutzt momentan noch den von Nessus geerbten Port 9390, dieser Standardport wird sich aber in naher Zukunft ändern. Mit dem "`Vorgabe"'-Knopf können Sie diese Einstellung jederzeit auf den Standardport zurücksetzen. Modified: trunk/openvas-compendium/openvas-compendium.tex =================================================================== --- trunk/openvas-compendium/openvas-compendium.tex 2009-01-04 00:38:09 UTC (rev 2147) +++ trunk/openvas-compendium/openvas-compendium.tex 2009-01-04 03:59:15 UTC (rev 2148) @@ -1590,7 +1590,7 @@ \paragraph{Port} The port where the OpenVAS Server waits for connections. Older Nessus -Servers used 3001, but the official port now is 1241. With the default +Servers used 1241, but the official port now is 9390. With the default button you can reset this option to the default port. From scm-commit at wald.intevation.org Mon Jan 5 09:32:56 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Mon, 5 Jan 2009 09:32:56 +0100 (CET) Subject: [Openvas-commits] r2149 - trunk/openvas-compendium Message-ID: <20090105083256.3B38D40715@pyrosoma.intevation.org> Author: mwiegand Date: 2009-01-05 09:32:55 +0100 (Mon, 05 Jan 2009) New Revision: 2149 Modified: trunk/openvas-compendium/ChangeLog trunk/openvas-compendium/openvas-compendium.de.tex trunk/openvas-compendium/openvas-compendium.tex Log: * openvas-compendium.de.tex, openvas-compendium.tex: Fixed German translation, updated information regarding port usage by older and more recent versions of OpenVAS. Modified: trunk/openvas-compendium/ChangeLog =================================================================== --- trunk/openvas-compendium/ChangeLog 2009-01-04 03:59:15 UTC (rev 2148) +++ trunk/openvas-compendium/ChangeLog 2009-01-05 08:32:55 UTC (rev 2149) @@ -1,3 +1,9 @@ +2009-01-05 Michael Wiegand + + * openvas-compendium.de.tex, openvas-compendium.tex: Fixed German + translation, updated information regarding port usage by older and + more recent versions of OpenVAS. + 2009-01-04 Tim Brown * openvas-compendium.de.tex, openvas-compendium.tex: Updated to reflect Modified: trunk/openvas-compendium/openvas-compendium.de.tex =================================================================== --- trunk/openvas-compendium/openvas-compendium.de.tex 2009-01-04 03:59:15 UTC (rev 2148) +++ trunk/openvas-compendium/openvas-compendium.de.tex 2009-01-05 08:32:55 UTC (rev 2149) @@ -1684,9 +1684,10 @@ \paragraph{Port} -Der Port, an dem der OpenVAS Server auf Verbindungen wartet. OpenVAS -nutzt momentan noch den von Nessus geerbten Port 9390, dieser Standardport -wird sich aber in naher Zukunft ändern. Mit dem "`Vorgabe"'-Knopf können Sie +Der Port, an dem der OpenVAS-Server auf Verbindungen wartet. Ältere Versionen +des OpenVAS-Server einschließlich der Version 2.0.0 benutzten standardmäßig den +Port 1241. Seitdem nutzt OpenVAS für die Kommunikation über das OpenVAS +Transfer Protocol (OTP) den Port 9390. Mit dem "`Vorgabe"'-Knopf können Sie diese Einstellung jederzeit auf den Standardport zurücksetzen. \paragraph{Login} Modified: trunk/openvas-compendium/openvas-compendium.tex =================================================================== --- trunk/openvas-compendium/openvas-compendium.tex 2009-01-04 03:59:15 UTC (rev 2148) +++ trunk/openvas-compendium/openvas-compendium.tex 2009-01-05 08:32:55 UTC (rev 2149) @@ -1589,9 +1589,11 @@ \paragraph{Port} -The port where the OpenVAS Server waits for connections. Older Nessus -Servers used 1241, but the official port now is 9390. With the default -button you can reset this option to the default port. +The port where the OpenVAS Server waits for connections. Older versions of the +OpenVAS server up to and including version 2.0.0 used port 1241 as the default +port. The default port used for communication via the OpenVAS Transfer +Protocol (OTP) by more recent versions is 9390. You can reset this option to +the default port using the ``default'' button. \paragraph{Login} From scm-commit at wald.intevation.org Mon Jan 5 14:06:15 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Mon, 5 Jan 2009 14:06:15 +0100 (CET) Subject: [Openvas-commits] r2150 - in trunk/openvas-server: . openvasd Message-ID: <20090105130615.9C4E04071E@pyrosoma.intevation.org> Author: felix Date: 2009-01-05 14:06:14 +0100 (Mon, 05 Jan 2009) New Revision: 2150 Modified: trunk/openvas-server/ChangeLog trunk/openvas-server/openvasd/attack.c Log: * openvasd/attack.c (attack_network, launch_plugin) : Replaced tabs by spaces, repaired indentation & newlines, ready for refactoring. Modified: trunk/openvas-server/ChangeLog =================================================================== --- trunk/openvas-server/ChangeLog 2009-01-05 08:32:55 UTC (rev 2149) +++ trunk/openvas-server/ChangeLog 2009-01-05 13:06:14 UTC (rev 2150) @@ -1,3 +1,8 @@ +2009-01-05 Felix Wolfsteller + + * openvasd/attack.c (attack_network, launch_plugin) : Replaced tabs by + spaces, repaired indentation & newlines, ready for refactoring. + 2009-01-02 Jan-Oliver Wagner * openvasd/openvasd.c (server_thread): Removed initialization @@ -42,6 +47,10 @@ 2008-12-30 Felix Wolfsteller + * openvasd/attack.c: Replaced K&R header, added comment to attack_host. + +2008-12-30 Felix Wolfsteller + * openvasd/attack.c: Replaced K&R header, added comment to attack_host. 2008-12-30 Felix Wolfsteller Modified: trunk/openvas-server/openvasd/attack.c =================================================================== --- trunk/openvas-server/openvasd/attack.c 2009-01-05 08:32:55 UTC (rev 2149) +++ trunk/openvas-server/openvasd/attack.c 2009-01-05 13:06:14 UTC (rev 2150) @@ -147,7 +147,7 @@ /** * Launches a nvt. Respects safe check preference (i.e. does not try destructive * nvt if save_checks is yes). Does not launch a plugin twice if !save_kb_replay. - * + * * @return ERR_HOST_DEAD if host died, ERR_CANT_FORK if forking failed, * 0 otherwise. */ @@ -163,137 +163,119 @@ int optimize = preferences_optimize_test(preferences); int category = plugin->category; static int last_status = 0; - + strncpy(name, plug_get_path(args), sizeof(name) - 1); name[sizeof(name) - 1 ] = '\0'; - if(plug_get_launch(args) != LAUNCH_DISABLED || - category == ACT_INIT || - (category == ACT_SETTINGS)) /* can we launch it ? */ - { - char * error; - - pl_class_t * cl_ptr = arg_get_value(args, "PLUGIN_CLASS"); - - - if(preferences_safe_checks_enabled(preferences) && - (category == ACT_DESTRUCTIVE_ATTACK || - category == ACT_KILL_HOST || - category == ACT_FLOOD || - category == ACT_DENIAL)) - { - if(preferences_log_whole_attack(preferences)) - log_write("user %s : Not launching %s against %s %s (this is not an error)\n", - attack_user_name(globals), - plugin->arglist->name, - hostname, - "because safe checks are enabled"); - plugin_set_running_state(sched, plugin, PLUGIN_STATUS_DONE); - return 0; - } - - (*cur_plug) ++; - if ( ( *cur_plug * 100 ) / num_plugs >= last_status ) - { - last_status = (*cur_plug * 100 ) / num_plugs + 2; - if ( comm_send_status(globals, hostname, "attack", *cur_plug, num_plugs) < 0 ) + if (plug_get_launch(args) != LAUNCH_DISABLED + || category == ACT_INIT + || category == ACT_SETTINGS) /* can we launch it ? */ { - /* Could not send our status back to our father -> exit */ - pluginlaunch_stop(); - return ERR_HOST_DEAD; - } - } + char * error; + pl_class_t * cl_ptr = arg_get_value(args, "PLUGIN_CLASS"); - if(save_kb(globals)) - { - char * oid = plug_get_oid(args); - char asc_id[100]; - - snprintf(asc_id, sizeof(asc_id), "Launched/%s", oid); - if(kb_item_get_int(kb, asc_id) > 0 && - !save_kb_replay_check(globals, category)) - { - /* - * XXX determine here if we should skip - * ACT_SCANNER, ACT_GATHER_INFO, ACT_ATTACK and ACT_DENIAL - */ - if(preferences_log_whole_attack(preferences)) - log_write("user %s : Not launching %s against %s %s (this is not an error)\n", - attack_user_name(globals), - plugin->arglist->name, - hostname, - "because it has already been launched in the past"); - plugin_set_running_state(sched, plugin, PLUGIN_STATUS_DONE); - return 0; - } - else { - kb_item_add_int(kb, asc_id, 1); - save_kb_write_int(globals, hostname, asc_id, 1); - } - } - - - - if(!optimize || !(error = requirements_plugin(kb, plugin, preferences))) - { - int pid; - - /* - * Start the plugin - */ - pid = plugin_launch(globals,sched, plugin, hostinfos, preferences, kb, name, cl_ptr); - if(pid < 0) - { - plugin_set_running_state(sched, plugin, PLUGIN_STATUS_UNRUN); - return ERR_CANT_FORK; - } - - if(preferences_log_whole_attack(preferences)) - log_write("user %s : launching %s against %s [%d]\n", - attack_user_name(globals), - plugin->arglist->name, - hostname, - pid); - - - /* - * Stop the test if the host is 'dead' - */ - if(kb_item_get_int(kb, "Host/dead") > 0 || - kb_item_get_int(kb, "Host/ping_failed") > 0) - { - log_write("user %s : The remote host (%s) is dead\n", - attack_user_name(globals), - hostname); - pluginlaunch_stop(); - if(new_kb)save_kb_close(globals, hostname); - if(kb_item_get_int(kb, "Host/ping_failed") > 0) - { - save_kb_restore_backup(globals, hostname); - } - - plugin_set_running_state(sched, plugin, PLUGIN_STATUS_DONE); - return ERR_HOST_DEAD; - } - } - - else /* requirements_plugin() failed */ - { - plugin_set_running_state(sched, plugin, PLUGIN_STATUS_DONE); - if(preferences_log_whole_attack(preferences)) - log_write("user %s : Not launching %s against %s %s (this is not an error)\n", - attack_user_name(globals), - plugin->arglist->name, - hostname, - error); - - } - } /* if(plugins->launch) */ - else - plugin_set_running_state(sched, plugin, PLUGIN_STATUS_DONE); - - return 0; + if(preferences_safe_checks_enabled(preferences) && + (category == ACT_DESTRUCTIVE_ATTACK || + category == ACT_KILL_HOST || + category == ACT_FLOOD || + category == ACT_DENIAL)) + { + if (preferences_log_whole_attack(preferences)) + log_write("user %s : Not launching %s against %s %s (this is not an error)\n", + attack_user_name(globals), plugin->arglist->name, hostname, + "because safe checks are enabled"); + plugin_set_running_state(sched, plugin, PLUGIN_STATUS_DONE); + return 0; + } + + (*cur_plug) ++; + if ( ( *cur_plug * 100 ) / num_plugs >= last_status ) + { + last_status = (*cur_plug * 100 ) / num_plugs + 2; + if ( comm_send_status(globals, hostname, "attack", *cur_plug, num_plugs) < 0 ) + { + /* Could not send our status back to our father -> exit */ + pluginlaunch_stop(); + return ERR_HOST_DEAD; + } + } + + if(save_kb(globals)) + { + char * oid = plug_get_oid(args); + char asc_id[100]; + + snprintf(asc_id, sizeof(asc_id), "Launched/%s", oid); + + if(kb_item_get_int(kb, asc_id) > 0 && + !save_kb_replay_check(globals, category)) + { + /* XXX determine here if we should skip ACT_SCANNER, ACT_GATHER_INFO, + ACT_ATTACK and ACT_DENIAL */ + if(preferences_log_whole_attack(preferences)) + log_write("user %s : Not launching %s against %s %s (this is not an error)\n", + attack_user_name(globals), plugin->arglist->name, hostname, + "because it has already been launched in the past"); + plugin_set_running_state(sched, plugin, PLUGIN_STATUS_DONE); + return 0; + } + else + { + kb_item_add_int(kb, asc_id, 1); + save_kb_write_int(globals, hostname, asc_id, 1); + } + } + + if(!optimize || !(error = requirements_plugin(kb, plugin, preferences))) + { + int pid; + + /* Start the plugin */ + pid = plugin_launch(globals, sched, plugin, hostinfos, preferences, kb, + name, cl_ptr); + if(pid < 0) + { + plugin_set_running_state(sched, plugin, PLUGIN_STATUS_UNRUN); + return ERR_CANT_FORK; + } + + if(preferences_log_whole_attack(preferences)) + log_write("user %s : launching %s against %s [%d]\n", + attack_user_name(globals), plugin->arglist->name, hostname, + pid); + + /* Stop the test if the host is 'dead' */ + if(kb_item_get_int(kb, "Host/dead") > 0 || + kb_item_get_int(kb, "Host/ping_failed") > 0) + { + log_write("user %s : The remote host (%s) is dead\n", + attack_user_name(globals), hostname); + pluginlaunch_stop(); + + if(new_kb) + save_kb_close(globals, hostname); + + if(kb_item_get_int(kb, "Host/ping_failed") > 0) + save_kb_restore_backup(globals, hostname); + + plugin_set_running_state(sched, plugin, PLUGIN_STATUS_DONE); + return ERR_HOST_DEAD; + } + } + else /* requirements_plugin() failed */ + { + plugin_set_running_state(sched, plugin, PLUGIN_STATUS_DONE); + if(preferences_log_whole_attack(preferences)) + log_write("user %s : Not launching %s against %s %s (this is not an error)\n", + attack_user_name(globals), plugin->arglist->name, + hostname, error); + } + } /* if(plugins->launch) */ + else + plugin_set_running_state(sched, plugin, PLUGIN_STATUS_DONE); + + return 0; } /** @@ -489,26 +471,26 @@ /** * This function attacks a whole network */ -int +int attack_network(struct arglist * globals) { - int max_hosts = 0; - int num_tested = 0; - int host_pending = 0; + int max_hosts = 0; + int num_tested = 0; + int host_pending = 0; char hostname[1024]; char * hostlist; struct in_addr host_ip; - int hg_flags = 0; + int hg_flags = 0; int hg_res; struct hg_globals * hg_globals = NULL; - int global_socket = -1; + int global_socket = -1; struct arglist * preferences = NULL; struct arglist * plugins = NULL; - struct openvas_rules *rules = NULL; + struct openvas_rules *rules = NULL; struct arglist * rejected_hosts = NULL; int restoring = 0; harglst * tested = NULL; - int save_session= 0; + int save_session= 0; int return_code = 0; char * port_range; plugins_scheduler_t sched; @@ -526,298 +508,289 @@ num_tested = 0; global_socket = GPOINTER_TO_SIZE(arg_get_value(globals, "global_socket")); - + plugins = arg_get_value(globals, "plugins"); rules = arg_get_value(globals, "rules"); rejected_hosts = emalloc(sizeof(struct arglist)); - + save_session = preferences_save_session(preferences); restoring = (GPOINTER_TO_SIZE(arg_get_value(globals, "RESTORE-SESSION")) == 1); - - if(restoring)tested = arg_get_value(globals, "TESTED_HOSTS"); - if(save_session)save_tests_init(globals); + if (restoring) tested = arg_get_value(globals, "TESTED_HOSTS"); + if (save_session) save_tests_init(globals); + + /* Init and check Target List */ hostlist = arg_get_value(preferences, "TARGET"); - if( hostlist == NULL ){ - log_write("%s : TARGET not set ?!", - attack_user_name(globals)); - EXIT(1); - } - - + if ( hostlist == NULL ) + { + log_write ("%s : TARGET not set ?!", attack_user_name(globals) ); + EXIT(1); + } + + /* Init and check Port Range */ port_range = arg_get_value(preferences, "port_range"); - if( port_range == NULL || - port_range[0] == '\0' ) - port_range = "1-15000"; - + if( port_range == NULL || port_range[0] == '\0' ) + port_range = "1-15000"; + if( strcmp(port_range, "-1") != 0 ) - { - unsigned short * ports; - ports = (unsigned short*)getpts(port_range, NULL); - if( ports == NULL){ - auth_printf(globals, "SERVER <|> ERROR <|> E001 - Invalid port range <|> SERVER\n"); - return -1; - } - } + { + unsigned short * ports; + ports = (unsigned short*) getpts (port_range, NULL); + if( ports == NULL) + { + auth_printf(globals, "SERVER <|> ERROR <|> E001 - Invalid port range <|> SERVER\n"); + return -1; + } + } + /* * Initialization of the attack */ sched = plugins_scheduler_init(plugins, preferences_autoload_dependencies(preferences), preferences_silent_dependencies(preferences) ); - - + hg_flags = preferences_get_host_expansion(preferences); max_hosts = get_max_hosts_number(globals, preferences); - - + + if( restoring == 0) - { - int max_checks = get_max_checks_number(globals, preferences); - log_write("user %s starts a new scan. Target(s) : %s, with max_hosts = %d and max_checks = %d\n", - attack_user_name(globals), - hostlist, - max_hosts, - max_checks); - } + { + int max_checks = get_max_checks_number(globals, preferences); + log_write("user %s starts a new scan. Target(s) : %s, with max_hosts = %d and max_checks = %d\n", + attack_user_name(globals), hostlist, max_hosts, max_checks); + } else - { - int max_checks = get_max_checks_number(globals, preferences); - log_write("user %s restores session %s, with max_hosts = %d and max_checks = %d\n", - attack_user_name(globals), - (char*)arg_get_value(globals, "RESTORE-SESSION-KEY"), - max_hosts, - max_checks); - - save_tests_playback(globals, arg_get_value(globals, "RESTORE-SESSION-KEY"),tested); - } - - - /* + { + int max_checks = get_max_checks_number(globals, preferences); + log_write("user %s restores session %s, with max_hosts = %d and max_checks = %d\n", + attack_user_name(globals), + (char*)arg_get_value(globals, "RESTORE-SESSION-KEY"), + max_hosts, max_checks); + + save_tests_playback(globals, arg_get_value(globals, "RESTORE-SESSION-KEY"),tested); + } + + /* * Initialize the hosts_gatherer library */ if ( preferences_get_slice_network_addresses ( preferences ) != 0 ) - hg_flags |= HG_DISTRIBUTE; - + hg_flags |= HG_DISTRIBUTE; + hg_globals = hg_init(hostlist, hg_flags); hg_res = hg_next_host(hg_globals, &host_ip, hostname, sizeof(hostname)); if( tested != NULL ) - while(hg_res >= 0 && - harg_get_int( tested, hostname ) != 0 ) - { - hg_res = hg_next_host(hg_globals, &host_ip, hostname, sizeof(hostname)); - } - - + { + while(hg_res >= 0 && harg_get_int( tested, hostname ) != 0 ) + { + hg_res = hg_next_host(hg_globals, &host_ip, hostname, sizeof(hostname)); + } + } + if( hg_res < 0 ) - goto stop; - - hosts_init(global_socket, max_hosts); + goto stop; + + hosts_init(global_socket, max_hosts); + /* * Start the attack ! */ - - while( hg_res >= 0 ) + while( hg_res >= 0 ) { nthread_t pid; - - - /* - * openvasd offers the ability to either test - * only the hosts we tested in the past, or only - * the hosts we never tested (or both, of course) - */ - if(save_kb(globals)) - { - if(save_kb_pref_tested_hosts_only(globals)) - { - if(!save_kb_exists(globals, hostname)) - { - log_write("user %s : not testing %s because it has never been tested before\n", - attack_user_name(globals), - hostname); - hg_res = hg_next_host(hg_globals, &host_ip, hostname, sizeof(hostname)); - if( tested != NULL ) - { - while(hg_res >= 0 && harg_get_int( tested, hostname ) != 0 ) - hg_res = hg_next_host(hg_globals, &host_ip, hostname, sizeof(hostname)); - } - continue; - } - } - else if(save_kb_pref_untested_hosts_only(globals)) - { - /* XXX */ - if(save_kb_exists(globals, hostname)) - { - log_write("user %s : not testing %s because it has already been tested before\n", - attack_user_name(globals), - hostname); - hg_res = hg_next_host(hg_globals, &host_ip, hostname, sizeof(hostname)); - if( tested != NULL ) - { - while(hg_res >= 0 && harg_get_int( tested, hostname ) != 0 ) - hg_res = hg_next_host(hg_globals, &host_ip, hostname, sizeof(hostname)); - } - continue; - } - } - } + /* openvasd offers the ability to either test + * only the hosts we tested in the past, or only + * the hosts we never tested (or both, of course) */ + if(save_kb(globals)) + { + if(save_kb_pref_tested_hosts_only(globals)) + { + if(!save_kb_exists(globals, hostname)) + { + log_write("user %s : not testing %s because it has never been tested before\n", + attack_user_name(globals), hostname); + hg_res = hg_next_host(hg_globals, &host_ip, hostname, sizeof(hostname)); + + if( tested != NULL ) + { + while(hg_res >= 0 && harg_get_int( tested, hostname ) != 0 ) + hg_res = hg_next_host(hg_globals, &host_ip, hostname, sizeof(hostname)); + } + continue; + } + } + else if(save_kb_pref_untested_hosts_only(globals)) + { + /* XXX */ + if(save_kb_exists(globals, hostname)) + { + log_write("user %s : not testing %s because it has already been tested before\n", + attack_user_name(globals), hostname); + hg_res = hg_next_host(hg_globals, &host_ip, hostname, sizeof(hostname)); + if( tested != NULL ) + { + while(hg_res >= 0 && harg_get_int( tested, hostname ) != 0 ) + hg_res = hg_next_host(hg_globals, &host_ip, hostname, sizeof(hostname)); + } + continue; + } + } + } + host_pending = 0 ; - if(CAN_TEST(get_host_rules(rules, host_ip,32)) == 0) /* do we have the right to test this host ? */ - { - log_write("user %s : rejected attempt to scan %s", - attack_user_name(globals), hostname); - arg_add_value(rejected_hosts, hostname, ARG_INT, sizeof(int), (void*)1); - } + /* Do we have the right to test this host ? */ + if(CAN_TEST(get_host_rules(rules, host_ip,32)) == 0) + { + log_write("user %s : rejected attempt to scan %s", + attack_user_name(globals), hostname); + arg_add_value(rejected_hosts, hostname, ARG_INT, sizeof(int), (void*)1); + } else - { - struct attack_start_args args; - int s; - char * MAC = NULL; - int mac_err = -1; + { // We have the right to test this host + struct attack_start_args args; + int s; + char * MAC = NULL; + int mac_err = -1; - - - if(preferences_use_mac_addr(preferences) && - is_local_ip(host_ip)) - { - mac_err = get_mac_addr(host_ip, &MAC); - if(mac_err > 0) - { - /* remote host is down */ - hg_res = hg_next_host(hg_globals, &host_ip, hostname, sizeof(hostname)); - if( tested != NULL ) - { - while(hg_res >= 0 && harg_get_int( tested, hostname ) != 0 ) - hg_res = hg_next_host(hg_globals, &host_ip, hostname, sizeof(hostname)); - } - continue; - } - } - - s = hosts_new(globals, hostname); - if(s < 0)goto scan_stop; - - + if(preferences_use_mac_addr(preferences) && is_local_ip(host_ip)) + { + mac_err = get_mac_addr(host_ip, &MAC); + if(mac_err > 0) + { + /* remote host is down */ + hg_res = hg_next_host(hg_globals, &host_ip, hostname, sizeof(hostname)); + if( tested != NULL ) + { + while(hg_res >= 0 && harg_get_int( tested, hostname ) != 0 ) + hg_res = hg_next_host(hg_globals, &host_ip, hostname, sizeof(hostname)); + } + continue; + } + } - args.globals = globals; - strncpy(args.hostname, hostname, sizeof(args.hostname) - 1); - args.hostname[sizeof(args.hostname) - 1] = '\0'; - args.hostip.s_addr = host_ip.s_addr; - args.host_mac_addr = MAC; - args.sched = sched; - args.thread_socket = s; - -forkagain: - pid = create_process((process_func_t)attack_start, &args); - if(pid < 0) - { - fork_retries ++; - if(fork_retries > MAX_FORK_RETRIES) - { - log_write("fork() failed - %s. %s won't be tested\n", strerror(errno), hostname); - /* - * forking failed - we go to the wait queue - */ - efree(&MAC); - goto stop; - } - log_write("fork() failed - sleeping %d seconds and trying again...\n", fork_retries); - fork_sleep(fork_retries); - goto forkagain; - } + s = hosts_new(globals, hostname); + if(s < 0) goto scan_stop; - hosts_set_pid(hostname, pid); - log_write("user %s : testing %s (%s) [%d]\n", attack_user_name(globals), hostname, inet_ntoa(args.hostip), pid); - if(MAC != NULL)efree(&MAC); - } - - - num_tested++; - hg_res = hg_next_host(hg_globals, &host_ip, hostname, sizeof(hostname)); - if(tested != NULL) - { - while(hg_res >= 0 && - harg_get_int(tested, hostname)) - { - hg_res = hg_next_host(hg_globals, &host_ip, hostname, sizeof(hostname)); - } - } - } - - - + args.globals = globals; + strncpy(args.hostname, hostname, sizeof(args.hostname) - 1); + args.hostname[sizeof(args.hostname) - 1] = '\0'; + args.hostip.s_addr = host_ip.s_addr; + args.host_mac_addr = MAC; + args.sched = sched; + args.thread_socket = s; +forkagain: + pid = create_process( (process_func_t) attack_start, &args); + if(pid < 0) + { + fork_retries ++; + if(fork_retries > MAX_FORK_RETRIES) + { + /* + * forking failed - we go to the wait queue + */ + log_write("fork() failed - %s. %s won't be tested\n", + strerror(errno), hostname); + efree(&MAC); + goto stop; + } + + log_write("fork() failed - sleeping %d seconds and trying again...\n", fork_retries); + fork_sleep(fork_retries); + goto forkagain; + } + + hosts_set_pid(hostname, pid); + log_write("user %s : testing %s (%s) [%d]\n", attack_user_name(globals), hostname, inet_ntoa(args.hostip), pid); + if(MAC != NULL) + efree(&MAC); + } + + num_tested++; + hg_res = hg_next_host(hg_globals, &host_ip, hostname, sizeof(hostname)); + if(tested != NULL) + { + while(hg_res >= 0 && harg_get_int(tested, hostname)) + { + hg_res = hg_next_host(hg_globals, &host_ip, hostname, sizeof(hostname)); + } + } + } + /* * Every host is being tested... We have to wait for the threads * to terminate */ - - while(hosts_read(globals) == 0); + while(hosts_read(globals) == 0) + ; + log_write("user %s : test complete", attack_user_name(globals)); -scan_stop: - /* + +scan_stop: + /* * Delete the files uploaded by the user, if any */ files = arg_get_value(globals, "files_translation"); if(files) - { - hw = harg_walk_init(files); - while((key = (char*)harg_walk_next(hw))) { - unlink(harg_get_string(files, key)); + hw = harg_walk_init(files); + while((key = (char*) harg_walk_next(hw))) + { + unlink(harg_get_string(files, key)); + } } - } - - if(rejected_hosts && rejected_hosts->next) - { - char * banner = emalloc(4001); - int length = 0; - sprintf(banner, "SERVER <|> ERROR <|> E002 - These hosts could not be tested because you are not allowed to do so :;"); - length = strlen(banner); + if(rejected_hosts && rejected_hosts->next) + { + char * banner = emalloc(4001); + int length = 0; - while(rejected_hosts->next && (length < (4000-3))) - { - int n; - n = strlen(rejected_hosts->name); - if(length + n + 1 >= 4000) - { - n = 4000 - length - 2; - } - strncat(banner, rejected_hosts->name, n); - strncat(banner, ";", 1); - length+=n+1; - rejected_hosts = rejected_hosts->next; - } - if( rejected_hosts->next != NULL ) - strcat(banner, "..."); - - auth_printf(globals, "%s\n", banner); - } - -stop: - if(save_session){ - save_tests_close(globals); - if(!preferences_save_empty_sessions(preferences)) - { - if(save_tests_empty(globals)) + sprintf(banner, "SERVER <|> ERROR <|> E002 - These hosts could not be tested because you are not allowed to do so :;"); + length = strlen(banner); + + while(rejected_hosts->next && (length < (4000-3))) { - log_write("user %s : Nothing interesting found - deleting the session\n", - (char*)arg_get_value(globals, "user")); - save_tests_delete_current(globals); - } + int n; + n = strlen(rejected_hosts->name); + if(length + n + 1 >= 4000) + { + n = 4000 - length - 2; + } + + strncat(banner, rejected_hosts->name, n); + strncat(banner, ";", 1); + length+=n+1; + rejected_hosts = rejected_hosts->next; + } + + if( rejected_hosts->next != NULL ) + strcat(banner, "..."); + + auth_printf(globals, "%s\n", banner); + } + +stop: + if(save_session) + { + save_tests_close(globals); + if(!preferences_save_empty_sessions(preferences)) + { + if(save_tests_empty(globals)) + { + log_write("user %s : Nothing interesting found - deleting the session\n", + (char*)arg_get_value(globals, "user")); + save_tests_delete_current(globals); + } } - } - + } + hg_cleanup(hg_globals); - + arg_free_all(rejected_hosts); plugins_scheduler_free(sched); gettimeofday(&now, NULL); log_write("Total time to scan all hosts : %ld seconds\n", now.tv_sec - then.tv_sec); - + return return_code; } From scm-commit at wald.intevation.org Tue Jan 6 12:45:12 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Tue, 6 Jan 2009 12:45:12 +0100 (CET) Subject: [Openvas-commits] r2151 - in trunk/openvas-client: . nessus nessus/prefs_dialog Message-ID: <20090106114512.CDED5406A5@pyrosoma.intevation.org> Author: felix Date: 2009-01-06 12:45:12 +0100 (Tue, 06 Jan 2009) New Revision: 2151 Modified: trunk/openvas-client/ChangeLog trunk/openvas-client/nessus/auth.c trunk/openvas-client/nessus/prefs_dialog/prefs_context.c trunk/openvas-client/nessus/prefs_dialog/prefs_dialog.c trunk/openvas-client/nessus/prefs_dialog/prefs_options.c trunk/openvas-client/nessus/prefs_dialog/prefs_plugins.c trunk/openvas-client/nessus/prefs_dialog/prefs_target.c Log: Comments and Documentation converted to Javadoc format, added. * nessus/auth.c : Doc/comments improved, K&R function declarations replaced. * nessus/prefs_dialog/prefs_plugins.c, nessus/prefs_dialog/prefs_dialog.c, nessus/prefs_dialog/prefs_context.c, nessus/prefs_dialog/prefs_options.c, nessus/prefs_dialog/prefs_target.c: Doc/comments improved. Modified: trunk/openvas-client/ChangeLog =================================================================== --- trunk/openvas-client/ChangeLog 2009-01-05 13:06:14 UTC (rev 2150) +++ trunk/openvas-client/ChangeLog 2009-01-06 11:45:12 UTC (rev 2151) @@ -1,3 +1,15 @@ +2009-01-06 Felix Wolfsteller + + Comments and Documentation converted to Javadoc format, added. + + * nessus/auth.c : Doc/comments improved, K&R function declarations + replaced. + + * nessus/prefs_dialog/prefs_plugins.c, + nessus/prefs_dialog/prefs_dialog.c, nessus/prefs_dialog/prefs_context.c, + nessus/prefs_dialog/prefs_options.c, nessus/prefs_dialog/prefs_target.c: + Doc/comments improved. + 2009-01-02 Michael Wiegand Modified openvas-client to use the freshly allocated IANA port 9390 Modified: trunk/openvas-client/nessus/auth.c =================================================================== --- trunk/openvas-client/nessus/auth.c 2009-01-05 13:06:14 UTC (rev 2150) +++ trunk/openvas-client/nessus/auth.c 2009-01-06 11:45:12 UTC (rev 2151) @@ -36,28 +36,20 @@ #include "auth.h" #include "sighand.h" -/* - * auth_login +/** + * Sends the login and password to the OpenVAS + * daemon. * - * sends the login and password to the Nessus - * daemon + * @param user Login users name. + * @param password Login users password. * - * Params : - * user : login - * password : password - * - * Returns : - * 0 if the login informations were sent successfully - * -1 if a problem occured + * @returns 0 if the login informations were sent successfully, + * -1 if a problem occured. * * Note : this function does NOT check if the login/password are * valid. */ - -int auth_login(soc, user, password) - int soc; - const char * user; - const char * password; +int auth_login(int soc, const char *user, const char* password) { char * buf = emalloc(255); @@ -77,10 +69,8 @@ } -/* - * network_printf( - * - * This function sends a string to the server. +/** + * This function sends a string to the server using a printf syntax. * In the future, it will have to encrypt the string * but I have not implemented this feature right now */ @@ -129,11 +119,9 @@ efree(&buffer); } -/* - * network_gets( - * +/** * Reads data sent by the server - * RETURN: >0 is the amount of data placed in s + * @return >0 is the amount of data placed in s * <0 means there was an error. */ int network_gets(soc, s, size) Modified: trunk/openvas-client/nessus/prefs_dialog/prefs_context.c =================================================================== --- trunk/openvas-client/nessus/prefs_dialog/prefs_context.c 2009-01-05 13:06:14 UTC (rev 2150) +++ trunk/openvas-client/nessus/prefs_dialog/prefs_context.c 2009-01-06 11:45:12 UTC (rev 2151) @@ -44,6 +44,14 @@ #include "../xpm/connect_16.xpm" #include "../xpm/disconnect_16.xpm" +/** + * Sets sensitivity of a GTK Widget that is registered as name in the arglist + * MainDialog. + * + * @param name Name of the entry for the GTK Widget in the arglist MainDialog. + * @param enable If true the widget will be sensitive, if false it will be + * insensitive (not reacting to user input). + */ void prefs_context_enable_widget(name, enabled) const gchar *name; @@ -231,7 +239,8 @@ prefs_report_update(ctrls_report, FALSE); } -/* Update the connection state image. +/** + * @brief Update the connection state image. * * If is_connected is true, the picture shown in the image is set to * connect_16, otherwise it is set to disconnect_16. @@ -257,7 +266,15 @@ is_connected ? connected : disconnected); } - +/** + * @brief Updates icon and string in status bar. + * + * The statusbar in the OpenVAS GUI hosts a small icon showing if the currently + * selected task (or Globals) is connected or not and a string showing + * connection details (e.g. "Connection: user at localhost"). + * + * @param context The context to draw information from. + */ void prefs_context_update_statusbar(context) struct context *context; Modified: trunk/openvas-client/nessus/prefs_dialog/prefs_dialog.c =================================================================== --- trunk/openvas-client/nessus/prefs_dialog/prefs_dialog.c 2009-01-05 13:06:14 UTC (rev 2150) +++ trunk/openvas-client/nessus/prefs_dialog/prefs_dialog.c 2009-01-06 11:45:12 UTC (rev 2151) @@ -26,6 +26,14 @@ * do so, delete this exception statement from your version. */ +/** + * @file + * Module to create large parts of the GUI.\n + * Most visible GTK Widgets are hooked into arglist(s) like MainDialog (defined + * in nessus.c). + * + */ + #include #include "nessus_i18n.h" @@ -115,7 +123,7 @@ } /** - * Save the current global settings to ~/.openvasrc . + * @brief Save the current global settings to ~/.openvasrc . */ void save_global_settings(menuitem, ctrls) @@ -131,7 +139,10 @@ } /** - * Toggle Toolbar on/off. + * @brief Toggle Toolbar on/off. + * + * @param menuitem Check box menu item for toggling visibility of the toolbar. + * @param ctrls Arglist where the TOOLBAR is hooked into. */ void toggle_toolbar(menuitem, ctrls) @@ -152,8 +163,12 @@ } } + /** - * Toggle Message-Log on/off. + * @brief Toggle Message-Log on/off. + * + * @param menuitem Check box menu item for toggling the message frame display. + * @param ctrls Arglist where the MSGLOGFRAME is hooked into. */ void toggle_msglog(menuitem, ctrls) @@ -175,10 +190,9 @@ } -/* - * Menu items +/** + * @brief Add a menu item. */ - void menuitem_add(menuitem, menu, name, stockicon, func) GtkWidget *menuitem; @@ -203,6 +217,11 @@ g_signal_connect(GTK_OBJECT(menuitem), "activate", func, MainDialog); } +/** + * @brief Adds a separator to a menu. + * + * @param menu Menu to add a separator to. + */ void menuitem_separator(menu) GtkWidget *menu; @@ -216,7 +235,7 @@ /** - * Add a pair of new "stock" icons to the factory. + * @brief Add a pair of new "stock" icons to the factory. * * The parameters small and large are the arrays of char* that make up * an xpm. The icons are added to the factory as an icon set for the @@ -269,9 +288,9 @@ } /** - * Create some nessus specific stock icons. + * @brief Create some openvas specific stock icons. * - * This function adds several nessus specific icon sets for use in e.g. + * This function adds several openvas specific icon sets for use in e.g. * menus and buttons. */ static void @@ -803,7 +822,9 @@ } } - +/** + * Sets default values to the GTK Widgets hooked in ctrls. + */ void prefs_dialog_set_defaults(context, ctrls) struct context *context; @@ -1010,7 +1031,11 @@ #endif } - +/** + * Sets tooltips for various GTK widgets hooked up in ctrls. + * + * @param ctrls Arglist with GTK widget hooked into. + */ static void prefs_dialog_set_tooltips(ctrls) struct arglist *ctrls; @@ -1075,6 +1100,7 @@ /** * Sets a string in a preference arglist as either "yes" or "no", * depending on the state (active -> "yes") of a togglebutton. + * * @param preferences Servers preference arglist. * @param togglebutton A gtk_toggle_button, of which the state will decide the * preference value (active -> "yes"). @@ -1101,6 +1127,12 @@ } } +/** + * Applies user choices to a context (and its preferences etc.). + * + * @param context The context to manipulate + * @param ctrls Arglist with all the GTK widgets hooked in. + */ void prefs_dialog_apply(context, ctrls) struct context *context; @@ -1305,6 +1337,7 @@ /** * Creates a string from plugin preference radiobuttons. + * * @param list Value of arg_get_value(pref->value, "RADIOBUTTONS) * @param pref The plugin preference * @returns Plugin preference string for a radiobutton selection. @@ -1343,7 +1376,6 @@ } - /** * Applies the input from the plugins preferences widgets to the arglists. * XXX Warning: Modified: trunk/openvas-client/nessus/prefs_dialog/prefs_options.c =================================================================== --- trunk/openvas-client/nessus/prefs_dialog/prefs_options.c 2009-01-05 13:06:14 UTC (rev 2150) +++ trunk/openvas-client/nessus/prefs_dialog/prefs_options.c 2009-01-06 11:45:12 UTC (rev 2151) @@ -18,6 +18,20 @@ * wish to do so, delete this exception statement from your version. */ +/** + * @file + * Triggers building of most of the right part of the GUI (a listnotebook with + * many pages with options in it). + * GUI Management via an arglist with following entries: + * - SCAN_OPTIONS + * - PLUGINS + * - PLUGINS_PREFS + * - TARGET + * - MAIN + * - USER + * - SAVE_KB + */ + #include #include Modified: trunk/openvas-client/nessus/prefs_dialog/prefs_plugins.c =================================================================== --- trunk/openvas-client/nessus/prefs_dialog/prefs_plugins.c 2009-01-05 13:06:14 UTC (rev 2150) +++ trunk/openvas-client/nessus/prefs_dialog/prefs_plugins.c 2009-01-06 11:45:12 UTC (rev 2151) @@ -139,7 +139,8 @@ gtk_tree_view_collapse_all(GTK_TREE_VIEW(data)); } -/* Update the statistics label. +/** + * @brief Update the statistics label. * * The user_data argument must be a pointer to the label widget. This * function expects the label widget to have tree widget for which @@ -174,7 +175,8 @@ return FALSE; } -/* Schedule the idle update of the statistics label +/** + * @brief Schedule the idle update of the statistics label * * This function is called by the handlers for some of the signals sent * by the model behind the plugin tree that indicate that the model has @@ -215,8 +217,8 @@ update_plugin_statistics_label_when_idle(user_data); } -/* - * plugin_list_setup +/** + * @brief plugin_list_setup * * Draws the main window showing informations * about the plugins of the server @@ -374,7 +376,8 @@ return (ctrls); } -/* make the plugins widgets "read only" so that the user can browse the +/** + * Make the plugins widgets "read only" so that the user can browse the * plugins tree but cannot make modifications. */ void @@ -395,7 +398,4 @@ prefs_plugin_tree_context_changed(context, ctrls, FALSE); } - - - #endif Modified: trunk/openvas-client/nessus/prefs_dialog/prefs_target.c =================================================================== --- trunk/openvas-client/nessus/prefs_dialog/prefs_target.c 2009-01-05 13:06:14 UTC (rev 2150) +++ trunk/openvas-client/nessus/prefs_dialog/prefs_target.c 2009-01-06 11:45:12 UTC (rev 2151) @@ -27,7 +27,14 @@ */ /** - * @file Build up target selection pane in GUI. + * @file + * Build up target selection panel in GUI. + * + * The arglist to manage the target selection looks like:\n + * - FRAME > The gtk frame with label, text-entry, button and option in it. + * - READ_FROM_FILE > The button to open the file selection dialog.\n + * - TARGET > The text entry.\n + * - DNS_EXPAND > The Checkbox linked to the DNS expand option.\n */ #include From scm-commit at wald.intevation.org Tue Jan 6 13:51:05 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Tue, 6 Jan 2009 13:51:05 +0100 (CET) Subject: [Openvas-commits] r2152 - in trunk/openvas-client: . nessus/prefs_dialog Message-ID: <20090106125105.1D8BE406E0@pyrosoma.intevation.org> Author: felix Date: 2009-01-06 13:51:04 +0100 (Tue, 06 Jan 2009) New Revision: 2152 Modified: trunk/openvas-client/ChangeLog trunk/openvas-client/nessus/prefs_dialog/prefs_dialog_plugins_prefs.c Log: * nessus/prefs_dialog/prefs_dialog_plugins_prefs.c: Added/ removed whitespaces, added comments, replaced K&R function declarations. Modified: trunk/openvas-client/ChangeLog =================================================================== --- trunk/openvas-client/ChangeLog 2009-01-06 11:45:12 UTC (rev 2151) +++ trunk/openvas-client/ChangeLog 2009-01-06 12:51:04 UTC (rev 2152) @@ -1,5 +1,10 @@ 2009-01-06 Felix Wolfsteller + * nessus/prefs_dialog/prefs_dialog_plugins_prefs.c: Added/ removed + whitespaces, added comments, replaced K&R function declarations. + +2009-01-06 Felix Wolfsteller + Comments and Documentation converted to Javadoc format, added. * nessus/auth.c : Doc/comments improved, K&R function declarations Modified: trunk/openvas-client/nessus/prefs_dialog/prefs_dialog_plugins_prefs.c =================================================================== --- trunk/openvas-client/nessus/prefs_dialog/prefs_dialog_plugins_prefs.c 2009-01-06 11:45:12 UTC (rev 2151) +++ trunk/openvas-client/nessus/prefs_dialog/prefs_dialog_plugins_prefs.c 2009-01-06 12:51:04 UTC (rev 2152) @@ -55,6 +55,7 @@ * Adds and hooks up (or resets) the two notebook pages for Plugin Preferences * and Credentials. * These pages are itself notebooks with dynamical content. + * * @param ctrls Arglist to hook the notebooks into. */ static void @@ -85,6 +86,12 @@ } } +/** + * Creates "Advanced Plugins preferences" and "Credentials" frames. + * Calls create_plugin_prefs_containers to init content in them. + * + * @return Arglist with Plugins preferences and Credentials hooked into. + */ struct arglist * prefs_dialog_plugins_prefs() { @@ -117,7 +124,12 @@ return (ctrls); } - +/** + * @brief Sets the preference frame and the credentials frame readonly. + * + * @param ctrls Arglist where the FRAME and FRAME_CREDENTIALS are hooked in. + * @param readonly If true, frames are set readonly. + */ void prefs_dialog_plugins_prefs_read_only(struct arglist *ctrls, gboolean readonly) { @@ -132,6 +144,7 @@ * widgets and values. * Widgets are added dynamically, based on the plugin preference type, e.g. * for a PREF_CHECKBOX pprefs_add_checkbox() is called. + * * @param context The context to use. * @param ctrls Arglist holding the notebook page widgets. * @param plugins Plugin list. @@ -303,10 +316,12 @@ /** * Adds a notebook page to either the plugin preference notebook or the * credentials notebook and returns the vbox for it. + * * @param ctrls Arglist in which the other Gtk widgets are held. * @param name Name for the new notebook page. * @param credentials If 0 page is added to preference notebook, otherwise to * credentials notebook. + * * @return The Gtk vbox nested in a Gtk scrolled window of the new page. */ static GtkWidget * @@ -432,6 +447,7 @@ * To do this, all "next" and child contextes of ctx are recursively searched * for plugins that have a ssh_credentials preferences, their combobox is * unpacked and the new entry appended. + * * @param ctx Context to start looking for plugins with ssh_credentials preference. * @param newentry Text to add (should be key of ctx's sshkeys hash table). * @see context.sshkeys @@ -492,7 +508,7 @@ GtkTreeIter iter; gboolean valid; int idx = -1; - GtkTreeModel * treemdl = gtk_combo_box_get_model(GTK_COMBO_BOX(combobox)); + GtkTreeModel* treemdl = gtk_combo_box_get_model(GTK_COMBO_BOX(combobox)); valid = gtk_tree_model_get_iter_first(treemdl, &iter); // Find the right item. while(valid) @@ -512,7 +528,6 @@ } gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), idx); - } /** @@ -540,8 +555,8 @@ { gtk_combo_box_append_text(GTK_COMBO_BOX(combobox), key); } - + /** * Function to add a "ssh-credentials combo box" to select a ssh key. */ @@ -554,10 +569,10 @@ GtkWidget* hbox; GtkWidget* sshinfoframe; GtkWidget* managerbutton; - char *name = pref->name; - + char* name = pref->name; + value = get_pref_value(pref, pprefs, value); - + hbox = gtk_hbox_new(FALSE, 0); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 5); gtk_widget_show(hbox); From scm-commit at wald.intevation.org Tue Jan 6 13:56:49 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Tue, 6 Jan 2009 13:56:49 +0100 (CET) Subject: [Openvas-commits] r2153 - in trunk/openvas-client: . nessus/prefs_dialog Message-ID: <20090106125649.231CA406E0@pyrosoma.intevation.org> Author: felix Date: 2009-01-06 13:56:48 +0100 (Tue, 06 Jan 2009) New Revision: 2153 Modified: trunk/openvas-client/ChangeLog trunk/openvas-client/nessus/prefs_dialog/prefs_dialog_plugins_prefs.c Log: * nessus/prefs_dialog/prefs_dialog_plugins_prefs.c: (Replaced K&R function declarations in separate commit, adjusted ChangeLog.) Modified: trunk/openvas-client/ChangeLog =================================================================== --- trunk/openvas-client/ChangeLog 2009-01-06 12:51:04 UTC (rev 2152) +++ trunk/openvas-client/ChangeLog 2009-01-06 12:56:48 UTC (rev 2153) @@ -1,7 +1,12 @@ 2009-01-06 Felix Wolfsteller + * nessus/prefs_dialog/prefs_dialog_plugins_prefs.c: Replaced K&R + function declarations. + +2009-01-06 Felix Wolfsteller + * nessus/prefs_dialog/prefs_dialog_plugins_prefs.c: Added/ removed - whitespaces, added comments, replaced K&R function declarations. + whitespaces, added comments. 2009-01-06 Felix Wolfsteller Modified: trunk/openvas-client/nessus/prefs_dialog/prefs_dialog_plugins_prefs.c =================================================================== --- trunk/openvas-client/nessus/prefs_dialog/prefs_dialog_plugins_prefs.c 2009-01-06 12:51:04 UTC (rev 2152) +++ trunk/openvas-client/nessus/prefs_dialog/prefs_dialog_plugins_prefs.c 2009-01-06 12:56:48 UTC (rev 2153) @@ -59,8 +59,7 @@ * @param ctrls Arglist to hook the notebooks into. */ static void -create_plugin_prefs_containers(ctrls) - struct arglist *ctrls; +create_plugin_prefs_containers(struct arglist* ctrls) { GtkWidget *listnotebook, *cred_listnotebook; @@ -150,10 +149,8 @@ * @param plugins Plugin list. */ void -prefs_dialog_plugins_prefs_fill(context, ctrls, plugins) - struct context *context; - struct arglist *ctrls; - struct nessus_plugin *plugins; +prefs_dialog_plugins_prefs_fill (struct context* context, struct arglist* ctrls, + struct nessus_plugin* plugins) { struct arglist *pprefs = arg_get_value(context->prefs, "PLUGINS_PREFS"); struct nessus_plugin *plugs = plugins; @@ -213,9 +210,7 @@ * preferences widgets */ void -prefs_plugins_reset(ctrls, plugins) - struct arglist *ctrls; - struct nessus_plugin *plugins; +prefs_plugins_reset (struct arglist* ctrls, struct nessus_plugin* plugins) { struct arglist *prefs; @@ -245,9 +240,7 @@ * Redraw the plugins preferences */ void -prefs_plugins_prefs_redraw(context, ctrls) - struct context *context; - struct arglist *ctrls; +prefs_plugins_prefs_redraw (struct context* context, struct arglist* ctrls) { GtkWidget *frame, *cred_frame; GtkWidget *plugin_prefs, *plugin_credentials; @@ -325,10 +318,7 @@ * @return The Gtk vbox nested in a Gtk scrolled window of the new page. */ static GtkWidget * -pprefs_add_notebook_page(ctrls, name, credentials) - struct arglist *ctrls; - char *name; - int credentials; +pprefs_add_notebook_page(struct arglist* ctrls, char* name, int credentials) { GtkWidget *vbox = NULL; GtkWidget *notebook = NULL; @@ -399,7 +389,6 @@ static int select_file(GtkWidget * b, struct arglist *ctrls) { - GtkWidget *filew = gtk_file_selection_new(_("Select file")); g_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(filew)->ok_button), @@ -628,11 +617,8 @@ * Add "entry" widget corresponding to the "entry" plugin preference. */ static void -pprefs_add_entry(pprefs, pref, value, vbox) - struct arglist *pprefs; - struct arglist *pref; - char *value; - GtkWidget *vbox; +pprefs_add_entry (struct arglist* pprefs, struct arglist* pref, char* value, + GtkWidget* vbox) { GtkWidget *entry, *text, *box; char *name = pref->name; @@ -659,11 +645,8 @@ * Add "password" widget corresponding to the "password" plugin preference. */ static void -pprefs_add_password(pprefs, pref, value, vbox) - struct arglist *pprefs; - struct arglist *pref; - char *value; - GtkWidget *vbox; +pprefs_add_password (struct arglist* pprefs, struct arglist* pref, char* value, + GtkWidget* vbox) { GtkWidget *entry, *text, *box; char *name = pref->name; @@ -691,11 +674,8 @@ * Add "file" widgets corresponding to the "file" plugin preference. */ static void -pprefs_add_file(pprefs, pref, value, vbox) - struct arglist *pprefs; - struct arglist *pref; - char *value; - GtkWidget *vbox; +pprefs_add_file (struct arglist* pprefs, struct arglist* pref, char* value, + GtkWidget* vbox) { GtkWidget *entry, *text, *box; GtkWidget *hbox, *button; @@ -734,11 +714,8 @@ * Add radio buttons corresponding to the "radio" plugin preference. */ static void -pprefs_add_radio(pprefs, pref, value, vbox) - struct arglist *pprefs; - struct arglist *pref; - char *value; - GtkWidget *vbox; +pprefs_add_radio (struct arglist* pprefs, struct arglist* pref, char* value, + GtkWidget* vbox) { GtkWidget *orig; GtkWidget *button, *first_button; @@ -790,11 +767,8 @@ * Add a "checkbox" widget corresponding to the "checkbox" plugin preference. */ static void -pprefs_add_checkbox(pprefs, pref, value, vbox) - struct arglist *pprefs; - struct arglist *pref; - char *value; - GtkWidget *vbox; +pprefs_add_checkbox (struct arglist* pprefs, struct arglist* pref, char* value, + GtkWidget* vbox) { GtkWidget *box; GtkWidget *button; From scm-commit at wald.intevation.org Tue Jan 6 15:38:10 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Tue, 6 Jan 2009 15:38:10 +0100 (CET) Subject: [Openvas-commits] r2154 - in trunk/openvas-plugins: . scripts Message-ID: <20090106143810.6777140704@pyrosoma.intevation.org> Author: chandra Date: 2009-01-06 15:38:06 +0100 (Tue, 06 Jan 2009) New Revision: 2154 Added: trunk/openvas-plugins/scripts/gb_bpftp_client_bof_vuln.nasl trunk/openvas-plugins/scripts/gb_bpftp_detect.nasl trunk/openvas-plugins/scripts/gb_bpsoft_hex_workshop_cmpa_dos_vuln.nasl trunk/openvas-plugins/scripts/gb_bpsoft_hex_workshop_detect.nasl trunk/openvas-plugins/scripts/gb_ms_win_media_player_int_overflow_vuln.nasl trunk/openvas-plugins/scripts/gb_pgp_desktop_detect_win.nasl trunk/openvas-plugins/scripts/gb_pgp_desktop_dos_vuln.nasl Modified: trunk/openvas-plugins/ChangeLog Log: Added new plugins Modified: trunk/openvas-plugins/ChangeLog =================================================================== --- trunk/openvas-plugins/ChangeLog 2009-01-06 12:56:48 UTC (rev 2153) +++ trunk/openvas-plugins/ChangeLog 2009-01-06 14:38:06 UTC (rev 2154) @@ -1,3 +1,13 @@ +2008-01-06 Chandrashekhar B + * scripts/gb_bpftp_detect.nasl, + scripts/gb_bpftp_client_bof_vuln.nasl, + scripts/gb_bpsoft_hex_workshop_cmpa_dos_vuln.nasl, + scripts/gb_ms_win_media_player_int_overflow_vuln.nasl, + scripts/gb_pgp_desktop_detect_win.nasl, + scripts/gb_pgp_desktop_dos_vuln.nasl, + scripts/gb_bpsoft_hex_workshop_detect.nasl: + Added new plugins + 2009-01-02 Thomas Reinke * freebsd_mplayer10.nasl freebsd_mysql-server15.nasl freebsd_roundcube.nasl freebsd_twiki2.nasl freebsd_vim3.nasl Added: trunk/openvas-plugins/scripts/gb_bpftp_client_bof_vuln.nasl =================================================================== --- trunk/openvas-plugins/scripts/gb_bpftp_client_bof_vuln.nasl 2009-01-06 12:56:48 UTC (rev 2153) +++ trunk/openvas-plugins/scripts/gb_bpftp_client_bof_vuln.nasl 2009-01-06 14:38:06 UTC (rev 2154) @@ -0,0 +1,87 @@ +############################################################################### +# OpenVAS Vulnerability Test +# $Id: gb_bpftp_client_bof_vuln.nasl 797 2009-01-02 20:10:24Z jan $ +# +# BulletProof FTP Client '.bps' File Buffer Overflow Vulnerability +# +# Authors: +# Sharath S +# +# Copyright: +# Copyright (c) 2008 Intevation GmbH, http://www.intevation.net +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 +# (or any later version), as published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +############################################################################### + +if(description) +{ + script_id(800330); + script_version("$Revision: 1.0 $"); + script_cve_id("CVE-2008-5753", "CVE-2008-5754"); + script_bugtraq_id(33007, 33024); + script_name(english:"BulletProof FTP Client '.bps' File Buffer Overflow Vulnerability"); + desc["english"] = " + + Overview: This host has BulletProof FTP Client installed and is prone to + Stack-Based Buffer Overflow vulnerability. + + Vulnerability Insight: + The flaw is caused due to improper boundary checks in .bps file with a long + second line and bookmark file entry with a long host name. + + Impact: + Successful exploitation will let the attacker to execute arbitrary codes in + the context of the application and can cause Denial of Service to the + application. + + Impact Level: Application + + Affected Software/OS: + BulletProof FTP Client version 2.63.0.56 or prior on Windows + + Fix: No solution or patch is available as on 5th January, 2009. Information + regarding this issue will be updated once the solution details are available. + For updates refer, http://www.bpftp.com/ + + References: + http://secunia.com/advisories/33322 + http://www.milw0rm.com/exploits/7571 + http://www.milw0rm.com/exploits/7589 + + CVSS Score: + CVSS Base Score : 9.3 (AV:N/AC:M/Au:NR/C:C/I:C/A:C) + CVSS Temporal Score : 8.4 + Risk factor: Critical"; + + script_description(english:desc["english"]); + script_summary(english:"Check for the Version of BulletProof FTP Client"); + script_category(ACT_GATHER_INFO); + script_copyright(english:"Copyright (C) 2008 Intevation GmbH"); + script_family(english:"Denial of Service"); + script_dependencies("secpod_bpftp_detect.nasl"); + exit(0); +} + + +include("version_func.inc"); + +ver = get_kb_item("BulletProof/Client/Ver"); +if(!ver){ + exit(0); +} + +# Grep for version 2.63.0.56 or prior +if(version_is_less_equal(version:ver, test_version:"2.63.0.56")){ + security_hole(0); +} Property changes on: trunk/openvas-plugins/scripts/gb_bpftp_client_bof_vuln.nasl ___________________________________________________________________ Name: svn:executable + * Added: trunk/openvas-plugins/scripts/gb_bpftp_detect.nasl =================================================================== --- trunk/openvas-plugins/scripts/gb_bpftp_detect.nasl 2009-01-06 12:56:48 UTC (rev 2153) +++ trunk/openvas-plugins/scripts/gb_bpftp_detect.nasl 2009-01-06 14:38:06 UTC (rev 2154) @@ -0,0 +1,73 @@ +############################################################################### +# OpenVAS Vulnerability Test +# $Id: gb_bpftp_detect.nasl 797 2009-01-02 19:07:24Z jan $ +# +# BulletProof FTP Version Detection +# +# Authors: +# Sharath S +# +# Copyright: +# Copyright (c) 2008 Intevation GmbH, http://www.intevation.net +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 +# (or any later version), as published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +############################################################################### + +if(description) +{ + script_id(800329); + script_version("$Revision: 1.0 $"); + script_name(english:"BulletProof FTP Version Detection"); + desc["english"] = " + Overview : This script finds the installed BulletProof FTP Version and + saves the version in KB. + + Risk factor : Informational"; + + script_description(english:desc["english"]); + script_summary(english:"Set Version of BulletProof FTP in KB"); + script_category(ACT_GATHER_INFO); + script_copyright(english:"Copyright (C) 2008 Intevation GmbH"); + script_family(english:"General"); + script_dependencies("secpod_reg_enum.nasl"); + script_require_keys("SMB/WindowsVersion"); + exit(0); +} + + +include("smb_nt.inc"); +include("secpod_smb_func.inc"); + +if(!get_kb_item("SMB/WindowsVersion")){ + exit(0); +} + +key = "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall" + + "\BulletProof FTP Client_is1"; +if("BulletProof FTP Client" >< registry_get_sz(key:key, item:"DisplayName")) +{ + exePath = registry_get_sz(key:key, item:"DisplayIcon"); + if(!exePath){ + exit(0); + } + share = ereg_replace(pattern:"([A-Z]):.*", replace:"\1$", string:exePath); + file = ereg_replace(pattern:"[A-Z]:(.*)", replace:"\1", string:exePath); + + bpftpVer = GetVer(file:file, share:share); + + # Set the Version in KB + if(bpftpVer){ + set_kb_item(name:"BulletProof/Client/Ver", value:bpftpVer); + } +} Property changes on: trunk/openvas-plugins/scripts/gb_bpftp_detect.nasl ___________________________________________________________________ Name: svn:executable + * Added: trunk/openvas-plugins/scripts/gb_bpsoft_hex_workshop_cmpa_dos_vuln.nasl =================================================================== --- trunk/openvas-plugins/scripts/gb_bpsoft_hex_workshop_cmpa_dos_vuln.nasl 2009-01-06 12:56:48 UTC (rev 2153) +++ trunk/openvas-plugins/scripts/gb_bpsoft_hex_workshop_cmpa_dos_vuln.nasl 2009-01-06 14:38:06 UTC (rev 2154) @@ -0,0 +1,86 @@ +############################################################################### +# OpenVAS Vulnerability Test +# $Id: gb_bpsoft_hex_workshop_cmpa_dos_vuln.nasl 799 2009-01-02 18:08:24Z jan $ +# +# BreakPoint Software Hex Workshop Denial of Service vulnerability +# +# Authors: +# Sharath S +# +# Copyright: +# Copyright (c) 2009 Intevation GmbH, http://www.intevation.net +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 +# (or any later version), as published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +############################################################################### + +if(description) +{ + script_id(800327); + script_version("$Revision: 1.0 $"); + script_cve_id("CVE-2008-5756"); + script_bugtraq_id(33023); + script_name(english:"BreakPoint Software Hex Workshop Denial of Service vulnerability"); + desc["english"] = " + + Overview: This host has Hex Workshop installed and is prone to Denial of + Service vulnerability. + + Vulnerability Insight: + The flaw is caused due to improper boundary checks in Color Mapping or + .cmap file via a long mapping reference. + + Impact: + Successful exploitation will allow attackers to execute arbitrary code and + can cause Denial of Service to the application. + + Impact Level: Application + + Affected Software/OS: + BreakPoint Software Hex Workshop version 5.1.4 and prior on Windows. + + Fix: No solution or patch is available as on 06th January, 2009. Information + regarding this issue will be updated once the solution details are available. + For updates refer, http://www.bpsoft.com/downloads + + References: + http://secunia.com/Advisories/33327 + http://www.milw0rm.com/exploits/7592 + + CVSS Score: + CVSS Base Score : 6.8 (AV:N/AC:M/Au:NR/C:P/I:P/A:P) + CVSS Temporal Score : 6.1 + Risk factor: High"; + + script_description(english:desc["english"]); + script_summary(english:"Check for the Version of Hex Workshop"); + script_category(ACT_GATHER_INFO); + script_copyright(english:"Copyright (C) 2009 Intevation GmbH"); + script_family(english:"Denial of Service"); + script_dependencies("gb_bpsoft_hex_workshop_detect.nasl"); + exit(0); +} + + +include("version_func.inc"); + +hwVer = get_kb_item("BPSoft/HexWorkshop/Ver"); +if(!hwVer){ + exit(0); +} + +# Check for version 5.1.4.4188 and prior +if(version_in_range(version:hwVer, test_version:"1.0", + test_version2:"5.1.4.4188")){ + security_hole(0); +} Property changes on: trunk/openvas-plugins/scripts/gb_bpsoft_hex_workshop_cmpa_dos_vuln.nasl ___________________________________________________________________ Name: svn:executable + * Added: trunk/openvas-plugins/scripts/gb_bpsoft_hex_workshop_detect.nasl =================================================================== --- trunk/openvas-plugins/scripts/gb_bpsoft_hex_workshop_detect.nasl 2009-01-06 12:56:48 UTC (rev 2153) +++ trunk/openvas-plugins/scripts/gb_bpsoft_hex_workshop_detect.nasl 2009-01-06 14:38:06 UTC (rev 2154) @@ -0,0 +1,68 @@ +############################################################################### +# OpenVAS Vulnerability Test +# $Id: gb_bpsoft_hex_workshop_detect.nasl 799 2009-01-02 17:52:24Z jan $ +# +# BreakPoint Software, Hex Workshop Version Detection +# +# Authors: +# Sharath S +# +# Copyright: +# Copyright (c) 2009 Intevation GmbH, http://www.intevation.net +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 +# (or any later version), as published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +############################################################################### + +if(description) +{ + script_id(800326); + script_version("$Revision: 1.0 $"); + script_name(english:"BreakPoint Software Hex Workshop Version Detection"); + desc["english"] = " + Overview : This script finds the installed Hex Workshop Version and saves the + version in KB. + + Risk factor : Informational"; + + script_description(english:desc["english"]); + script_summary(english:"Set Version of Hex Workshop in KB"); + script_category(ACT_GATHER_INFO); + script_copyright(english:"Copyright (C) 2009 Intevation GmbH"); + script_family(english:"General"); + script_dependencies("secpod_reg_enum.nasl"); + script_require_keys("SMB/WindowsVersion"); + exit(0); +} + + +include("smb_nt.inc"); +include("secpod_smb_func.inc"); + +if(!get_kb_item("SMB/WindowsVersion")){ + exit(0); +} + +key = "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\"; +foreach item (registry_enum_keys(key:key)) +{ + if("Hex Workshop" >< registry_get_sz(key:key + item, item:"DisplayName")) + { + hwVer = registry_get_sz(key:key + item, item:"DisplayVersion"); + if(hwVer){ + # Set the Version in KB + set_kb_item(name:"BPSoft/HexWorkshop/Ver", value:hwVer); + } + exit(0); + } +} Property changes on: trunk/openvas-plugins/scripts/gb_bpsoft_hex_workshop_detect.nasl ___________________________________________________________________ Name: svn:executable + * Added: trunk/openvas-plugins/scripts/gb_ms_win_media_player_int_overflow_vuln.nasl =================================================================== --- trunk/openvas-plugins/scripts/gb_ms_win_media_player_int_overflow_vuln.nasl 2009-01-06 12:56:48 UTC (rev 2153) +++ trunk/openvas-plugins/scripts/gb_ms_win_media_player_int_overflow_vuln.nasl 2009-01-06 14:38:06 UTC (rev 2154) @@ -0,0 +1,78 @@ +############################################################################### +# OpenVAS Vulnerability Test +# $Id: gb_ms_win_mp_int_overflow_vuln.nasl 793 2009-01-02 10:43:24Z jan $ +# +# Integer Overflow vulnerability in Microsoft Windows Media Player +# +# Authors: +# Sharath S +# +# Copyright: +# Copyright (c) 2008 Intevation GmbH, http://www.intevation.net +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 +# (or any later version), as published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +############################################################################### + +if(description) +{ + script_id(800328); + script_version("$Revision: 1.0 $"); + script_cve_id("CVE-2008-5745"); + script_bugtraq_id(33042); + script_name(english:"Integer Overflow vulnerability in Microsoft Windows Media Player"); + desc["english"] = " + + Overview: This host has Windows Media Player installed and is prone to + Integer Overflow vulnerability + + Vulnerability Insight: + The issue is caused due to improper loading of WAV, SND or MID files on + the affected application. + + Impact: + Successful exploitation will allow attackers to execute arbitrary codes + and cause application crash. + + Impact Level: Application + + Affected Software/OS: + Microsoft, Windows Media Player version 9.x, 10.x, and 11.x + + Fix: No solution or patch is available as on 05th January, 2009. Information + regarding this issue will be updated once the solution details are available. + For updates refer, http://www.microsoft.com/ + + References: + http://securitytracker.com/alerts/2008/Dec/1021495.html + http://downloads.securityfocus.com/vulnerabilities/exploits/33042.c + + CVSS Score: + CVSS Base Score : 4.3 (AV:N/AC:M/Au:NR/C:N/I:N/A:P) + CVSS Temporal Score : 3.9 + Risk factor: Medium"; + + script_description(english:desc["english"]); + script_summary(english:"Check for the Version of Windows Media Player"); + script_category(ACT_GATHER_INFO); + script_copyright(english:"Copyright (C) 2008 Intevation GmbH"); + script_family(english:"Denial of Service"); + script_dependencies("secpod_ms_win_media_player_detect_900173.nasl"); + exit(0); +} + + +#Grep for the versions 9.x , 10.x and 11.x +if(get_kb_item("Win/MediaPlayer/Ver") =~ "^(9|1[01])\..*$"){ + security_warning(0); +} Property changes on: trunk/openvas-plugins/scripts/gb_ms_win_media_player_int_overflow_vuln.nasl ___________________________________________________________________ Name: svn:executable + * Added: trunk/openvas-plugins/scripts/gb_pgp_desktop_detect_win.nasl =================================================================== --- trunk/openvas-plugins/scripts/gb_pgp_desktop_detect_win.nasl 2009-01-06 12:56:48 UTC (rev 2153) +++ trunk/openvas-plugins/scripts/gb_pgp_desktop_detect_win.nasl 2009-01-06 14:38:06 UTC (rev 2154) @@ -0,0 +1,71 @@ +############################################################################### +# OpenVAS Vulnerability Test +# $Id: gb_pgp_desktop_detect_win.nasl 789 2009-01-02 13:40:29Z jan $ +# +# PGP Desktop Version Detection (Windows) +# +# Authors: +# Sujit Ghosal +# +# Copyright (c) 2008 Intevation GmbH, http://www.intevation.net +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 +# (or any later version), as published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +############################################################################### + +if(description) +{ + script_id(800215); + script_version("$Revision: 1.0 $"); + script_name(english:"PGP Desktop Version Detection (Windows)"); + desc["english"] = " + + Overview: The script detects the installed PGP Desktop Version and saves + the version in KB. + + Risk factor: Informational"; + + script_description(english:desc["english"]); + script_summary(english:"Check for PGP Desktop version"); + script_category(ACT_GATHER_INFO); + script_copyright(english:"Copyright (C) 2008 Intevation GmbH"); + script_family(english:"General"); + script_dependencies("secpod_reg_enum.nasl"); + script_require_keys("SMB/WindowsVersion"); + exit(0); +} + + +include("smb_nt.inc"); +include("secpod_smb_func.inc"); + +if(!get_kb_item("SMB/WindowsVersion")){ + exit(0); +} + +if(!registry_key_exists(key:"SOFTWARE\PGP Corporation\PGP")){ + exit(0); +} + +key = "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\"; +foreach item (registry_enum_keys(key:key)) +{ + if("PGP Desktop" >< registry_get_sz(key:key + item, item:"DisplayName")) + { + pgpdeskVer = registry_get_sz(key:key + item, item:"DisplayVersion"); + if(pgpdeskVer != NULL){ + set_kb_item(name:"PGPDesktop/Win/Ver", value:pgpdeskVer); + } + exit(0); + } +} Added: trunk/openvas-plugins/scripts/gb_pgp_desktop_dos_vuln.nasl =================================================================== --- trunk/openvas-plugins/scripts/gb_pgp_desktop_dos_vuln.nasl 2009-01-06 12:56:48 UTC (rev 2153) +++ trunk/openvas-plugins/scripts/gb_pgp_desktop_dos_vuln.nasl 2009-01-06 14:38:06 UTC (rev 2154) @@ -0,0 +1,82 @@ +############################################################################### +# OpenVAS Vulnerability Test +# $Id: gb_pgp_desktop_dos_vuln.nasl 789 2009-01-02 13:40:29Z jan $ +# +# PGP Desktop Denial of Service Vulnerability +# +# Authors: +# Sujit Ghosal +# +# Copyright (c) 2008 Intevation GmbH, http://www.intevation.net +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 +# (or any later version), as published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +############################################################################### + +if(description) +{ + script_id(800216); + script_version("$Revision: 1.0 $"); + script_cve_id("CVE-2008-5731"); + script_bugtraq_id(32991); + script_name(english:"PGP Desktop Denial of Service Vulnerability"); + desc["english"] = " + + Overview: This host is running PGP Desktop and is prone to Denial of Service + Vulnerability. + + Vulnerability Insight: + This flaw is due to an error in the PGPwded.sys device driver when handling + certain METHOD_BUFFERED IOCTL request that overwrites portions of memory. + + Impact: + Successful exploitation will let the attacker to execute arbitrary codes in + the context of an application via crafted program to cause denial of service. + + Affected Software/OS: + PGP Corporation, PGP Desktop version 9.9.0.397 or prior on Windows. + + Fix: No solution or patch is available as on 05th January, 2009. Information + regarding this issue will be updated once the solution details are available. + For updates refer, http://www.pgp.com/products/desktop/index.html + + References: + http://secunia.com/advisories/33310 + http://www.milw0rm.com/exploits/7556 + + CVSS Score: + CVSS Base Score : 2.1 (AV:L/AC:L/Au:NR/C:P/I:N/A:N) + CVSS Temporal Score : 1.9 + Risk factor: Low"; + + script_description(english:desc["english"]); + script_summary(english:"Check for the version of PGP Desktop"); + script_category(ACT_GATHER_INFO); + script_copyright(english:"Copyright (C) 2008 Intevation GmbH"); + script_family(english:"Denial of Service"); + script_dependencies("gb_pgp_desktop_detect_win.nasl"); + exit(0); +} + + +include("version_func.inc"); + +ver = get_kb_item("PGPDesktop/Win/Ver"); +if(!ver){ + exit(0); +} + +# Grep for version 9.9.0.397 and prior +if(version_is_less_equal(version:ver, test_version:"9.9.0.397")){ + security_warning(0); +} From scm-commit at wald.intevation.org Wed Jan 7 11:37:11 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Wed, 7 Jan 2009 11:37:11 +0100 (CET) Subject: [Openvas-commits] r2155 - in trunk/openvas-client: . nessus nessus/prefs_dialog po src/gui Message-ID: <20090107103711.1474D4070A@pyrosoma.intevation.org> Author: felix Date: 2009-01-07 11:37:08 +0100 (Wed, 07 Jan 2009) New Revision: 2155 Added: trunk/openvas-client/src/gui/nvt_pref_sshlogin.c trunk/openvas-client/src/gui/nvt_pref_sshlogin.h Modified: trunk/openvas-client/MANIFEST trunk/openvas-client/nessus/Makefile trunk/openvas-client/nessus/prefs_dialog/prefs_dialog_plugins_prefs.c trunk/openvas-client/po/POTFILES trunk/openvas-client/src/gui/Makefile trunk/openvas-client/src/gui/ssh_keys_dialog.c Log: Donating visualization of a nvt sshlogins preference an own module. * src/gui/nvt_pref_sshlogin.c: New module with nvt pref sshlogin gui functions (moved from nessus/prefs_dialog/prefs_dialog_plugins_prefs.c). Updated style to be closer to GNU Coding Standards. * src/gui/nvt_pref_sshlogin.h: Header for nvt pref sshlogin gui functions. * MANIFEST: Added the new files. * po/POTFILES: Added the new files. * src/gui/Makefile: Added new target for new module, added libnessus include. * nessus/Makefile: Added the new target. * src/gui/ssh_keys_dialog.c: Changed include and function call to match new module. * nessus/prefs_dialog/prefs_dialog_plugins_prefs.c: (Re)moved code that deals with nvt sshlogin preferences (to src/gui/nvt_pref_sshlogin.c), added include, changed references to renamed functions. Modified: trunk/openvas-client/MANIFEST =================================================================== --- trunk/openvas-client/MANIFEST 2009-01-06 14:38:06 UTC (rev 2154) +++ trunk/openvas-client/MANIFEST 2009-01-07 10:37:08 UTC (rev 2155) @@ -203,6 +203,8 @@ src/gui/about_dlg.h src/gui/error_dlg.c src/gui/error_dlg.h +src/gui/nvt_pref_sshlogin.h +src/gui/nvt_pref_sshlogin.c src/gui/ssh_key_info_form.h src/gui/ssh_key_info_form.c src/gui/ssh_keys_dialog.c Modified: trunk/openvas-client/nessus/Makefile =================================================================== --- trunk/openvas-client/nessus/Makefile 2009-01-06 14:38:06 UTC (rev 2154) +++ trunk/openvas-client/nessus/Makefile 2009-01-07 10:37:08 UTC (rev 2155) @@ -72,7 +72,7 @@ GUI_OBJS = ../src/gui/about_dlg.o \ ../src/gui/slad_install.o ../src/gui/ssh_keys_dialog.o \ ../src/gui/treeview_support.o \ - ../src/gui/ssh_key_info_form.o + ../src/gui/ssh_key_info_form.o ../src/gui/nvt_pref_sshlogin.o all : cflags ${make_bindir}/$(NESSUSCLIENT) Modified: trunk/openvas-client/nessus/prefs_dialog/prefs_dialog_plugins_prefs.c =================================================================== --- trunk/openvas-client/nessus/prefs_dialog/prefs_dialog_plugins_prefs.c 2009-01-06 14:38:06 UTC (rev 2154) +++ trunk/openvas-client/nessus/prefs_dialog/prefs_dialog_plugins_prefs.c 2009-01-07 10:37:08 UTC (rev 2155) @@ -37,6 +37,7 @@ #include "listnotebook.h" #include "readonly.h" #include "error_dlg.h" +#include "nvt_pref_sshlogin.h" #include "ssh_keys_dialog.h" #include "ssh_key_info_form.h" #include "openvas_ssh_login.h" @@ -49,7 +50,6 @@ static void pprefs_add_file(struct arglist *, struct arglist *, char *, GtkWidget*); static void pprefs_add_checkbox(struct arglist *, struct arglist *, char *, GtkWidget*); static void pprefs_add_radio(struct arglist *, struct arglist *, char *, GtkWidget*); -static void pprefs_add_sshcredentials(struct arglist *, struct arglist *, char *, GtkWidget*, struct context* context); /** * Adds and hooks up (or resets) the two notebook pages for Plugin Preferences @@ -193,7 +193,7 @@ else if(!strcmp(type, PREF_FILE)) pprefs_add_file(pprefs, prefs, value, vbox); else if(!strcmp(type, PREF_SSH_CREDENTIALS)) - pprefs_add_sshcredentials(pprefs, prefs, value, vbox, context); + nvt_pref_sshlogin_add (pprefs, prefs, value, vbox, context); else show_warning(_("%s asked for unknown preference type %s."), plugs->name, type); @@ -430,190 +430,7 @@ return value; } - /** - * Adds an entry to all the Comboboxes showing SSH keys. - * To do this, all "next" and child contextes of ctx are recursively searched - * for plugins that have a ssh_credentials preferences, their combobox is - * unpacked and the new entry appended. - * - * @param ctx Context to start looking for plugins with ssh_credentials preference. - * @param newentry Text to add (should be key of ctx's sshkeys hash table). - * @see context.sshkeys - */ -void -prefs_dialog_plugins_prefs_update_ssh_comboboxes(struct context* ctx, - char* newentry) -{ - if(ctx == NULL || newentry == NULL) - return; - - struct nessus_plugin* plugins; - struct arglist* pref; - char* type; - - // Look in all Scopes + Global - while(ctx && ctx->type < CONTEXT_REPORT) - { - prefs_dialog_plugins_prefs_update_ssh_comboboxes(ctx->children, newentry); - if(ctx->type == CONTEXT_SCOPE || ctx->type == CONTEXT_GLOBAL) - { - // Look in all plugins for a SSH_LOGIN preference - plugins = ctx->plugins; - while(plugins != NULL) - { - pref = plugins->plugin_prefs; - while(pref && pref->next) - { - type = (char *)arg_get_value(pref->value, "type"); - if(type != NULL && !strcmp(type, PREF_SSH_CREDENTIALS)) - { - GtkWidget* combobox = arg_get_value(pref->value, "COMBOBOX"); - gtk_combo_box_append_text(GTK_COMBO_BOX(combobox), newentry); - } - pref = pref->next; - } - plugins = plugins->next; - } - } - ctx = ctx->next; - } - - return; -} - - -/** - * Helper function to set the active text of a combobox that has been - * initialized with gtk_combobox_new_text(). - * If value is not in the list of combobox entries, the first entry will be - * set to be the active one. - * @param combobox GtkComboBox to manipulate. - * @param value String of the active-item-to-be. - */ -static void -text_combobox_set_active_text(GtkWidget* combobox, char* value) -{ - GtkTreeIter iter; - gboolean valid; - int idx = -1; - GtkTreeModel* treemdl = gtk_combo_box_get_model(GTK_COMBO_BOX(combobox)); - valid = gtk_tree_model_get_iter_first(treemdl, &iter); - // Find the right item. - while(valid) - { - char* entry; - idx++; - gtk_tree_model_get(treemdl, &iter, 0, &entry, -1); - valid = gtk_tree_model_iter_next (treemdl, &iter); - // If text is the text we want to be active, make it active and return. - if(strcmp(entry, value) == 0) - { - break; - } - // If that was the last item, we apparently havent found any match - if(valid == FALSE) - idx = 0; - } - - gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), idx); -} - -/** - * Fills the ssh_key_info_form form with values from an openvas_ssh_login. - * The openvas_ssh_login is referenced by its name, which is the selected item - * of a combobox. The information is then gathered ftom the Global contexts - * sshkeys Hashtable. To be used as a "change" signal callback of a combobox. - * @param combobox Combobox to read active item from. - * @param form The ssh_key_info_form to update. - */ -static void -show_sshinfo_cb(GtkWidget* combobox, ssh_key_info_form* form) -{ - openvas_ssh_login* sellogin = g_hash_table_lookup(Global->sshkeys, gtk_combo_box_get_active_text(GTK_COMBO_BOX(combobox))); - ssh_key_info_form_fill(form, sellogin); -} - -/** - * Callback to add a key from a GHashTable to a Combobox. - * @param key Will be added to combobox. - * @param value --ignored-- (callback) - */ -static void -add_key_to_combobox_cb(char* key, gpointer value, GtkWidget* combobox) -{ - gtk_combo_box_append_text(GTK_COMBO_BOX(combobox), key); -} - - -/** - * Function to add a "ssh-credentials combo box" to select a ssh key. - */ -static void -pprefs_add_sshcredentials(struct arglist* pprefs, struct arglist* pref, - char* value, GtkWidget* vbox, struct context* context) -{ - GtkWidget* combobox; - GtkWidget* text; - GtkWidget* hbox; - GtkWidget* sshinfoframe; - GtkWidget* managerbutton; - char* name = pref->name; - - value = get_pref_value(pref, pprefs, value); - - hbox = gtk_hbox_new(FALSE, 0); - gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 5); - gtk_widget_show(hbox); - - text = gtk_label_new(name); - gtk_box_pack_start(GTK_BOX(hbox), text, TRUE, TRUE, 5); - gtk_widget_show(text); - - combobox = gtk_combo_box_new_text (); - gtk_combo_box_append_text (GTK_COMBO_BOX(combobox), NO_SSH_LOGIN_SELECTED); - gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 0); - - // First add frame, so that signal function is already set and set_active_text - // will trigger filling the info frame. - sshinfoframe = gtk_frame_new(_("SSH Key Information")); - gtk_widget_show(sshinfoframe); - gtk_box_pack_start_defaults(GTK_BOX(vbox), sshinfoframe); - - ssh_key_info_form* loginform = ssh_key_info_form_create(); - gtk_container_add (GTK_CONTAINER (sshinfoframe), loginform->box); - - g_signal_connect(GTK_OBJECT(combobox), "changed", - (GtkSignalFunc) show_sshinfo_cb, loginform); - - // Add all the known accounts to combobox - if(Global->sshkeys != NULL) - { - // TODO: If entries should be added sorted, we can generate a list of keys - // (either update gtk or generate by hand) or consistently use a treemodel - g_hash_table_foreach(Global->sshkeys, (GHFunc) add_key_to_combobox_cb, combobox); - text_combobox_set_active_text(combobox, value); - } - - gtk_box_pack_end(GTK_BOX(hbox), combobox, TRUE, TRUE, 5); - - // Add and hook up button to open key management - managerbutton = gtk_button_new_with_label(_("OpenVAS SSH Key Manager")); - gtk_widget_show(managerbutton); - gtk_box_pack_start_defaults(GTK_BOX(vbox), managerbutton); - - g_signal_connect(GTK_OBJECT(managerbutton), "clicked", - (GtkSignalFunc) ssh_manager_button_cb, - (void*) NULL); - - arg_add_value(pref->value, "COMBOBOX", ARG_PTR, -1, combobox); - - gtk_widget_show(combobox); - gtk_widget_show_all(sshinfoframe); -} - - -/** * Add "entry" widget corresponding to the "entry" plugin preference. */ static void Modified: trunk/openvas-client/po/POTFILES =================================================================== --- trunk/openvas-client/po/POTFILES 2009-01-06 14:38:06 UTC (rev 2154) +++ trunk/openvas-client/po/POTFILES 2009-01-07 10:37:08 UTC (rev 2155) @@ -1,6 +1,7 @@ src/openvas-lib/openvas_certificate_file.c src/gui/about_dlg.c src/gui/error_dlg.c +src/gui/nvt_pref_sshlogin.c src/gui/slad_install.c src/gui/ssh_key_info_form.c src/gui/ssh_keys_dialog.c Modified: trunk/openvas-client/src/gui/Makefile =================================================================== --- trunk/openvas-client/src/gui/Makefile 2009-01-06 14:38:06 UTC (rev 2154) +++ trunk/openvas-client/src/gui/Makefile 2009-01-07 10:37:08 UTC (rev 2155) @@ -36,7 +36,7 @@ include ../../nessus.tmpl GTKLIBS= $(GTKCONFIG_LIBS) -INCLUDE = ${include} $(GTKCONFIG_CFLAGS) -I../../nessus -I.. -I../../nessus/prefs_dialog -I../openvas-lib +INCLUDE = ${include} $(GTKCONFIG_CFLAGS) -I../../nessus -I.. -I../../nessus/prefs_dialog -I../openvas-lib -I../../libnessus NESSUS_INCLUDE=`sh ./cflags` CFLAGS+=-Wall @@ -48,7 +48,7 @@ LDFLAGS+=-mwindows endif -OBJS=about_dlg.o error_dlg.o slad_install.o ssh_keys_dialog.o treeview_support.o ssh_key_info_form.o +OBJS=about_dlg.o error_dlg.o slad_install.o ssh_keys_dialog.o treeview_support.o ssh_key_info_form.o nvt_pref_sshlogin.o all : cflags $(OBJS) @@ -78,5 +78,8 @@ treeview_support.o : cflags treeview_support.c $(CC) $(CFLAGS) $(NESSUS_INCLUDE) -c treeview_support.c +nvt_pref_sshlogin.o : cflags nvt_pref_sshlogin.c + $(CC) $(CFLAGS) $(NESSUS_INCLUDE) -c nvt_pref_sshlogin.c + clean : rm -f *.o cflags Added: trunk/openvas-client/src/gui/nvt_pref_sshlogin.c =================================================================== --- trunk/openvas-client/src/gui/nvt_pref_sshlogin.c 2009-01-06 14:38:06 UTC (rev 2154) +++ trunk/openvas-client/src/gui/nvt_pref_sshlogin.c 2009-01-07 10:37:08 UTC (rev 2155) @@ -0,0 +1,244 @@ +/* OpenVAS-Client + * $Id$ + * Description: GUI handling for NVT preference "sshlogins". + * + * Author(s): + * Felix Wolfsteller + * + * Copyright: + * Copyright (C) 2008 Intevation GmbH + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, + * or, at your option, any later version as published by the Free + * Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * In addition, as a special exception, you have + * permission to link the code of this program with the OpenSSL + * library (or with modified versions of OpenSSL that use the same + * license as OpenSSL), and distribute linked combinations including + * the two. You must obey the GNU General Public License in all + * respects for all of the code used other than OpenSSL. If you + * modify this file, you may extend this exception to your version + * of the file, but you are not obligated to do so. If you do not + * wish to do so, delete this exception statement from your version. + */ + +/** + * @file + * Functions for adding / updating GTK Widgets that deal with user interaction + * for a NVTS "sshlogins" preference. + */ + + +#include +#include "glib.h" + +#include "nvt_pref_sshlogin.h" + +#include "arglists.c" +#include "context.h" +#include "comm.h" // for PREF_SSH_CREDENTIALS only +#include "nessus_i18n.h" +#include "nessus_plugin.h" +#include "ssh_key_info_form.h" +#include "ssh_keys_dialog.h" + + +/** + * Helper function to set the active text of a combobox that has been + * initialized with gtk_combobox_new_text(). + * If value is not in the list of combobox entries, the first entry will be + * set to be the active one. + * + * @param combobox GtkComboBox to manipulate. + * @param value String of the active-item-to-be. + */ +static void +text_combobox_set_active_text (GtkWidget* combobox, char* value) +{ + GtkTreeIter iter; + gboolean valid; + int idx = -1; + GtkTreeModel* treemdl = gtk_combo_box_get_model (GTK_COMBO_BOX(combobox)); + valid = gtk_tree_model_get_iter_first (treemdl, &iter); + // Find the right item. + while (valid) + { + char* entry; + idx++; + gtk_tree_model_get (treemdl, &iter, 0, &entry, -1); + valid = gtk_tree_model_iter_next (treemdl, &iter); + // If text is the text we want to be active, make it active and return. + if (strcmp(entry, value) == 0) + { + break; + } + // If that was the last item, we apparently havent found any match + if (valid == FALSE) + idx = 0; + } + + gtk_combo_box_set_active (GTK_COMBO_BOX(combobox), idx); +} + +/** + * Fills the ssh_key_info_form form with values from an openvas_ssh_login. + * The openvas_ssh_login is referenced by its name, which is the selected item + * of a combobox. The information is then gathered ftom the Global contexts + * sshkeys Hashtable. To be used as a "change" signal callback of a combobox. + * + * @param combobox Combobox to read active item from. + * @param form The ssh_key_info_form to update. + */ +static void +show_sshinfo_cb (GtkWidget* combobox, ssh_key_info_form* form) +{ + openvas_ssh_login* sellogin = g_hash_table_lookup (Global->sshkeys, + gtk_combo_box_get_active_text(GTK_COMBO_BOX(combobox))); + ssh_key_info_form_fill (form, sellogin); +} + + +/** + * @brief Callback to add a key from a GHashTable to a Combobox. + * + * @param key Will be added to combobox. + * @param value --ignored-- (callback) + */ +static void +add_key_to_combobox_cb (char* key, gpointer value, GtkWidget* combobox) +{ + gtk_combo_box_append_text (GTK_COMBO_BOX(combobox), key); +} + +/** + * Adds an entry to all the Comboboxes showing SSH keys. + * To do this, all "next" and child contextes of ctx are recursively searched + * for plugins that have a ssh_credentials preferences, their combobox is + * unpacked and the new entry appended. + * + * @param ctx Context to start looking for plugins with ssh_credentials preference. + * @param newentry Text to add (should be key of ctx's sshkeys hash table). + * @see context.sshkeys + */ +void +nvt_pref_sshlogin_update_all_comboboxes (struct context* ctx, char* newentry) +{ + if (ctx == NULL || newentry == NULL) + return; + + struct nessus_plugin* plugins; + struct arglist* pref; + char* type; + + // Look in all Scopes + Global + while (ctx && ctx->type < CONTEXT_REPORT) + { + nvt_pref_sshlogin_update_all_comboboxes (ctx->children, newentry); + if (ctx->type == CONTEXT_SCOPE || ctx->type == CONTEXT_GLOBAL) + { + // Look in all plugins for a SSH_LOGIN preference + plugins = ctx->plugins; + while (plugins != NULL) + { + pref = plugins->plugin_prefs; + while (pref && pref->next) + { + type = (char *)arg_get_value(pref->value, "type"); + if (type != NULL && !strcmp (type, PREF_SSH_CREDENTIALS)) + { + GtkWidget* combobox = arg_get_value (pref->value, "COMBOBOX"); + gtk_combo_box_append_text (GTK_COMBO_BOX(combobox), newentry); + } + pref = pref->next; + } + plugins = plugins->next; + } + } + ctx = ctx->next; + } + + return; +} + + +/** + * Function to add a "ssh-credentials combo box" that allows the user to select a + * ssh key. + * + * @param pprefs Plugin preferences. + * @param pref Current plugin preference. + * @param value Plugin preference value. + * @param vbox Box where to add widgets to. + * @param context Current context. + */ +void +nvt_pref_sshlogin_add (struct arglist* pprefs, struct arglist* pref, + char* value, GtkWidget* vbox, struct context* context) +{ + GtkWidget* combobox; + GtkWidget* text; + GtkWidget* hbox; + GtkWidget* sshinfoframe; + GtkWidget* managerbutton; + char* name = pref->name; + + hbox = gtk_hbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 5); + gtk_widget_show(hbox); + + text = gtk_label_new (name); + gtk_box_pack_start (GTK_BOX(hbox), text, TRUE, TRUE, 5); + gtk_widget_show (text); + + combobox = gtk_combo_box_new_text (); + gtk_combo_box_append_text (GTK_COMBO_BOX(combobox), NO_SSH_LOGIN_SELECTED); + gtk_combo_box_set_active (GTK_COMBO_BOX(combobox), 0); + + // First add frame, so that signal function is already set and set_active_text + // will trigger filling the info frame. + sshinfoframe = gtk_frame_new (_("SSH Key Information")); + gtk_widget_show (sshinfoframe); + gtk_box_pack_start_defaults (GTK_BOX(vbox), sshinfoframe); + + ssh_key_info_form* loginform = ssh_key_info_form_create(); + gtk_container_add (GTK_CONTAINER (sshinfoframe), loginform->box); + + g_signal_connect (GTK_OBJECT(combobox), "changed", + (GtkSignalFunc) show_sshinfo_cb, loginform); + + // Add all the known accounts to combobox + if (Global->sshkeys != NULL) + { + // TODO: If entries should be added sorted, we can generate a list of keys + // (either update gtk or generate by hand) or consistently use a treemodel + g_hash_table_foreach(Global->sshkeys, (GHFunc) add_key_to_combobox_cb, combobox); + text_combobox_set_active_text(combobox, value); + } + + gtk_box_pack_end (GTK_BOX(hbox), combobox, TRUE, TRUE, 5); + + // Add and hook up button to open key management + managerbutton = gtk_button_new_with_label (_("OpenVAS SSH Key Manager")); + gtk_widget_show (managerbutton); + gtk_box_pack_start_defaults (GTK_BOX(vbox), managerbutton); + + g_signal_connect (GTK_OBJECT(managerbutton), "clicked", + (GtkSignalFunc) ssh_manager_button_cb, + (void*) NULL); + + arg_add_value (pref->value, "COMBOBOX", ARG_PTR, -1, combobox); + + gtk_widget_show (combobox); + gtk_widget_show_all (sshinfoframe); +} Added: trunk/openvas-client/src/gui/nvt_pref_sshlogin.h =================================================================== --- trunk/openvas-client/src/gui/nvt_pref_sshlogin.h 2009-01-06 14:38:06 UTC (rev 2154) +++ trunk/openvas-client/src/gui/nvt_pref_sshlogin.h 2009-01-07 10:37:08 UTC (rev 2155) @@ -0,0 +1,47 @@ +/* OpenVAS-Client + * $Id$ + * Description: Header for GUI handling for NVT preference "sshlogins". + * + * Author(s): + * Felix Wolfsteller + * + * Copyright: + * Copyright (C) 2008 Intevation GmbH + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, + * or, at your option, any later version as published by the Free + * Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * In addition, as a special exception, you have + * permission to link the code of this program with the OpenSSL + * library (or with modified versions of OpenSSL that use the same + * license as OpenSSL), and distribute linked combinations including + * the two. You must obey the GNU General Public License in all + * respects for all of the code used other than OpenSSL. If you + * modify this file, you may extend this exception to your version + * of the file, but you are not obligated to do so. If you do not + * wish to do so, delete this exception statement from your version. + */ + +#ifndef _OPENVAS_CLIENT_NVT_PREF_SSHLOGIN_H +#define _OPENVAS_CLIENT_NVT_PREF_SSHLOGIN_H + +#include "context.h" + +void nvt_pref_sshlogin_add (struct arglist* pprefs, struct arglist* pref, + char* value, GtkWidget* vbox, + struct context* context); + +void nvt_pref_sshlogin_update_all_comboboxes (struct context* ctx, + char* newentry); +#endif Modified: trunk/openvas-client/src/gui/ssh_keys_dialog.c =================================================================== --- trunk/openvas-client/src/gui/ssh_keys_dialog.c 2009-01-06 14:38:06 UTC (rev 2154) +++ trunk/openvas-client/src/gui/ssh_keys_dialog.c 2009-01-07 10:37:08 UTC (rev 2155) @@ -42,7 +42,7 @@ #include "listnotebook.h" #include "openvas_ssh_login.h" #include "preferences.h" -#include "prefs_dialog_plugins_prefs.h" +#include "nvt_pref_sshlogin.h" #include "ssh_keys_dialog.h" #include "ssh_key_info_form.h" @@ -136,7 +136,7 @@ efree(&loginsfile); ssh_keys_dialog_add_key(NULL, loginfo, notebook); - prefs_dialog_plugins_prefs_update_ssh_comboboxes(Global, loginfo->name); + nvt_pref_sshlogin_update_all_comboboxes (Global, loginfo->name); break; } default: From scm-commit at wald.intevation.org Wed Jan 7 13:47:58 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Wed, 7 Jan 2009 13:47:58 +0100 (CET) Subject: [Openvas-commits] r2156 - in trunk/openvas-client: . nessus/prefs_dialog Message-ID: <20090107124758.971F54071F@pyrosoma.intevation.org> Author: felix Date: 2009-01-07 13:47:57 +0100 (Wed, 07 Jan 2009) New Revision: 2156 Modified: trunk/openvas-client/ChangeLog trunk/openvas-client/nessus/prefs_dialog/prefs_dialog_plugins_prefs.c Log: * nessus/prefs_dialog/prefs_dialog_plugins_prefs.c: Removed obsolete includes. Modified: trunk/openvas-client/ChangeLog =================================================================== --- trunk/openvas-client/ChangeLog 2009-01-07 10:37:08 UTC (rev 2155) +++ trunk/openvas-client/ChangeLog 2009-01-07 12:47:57 UTC (rev 2156) @@ -1,3 +1,35 @@ +2009-01-07 Felix Wolfsteller + + * nessus/prefs_dialog/prefs_dialog_plugins_prefs.c: Removed obsolete + includes. + +2009-01-07 Felix Wolfsteller + + Donating visualization of a nvt sshlogins preference an own module. + + * src/gui/nvt_pref_sshlogin.c: New module with nvt pref sshlogin gui + functions (moved from nessus/prefs_dialog/prefs_dialog_plugins_prefs.c). + Updated style to be closer to GNU Coding Standards. + + * src/gui/nvt_pref_sshlogin.h: Header for nvt pref sshlogin gui + functions. + + * MANIFEST: Added the new files. + + * po/POTFILES: Added the new files. + + * src/gui/Makefile: Added new target for new module, added libnessus + include. + + * nessus/Makefile: Added the new target. + + * src/gui/ssh_keys_dialog.c: Changed include and function call to match + new module. + + * nessus/prefs_dialog/prefs_dialog_plugins_prefs.c: (Re)moved code that + deals with nvt sshlogin preferences (to src/gui/nvt_pref_sshlogin.c), + added include, changed references to renamed functions. + 2009-01-06 Felix Wolfsteller * nessus/prefs_dialog/prefs_dialog_plugins_prefs.c: Replaced K&R Modified: trunk/openvas-client/nessus/prefs_dialog/prefs_dialog_plugins_prefs.c =================================================================== --- trunk/openvas-client/nessus/prefs_dialog/prefs_dialog_plugins_prefs.c 2009-01-07 10:37:08 UTC (rev 2155) +++ trunk/openvas-client/nessus/prefs_dialog/prefs_dialog_plugins_prefs.c 2009-01-07 12:47:57 UTC (rev 2156) @@ -38,9 +38,6 @@ #include "readonly.h" #include "error_dlg.h" #include "nvt_pref_sshlogin.h" -#include "ssh_keys_dialog.h" -#include "ssh_key_info_form.h" -#include "openvas_ssh_login.h" #include "nessus_i18n.h" From scm-commit at wald.intevation.org Wed Jan 7 13:53:33 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Wed, 7 Jan 2009 13:53:33 +0100 (CET) Subject: [Openvas-commits] r2157 - in trunk/openvas-server: . openvasd Message-ID: <20090107125333.814FE4071F@pyrosoma.intevation.org> Author: felix Date: 2009-01-07 13:53:33 +0100 (Wed, 07 Jan 2009) New Revision: 2157 Modified: trunk/openvas-server/ChangeLog trunk/openvas-server/openvasd/save_kb.c trunk/openvas-server/openvasd/save_tests.c Log: Comment style transformed to JavaDoc style, duplicate code found and TODOs added. * openvasd/save_kb.c: Transformed comments to JavaDoc style, minor improvements, added note about code duplicates in save_tests.c. * openvasd/save_tests.c: Added note about code duplicate in save_kb.c. Modified: trunk/openvas-server/ChangeLog =================================================================== --- trunk/openvas-server/ChangeLog 2009-01-07 12:47:57 UTC (rev 2156) +++ trunk/openvas-server/ChangeLog 2009-01-07 12:53:33 UTC (rev 2157) @@ -1,3 +1,13 @@ +2009-01-07 Felix Wolfsteller + + Comment style transformed to JavaDoc style, duplicate code found and + TODOs added. + + * openvasd/save_kb.c: Transformed comments to JavaDoc style, minor + improvements, added note about code duplicates in save_tests.c. + + * openvasd/save_tests.c: Added note about code duplicate in save_kb.c. + 2009-01-05 Felix Wolfsteller * openvasd/attack.c (attack_network, launch_plugin) : Replaced tabs by Modified: trunk/openvas-server/openvasd/save_kb.c =================================================================== --- trunk/openvas-server/openvasd/save_kb.c 2009-01-07 12:47:57 UTC (rev 2156) +++ trunk/openvas-server/openvasd/save_kb.c 2009-01-07 12:53:33 UTC (rev 2157) @@ -46,14 +46,20 @@ #include "save_kb.h" +/** @TODO seems there is some code duplicate in save_tests.c */ - /*========================================================================= Private functions ===========================================================================*/ - +/** + * @brief Replaces slashes in name by underscores. + * + * @param name String in which slashes will be replaced by underscores. + * + * @return Pointer to the parameter name string. + */ static char * filter_odd_name(name) char * name; @@ -72,12 +78,10 @@ } -/*----------------------------------------------------------------- - - Name of the directory which contains the sessions of the current - user (/path/to/var/openvas//kbs/) - -------------------------------------------------------------------*/ +/** + * Returns name of the directory which contains the sessions of the current + * user (/path/to/var/openvas//kbs/) + */ static char * kb_dirname(globals) struct arglist * globals; @@ -89,15 +93,11 @@ return(dir); } -/*---------------------------------------------------------------- - - Create a kb directory. - XXXXX does not check for the existence of a directory and does - not check any error - -------------------------------------------------------------------*/ - - +/** + * Create a kb directory. + * XXXXX does not check for the existence of a directory and does + * not check any error + */ static int kb_mkdir(dir) char * dir; @@ -127,12 +127,9 @@ } -/*---------------------------------------------------------------- - - From , return - /path/to/var/openvas//kb/ - -------------------------------------------------------------------*/ +/** + * From , return /path/to/var/openvas//kb/ . + */ static char* kb_fname(globals, hostname) struct arglist * globals; @@ -155,7 +152,6 @@ /* * mmap() tends to sometimes act weirdly */ - static char* map_file(file) int file; @@ -316,7 +312,7 @@ * SentData/... * Launched/... * - * We don't want to save /tmp/... + * Ignores any items starting with /tmp/, NIDS/ or Settings/ */ static int save_kb_write(globals, hostname, name, value, type) @@ -392,17 +388,14 @@ =======================================================================*/ -/*------------------------------------------------------------------ - - Initialize a new KB that will be saved - - The indexes of all the opened KB are in a hashlist in - globals, saved under the name "save_kb". This makes no sense - at this time, as the test of each host is done in a separate - process, but this allows us to regroup easily these in - the future - - -------------------------------------------------------------------*/ +/** + * Initialize a new KB that will be saved + * The indexes of all the opened KB are in a hashlist in + * globals, saved under the name "save_kb". This makes no sense + * at this time, as the test of each host is done in a separate + * process, but this allows us to regroup easily these in + * the future. + */ int save_kb_new(globals, hostname) struct arglist * globals; @@ -461,7 +454,7 @@ efree(&fname); } -/* +/** * Returns <1> if we already saved a KB for this host, * less than seconds ago. If is * equal to zero, then the age is not taken in account @@ -522,7 +515,7 @@ -/* +/** * Restores a copy of the knowledge base */ int @@ -546,10 +539,10 @@ } return 0; } -/* + +/** * Makes a copy of the knowledge base */ - int save_kb_backup(globals, hostname) struct arglist * globals; @@ -620,11 +613,11 @@ } -/* - * Restores a previously saved knowledge base +/** + * @brief Restores a previously saved knowledge base * * The KB entry 'Host/dead' is ignored, as well as all the - * entries starting by '/tmp/' + * entries starting with '/tmp/'. */ struct kb_item ** save_kb_load_kb(globals, hostname) @@ -740,8 +733,8 @@ *-------------------------------------------------------------------*/ -/* - * Returns <1> if the user wants us the save the knowledge base +/** + * Returns <1> if the user wants us the save the knowledge base. */ int save_kb(globals) struct arglist * globals; @@ -764,9 +757,9 @@ return 0; } -/* +/** * Returns <1> if we should only test hosts whose knowledge base we - * already have + * already have. */ int save_kb_pref_tested_hosts_only(globals) struct arglist * globals; @@ -781,8 +774,8 @@ return 0; } -/* - * Returns <1> if we should only test hosts whose kb we DO NOT have +/** + * Returns <1> if we should only test hosts whose kb we DO NOT have. */ int save_kb_pref_untested_hosts_only(globals) struct arglist * globals; @@ -797,8 +790,8 @@ return 0; } -/* - * Returns <1> if we should restore the KB for the tests +/** + * Returns <1> if we should restore the KB for the tests. */ int save_kb_pref_restore(globals) struct arglist * globals; @@ -813,8 +806,8 @@ return 0; } -/* - * Return <1> if this type of plugin can be executed +/** + * Return <1> if this type of plugin can be executed. */ int save_kb_replay_check(globals, type) struct arglist * globals; @@ -852,7 +845,7 @@ return 1; } -/* +/** * Returns the max. age of the KB, in seconds, as set * by the user */ @@ -869,7 +862,7 @@ } -/* +/** * Differential scans * * @@ -886,7 +879,6 @@ * TODO : * Add 'DataSent/PluginID/Num' entries */ - int diff_scan(globals) struct arglist * globals; Modified: trunk/openvas-server/openvasd/save_tests.c =================================================================== --- trunk/openvas-server/openvasd/save_tests.c 2009-01-07 12:47:57 UTC (rev 2156) +++ trunk/openvas-server/openvasd/save_tests.c 2009-01-07 12:53:33 UTC (rev 2157) @@ -39,6 +39,8 @@ #include "save_tests.h" +/** @TODO seems there is some code duplicate in save_kb.c */ + /*================================================================ Private functions From scm-commit at wald.intevation.org Wed Jan 7 14:21:27 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Wed, 7 Jan 2009 14:21:27 +0100 (CET) Subject: [Openvas-commits] r2158 - in trunk/openvas-server: . openvasd Message-ID: <20090107132127.82B774069B@pyrosoma.intevation.org> Author: felix Date: 2009-01-07 14:21:26 +0100 (Wed, 07 Jan 2009) New Revision: 2158 Modified: trunk/openvas-server/ChangeLog trunk/openvas-server/openvasd/attack.c Log: * openvasd/attack.c (attack_host, attack_start): Reformatted. * openvasd/attack.c (attack_network): Remoded local unused variable return_code, added comment. Modified: trunk/openvas-server/ChangeLog =================================================================== --- trunk/openvas-server/ChangeLog 2009-01-07 12:53:33 UTC (rev 2157) +++ trunk/openvas-server/ChangeLog 2009-01-07 13:21:26 UTC (rev 2158) @@ -1,5 +1,12 @@ 2009-01-07 Felix Wolfsteller + * openvasd/attack.c (attack_host, attack_start): Reformatted. + + * openvasd/attack.c (attack_network): Remoded local unused variable + return_code, added comment. + +2009-01-07 Felix Wolfsteller + Comment style transformed to JavaDoc style, duplicate code found and TODOs added. Modified: trunk/openvas-server/openvasd/attack.c =================================================================== --- trunk/openvas-server/openvasd/attack.c 2009-01-07 12:53:33 UTC (rev 2157) +++ trunk/openvas-server/openvasd/attack.c 2009-01-07 13:21:26 UTC (rev 2158) @@ -284,7 +284,7 @@ static void attack_host (struct arglist * globals, struct arglist * hostinfos, char * hostname, plugins_scheduler_t sched) -{ +{ /* * Used for the status */ @@ -294,34 +294,34 @@ struct kb_item ** kb; int new_kb = 0; int kb_restored = 0; - int forks_retry = 0; - struct arglist * plugins = arg_get_value(globals, "plugins"); - struct arglist * tmp; + int forks_retry = 0; + struct arglist * plugins = arg_get_value(globals, "plugins"); + struct arglist * tmp; setproctitle("testing %s", (char*)arg_get_value(hostinfos, "NAME")); - if(save_kb(globals)) - { - if( save_kb_exists(globals, hostname) != 0 && - save_kb_pref_restore(globals) != 0 ) - { - save_kb_backup(globals, hostname); - kb = save_kb_load_kb(globals, hostname); - kb_restored = 1; - } - else + if (save_kb(globals)) { - save_kb_new(globals, hostname); - kb = kb_new(); - new_kb = 1; + if (save_kb_exists(globals, hostname) != 0 && + save_kb_pref_restore(globals) != 0 ) + { + save_kb_backup(globals, hostname); + kb = save_kb_load_kb(globals, hostname); + kb_restored = 1; + } + else + { + save_kb_new(globals, hostname); + kb = kb_new(); + new_kb = 1; + } + + arg_add_value(globals, "CURRENTLY_TESTED_HOST", ARG_STRING, strlen(hostname), hostname); } - - arg_add_value(globals, "CURRENTLY_TESTED_HOST", ARG_STRING, strlen(hostname), hostname); - } - else kb = kb_new(); + else kb = kb_new(); - num_plugs = get_active_plugins_number(plugins); + num_plugs = get_active_plugins_number(plugins); tmp = emalloc(sizeof(struct arglist)); arg_add_value(tmp, "HOSTNAME", ARG_ARGLIST, -1, hostinfos); @@ -331,58 +331,64 @@ pluginlaunch_init(globals); - for(;;) - { - struct scheduler_plugin * plugin; - pid_t parent; - - /* - * Check that our father is still alive - */ - parent = getppid(); - if(parent <= 1 || process_alive(parent) == 0 ) + for(;;) { - pluginlaunch_stop(); - return; - } - - plugin = plugins_scheduler_next(sched); - if(plugin != NULL && plugin != PLUG_RUNNING) - { - int e; - again: - if((e = launch_plugin( globals, sched, plugin, hostname, &cur_plug, num_plugs, hostinfos, kb, new_kb)) < 0) - { - /* - * Remote host died - */ - if(e == ERR_HOST_DEAD) - goto host_died; - else if(e == ERR_CANT_FORK ) - { - if(forks_retry < MAX_FORK_RETRIES) - { - forks_retry++; - log_write("fork() failed - sleeping %d seconds (%s)", forks_retry, strerror(errno)); - fork_sleep(forks_retry); - goto again; - } - else { - log_write("fork() failed too many times - aborting"); - goto host_died; - } - } - } + struct scheduler_plugin * plugin; + pid_t parent; + + /* + * Check that our father is still alive + */ + parent = getppid(); + if (parent <= 1 || process_alive(parent) == 0 ) + { + pluginlaunch_stop(); + return; + } + + plugin = plugins_scheduler_next(sched); + if (plugin != NULL && plugin != PLUG_RUNNING) + { + int e; + +again: + if((e = launch_plugin( globals, sched, plugin, hostname, &cur_plug, num_plugs, hostinfos, kb, new_kb)) < 0) + { + /* + * Remote host died + */ + if(e == ERR_HOST_DEAD) + goto host_died; + else if (e == ERR_CANT_FORK ) + { + if (forks_retry < MAX_FORK_RETRIES) + { + forks_retry++; + log_write("fork() failed - sleeping %d seconds (%s)", forks_retry, strerror(errno)); + fork_sleep(forks_retry); + goto again; + } + else + { + log_write("fork() failed too many times - aborting"); + goto host_died; + } + } + } + } + else if(plugin == NULL) break; + else pluginlaunch_wait_for_free_process(); } - else if(plugin == NULL) break; - else pluginlaunch_wait_for_free_process(); - } + pluginlaunch_wait(); + host_died: arg_free(tmp); pluginlaunch_stop(); plugins_scheduler_free(sched); - if(new_kb)save_kb_close(globals, hostname); + + if (new_kb) + save_kb_close(globals, hostname); } /** @@ -392,56 +398,53 @@ static void attack_start (struct attack_start_args * args) { - struct arglist * globals = args->globals; - char * hostname = args->hostname; - char * mac = args->host_mac_addr; - struct arglist * plugs = arg_get_value(globals, "plugins"); - struct in_addr * hostip = &(args->hostip); - struct arglist * hostinfos; - - struct arglist * preferences = arg_get_value(globals,"preferences"); - char * non_simult = arg_get_value(preferences, "non_simult_ports"); - int thread_socket = args->thread_socket; - int soc; - struct timeval then, now; - plugins_scheduler_t sched = args->sched; - int i; + struct arglist * globals = args->globals; + char * hostname = args->hostname; + char * mac = args->host_mac_addr; + struct arglist * plugs = arg_get_value(globals, "plugins"); + struct in_addr * hostip = &(args->hostip); + struct arglist * hostinfos; + + struct arglist * preferences = arg_get_value(globals,"preferences"); + char * non_simult = arg_get_value(preferences, "non_simult_ports"); + int thread_socket = args->thread_socket; + int soc; + struct timeval then, now; + plugins_scheduler_t sched = args->sched; + int i; + + thread_socket = dup2(thread_socket, 4); + for (i=5; i= 0 && harg_get_int( tested, hostname ) != 0 ) + while(hg_res >= 0 && harg_get_int( tested, hostname ) != 0 ) hg_res = hg_next_host(hg_globals, &host_ip, hostname, sizeof(hostname)); } continue; @@ -792,5 +798,5 @@ gettimeofday(&now, NULL); log_write("Total time to scan all hosts : %ld seconds\n", now.tv_sec - then.tv_sec); - return return_code; + return 0; } From scm-commit at wald.intevation.org Wed Jan 7 23:13:08 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Wed, 7 Jan 2009 23:13:08 +0100 (CET) Subject: [Openvas-commits] r2159 - trunk/doc/website Message-ID: <20090107221308.D200A406E0@pyrosoma.intevation.org> Author: jan Date: 2009-01-07 23:13:08 +0100 (Wed, 07 Jan 2009) New Revision: 2159 Added: trunk/doc/website/openvas-devcon2.htm4 Log: Page on OpenVAS developer Conference #2. Added: trunk/doc/website/openvas-devcon2.htm4 =================================================================== --- trunk/doc/website/openvas-devcon2.htm4 2009-01-07 13:21:26 UTC (rev 2158) +++ trunk/doc/website/openvas-devcon2.htm4 2009-01-07 22:13:08 UTC (rev 2159) @@ -0,0 +1,110 @@ +m4_dnl -*-html-*- +m4_include(`template.m4') + +m4_dnl OpenVAS +m4_dnl $Id$ +m4_dnl Description: About the OpenVAS Developer Conference #2 +m4_dnl +m4_dnl Authors: +m4_dnl Jan-Oliver Wagner +m4_dnl +m4_dnl Copyright: +m4_dnl Copyright (C) 2009 Intevation GmbH +m4_dnl +m4_dnl This program is free software; you can redistribute it and/or modify +m4_dnl it under the terms of the GNU General Public License version 2, +m4_dnl as published by the Free Software Foundation. +m4_dnl +m4_dnl This program is distributed in the hope that it will be useful, +m4_dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +m4_dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +m4_dnl GNU General Public License for more details. +m4_dnl +m4_dnl You should have received a copy of the GNU General Public License +m4_dnl along with this program; if not, write to the Free Software +m4_dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + + +PAGE_START +

OpenVAS Developer Conference #2 (July 9-12 2009)

+ +

+The second OpenVAS developer conference takes again place +in Osnabrück, Germany. +This page summarizes the current state of planning. +

+ +

+Attention: User's Workshop planned: Workshop on OpenVAS +administration and deployment on the day prior to the +conference: July 8th 2009. Costs will be reasonable and the money +spend to cover travel costs for students and other private OpenVAS +developers. Please express your serious interest on the openvas-discuss +mailing list. +

+ +

Agenda

+ +

+This is a collection of thoughts discussed on the +mailing list openvas-discuss. +Please involve yourself there to express your ideas or needs. +

+ +

+A major goal is derive a master plan for the next 12-24 month +of development. +

+ + +
    +
  • review the past 2 years of progress +
  • plan future features +
      +
    • Walkthrough of all the pending CR's +
    +
  • discuss core designs (towards OpenVAS 3.0) +
      +
    • OIDs: final layout and assignment procedure +
    • how to get rid of the opevas-plugins module +
    • replace the current internationalization concepts + in nasl/server with a solution by standard technologies +
    • OVAL with OpenVAS +
    +
  • discuss how to extend NVT coverage +
  • discuss professional services and how they relate to project +
  • meet the members of the OpenVAS mailing lists in real + life and have a beer (or other beverages) +
+ +

Place

+ +

+Intevation GmbH kindly hosts the developer conference at their offices: +

+ +Neuer Graben 17
+49074 Osnabrück
+Germany
+ +

+Note for attendies of the DevCon1: Intevation moved to new offices in 2007 +which are around 5 minutes walking distance from the ones where DecCon1 +took place. +

+ +

Accomodation

+ +

+Intevation will take care of hotel reservations. +Please include your preferences with the expression +of interest for attending. +

+ +

How to attend

+ +

+Please let us know on the openvas-discuss mailing list +whether you like to attend. +

+ From scm-commit at wald.intevation.org Wed Jan 7 23:16:03 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Wed, 7 Jan 2009 23:16:03 +0100 (CET) Subject: [Openvas-commits] r2160 - in trunk/openvas-plugins: . scripts Message-ID: <20090107221603.E8FC6406E0@pyrosoma.intevation.org> Author: reinke Date: 2009-01-07 23:16:01 +0100 (Wed, 07 Jan 2009) New Revision: 2160 Added: trunk/openvas-plugins/scripts/RHSA_2008_0787.nasl trunk/openvas-plugins/scripts/RHSA_2009_0002.nasl trunk/openvas-plugins/scripts/RHSA_2009_0003.nasl trunk/openvas-plugins/scripts/RHSA_2009_0004.nasl trunk/openvas-plugins/scripts/RHSA_2009_0005.nasl trunk/openvas-plugins/scripts/RHSA_2009_0008.nasl trunk/openvas-plugins/scripts/RHSA_2009_0011.nasl trunk/openvas-plugins/scripts/RHSA_2009_0018.nasl trunk/openvas-plugins/scripts/RHSA_2009_0019.nasl trunk/openvas-plugins/scripts/deb_1694_1.nasl trunk/openvas-plugins/scripts/deb_1694_2.nasl trunk/openvas-plugins/scripts/deb_1695_1.nasl trunk/openvas-plugins/scripts/fcore_2008_10755.nasl trunk/openvas-plugins/scripts/fcore_2008_11351.nasl trunk/openvas-plugins/scripts/fcore_2008_11484.nasl trunk/openvas-plugins/scripts/fcore_2008_11843.nasl trunk/openvas-plugins/scripts/fcore_2008_11868.nasl trunk/openvas-plugins/scripts/fcore_2008_11891.nasl trunk/openvas-plugins/scripts/fcore_2009_0059.nasl trunk/openvas-plugins/scripts/fcore_2009_0064.nasl trunk/openvas-plugins/scripts/fcore_2009_0088.nasl trunk/openvas-plugins/scripts/fcore_2009_0089.nasl trunk/openvas-plugins/scripts/fcore_2009_0091.nasl trunk/openvas-plugins/scripts/fcore_2009_0154.nasl trunk/openvas-plugins/scripts/fcore_2009_0160.nasl trunk/openvas-plugins/scripts/fcore_2009_0183.nasl trunk/openvas-plugins/scripts/fcore_2009_0187.nasl trunk/openvas-plugins/scripts/fcore_2009_0195.nasl trunk/openvas-plugins/scripts/freebsd_awstats3.nasl trunk/openvas-plugins/scripts/freebsd_p5-File-Path.nasl trunk/openvas-plugins/scripts/freebsd_php5-gd.nasl trunk/openvas-plugins/scripts/freebsd_xterm.nasl trunk/openvas-plugins/scripts/ubuntu_702_1.nasl trunk/openvas-plugins/scripts/ubuntu_703_1.nasl Modified: trunk/openvas-plugins/ChangeLog trunk/openvas-plugins/scripts/gather-package-list.nasl Log: New scripts added Modified: trunk/openvas-plugins/ChangeLog =================================================================== --- trunk/openvas-plugins/ChangeLog 2009-01-07 22:13:08 UTC (rev 2159) +++ trunk/openvas-plugins/ChangeLog 2009-01-07 22:16:01 UTC (rev 2160) @@ -1,3 +1,18 @@ +2009-01-02 Thomas Reinke + * deb_1694_1.nasl deb_1694_2.nasl deb_1695_1.nasl + freebsd_awstats3.nasl freebsd_p5-File-Path.nasl freebsd_php5-gd.nasl + freebsd_xterm.nasl ubuntu_702_1.nasl ubuntu_703_1.nasl + RHSA_2008_0787.nasl RHSA_2009_0002.nasl RHSA_2009_0003.nasl + RHSA_2009_0004.nasl RHSA_2009_0005.nasl RHSA_2009_0008.nasl + RHSA_2009_0011.nasl RHSA_2009_0018.nasl RHSA_2009_0019.nasl + fcore_2008_10755.nasl fcore_2008_11351.nasl fcore_2008_11484.nasl + fcore_2008_11843.nasl fcore_2008_11868.nasl fcore_2008_11891.nasl + fcore_2009_0059.nasl fcore_2009_0064.nasl fcore_2009_0088.nasl + fcore_2009_0089.nasl fcore_2009_0091.nasl fcore_2009_0154.nasl + fcore_2009_0160.nasl fcore_2009_0183.nasl fcore_2009_0187.nasl + fcore_2009_0195.nasl + New scripts + 2008-01-06 Chandrashekhar B * scripts/gb_bpftp_detect.nasl, scripts/gb_bpftp_client_bof_vuln.nasl, Added: trunk/openvas-plugins/scripts/RHSA_2008_0787.nasl =================================================================== --- trunk/openvas-plugins/scripts/RHSA_2008_0787.nasl 2009-01-07 22:13:08 UTC (rev 2159) +++ trunk/openvas-plugins/scripts/RHSA_2008_0787.nasl 2009-01-07 22:16:01 UTC (rev 2160) @@ -0,0 +1,152 @@ +# OpenVAS Vulnerability Test +# $Id$ +# Description: Auto-generated from advisory RHSA-2008:0787 () +# +# Authors: +# Thomas Reinke +# +# Copyright: +# Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com +# Text descriptions are largely excerpted from the referenced +# advisory, and are Copyright (c) the respective author(s) +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2, +# or at your option, GNU General Public License version 3, +# as published by the Free Software Foundation +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +# + +if(description) +{ + script_id(63097); + if(NASL_LEVEL>=2191) { + script_cve_id("CVE-2007-3848", "CVE-2006-4538", "CVE-2006-4814", "CVE-2007-4308", "CVE-2007-2172", "CVE-2007-6063", "CVE-2007-6206", "CVE-2007-6151", "CVE-2008-0007", "CVE-2008-2136", "CVE-2008-3275", "CVE-2008-3525", "CVE-2008-4210"); + } else { + script_cve_id("CVE-2007-3848", "CVE-2006-4538", "CVE-2006-4814", "CVE-2007-4308", "CVE-2007-2172", "CVE-2007-6063", "CVE-2007-6206", "CVE-2007-6151"); + }; + script_version ("$"); + name["english"] = "RedHat Security Advisory RHSA-2008:0787"; + script_name(english:name["english"]); + + desc["english"] = " +The remote host is missing updates to the kernel announced in +advisory RHSA-2008:0787. + +These updated packages fix the following security issues: + +* a flaw was found in the IPv4 forwarding base that allowed a local, +unprivileged user to cause an out-of-bounds access. (CVE-2007-2172, +Important) + +* a flaw was found in the handling of process death signals. This allowed a +local, unprivileged user to send arbitrary signals to the suid-process +executed by that user. Successful exploitation of this flaw depended on the +structure of the suid-program and its signal handling. (CVE-2007-3848, +Important) + +* when accessing kernel memory locations, certain Linux kernel drivers +registering a fault handler did not perform required range checks. A local, +unprivileged user could use this flaw to gain read or write access to +arbitrary kernel memory, or possibly cause a kernel crash. (CVE-2008-0007, +Important) + +* a possible kernel memory leak was found in the Linux kernel Simple +Internet Transition (SIT) INET6 implementation. This could allow a local, +unprivileged user to cause a denial of service. (CVE-2008-2136, Important) + +* missing capability checks were found in the SBNI WAN driver which could +allow a local, unprivileged user to bypass intended capability +restrictions. (CVE-2008-3525, Important) + +* a flaw was found in the way files were written using truncate() or +ftruncate(). This could allow a local, unprivileged user to acquire the +privileges of a different group and obtain access to sensitive information. +(CVE-2008-4210, Important) + +* a flaw was found in the ELF handling on Itanium-based systems. This +triggered a cross-region memory-mapping and allowed a local, unprivileged +user to cause a local denial of service. (CVE-2006-4538, Moderate) + +* a race condition in the mincore system core allowed a local, unprivileged +user to cause a local denial of service (system hang). (CVE-2006-4814, +Moderate) + +* a flaw was found in the aacraid SCSI driver. This allowed a local, +unprivileged user to make ioctl calls to the driver which should otherwise +be restricted to privileged users. (CVE-2007-4308, Moderate) + +* two buffer overflow flaws were found in the Integrated Services Digital +Network (ISDN) subsystem. A local, unprivileged user could use these flaws +to cause a denial of service. (CVE-2007-6063, CVE-2007-6151, Moderate) + +* a flaw was found in the way core dump files were created. If a local, +unprivileged user could make a root-owned process dump a core file into a +user-writable directory, the user could gain read access to that core file, +potentially compromising sensitive information. (CVE-2007-6206, Moderate) + +* a deficiency was found in the Linux kernel virtual file system (VFS) +implementation. This could allow a local, unprivileged user to attempt file +creation within deleted directories, possibly causing a local denial of +service. (CVE-2008-3275, Moderate) + +All users of Red Hat Enterprise Linux 2.1 on 64-bit architectures should +upgrade to these updated packages, which contain backported patches to +resolve these issues. + +Solution: +Please note that this update is available via +Red Hat Network. To use Red Hat Network, launch the Red +Hat Update Agent with the following command: up2date + +http://rhn.redhat.com/errata/RHSA-2008-0787.html +http://www.redhat.com/security/updates/classification/#important + +Risk factor : High"; + + script_description(english:desc["english"]); + + summary["english"] = "Redhat Security Advisory RHSA-2008:0787"; + script_summary(english:summary["english"]); + + script_category(ACT_GATHER_INFO); + + script_copyright(english:"Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com"); + family["english"] = "Red Hat Local Security Checks"; + script_family(english:family["english"]); + script_dependencies("gather-package-list.nasl"); + script_require_keys("ssh/login/rpms"); + exit(0); +} + +# +# The script code starts here +# + +include("revisions-lib.inc"); +include("pkg-lib-rpm.inc"); +vuln = 0; +if(isrpmvuln(pkg:"kernel", rpm:"kernel~2.4.18~e.67", rls:"RHENT_2.1")) { + vuln = 1; +} +if(isrpmvuln(pkg:"kernel-doc", rpm:"kernel-doc~2.4.18~e.67", rls:"RHENT_2.1")) { + vuln = 1; +} +if(isrpmvuln(pkg:"kernel-smp", rpm:"kernel-smp~2.4.18~e.67", rls:"RHENT_2.1")) { + vuln = 1; +} +if(isrpmvuln(pkg:"kernel-source", rpm:"kernel-source~2.4.18~e.67", rls:"RHENT_2.1")) { + vuln = 1; +} + +if(vuln) { + security_hole(0); +} Added: trunk/openvas-plugins/scripts/RHSA_2009_0002.nasl =================================================================== --- trunk/openvas-plugins/scripts/RHSA_2009_0002.nasl 2009-01-07 22:13:08 UTC (rev 2159) +++ trunk/openvas-plugins/scripts/RHSA_2009_0002.nasl 2009-01-07 22:16:01 UTC (rev 2160) @@ -0,0 +1,115 @@ +# OpenVAS Vulnerability Test +# $Id$ +# Description: Auto-generated from advisory RHSA-2009:0002 () +# +# Authors: +# Thomas Reinke +# +# Copyright: +# Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com +# Text descriptions are largely excerpted from the referenced +# advisory, and are Copyright (c) the respective author(s) +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2, +# or at your option, GNU General Public License version 3, +# as published by the Free Software Foundation +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +# + +if(description) +{ + script_id(63108); + if(NASL_LEVEL>=2191) { + script_cve_id("CVE-2008-5500", "CVE-2008-5501", "CVE-2008-5502", "CVE-2008-5503", "CVE-2008-5506", "CVE-2008-5507", "CVE-2008-5508", "CVE-2008-5511", "CVE-2008-5512", "CVE-2008-5513"); + } else { + script_cve_id("CVE-2008-5500", "CVE-2008-5501", "CVE-2008-5502", "CVE-2008-5503", "CVE-2008-5506", "CVE-2008-5507", "CVE-2008-5508", "CVE-2008-5511"); + }; + script_version ("$"); + name["english"] = "RedHat Security Advisory RHSA-2009:0002"; + script_name(english:name["english"]); + + desc["english"] = " +The remote host is missing updates announced in +advisory RHSA-2009:0002. + +Mozilla Thunderbird is a standalone mail and newsgroup client. + +Several flaws were found in the processing of malformed HTML mail content. +An HTML mail message containing malicious content could cause Thunderbird +to crash or, potentially, execute arbitrary code as the user running +Thunderbird. (CVE-2008-5500, CVE-2008-5501, CVE-2008-5502, CVE-2008-5511, +CVE-2008-5512, CVE-2008-5513) + +Several flaws were found in the way malformed content was processed. An +HTML mail message containing specially-crafted content could potentially +trick a Thunderbird user into surrendering sensitive information. +(CVE-2008-5503, CVE-2008-5506, CVE-2008-5507) + +Note: JavaScript support is disabled by default in Thunderbird; the above +issues are not exploitable unless JavaScript is enabled. + +A flaw was found in the way malformed URLs were processed by +Thunderbird. This flaw could prevent various URL sanitization mechanisms +from properly parsing a malicious URL. (CVE-2008-5508) + +All Thunderbird users should upgrade to these updated packages, which +resolve these issues. All running instances of Thunderbird must be +restarted for the update to take effect. + +Solution: +Please note that this update is available via +Red Hat Network. To use Red Hat Network, launch the Red +Hat Update Agent with the following command: up2date + +http://rhn.redhat.com/errata/RHSA-2009-0002.html +http://www.redhat.com/security/updates/classification/#moderate + +Risk factor : Medium"; + + script_description(english:desc["english"]); + + summary["english"] = "Redhat Security Advisory RHSA-2009:0002"; + script_summary(english:summary["english"]); + + script_category(ACT_GATHER_INFO); + + script_copyright(english:"Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com"); + family["english"] = "Red Hat Local Security Checks"; + script_family(english:family["english"]); + script_dependencies("gather-package-list.nasl"); + script_require_keys("ssh/login/rpms"); + exit(0); +} + +# +# The script code starts here +# + +include("revisions-lib.inc"); +include("pkg-lib-rpm.inc"); +vuln = 0; +if(isrpmvuln(pkg:"thunderbird", rpm:"thunderbird~1.5.0.12~18.el4", rls:"RHENT_4")) { + vuln = 1; +} +if(isrpmvuln(pkg:"thunderbird-debuginfo", rpm:"thunderbird-debuginfo~1.5.0.12~18.el4", rls:"RHENT_4")) { + vuln = 1; +} +if(isrpmvuln(pkg:"thunderbird", rpm:"thunderbird~2.0.0.19~1.el5_2", rls:"RHENT_5")) { + vuln = 1; +} +if(isrpmvuln(pkg:"thunderbird-debuginfo", rpm:"thunderbird-debuginfo~2.0.0.19~1.el5_2", rls:"RHENT_5")) { + vuln = 1; +} + +if(vuln) { + security_hole(0); +} Added: trunk/openvas-plugins/scripts/RHSA_2009_0003.nasl =================================================================== --- trunk/openvas-plugins/scripts/RHSA_2009_0003.nasl 2009-01-07 22:13:08 UTC (rev 2159) +++ trunk/openvas-plugins/scripts/RHSA_2009_0003.nasl 2009-01-07 22:16:01 UTC (rev 2160) @@ -0,0 +1,118 @@ +# OpenVAS Vulnerability Test +# $Id$ +# Description: Auto-generated from advisory RHSA-2009:0003 () +# +# Authors: +# Thomas Reinke +# +# Copyright: +# Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com +# Text descriptions are largely excerpted from the referenced +# advisory, and are Copyright (c) the respective author(s) +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2, +# or at your option, GNU General Public License version 3, +# as published by the Free Software Foundation +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +# + +if(description) +{ + script_id(63109); + script_cve_id("CVE-2008-4405", "CVE-2008-4993"); + script_version ("$"); + name["english"] = "RedHat Security Advisory RHSA-2009:0003"; + script_name(english:name["english"]); + + desc["english"] = " +The remote host is missing updates announced in +advisory RHSA-2009:0003. + +The xen packages contain the Xen tools and management daemons needed to +manage virtual machines running on Red Hat Enterprise Linux. + +Xen was found to allow unprivileged DomU domains to overwrite xenstore +values which should only be changeable by the privileged Dom0 domain. An +attacker controlling a DomU domain could, potentially, use this flaw to +kill arbitrary processes in Dom0 or trick a Dom0 user into accessing the +text console of a different domain running on the same host. This update +makes certain parts of the xenstore tree read-only to the unprivileged DomU +domains. (CVE-2008-4405) + +It was discovered that the qemu-dm.debug script created a temporary file in +/tmp in an insecure way. A local attacker in Dom0 could, potentially, use +this flaw to overwrite arbitrary files via a symlink attack. Note: This +script is not needed in production deployments and therefore was removed +and is not shipped with updated xen packages. (CVE-2008-4993) + +This update also fixes the following bug: + +* xen calculates its running time by adding the hypervisor's up-time to the +hypervisor's boot-time record. In live migrations of para-virtualized +guests, however, the guest would over-write the new hypervisor's boot-time +record with the boot-time of the previous hypervisor. This caused +time-dependent processes on the guests to fail (for example, crond would +fail to start cron jobs). With this update, the new hypervisor's boot-time +record is no longer over-written during live migrations. + +All xen users are advised to upgrade to these updated packages, which +contain backported patches to resolve these issues. The Xen host must be +restarted for the update to take effect. + +Solution: +Please note that this update is available via +Red Hat Network. To use Red Hat Network, launch the Red +Hat Update Agent with the following command: up2date + +http://rhn.redhat.com/errata/RHSA-2009-0003.html +http://www.redhat.com/security/updates/classification/#moderate + +Risk factor : Medium"; + + script_description(english:desc["english"]); + + summary["english"] = "Redhat Security Advisory RHSA-2009:0003"; + script_summary(english:summary["english"]); + + script_category(ACT_GATHER_INFO); + + script_copyright(english:"Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com"); + family["english"] = "Red Hat Local Security Checks"; + script_family(english:family["english"]); + script_dependencies("gather-package-list.nasl"); + script_require_keys("ssh/login/rpms"); + exit(0); +} + +# +# The script code starts here +# + +include("revisions-lib.inc"); +include("pkg-lib-rpm.inc"); +vuln = 0; +if(isrpmvuln(pkg:"xen-debuginfo", rpm:"xen-debuginfo~3.0.3~64.el5_2.9", rls:"RHENT_5")) { + vuln = 1; +} +if(isrpmvuln(pkg:"xen-libs", rpm:"xen-libs~3.0.3~64.el5_2.9", rls:"RHENT_5")) { + vuln = 1; +} +if(isrpmvuln(pkg:"xen", rpm:"xen~3.0.3~64.el5_2.9", rls:"RHENT_5")) { + vuln = 1; +} +if(isrpmvuln(pkg:"xen-devel", rpm:"xen-devel~3.0.3~64.el5_2.9", rls:"RHENT_5")) { + vuln = 1; +} + +if(vuln) { + security_hole(0); +} Added: trunk/openvas-plugins/scripts/RHSA_2009_0004.nasl =================================================================== --- trunk/openvas-plugins/scripts/RHSA_2009_0004.nasl 2009-01-07 22:13:08 UTC (rev 2159) +++ trunk/openvas-plugins/scripts/RHSA_2009_0004.nasl 2009-01-07 22:16:01 UTC (rev 2160) @@ -0,0 +1,160 @@ +# OpenVAS Vulnerability Test +# $Id$ +# Description: Auto-generated from advisory RHSA-2009:0004 () +# +# Authors: +# Thomas Reinke +# +# Copyright: +# Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com +# Text descriptions are largely excerpted from the referenced +# advisory, and are Copyright (c) the respective author(s) +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2, +# or at your option, GNU General Public License version 3, +# as published by the Free Software Foundation +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +# + +if(description) +{ + script_id(63112); + script_cve_id("CVE-2008-5077"); + script_version ("$"); + name["english"] = "RedHat Security Advisory RHSA-2009:0004"; + script_name(english:name["english"]); + + desc["english"] = " +The remote host is missing updates announced in +advisory RHSA-2009:0004. + +OpenSSL is a toolkit that implements Secure Sockets Layer (SSL v2/v3) and +Transport Layer Security (TLS v1) protocols as well as a full-strength, +general purpose, cryptography library. + +The Google security team discovered a flaw in the way OpenSSL checked the +verification of certificates. An attacker in control of a malicious server, +or able to effect a man in the middle attack, could present a malformed +SSL/TLS signature from a certificate chain to a vulnerable client and +bypass validation. (CVE-2008-5077) + +All OpenSSL users should upgrade to these updated packages, which contain +backported patches to resolve these issues. For the update to take effect, +all running OpenSSL client applications must be restarted, or the system +rebooted. + +Solution: +Please note that this update is available via +Red Hat Network. To use Red Hat Network, launch the Red +Hat Update Agent with the following command: up2date + +http://rhn.redhat.com/errata/RHSA-2009-0004.html +http://www.openssl.org/news/secadv_20090107.txt +http://www.redhat.com/security/updates/classification/#important + +Risk factor : High"; + + script_description(english:desc["english"]); + + summary["english"] = "Redhat Security Advisory RHSA-2009:0004"; + script_summary(english:summary["english"]); + + script_category(ACT_GATHER_INFO); + + script_copyright(english:"Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com"); + family["english"] = "Red Hat Local Security Checks"; + script_family(english:family["english"]); + script_dependencies("gather-package-list.nasl"); + script_require_keys("ssh/login/rpms"); + exit(0); +} + +# +# The script code starts here +# + +include("revisions-lib.inc"); +include("pkg-lib-rpm.inc"); +vuln = 0; +if(isrpmvuln(pkg:"openssl", rpm:"openssl~0.9.6b~49", rls:"RHENT_2.1")) { + vuln = 1; +} +if(isrpmvuln(pkg:"openssl-devel", rpm:"openssl-devel~0.9.6b~49", rls:"RHENT_2.1")) { + vuln = 1; +} +if(isrpmvuln(pkg:"openssl-perl", rpm:"openssl-perl~0.9.6b~49", rls:"RHENT_2.1")) { + vuln = 1; +} +if(isrpmvuln(pkg:"openssl095a", rpm:"openssl095a~0.9.5a~34", rls:"RHENT_2.1")) { + vuln = 1; +} +if(isrpmvuln(pkg:"openssl096", rpm:"openssl096~0.9.6~34", rls:"RHENT_2.1")) { + vuln = 1; +} +if(isrpmvuln(pkg:"openssl", rpm:"openssl~0.9.7a~33.25", rls:"RHENT_3")) { + vuln = 1; +} +if(isrpmvuln(pkg:"openssl-debuginfo", rpm:"openssl-debuginfo~0.9.7a~33.25", rls:"RHENT_3")) { + vuln = 1; +} +if(isrpmvuln(pkg:"openssl-devel", rpm:"openssl-devel~0.9.7a~33.25", rls:"RHENT_3")) { + vuln = 1; +} +if(isrpmvuln(pkg:"openssl-perl", rpm:"openssl-perl~0.9.7a~33.25", rls:"RHENT_3")) { + vuln = 1; +} +if(isrpmvuln(pkg:"openssl096b", rpm:"openssl096b~0.9.6b~16.49", rls:"RHENT_3")) { + vuln = 1; +} +if(isrpmvuln(pkg:"openssl096b-debuginfo", rpm:"openssl096b-debuginfo~0.9.6b~16.49", rls:"RHENT_3")) { + vuln = 1; +} +if(isrpmvuln(pkg:"openssl", rpm:"openssl~0.9.7a~43.17.el4_7.2", rls:"RHENT_4")) { + vuln = 1; +} +if(isrpmvuln(pkg:"openssl-debuginfo", rpm:"openssl-debuginfo~0.9.7a~43.17.el4_7.2", rls:"RHENT_4")) { + vuln = 1; +} +if(isrpmvuln(pkg:"openssl-devel", rpm:"openssl-devel~0.9.7a~43.17.el4_7.2", rls:"RHENT_4")) { + vuln = 1; +} +if(isrpmvuln(pkg:"openssl-perl", rpm:"openssl-perl~0.9.7a~43.17.el4_7.2", rls:"RHENT_4")) { + vuln = 1; +} +if(isrpmvuln(pkg:"openssl096b", rpm:"openssl096b~0.9.6b~22.46.el4_7", rls:"RHENT_4")) { + vuln = 1; +} +if(isrpmvuln(pkg:"openssl096b-debuginfo", rpm:"openssl096b-debuginfo~0.9.6b~22.46.el4_7", rls:"RHENT_4")) { + vuln = 1; +} +if(isrpmvuln(pkg:"openssl", rpm:"openssl~0.9.8b~10.el5_2.1", rls:"RHENT_5")) { + vuln = 1; +} +if(isrpmvuln(pkg:"openssl-debuginfo", rpm:"openssl-debuginfo~0.9.8b~10.el5_2.1", rls:"RHENT_5")) { + vuln = 1; +} +if(isrpmvuln(pkg:"openssl-perl", rpm:"openssl-perl~0.9.8b~10.el5_2.1", rls:"RHENT_5")) { + vuln = 1; +} +if(isrpmvuln(pkg:"openssl097a", rpm:"openssl097a~0.9.7a~9.el5_2.1", rls:"RHENT_5")) { + vuln = 1; +} +if(isrpmvuln(pkg:"openssl097a-debuginfo", rpm:"openssl097a-debuginfo~0.9.7a~9.el5_2.1", rls:"RHENT_5")) { + vuln = 1; +} +if(isrpmvuln(pkg:"openssl-devel", rpm:"openssl-devel~0.9.8b~10.el5_2.1", rls:"RHENT_5")) { + vuln = 1; +} + +if(vuln) { + security_hole(0); +} Added: trunk/openvas-plugins/scripts/RHSA_2009_0005.nasl =================================================================== --- trunk/openvas-plugins/scripts/RHSA_2009_0005.nasl 2009-01-07 22:13:08 UTC (rev 2159) +++ trunk/openvas-plugins/scripts/RHSA_2009_0005.nasl 2009-01-07 22:16:01 UTC (rev 2160) @@ -0,0 +1,116 @@ +# OpenVAS Vulnerability Test +# $Id$ +# Description: Auto-generated from advisory RHSA-2009:0005 () +# +# Authors: +# Thomas Reinke +# +# Copyright: +# Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com +# Text descriptions are largely excerpted from the referenced +# advisory, and are Copyright (c) the respective author(s) +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2, +# or at your option, GNU General Public License version 3, +# as published by the Free Software Foundation +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +# + +if(description) +{ + script_id(63110); + script_cve_id("CVE-2005-0706"); + script_version ("$"); + name["english"] = "RedHat Security Advisory RHSA-2009:0005"; + script_name(english:name["english"]); + + desc["english"] = " +The remote host is missing updates announced in +advisory RHSA-2009:0005. + +GNOME VFS is the GNOME virtual file system. It provides a modular +architecture and ships with several modules that implement support for +various local and remote file systems as well as numerous protocols, +including HTTP, FTP, and others. + +A buffer overflow flaw was discovered in the GNOME virtual file system when +handling data returned by CDDB servers. If a user connected to a malicious +CDDB server, an attacker could use this flaw to execute arbitrary code on +the victim's machine. (CVE-2005-0706) + +Users of gnome-vfs and gnome-vfs2 are advised to upgrade to these updated +packages, which contain a backported patch to correct this issue. All +running GNOME sessions must be restarted for the update to take effect. + +Solution: +Please note that this update is available via +Red Hat Network. To use Red Hat Network, launch the Red +Hat Update Agent with the following command: up2date + +http://rhn.redhat.com/errata/RHSA-2009-0005.html +http://www.redhat.com/security/updates/classification/#moderate + +Risk factor : Medium"; + + script_description(english:desc["english"]); + + summary["english"] = "Redhat Security Advisory RHSA-2009:0005"; + script_summary(english:summary["english"]); + + script_category(ACT_GATHER_INFO); + + script_copyright(english:"Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com"); + family["english"] = "Red Hat Local Security Checks"; + script_family(english:family["english"]); + script_dependencies("gather-package-list.nasl"); + script_require_keys("ssh/login/rpms"); + exit(0); +} + +# +# The script code starts here +# + +include("revisions-lib.inc"); +include("pkg-lib-rpm.inc"); +vuln = 0; +if(isrpmvuln(pkg:"gnome-vfs", rpm:"gnome-vfs~1.0.1~18.2", rls:"RHENT_2.1")) { + vuln = 1; +} +if(isrpmvuln(pkg:"gnome-vfs-devel", rpm:"gnome-vfs-devel~1.0.1~18.2", rls:"RHENT_2.1")) { + vuln = 1; +} +if(isrpmvuln(pkg:"gnome-vfs2", rpm:"gnome-vfs2~2.2.5~2E.3.3", rls:"RHENT_3")) { + vuln = 1; +} +if(isrpmvuln(pkg:"gnome-vfs2-debuginfo", rpm:"gnome-vfs2-debuginfo~2.2.5~2E.3.3", rls:"RHENT_3")) { + vuln = 1; +} +if(isrpmvuln(pkg:"gnome-vfs2-devel", rpm:"gnome-vfs2-devel~2.2.5~2E.3.3", rls:"RHENT_3")) { + vuln = 1; +} +if(isrpmvuln(pkg:"gnome-vfs2", rpm:"gnome-vfs2~2.8.2~8.7.el4_7.2", rls:"RHENT_4")) { + vuln = 1; +} +if(isrpmvuln(pkg:"gnome-vfs2-debuginfo", rpm:"gnome-vfs2-debuginfo~2.8.2~8.7.el4_7.2", rls:"RHENT_4")) { + vuln = 1; +} +if(isrpmvuln(pkg:"gnome-vfs2-devel", rpm:"gnome-vfs2-devel~2.8.2~8.7.el4_7.2", rls:"RHENT_4")) { + vuln = 1; +} +if(isrpmvuln(pkg:"gnome-vfs2-smb", rpm:"gnome-vfs2-smb~2.8.2~8.7.el4_7.2", rls:"RHENT_4")) { + vuln = 1; +} + +if(vuln) { + security_hole(0); +} Added: trunk/openvas-plugins/scripts/RHSA_2009_0008.nasl =================================================================== --- trunk/openvas-plugins/scripts/RHSA_2009_0008.nasl 2009-01-07 22:13:08 UTC (rev 2159) +++ trunk/openvas-plugins/scripts/RHSA_2009_0008.nasl 2009-01-07 22:16:01 UTC (rev 2160) @@ -0,0 +1,101 @@ +# OpenVAS Vulnerability Test +# $Id$ +# Description: Auto-generated from advisory RHSA-2009:0008 () +# +# Authors: +# Thomas Reinke +# +# Copyright: +# Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com +# Text descriptions are largely excerpted from the referenced +# advisory, and are Copyright (c) the respective author(s) +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2, +# or at your option, GNU General Public License version 3, +# as published by the Free Software Foundation +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +# + +if(description) +{ + script_id(63113); + script_cve_id("CVE-2008-3834"); + script_version ("$"); + name["english"] = "RedHat Security Advisory RHSA-2009:0008"; + script_name(english:name["english"]); + + desc["english"] = " +The remote host is missing updates announced in +advisory RHSA-2009:0008. + +D-Bus is a system for sending messages between applications. It is used for +the system-wide message bus service and as a per-user-login-session +messaging facility. + +A denial-of-service flaw was discovered in the system for sending messages +between applications. A local user could send a message with a malformed +signature to the bus causing the bus (and, consequently, any process using +libdbus to receive messages) to abort. (CVE-2008-3834) + +All users are advised to upgrade to these updated dbus packages, which +contain backported patch which resolve this issue. For the update to take +effect, all running instances of dbus-daemon and all running applications +using libdbus library must be restarted, or the system rebooted. + +Solution: +Please note that this update is available via +Red Hat Network. To use Red Hat Network, launch the Red +Hat Update Agent with the following command: up2date + +http://rhn.redhat.com/errata/RHSA-2009-0008.html +http://www.redhat.com/security/updates/classification/#moderate + +Risk factor : Medium"; + + script_description(english:desc["english"]); + + summary["english"] = "Redhat Security Advisory RHSA-2009:0008"; + script_summary(english:summary["english"]); + + script_category(ACT_GATHER_INFO); + + script_copyright(english:"Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com"); + family["english"] = "Red Hat Local Security Checks"; + script_family(english:family["english"]); + script_dependencies("gather-package-list.nasl"); + script_require_keys("ssh/login/rpms"); + exit(0); +} + +# +# The script code starts here +# + +include("revisions-lib.inc"); +include("pkg-lib-rpm.inc"); +vuln = 0; +if(isrpmvuln(pkg:"dbus", rpm:"dbus~1.0.0~7.el5_2.1", rls:"RHENT_5")) { + vuln = 1; +} +if(isrpmvuln(pkg:"dbus-debuginfo", rpm:"dbus-debuginfo~1.0.0~7.el5_2.1", rls:"RHENT_5")) { + vuln = 1; +} +if(isrpmvuln(pkg:"dbus-x11", rpm:"dbus-x11~1.0.0~7.el5_2.1", rls:"RHENT_5")) { + vuln = 1; +} +if(isrpmvuln(pkg:"dbus-devel", rpm:"dbus-devel~1.0.0~7.el5_2.1", rls:"RHENT_5")) { + vuln = 1; +} + +if(vuln) { + security_hole(0); +} Added: trunk/openvas-plugins/scripts/RHSA_2009_0011.nasl =================================================================== --- trunk/openvas-plugins/scripts/RHSA_2009_0011.nasl 2009-01-07 22:13:08 UTC (rev 2159) +++ trunk/openvas-plugins/scripts/RHSA_2009_0011.nasl 2009-01-07 22:16:01 UTC (rev 2160) @@ -0,0 +1,99 @@ +# OpenVAS Vulnerability Test +# $Id$ +# Description: Auto-generated from advisory RHSA-2009:0011 () +# +# Authors: +# Thomas Reinke +# +# Copyright: +# Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com +# Text descriptions are largely excerpted from the referenced +# advisory, and are Copyright (c) the respective author(s) +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2, +# or at your option, GNU General Public License version 3, +# as published by the Free Software Foundation +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +# + +if(description) +{ + script_id(63114); + script_cve_id("CVE-2008-5316", "CVE-2008-5317"); + script_version ("$"); + name["english"] = "RedHat Security Advisory RHSA-2009:0011"; + script_name(english:name["english"]); + + desc["english"] = " +The remote host is missing updates announced in +advisory RHSA-2009:0011. + +Little Color Management System (LittleCMS, or simply lcms) is a +small-footprint, speed-optimized open source color management engine. + +Multiple insufficient input validation flaws were discovered in LittleCMS. +An attacker could use these flaws to create a specially-crafted image file +which could cause an application using LittleCMS to crash, or, possibly, +execute arbitrary code when opened. (CVE-2008-5316, CVE-2008-5317) + +Users of lcms should upgrade to these updated packages, which contain +backported patches to correct these issues. All running applications using +lcms library must be restarted for the update to take effect. + +Solution: +Please note that this update is available via +Red Hat Network. To use Red Hat Network, launch the Red +Hat Update Agent with the following command: up2date + +http://rhn.redhat.com/errata/RHSA-2009-0011.html +http://www.redhat.com/security/updates/classification/#moderate + +Risk factor : Medium"; + + script_description(english:desc["english"]); + + summary["english"] = "Redhat Security Advisory RHSA-2009:0011"; + script_summary(english:summary["english"]); + + script_category(ACT_GATHER_INFO); + + script_copyright(english:"Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com"); + family["english"] = "Red Hat Local Security Checks"; + script_family(english:family["english"]); + script_dependencies("gather-package-list.nasl"); + script_require_keys("ssh/login/rpms"); + exit(0); +} + +# +# The script code starts here +# + +include("revisions-lib.inc"); +include("pkg-lib-rpm.inc"); +vuln = 0; +if(isrpmvuln(pkg:"lcms", rpm:"lcms~1.15~1.2.2.el5_2.2", rls:"RHENT_5")) { + vuln = 1; +} +if(isrpmvuln(pkg:"lcms-debuginfo", rpm:"lcms-debuginfo~1.15~1.2.2.el5_2.2", rls:"RHENT_5")) { + vuln = 1; +} +if(isrpmvuln(pkg:"python-lcms", rpm:"python-lcms~1.15~1.2.2.el5_2.2", rls:"RHENT_5")) { + vuln = 1; +} +if(isrpmvuln(pkg:"lcms-devel", rpm:"lcms-devel~1.15~1.2.2.el5_2.2", rls:"RHENT_5")) { + vuln = 1; +} + +if(vuln) { + security_hole(0); +} Added: trunk/openvas-plugins/scripts/RHSA_2009_0018.nasl =================================================================== --- trunk/openvas-plugins/scripts/RHSA_2009_0018.nasl 2009-01-07 22:13:08 UTC (rev 2159) +++ trunk/openvas-plugins/scripts/RHSA_2009_0018.nasl 2009-01-07 22:16:01 UTC (rev 2160) @@ -0,0 +1,104 @@ +# OpenVAS Vulnerability Test +# $Id$ +# Description: Auto-generated from advisory RHSA-2009:0018 () +# +# Authors: +# Thomas Reinke +# +# Copyright: +# Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com +# Text descriptions are largely excerpted from the referenced +# advisory, and are Copyright (c) the respective author(s) +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2, +# or at your option, GNU General Public License version 3, +# as published by the Free Software Foundation +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +# + +if(description) +{ + script_id(63111); + script_cve_id("CVE-2008-2383"); + script_version ("$"); + name["english"] = "RedHat Security Advisory RHSA-2009:0018"; + script_name(english:name["english"]); + + desc["english"] = " +The remote host is missing updates announced in +advisory RHSA-2009:0018. + +The xterm program is a terminal emulator for the X Window System. + +A flaw was found in the xterm handling of Device Control Request Status +String (DECRQSS) escape sequences. An attacker could create a malicious +text file (or log entry, if unfiltered) that could run arbitrary commands +if read by a victim inside an xterm window. (CVE-2008-2383) + +All xterm users are advised to upgrade to the updated package, which +contains a backported patch to resolve this issue. All running instances of +xterm must be restarted for the update to take effect. + +Solution: +Please note that this update is available via +Red Hat Network. To use Red Hat Network, launch the Red +Hat Update Agent with the following command: up2date + +http://rhn.redhat.com/errata/RHSA-2009-0018.html +http://www.redhat.com/security/updates/classification/#important + +Risk factor : High"; + + script_description(english:desc["english"]); + + summary["english"] = "Redhat Security Advisory RHSA-2009:0018"; + script_summary(english:summary["english"]); + + script_category(ACT_GATHER_INFO); + + script_copyright(english:"Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com"); + family["english"] = "Red Hat Local Security Checks"; + script_family(english:family["english"]); + script_dependencies("gather-package-list.nasl"); + script_require_keys("ssh/login/rpms"); + exit(0); +} + +# +# The script code starts here +# + +include("revisions-lib.inc"); +include("pkg-lib-rpm.inc"); +vuln = 0; +if(isrpmvuln(pkg:"xterm", rpm:"xterm~179~11.EL3", rls:"RHENT_3")) { + vuln = 1; +} +if(isrpmvuln(pkg:"xterm-debuginfo", rpm:"xterm-debuginfo~179~11.EL3", rls:"RHENT_3")) { + vuln = 1; +} +if(isrpmvuln(pkg:"xterm", rpm:"xterm~192~8.el4_7.2", rls:"RHENT_4")) { + vuln = 1; +} +if(isrpmvuln(pkg:"xterm-debuginfo", rpm:"xterm-debuginfo~192~8.el4_7.2", rls:"RHENT_4")) { + vuln = 1; +} +if(isrpmvuln(pkg:"xterm", rpm:"xterm~215~5.el5_2.2", rls:"RHENT_5")) { + vuln = 1; +} +if(isrpmvuln(pkg:"xterm-debuginfo", rpm:"xterm-debuginfo~215~5.el5_2.2", rls:"RHENT_5")) { + vuln = 1; +} + +if(vuln) { + security_hole(0); +} Added: trunk/openvas-plugins/scripts/RHSA_2009_0019.nasl =================================================================== --- trunk/openvas-plugins/scripts/RHSA_2009_0019.nasl 2009-01-07 22:13:08 UTC (rev 2159) +++ trunk/openvas-plugins/scripts/RHSA_2009_0019.nasl 2009-01-07 22:16:01 UTC (rev 2160) @@ -0,0 +1,90 @@ +# OpenVAS Vulnerability Test +# $Id$ +# Description: Auto-generated from advisory RHSA-2009:0019 () +# +# Authors: +# Thomas Reinke +# +# Copyright: +# Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com +# Text descriptions are largely excerpted from the referenced +# advisory, and are Copyright (c) the respective author(s) +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2, +# or at your option, GNU General Public License version 3, +# as published by the Free Software Foundation +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +# + +if(description) +{ + script_id(63115); + script_cve_id("CVE-2008-2383"); + script_version ("$"); + name["english"] = "RedHat Security Advisory RHSA-2009:0019"; + script_name(english:name["english"]); + + desc["english"] = " +The remote host is missing updates announced in +advisory RHSA-2009:0019. + +Hanterm is a replacement for xterm, a X Window System terminal emulator, +that supports Hangul input and output. + +A flaw was found in the Hanterm handling of Device Control Request Status +String (DECRQSS) escape sequences. An attacker could create a malicious +text file (or log entry, if unfiltered) that could run arbitrary commands +if read by a victim inside a Hanterm window. (CVE-2008-2383) + +All hanterm-xf users are advised to upgrade to the updated package, which +contains a backported patch to resolve this issue. All running instances of +hanterm must be restarted for the update to take effect. + +Solution: +Please note that this update is available via +Red Hat Network. To use Red Hat Network, launch the Red +Hat Update Agent with the following command: up2date + +http://rhn.redhat.com/errata/RHSA-2009-0019.html +http://www.redhat.com/security/updates/classification/#important + +Risk factor : High"; + + script_description(english:desc["english"]); + + summary["english"] = "Redhat Security Advisory RHSA-2009:0019"; + script_summary(english:summary["english"]); + + script_category(ACT_GATHER_INFO); + + script_copyright(english:"Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com"); + family["english"] = "Red Hat Local Security Checks"; + script_family(english:family["english"]); + script_dependencies("gather-package-list.nasl"); + script_require_keys("ssh/login/rpms"); + exit(0); +} + +# +# The script code starts here +# + +include("revisions-lib.inc"); +include("pkg-lib-rpm.inc"); +vuln = 0; +if(isrpmvuln(pkg:"hanterm-xf", rpm:"hanterm-xf~2.0.5~5.AS21.2", rls:"RHENT_2.1")) { + vuln = 1; +} + +if(vuln) { + security_hole(0); +} Added: trunk/openvas-plugins/scripts/deb_1694_1.nasl =================================================================== --- trunk/openvas-plugins/scripts/deb_1694_1.nasl 2009-01-07 22:13:08 UTC (rev 2159) +++ trunk/openvas-plugins/scripts/deb_1694_1.nasl 2009-01-07 22:16:01 UTC (rev 2160) @@ -0,0 +1,88 @@ +# OpenVAS Vulnerability Test +# $Id$ +# Description: Auto-generated from advisory DSA 1694-1 (xterm) +# +# Authors: +# Thomas Reinke +# +# Copyright: +# Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com +# Text descriptions are largely excerpted from the referenced +# advisory, and are Copyright (c) the respective author(s) +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2, +# or at your option, GNU General Public License version 3, +# as published by the Free Software Foundation +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +# + +if(description) +{ + script_id(63098); + script_cve_id("CVE-2008-2383"); + script_version ("$"); + name["english"] = "Debian Security Advisory DSA 1694-1 (xterm)"; + script_name(english:name["english"]); + + desc["english"] = " +The remote host is missing an update to xterm +announced via advisory DSA 1694-1. + +Paul Szabo discovered that xterm, a terminal emulator for the X Window +System, places arbitrary characters into the input buffer when +displaying certain crafted escape sequences (CVE-2008-2383). + +As an additional precaution, this security update also disables font +changing, user-defined keys, and X property changes through escape +sequences. + +For the stable distribution (etch), this problem has been fixed in +version 222-1etch3. + +For the unstable distribution (sid), this problem will be fixed soon. + +We recommend that you upgrade your xterm package. + +Solution: +https://secure1.securityspace.com/smysecure/catid.html?in=DSA%201694-1 + +Risk factor : High"; + + script_description(english:desc["english"]); + + summary["english"] = "Debian Security Advisory DSA 1694-1 (xterm)"; + script_summary(english:summary["english"]); + + script_category(ACT_GATHER_INFO); + + script_copyright(english:"Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com"); + family["english"] = "Debian Local Security Checks"; + script_family(english:family["english"]); + script_dependencies("gather-package-list.nasl"); + script_require_keys("ssh/login/packages"); + exit(0); +} + +# +# The script code starts here +# + +include("revisions-lib.inc"); +include("pkg-lib-deb.inc"); +vuln = 0; +if(isdpkgvuln(pkg:"xterm", ver:"222-1etch3", rls:"DEB4.0")) { + vuln = 1; +} + +if(vuln) { + security_hole(0); +} Added: trunk/openvas-plugins/scripts/deb_1694_2.nasl =================================================================== --- trunk/openvas-plugins/scripts/deb_1694_2.nasl 2009-01-07 22:13:08 UTC (rev 2159) +++ trunk/openvas-plugins/scripts/deb_1694_2.nasl 2009-01-07 22:16:01 UTC (rev 2160) @@ -0,0 +1,90 @@ +# OpenVAS Vulnerability Test +# $Id$ +# Description: Auto-generated from advisory DSA 1694-2 (xterm) +# +# Authors: +# Thomas Reinke +# +# Copyright: +# Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com +# Text descriptions are largely excerpted from the referenced +# advisory, and are Copyright (c) the respective author(s) +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2, +# or at your option, GNU General Public License version 3, +# as published by the Free Software Foundation +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +# + +if(description) +{ + script_id(63100); + script_cve_id("CVE-2008-2383"); + script_version ("$"); + name["english"] = "Debian Security Advisory DSA 1694-2 (xterm)"; + script_name(english:name["english"]); + + desc["english"] = " +The remote host is missing an update to xterm +announced via advisory DSA 1694-2. + +The xterm update in DSA-1694-1 disabled font changing as a precaution. +However, users reported that they need this feature. The update in this +DSA makes font shifting through escape sequences configurable, using a +new allowFontOps X resource, and unconditionally enables font changing +through keyboard sequences. + +For the stable distribution (etch), this problem has been fixed in +version 222-1etch4. + +For the testing distribution (lenny), this problem has been fixed in +version 235-2. + +For the unstable distribution (sid), this problem has been fixed in +version 238-2. + +We recommend that you upgrade your xterm package. + +Solution: +https://secure1.securityspace.com/smysecure/catid.html?in=DSA%201694-2 + +Risk factor : High"; + + script_description(english:desc["english"]); + + summary["english"] = "Debian Security Advisory DSA 1694-2 (xterm)"; + script_summary(english:summary["english"]); + + script_category(ACT_GATHER_INFO); + + script_copyright(english:"Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com"); + family["english"] = "Debian Local Security Checks"; + script_family(english:family["english"]); + script_dependencies("gather-package-list.nasl"); + script_require_keys("ssh/login/packages"); + exit(0); +} + +# +# The script code starts here +# + +include("revisions-lib.inc"); +include("pkg-lib-deb.inc"); +vuln = 0; +if(isdpkgvuln(pkg:"xterm", ver:"222-1etch4", rls:"DEB4.0")) { + vuln = 1; +} + +if(vuln) { + security_hole(0); +} Added: trunk/openvas-plugins/scripts/deb_1695_1.nasl =================================================================== --- trunk/openvas-plugins/scripts/deb_1695_1.nasl 2009-01-07 22:13:08 UTC (rev 2159) +++ trunk/openvas-plugins/scripts/deb_1695_1.nasl 2009-01-07 22:16:01 UTC (rev 2160) @@ -0,0 +1,172 @@ +# OpenVAS Vulnerability Test +# $Id$ +# Description: Auto-generated from advisory DSA 1695-1 (ruby1.8, ruby1.9) +# +# Authors: +# Thomas Reinke +# +# Copyright: +# Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com +# Text descriptions are largely excerpted from the referenced +# advisory, and are Copyright (c) the respective author(s) +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2, +# or at your option, GNU General Public License version 3, +# as published by the Free Software Foundation +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +# + +if(description) +{ + script_id(63099); + script_cve_id("CVE-2008-3443"); + script_version ("$"); + name["english"] = "Debian Security Advisory DSA 1695-1 (ruby1.8, ruby1.9)"; + script_name(english:name["english"]); + + desc["english"] = " +The remote host is missing an update to ruby1.8, ruby1.9 +announced via advisory DSA 1695-1. + +The regular expression engine of Ruby, a scripting language, contains a +memory leak which can be triggered remotely under certain circumstances, +leading to a denial of service condition (CVE-2008-3443). + +In addition, this security update addresses a regression in the REXML +XML parser of the ruby1.8 package; the regression was introduced in +DSA-1651-1. + +For the stable distribution (etch), this problem has been fixed in version +1.8.5-4etch4 of the ruby1.8 package, and version 1.9.0+20060609-1etch4 +of the ruby1.9 package. + +For the unstable distribution (sid), this problem has been fixed in +version 1.8.7.72-1 of the ruby1.8 package. The ruby1.9 package will be +fixed soon. + +We recommend that you upgrade your Ruby packages. + +Solution: +https://secure1.securityspace.com/smysecure/catid.html?in=DSA%201695-1 + +Risk factor : High"; + + script_description(english:desc["english"]); + + summary["english"] = "Debian Security Advisory DSA 1695-1 (ruby1.8, ruby1.9)"; + script_summary(english:summary["english"]); + + script_category(ACT_GATHER_INFO); + + script_copyright(english:"Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com"); + family["english"] = "Debian Local Security Checks"; + script_family(english:family["english"]); + script_dependencies("gather-package-list.nasl"); + script_require_keys("ssh/login/packages"); + exit(0); +} + +# +# The script code starts here +# + +include("revisions-lib.inc"); +include("pkg-lib-deb.inc"); +vuln = 0; +if(isdpkgvuln(pkg:"ruby1.9-examples", ver:"1.9.0+20060609-1etch4", rls:"DEB4.0")) { + vuln = 1; +} +if(isdpkgvuln(pkg:"irb1.9", ver:"1.9.0+20060609-1etch4", rls:"DEB4.0")) { + vuln = 1; +} +if(isdpkgvuln(pkg:"rdoc1.8", ver:"1.8.5-4etch4", rls:"DEB4.0")) { + vuln = 1; +} +if(isdpkgvuln(pkg:"ri1.8", ver:"1.8.5-4etch4", rls:"DEB4.0")) { + vuln = 1; +} +if(isdpkgvuln(pkg:"ruby1.9-elisp", ver:"1.9.0+20060609-1etch4", rls:"DEB4.0")) { + vuln = 1; +} +if(isdpkgvuln(pkg:"ri1.9", ver:"1.9.0+20060609-1etch4", rls:"DEB4.0")) { + vuln = 1; +} +if(isdpkgvuln(pkg:"rdoc1.9", ver:"1.9.0+20060609-1etch4", rls:"DEB4.0")) { + vuln = 1; +} +if(isdpkgvuln(pkg:"irb1.8", ver:"1.8.5-4etch4", rls:"DEB4.0")) { + vuln = 1; +} +if(isdpkgvuln(pkg:"ruby1.8-elisp", ver:"1.8.5-4etch4", rls:"DEB4.0")) { + vuln = 1; +} +if(isdpkgvuln(pkg:"ruby1.8-examples", ver:"1.8.5-4etch4", rls:"DEB4.0")) { + vuln = 1; +} +if(isdpkgvuln(pkg:"libreadline-ruby1.8", ver:"1.8.5-4etch4", rls:"DEB4.0")) { + vuln = 1; +} +if(isdpkgvuln(pkg:"libopenssl-ruby1.9", ver:"1.9.0+20060609-1etch4", rls:"DEB4.0")) { + vuln = 1; +} +if(isdpkgvuln(pkg:"ruby1.9", ver:"1.9.0+20060609-1etch4", rls:"DEB4.0")) { + vuln = 1; +} +if(isdpkgvuln(pkg:"libdbm-ruby1.9", ver:"1.9.0+20060609-1etch4", rls:"DEB4.0")) { + vuln = 1; +} +if(isdpkgvuln(pkg:"ruby1.8", ver:"1.8.5-4etch4", rls:"DEB4.0")) { + vuln = 1; +} +if(isdpkgvuln(pkg:"libopenssl-ruby1.8", ver:"1.8.5-4etch4", rls:"DEB4.0")) { + vuln = 1; +} +if(isdpkgvuln(pkg:"libgdbm-ruby1.9", ver:"1.9.0+20060609-1etch4", rls:"DEB4.0")) { + vuln = 1; +} +if(isdpkgvuln(pkg:"ruby1.8-dev", ver:"1.8.5-4etch4", rls:"DEB4.0")) { + vuln = 1; +} +if(isdpkgvuln(pkg:"ruby1.9-dev", ver:"1.9.0+20060609-1etch4", rls:"DEB4.0")) { + vuln = 1; +} +if(isdpkgvuln(pkg:"libreadline-ruby1.9", ver:"1.9.0+20060609-1etch4", rls:"DEB4.0")) { + vuln = 1; +} +if(isdpkgvuln(pkg:"libdbm-ruby1.8", ver:"1.8.5-4etch4", rls:"DEB4.0")) { + vuln = 1; +} +if(isdpkgvuln(pkg:"libtcltk-ruby1.9", ver:"1.9.0+20060609-1etch4", rls:"DEB4.0")) { + vuln = 1; +} +if(isdpkgvuln(pkg:"libtcltk-ruby1.8", ver:"1.8.5-4etch4", rls:"DEB4.0")) { + vuln = 1; +} +if(isdpkgvuln(pkg:"libgdbm-ruby1.8", ver:"1.8.5-4etch4", rls:"DEB4.0")) { + vuln = 1; +} +if(isdpkgvuln(pkg:"libruby1.8-dbg", ver:"1.8.5-4etch4", rls:"DEB4.0")) { + vuln = 1; +} +if(isdpkgvuln(pkg:"libruby1.9", ver:"1.9.0+20060609-1etch4", rls:"DEB4.0")) { + vuln = 1; +} +if(isdpkgvuln(pkg:"libruby1.9-dbg", ver:"1.9.0+20060609-1etch4", rls:"DEB4.0")) { + vuln = 1; +} +if(isdpkgvuln(pkg:"libruby1.8", ver:"1.8.5-4etch4", rls:"DEB4.0")) { + vuln = 1; +} + +if(vuln) { + security_hole(0); +} Added: trunk/openvas-plugins/scripts/fcore_2008_10755.nasl =================================================================== --- trunk/openvas-plugins/scripts/fcore_2008_10755.nasl 2009-01-07 22:13:08 UTC (rev 2159) +++ trunk/openvas-plugins/scripts/fcore_2008_10755.nasl 2009-01-07 22:16:01 UTC (rev 2160) @@ -0,0 +1,94 @@ +# OpenVAS Vulnerability Test +# $Id$ +# Description: Auto-generated from advisory FEDORA-2008-10755 (am-utils) +# +# Authors: +# Thomas Reinke +# +# Copyright: +# Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com +# Text descriptions are largely excerpted from the referenced +# advisory, and are Copyright (c) the respective author(s) +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2, +# or at your option, GNU General Public License version 3, +# as published by the Free Software Foundation +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +# + +if(description) +{ + script_id(63130); + script_cve_id("CVE-2008-1078"); + script_version ("$"); + name["english"] = "Fedora Core 9 FEDORA-2008-10755 (am-utils)"; + script_name(english:name["english"]); + + desc["english"] = " +The remote host is missing an update to am-utils +announced via advisory FEDORA-2008-10755. + +ChangeLog: + +* Tue Dec 2 2008 Karel Zak 5:6.1.5-8.1 +- fix #450754 - Amd does not work with 2.6.25 (thanks to Philippe Troin) +- fix #435420 - CVE-2008-1078 am-utils: insecure usage of temporary files +- fix autotools stuff + +References: + +[ 1 ] Bug #435420 - CVE-2008-1078 am-utils: insecure usage of temporary files +https://bugzilla.redhat.com/show_bug.cgi?id=435420 + +Solution: Apply the appropriate updates. + +This update can be installed with the yum update program. Use +su -c 'yum update am-utils' at the command line. +For more information, refer to Managing Software with yum, +available at http://docs.fedoraproject.org/yum/. + +https://secure1.securityspace.com/smysecure/catid.html?in=FEDORA-2008-10755 + +Risk factor : High"; + + script_description(english:desc["english"]); + + summary["english"] = "Fedora Core 9 FEDORA-2008-10755 (am-utils)"; + script_summary(english:summary["english"]); + + script_category(ACT_GATHER_INFO); + + script_copyright(english:"Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com"); + family["english"] = "Fedora Local Security Checks"; + script_family(english:family["english"]); + script_dependencies("gather-package-list.nasl"); + script_require_keys("ssh/login/rpms"); + exit(0); +} + +# +# The script code starts here +# + +include("revisions-lib.inc"); +include("pkg-lib-rpm.inc"); +vuln = 0; +if(isrpmvuln(pkg:"am-utils", rpm:"am-utils~6.1.5~8.1.fc9", rls:"FC9")) { + vuln = 1; +} +if(isrpmvuln(pkg:"am-utils-debuginfo", rpm:"am-utils-debuginfo~6.1.5~8.1.fc9", rls:"FC9")) { + vuln = 1; +} + +if(vuln) { + security_hole(0); +} Added: trunk/openvas-plugins/scripts/fcore_2008_11351.nasl =================================================================== --- trunk/openvas-plugins/scripts/fcore_2008_11351.nasl 2009-01-07 22:13:08 UTC (rev 2159) +++ trunk/openvas-plugins/scripts/fcore_2008_11351.nasl 2009-01-07 22:16:01 UTC (rev 2160) @@ -0,0 +1,156 @@ +# OpenVAS Vulnerability Test +# $Id$ +# Description: Auto-generated from advisory FEDORA-2008-11351 (avahi) +# +# Authors: +# Thomas Reinke +# +# Copyright: +# Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com +# Text descriptions are largely excerpted from the referenced +# advisory, and are Copyright (c) the respective author(s) +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2, +# or at your option, GNU General Public License version 3, +# as published by the Free Software Foundation +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +# + +if(description) +{ + script_id(63129); + script_cve_id("CVE-2008-5081"); + script_version ("$"); + name["english"] = "Fedora Core 10 FEDORA-2008-11351 (avahi)"; + script_name(english:name["english"]); + + desc["english"] = " +The remote host is missing an update to avahi +announced via advisory FEDORA-2008-11351. + +ChangeLog: + +* Sun Dec 14 2008 Lennart Poettering - 0.6.22-12 +- Fix a couple of issues, rhbz #475394, avahi bts #209, rhbz #438013, avahi bts +All backported from upstream 0.6.24 + +References: + +[ 1 ] Bug #475964 - CVE-2008-5081 avahi: avahi-daemon DoS (application abort) via packet with source port 0 +https://bugzilla.redhat.com/show_bug.cgi?id=475964 + +Solution: Apply the appropriate updates. + +This update can be installed with the yum update program. Use +su -c 'yum update avahi' at the command line. +For more information, refer to Managing Software with yum, +available at http://docs.fedoraproject.org/yum/. + +https://secure1.securityspace.com/smysecure/catid.html?in=FEDORA-2008-11351 + +Risk factor : High"; + + script_description(english:desc["english"]); + + summary["english"] = "Fedora Core 10 FEDORA-2008-11351 (avahi)"; + script_summary(english:summary["english"]); + + script_category(ACT_GATHER_INFO); + + script_copyright(english:"Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com"); + family["english"] = "Fedora Local Security Checks"; + script_family(english:family["english"]); + script_dependencies("gather-package-list.nasl"); + script_require_keys("ssh/login/rpms"); + exit(0); +} + +# +# The script code starts here +# + +include("revisions-lib.inc"); +include("pkg-lib-rpm.inc"); +vuln = 0; +if(isrpmvuln(pkg:"avahi", rpm:"avahi~0.6.22~12.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"avahi-autoipd", rpm:"avahi-autoipd~0.6.22~12.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"avahi-compat-howl", rpm:"avahi-compat-howl~0.6.22~12.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"avahi-compat-howl", rpm:"avahi-compat-howl~devel~0.6.22", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"avahi-compat-libdns_sd", rpm:"avahi-compat-libdns_sd~0.6.22~12.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"avahi-compat-libdns_sd", rpm:"avahi-compat-libdns_sd~devel~0.6.22", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"avahi-devel", rpm:"avahi-devel~0.6.22~12.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"avahi-dnsconfd", rpm:"avahi-dnsconfd~0.6.22~12.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"avahi-glib", rpm:"avahi-glib~0.6.22~12.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"avahi-glib-devel", rpm:"avahi-glib-devel~0.6.22~12.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"avahi-gobject", rpm:"avahi-gobject~0.6.22~12.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"avahi-gobject-devel", rpm:"avahi-gobject-devel~0.6.22~12.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"avahi-qt3", rpm:"avahi-qt3~0.6.22~12.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"avahi-qt3-devel", rpm:"avahi-qt3-devel~0.6.22~12.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"avahi-qt4", rpm:"avahi-qt4~0.6.22~12.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"avahi-qt4-devel", rpm:"avahi-qt4-devel~0.6.22~12.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"avahi-sharp", rpm:"avahi-sharp~0.6.22~12.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"avahi-tools", rpm:"avahi-tools~0.6.22~12.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"avahi-ui", rpm:"avahi-ui~0.6.22~12.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"avahi-ui-devel", rpm:"avahi-ui-devel~0.6.22~12.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"avahi-ui-sharp", rpm:"avahi-ui-sharp~0.6.22~12.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"avahi-ui-tools", rpm:"avahi-ui-tools~0.6.22~12.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"avahi-debuginfo", rpm:"avahi-debuginfo~0.6.22~12.fc10", rls:"FC10")) { + vuln = 1; +} + +if(vuln) { + security_hole(0); +} Added: trunk/openvas-plugins/scripts/fcore_2008_11484.nasl =================================================================== --- trunk/openvas-plugins/scripts/fcore_2008_11484.nasl 2009-01-07 22:13:08 UTC (rev 2159) +++ trunk/openvas-plugins/scripts/fcore_2008_11484.nasl 2009-01-07 22:16:01 UTC (rev 2160) @@ -0,0 +1,94 @@ +# OpenVAS Vulnerability Test +# $Id$ +# Description: Auto-generated from advisory FEDORA-2008-11484 (zoneminder) +# +# Authors: +# Thomas Reinke +# +# Copyright: +# Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com +# Text descriptions are largely excerpted from the referenced +# advisory, and are Copyright (c) the respective author(s) +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2, +# or at your option, GNU General Public License version 3, +# as published by the Free Software Foundation +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +# + +if(description) +{ + script_id(63123); + script_version ("$"); + name["english"] = "Fedora Core 10 FEDORA-2008-11484 (zoneminder)"; + script_name(english:name["english"]); + + desc["english"] = " +The remote host is missing an update to zoneminder +announced via advisory FEDORA-2008-11484. + +Update Information: + +Fix permissions on /etc/zm.conf +ChangeLog: + +* Mon Dec 15 2008 Martin Ebourne - 1.23.3-2 +- Fix permissions on zm.conf + +References: + +[ 1 ] Bug #476529 - zoneminder: default permissions of zm.conf +https://bugzilla.redhat.com/show_bug.cgi?id=476529 + +Solution: Apply the appropriate updates. + +This update can be installed with the yum update program. Use +su -c 'yum update zoneminder' at the command line. +For more information, refer to Managing Software with yum, +available at http://docs.fedoraproject.org/yum/. + +https://secure1.securityspace.com/smysecure/catid.html?in=FEDORA-2008-11484 + +Risk factor : High"; + + script_description(english:desc["english"]); + + summary["english"] = "Fedora Core 10 FEDORA-2008-11484 (zoneminder)"; + script_summary(english:summary["english"]); + + script_category(ACT_GATHER_INFO); + + script_copyright(english:"Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com"); + family["english"] = "Fedora Local Security Checks"; + script_family(english:family["english"]); + script_dependencies("gather-package-list.nasl"); + script_require_keys("ssh/login/rpms"); + exit(0); +} + +# +# The script code starts here +# + +include("revisions-lib.inc"); +include("pkg-lib-rpm.inc"); +vuln = 0; +if(isrpmvuln(pkg:"zoneminder", rpm:"zoneminder~1.23.3~2.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"zoneminder-debuginfo", rpm:"zoneminder-debuginfo~1.23.3~2.fc10", rls:"FC10")) { + vuln = 1; +} + +if(vuln) { + security_hole(0); +} Added: trunk/openvas-plugins/scripts/fcore_2008_11843.nasl =================================================================== --- trunk/openvas-plugins/scripts/fcore_2008_11843.nasl 2009-01-07 22:13:08 UTC (rev 2159) +++ trunk/openvas-plugins/scripts/fcore_2008_11843.nasl 2009-01-07 22:16:01 UTC (rev 2160) @@ -0,0 +1,101 @@ +# OpenVAS Vulnerability Test +# $Id$ +# Description: Auto-generated from advisory FEDORA-2008-11843 (p7zip) +# +# Authors: +# Thomas Reinke +# +# Copyright: +# Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com +# Text descriptions are largely excerpted from the referenced +# advisory, and are Copyright (c) the respective author(s) +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2, +# or at your option, GNU General Public License version 3, +# as published by the Free Software Foundation +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +# + +if(description) +{ + script_id(63126); + script_version ("$"); + name["english"] = "Fedora Core 10 FEDORA-2008-11843 (p7zip)"; + script_name(english:name["english"]); + + desc["english"] = " +The remote host is missing an update to p7zip +announced via advisory FEDORA-2008-11843. + +Update Information: + +This update addresses some moderate archiver flaws discovered in p7zip versions +earlier than 4.57. + +ChangeLog: + +* Tue Dec 23 2008 Matthias Saou 4.61-1 +- Update to 4.61. +- Update norar patch. +- Use asm for x86 too (nasm). + +References: + +[ 1 ] Bug #438410 - p7zip: Archive Formats Issues +https://bugzilla.redhat.com/show_bug.cgi?id=438410 + +Solution: Apply the appropriate updates. + +This update can be installed with the yum update program. Use +su -c 'yum update p7zip' at the command line. +For more information, refer to Managing Software with yum, +available at http://docs.fedoraproject.org/yum/. + +https://secure1.securityspace.com/smysecure/catid.html?in=FEDORA-2008-11843 + +Risk factor : High"; + + script_description(english:desc["english"]); + + summary["english"] = "Fedora Core 10 FEDORA-2008-11843 (p7zip)"; + script_summary(english:summary["english"]); + + script_category(ACT_GATHER_INFO); + + script_copyright(english:"Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com"); + family["english"] = "Fedora Local Security Checks"; + script_family(english:family["english"]); + script_dependencies("gather-package-list.nasl"); + script_require_keys("ssh/login/rpms"); + exit(0); +} + +# +# The script code starts here +# + +include("revisions-lib.inc"); +include("pkg-lib-rpm.inc"); +vuln = 0; +if(isrpmvuln(pkg:"p7zip", rpm:"p7zip~4.61~1.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"p7zip-plugins", rpm:"p7zip-plugins~4.61~1.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"p7zip-debuginfo", rpm:"p7zip-debuginfo~4.61~1.fc10", rls:"FC10")) { + vuln = 1; +} + +if(vuln) { + security_hole(0); +} Added: trunk/openvas-plugins/scripts/fcore_2008_11868.nasl =================================================================== --- trunk/openvas-plugins/scripts/fcore_2008_11868.nasl 2009-01-07 22:13:08 UTC (rev 2159) +++ trunk/openvas-plugins/scripts/fcore_2008_11868.nasl 2009-01-07 22:16:01 UTC (rev 2160) @@ -0,0 +1,105 @@ +# OpenVAS Vulnerability Test +# $Id$ +# Description: Auto-generated from advisory FEDORA-2008-11868 (p7zip) +# +# Authors: +# Thomas Reinke +# +# Copyright: +# Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com +# Text descriptions are largely excerpted from the referenced +# advisory, and are Copyright (c) the respective author(s) +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2, +# or at your option, GNU General Public License version 3, +# as published by the Free Software Foundation +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +# + +if(description) +{ + script_id(63127); + script_version ("$"); + name["english"] = "Fedora Core 9 FEDORA-2008-11868 (p7zip)"; + script_name(english:name["english"]); + + desc["english"] = " +The remote host is missing an update to p7zip +announced via advisory FEDORA-2008-11868. + +Update Information: + +This update addresses some moderate archiver flaws discovered in p7zip versions +earlier than 4.57. + +ChangeLog: + +* Tue Dec 23 2008 Matthias Saou 4.61-1 +- Update to 4.61. +- Update norar patch. +- Use asm for x86 too (nasm). +* Wed Jun 18 2008 Matthias Saou 4.58-1 +- Update to 4.58. +- Update norar patch. +- Update install patch. + +References: + +[ 1 ] Bug #438410 - p7zip: Archive Formats Issues +https://bugzilla.redhat.com/show_bug.cgi?id=438410 + +Solution: Apply the appropriate updates. + +This update can be installed with the yum update program. Use +su -c 'yum update p7zip' at the command line. +For more information, refer to Managing Software with yum, +available at http://docs.fedoraproject.org/yum/. + +https://secure1.securityspace.com/smysecure/catid.html?in=FEDORA-2008-11868 + +Risk factor : High"; + + script_description(english:desc["english"]); + + summary["english"] = "Fedora Core 9 FEDORA-2008-11868 (p7zip)"; + script_summary(english:summary["english"]); + + script_category(ACT_GATHER_INFO); + + script_copyright(english:"Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com"); + family["english"] = "Fedora Local Security Checks"; + script_family(english:family["english"]); + script_dependencies("gather-package-list.nasl"); + script_require_keys("ssh/login/rpms"); + exit(0); +} + +# +# The script code starts here +# + +include("revisions-lib.inc"); +include("pkg-lib-rpm.inc"); +vuln = 0; +if(isrpmvuln(pkg:"p7zip", rpm:"p7zip~4.61~1.fc9", rls:"FC9")) { + vuln = 1; +} +if(isrpmvuln(pkg:"p7zip-plugins", rpm:"p7zip-plugins~4.61~1.fc9", rls:"FC9")) { + vuln = 1; +} +if(isrpmvuln(pkg:"p7zip-debuginfo", rpm:"p7zip-debuginfo~4.61~1.fc9", rls:"FC9")) { + vuln = 1; +} + +if(vuln) { + security_hole(0); +} Added: trunk/openvas-plugins/scripts/fcore_2008_11891.nasl =================================================================== --- trunk/openvas-plugins/scripts/fcore_2008_11891.nasl 2009-01-07 22:13:08 UTC (rev 2159) +++ trunk/openvas-plugins/scripts/fcore_2008_11891.nasl 2009-01-07 22:16:01 UTC (rev 2160) @@ -0,0 +1,101 @@ +# OpenVAS Vulnerability Test +# $Id$ +# Description: Auto-generated from advisory FEDORA-2008-11891 (p7zip) +# +# Authors: +# Thomas Reinke +# +# Copyright: +# Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com +# Text descriptions are largely excerpted from the referenced +# advisory, and are Copyright (c) the respective author(s) +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2, +# or at your option, GNU General Public License version 3, +# as published by the Free Software Foundation +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +# + +if(description) +{ + script_id(63131); + script_version ("$"); + name["english"] = "Fedora Core 8 FEDORA-2008-11891 (p7zip)"; + script_name(english:name["english"]); + + desc["english"] = " +The remote host is missing an update to p7zip +announced via advisory FEDORA-2008-11891. + +Update Information: + +This update addresses some moderate archiver flaws discovered in p7zip versions +earlier than 4.57. + +ChangeLog: + +* Tue Dec 23 2008 Matthias Saou 4.61-1 +- Update to 4.61. +- Update norar patch. +- Use asm for x86 too (nasm). + +References: + +[ 1 ] Bug #438410 - p7zip: Archive Formats Issues +https://bugzilla.redhat.com/show_bug.cgi?id=438410 + +Solution: Apply the appropriate updates. + +This update can be installed with the yum update program. Use +su -c 'yum update p7zip' at the command line. +For more information, refer to Managing Software with yum, +available at http://docs.fedoraproject.org/yum/. + +https://secure1.securityspace.com/smysecure/catid.html?in=FEDORA-2008-11891 + +Risk factor : High"; + + script_description(english:desc["english"]); + + summary["english"] = "Fedora Core 8 FEDORA-2008-11891 (p7zip)"; + script_summary(english:summary["english"]); + + script_category(ACT_GATHER_INFO); + + script_copyright(english:"Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com"); + family["english"] = "Fedora Local Security Checks"; + script_family(english:family["english"]); + script_dependencies("gather-package-list.nasl"); + script_require_keys("ssh/login/rpms"); + exit(0); +} + +# +# The script code starts here +# + +include("revisions-lib.inc"); +include("pkg-lib-rpm.inc"); +vuln = 0; +if(isrpmvuln(pkg:"p7zip", rpm:"p7zip~4.61~1.fc8", rls:"FC8")) { + vuln = 1; +} +if(isrpmvuln(pkg:"p7zip-plugins", rpm:"p7zip-plugins~4.61~1.fc8", rls:"FC8")) { + vuln = 1; +} +if(isrpmvuln(pkg:"p7zip-debuginfo", rpm:"p7zip-debuginfo~4.61~1.fc8", rls:"FC8")) { + vuln = 1; +} + +if(vuln) { + security_hole(0); +} Added: trunk/openvas-plugins/scripts/fcore_2009_0059.nasl =================================================================== --- trunk/openvas-plugins/scripts/fcore_2009_0059.nasl 2009-01-07 22:13:08 UTC (rev 2159) +++ trunk/openvas-plugins/scripts/fcore_2009_0059.nasl 2009-01-07 22:16:01 UTC (rev 2160) @@ -0,0 +1,101 @@ +# OpenVAS Vulnerability Test +# $Id$ +# Description: Auto-generated from advisory FEDORA-2009-0059 (xterm) +# +# Authors: +# Thomas Reinke +# +# Copyright: +# Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com +# Text descriptions are largely excerpted from the referenced +# advisory, and are Copyright (c) the respective author(s) +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2, +# or at your option, GNU General Public License version 3, +# as published by the Free Software Foundation +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +# + +if(description) +{ + script_id(63116); + script_cve_id("CVE-2003-0063", "CVE-2003-0071", "CVE-2008-2383"); + script_version ("$"); + name["english"] = "Fedora Core 9 FEDORA-2009-0059 (xterm)"; + script_name(english:name["english"]); + + desc["english"] = " +The remote host is missing an update to xterm +announced via advisory FEDORA-2009-0059. + +Update Information: + +This update fixes the following security issue: CRLF injection vulnerability +in xterm allows user-assisted attackers to execute arbitrary commands via LF +(aka \n) characters surrounding a command name within a Device Control Request +Status String (DECRQSS) escape sequence in a text file, a related issue to +CVE-2003-0063 and CVE-2003-0071. + +ChangeLog: + +* Tue Jan 6 2009 Miroslav Lichvar 238-1 +- update to 238 (#479000, CVE-2008-2383) +- set default values of allowWindowOps and allowFontOps resources to false + +References: + +[ 1 ] Bug #479000 - xterm executes arbitrary commands +https://bugzilla.redhat.com/show_bug.cgi?id=479000 + +Solution: Apply the appropriate updates. + +This update can be installed with the yum update program. Use +su -c 'yum update xterm' at the command line. +For more information, refer to Managing Software with yum, +available at http://docs.fedoraproject.org/yum/. + +https://secure1.securityspace.com/smysecure/catid.html?in=FEDORA-2009-0059 + +Risk factor : High"; + + script_description(english:desc["english"]); + + summary["english"] = "Fedora Core 9 FEDORA-2009-0059 (xterm)"; + script_summary(english:summary["english"]); + + script_category(ACT_GATHER_INFO); + + script_copyright(english:"Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com"); + family["english"] = "Fedora Local Security Checks"; + script_family(english:family["english"]); + script_dependencies("gather-package-list.nasl"); + script_require_keys("ssh/login/rpms"); + exit(0); +} + +# +# The script code starts here +# + +include("revisions-lib.inc"); +include("pkg-lib-rpm.inc"); +vuln = 0; +if(isrpmvuln(pkg:"xterm", rpm:"xterm~238~1.fc9", rls:"FC9")) { + vuln = 1; +} +if(isrpmvuln(pkg:"xterm-debuginfo", rpm:"xterm-debuginfo~238~1.fc9", rls:"FC9")) { + vuln = 1; +} + +if(vuln) { + security_hole(0); +} Added: trunk/openvas-plugins/scripts/fcore_2009_0064.nasl =================================================================== --- trunk/openvas-plugins/scripts/fcore_2009_0064.nasl 2009-01-07 22:13:08 UTC (rev 2159) +++ trunk/openvas-plugins/scripts/fcore_2009_0064.nasl 2009-01-07 22:16:01 UTC (rev 2160) @@ -0,0 +1,110 @@ +# OpenVAS Vulnerability Test +# $Id$ +# Description: Auto-generated from advisory FEDORA-2009-0064 (proftpd) +# +# Authors: +# Thomas Reinke +# +# Copyright: +# Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com +# Text descriptions are largely excerpted from the referenced +# advisory, and are Copyright (c) the respective author(s) +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2, +# or at your option, GNU General Public License version 3, +# as published by the Free Software Foundation +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +# + +if(description) +{ + script_id(63117); + script_cve_id("CVE-2008-4242"); + script_version ("$"); + name["english"] = "Fedora Core 9 FEDORA-2009-0064 (proftpd)"; + script_name(english:name["english"]); + + desc["english"] = " +The remote host is missing an update to proftpd +announced via advisory FEDORA-2009-0064. + +Update Information: + +This update fixes a security issue where an attacker could conduct cross-site +request forgery (CSRF) attacks and execute arbitrary FTP commands. It also fixes +some SSL shutdown issues seen with certain clients. +ChangeLog: + +* Fri Jan 2 2009 Matthias Saou 1.3.1-8 +- Update default configuration to have a lit of available modules and more +example configuration for them. +- Include patches to fix TLS issues (#457280). +* Fri Jan 2 2009 Matthias Saou 1.3.1-7 +- Add Debian patch to fix CSRF vulnerability (#464127, upstream #3115). + +References: + +[ 1 ] Bug #464127 - CVE-2008-4242 proftpd CSRF attack +https://bugzilla.redhat.com/show_bug.cgi?id=464127 + +Solution: Apply the appropriate updates. + +This update can be installed with the yum update program. Use +su -c 'yum update proftpd' at the command line. +For more information, refer to Managing Software with yum, +available at http://docs.fedoraproject.org/yum/. + +https://secure1.securityspace.com/smysecure/catid.html?in=FEDORA-2009-0064 + +Risk factor : High"; + + script_description(english:desc["english"]); + + summary["english"] = "Fedora Core 9 FEDORA-2009-0064 (proftpd)"; + script_summary(english:summary["english"]); + + script_category(ACT_GATHER_INFO); + + script_copyright(english:"Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com"); + family["english"] = "Fedora Local Security Checks"; + script_family(english:family["english"]); + script_dependencies("gather-package-list.nasl"); + script_require_keys("ssh/login/rpms"); + exit(0); +} + +# +# The script code starts here +# + +include("revisions-lib.inc"); +include("pkg-lib-rpm.inc"); +vuln = 0; +if(isrpmvuln(pkg:"proftpd", rpm:"proftpd~1.3.1~8.fc9", rls:"FC9")) { + vuln = 1; +} +if(isrpmvuln(pkg:"proftpd-ldap", rpm:"proftpd-ldap~1.3.1~8.fc9", rls:"FC9")) { + vuln = 1; +} +if(isrpmvuln(pkg:"proftpd-mysql", rpm:"proftpd-mysql~1.3.1~8.fc9", rls:"FC9")) { + vuln = 1; +} +if(isrpmvuln(pkg:"proftpd-postgresql", rpm:"proftpd-postgresql~1.3.1~8.fc9", rls:"FC9")) { + vuln = 1; +} +if(isrpmvuln(pkg:"proftpd-debuginfo", rpm:"proftpd-debuginfo~1.3.1~8.fc9", rls:"FC9")) { + vuln = 1; +} + +if(vuln) { + security_hole(0); +} Added: trunk/openvas-plugins/scripts/fcore_2009_0088.nasl =================================================================== --- trunk/openvas-plugins/scripts/fcore_2009_0088.nasl 2009-01-07 22:13:08 UTC (rev 2159) +++ trunk/openvas-plugins/scripts/fcore_2009_0088.nasl 2009-01-07 22:16:01 UTC (rev 2160) @@ -0,0 +1,94 @@ +# OpenVAS Vulnerability Test +# $Id$ +# Description: Auto-generated from advisory FEDORA-2009-0088 (thunderbird) +# +# Authors: +# Thomas Reinke +# +# Copyright: +# Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com +# Text descriptions are largely excerpted from the referenced +# advisory, and are Copyright (c) the respective author(s) +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2, +# or at your option, GNU General Public License version 3, +# as published by the Free Software Foundation +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +# + +if(description) +{ + script_id(63118); + script_version ("$"); + name["english"] = "Fedora Core 8 FEDORA-2009-0088 (thunderbird)"; + script_name(english:name["english"]); + + desc["english"] = " +The remote host is missing an update to thunderbird +announced via advisory FEDORA-2009-0088. + +Update Information: + +Update to the new upstream Thunderbird 2.0.0.19 fixing multiple security issues: +http://www.mozilla.org/security/known-vulnerabilities/thunderbird20.html#thunderbird2.0.0.19 + +Note: after the updated packages are installed, Thunderbird must +be restarted for the update to take effect. + +ChangeLog: + +* Mon Jan 5 2009 Christopher Aillon 2.0.0.19-1 +- Update to 2.0.0.19 + +Solution: Apply the appropriate updates. + +This update can be installed with the yum update program. Use +su -c 'yum update thunderbird' at the command line. +For more information, refer to Managing Software with yum, +available at http://docs.fedoraproject.org/yum/. + +https://secure1.securityspace.com/smysecure/catid.html?in=FEDORA-2009-0088 + +Risk factor : High"; + + script_description(english:desc["english"]); + + summary["english"] = "Fedora Core 8 FEDORA-2009-0088 (thunderbird)"; + script_summary(english:summary["english"]); + + script_category(ACT_GATHER_INFO); + + script_copyright(english:"Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com"); + family["english"] = "Fedora Local Security Checks"; + script_family(english:family["english"]); + script_dependencies("gather-package-list.nasl"); + script_require_keys("ssh/login/rpms"); + exit(0); +} + +# +# The script code starts here +# + +include("revisions-lib.inc"); +include("pkg-lib-rpm.inc"); +vuln = 0; +if(isrpmvuln(pkg:"thunderbird", rpm:"thunderbird~2.0.0.19~1.fc8", rls:"FC8")) { + vuln = 1; +} +if(isrpmvuln(pkg:"thunderbird-debuginfo", rpm:"thunderbird-debuginfo~2.0.0.19~1.fc8", rls:"FC8")) { + vuln = 1; +} + +if(vuln) { + security_hole(0); +} Added: trunk/openvas-plugins/scripts/fcore_2009_0089.nasl =================================================================== --- trunk/openvas-plugins/scripts/fcore_2009_0089.nasl 2009-01-07 22:13:08 UTC (rev 2159) +++ trunk/openvas-plugins/scripts/fcore_2009_0089.nasl 2009-01-07 22:16:01 UTC (rev 2160) @@ -0,0 +1,111 @@ +# OpenVAS Vulnerability Test +# $Id$ +# Description: Auto-generated from advisory FEDORA-2009-0089 (proftpd) +# +# Authors: +# Thomas Reinke +# +# Copyright: +# Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com +# Text descriptions are largely excerpted from the referenced +# advisory, and are Copyright (c) the respective author(s) +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2, +# or at your option, GNU General Public License version 3, +# as published by the Free Software Foundation +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +# + +if(description) +{ + script_id(63119); + script_cve_id("CVE-2008-4242"); + script_version ("$"); + name["english"] = "Fedora Core 10 FEDORA-2009-0089 (proftpd)"; + script_name(english:name["english"]); + + desc["english"] = " +The remote host is missing an update to proftpd +announced via advisory FEDORA-2009-0089. + +Update Information: + +This update fixes a security issue where an attacker could conduct cross-site +request forgery (CSRF) attacks and execute arbitrary FTP commands. It also +fixes some SSL shutdown issues seen with certain clients. + +ChangeLog: + +* Fri Jan 2 2009 Matthias Saou 1.3.1-8 +- Update default configuration to have a lit of available modules and more +example configuration for them. +- Include patches to fix TLS issues (#457280). +* Fri Jan 2 2009 Matthias Saou 1.3.1-7 +- Add Debian patch to fix CSRF vulnerability (#464127, upstream #3115). + +References: + +[ 1 ] Bug #464127 - CVE-2008-4242 proftpd CSRF attack +https://bugzilla.redhat.com/show_bug.cgi?id=464127 + +Solution: Apply the appropriate updates. + +This update can be installed with the yum update program. Use +su -c 'yum update proftpd' at the command line. +For more information, refer to Managing Software with yum, +available at http://docs.fedoraproject.org/yum/. + +https://secure1.securityspace.com/smysecure/catid.html?in=FEDORA-2009-0089 + +Risk factor : High"; + + script_description(english:desc["english"]); + + summary["english"] = "Fedora Core 10 FEDORA-2009-0089 (proftpd)"; + script_summary(english:summary["english"]); + + script_category(ACT_GATHER_INFO); + + script_copyright(english:"Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com"); + family["english"] = "Fedora Local Security Checks"; + script_family(english:family["english"]); + script_dependencies("gather-package-list.nasl"); + script_require_keys("ssh/login/rpms"); + exit(0); +} + +# +# The script code starts here +# + +include("revisions-lib.inc"); +include("pkg-lib-rpm.inc"); +vuln = 0; +if(isrpmvuln(pkg:"proftpd", rpm:"proftpd~1.3.1~8.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"proftpd-ldap", rpm:"proftpd-ldap~1.3.1~8.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"proftpd-mysql", rpm:"proftpd-mysql~1.3.1~8.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"proftpd-postgresql", rpm:"proftpd-postgresql~1.3.1~8.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"proftpd-debuginfo", rpm:"proftpd-debuginfo~1.3.1~8.fc10", rls:"FC10")) { + vuln = 1; +} + +if(vuln) { + security_hole(0); +} Added: trunk/openvas-plugins/scripts/fcore_2009_0091.nasl =================================================================== --- trunk/openvas-plugins/scripts/fcore_2009_0091.nasl 2009-01-07 22:13:08 UTC (rev 2159) +++ trunk/openvas-plugins/scripts/fcore_2009_0091.nasl 2009-01-07 22:16:01 UTC (rev 2160) @@ -0,0 +1,101 @@ +# OpenVAS Vulnerability Test +# $Id$ +# Description: Auto-generated from advisory FEDORA-2009-0091 (xterm) +# +# Authors: +# Thomas Reinke +# +# Copyright: +# Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com +# Text descriptions are largely excerpted from the referenced +# advisory, and are Copyright (c) the respective author(s) +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2, +# or at your option, GNU General Public License version 3, +# as published by the Free Software Foundation +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +# + +if(description) +{ + script_id(63120); + script_cve_id("CVE-2003-0063", "CVE-2003-0071", "CVE-2008-2383"); + script_version ("$"); + name["english"] = "Fedora Core 10 FEDORA-2009-0091 (xterm)"; + script_name(english:name["english"]); + + desc["english"] = " +The remote host is missing an update to xterm +announced via advisory FEDORA-2009-0091. + +Update Information: + +This update fixes the following security issue: CRLF injection vulnerability +in xterm allows user-assisted attackers to execute arbitrary commands via LF +(aka \n) characters surrounding a command name within a Device Control Request +Status String (DECRQSS) escape sequence in a text file, a related issue to +CVE-2003-0063 and CVE-2003-0071. + +ChangeLog: + +* Tue Jan 6 2009 Miroslav Lichvar 238-1 +- update to 238 (#479000, CVE-2008-2383) +- set default values of allowWindowOps and allowFontOps resources to false + +References: + +[ 1 ] Bug #479000 - xterm executes arbitrary commands +https://bugzilla.redhat.com/show_bug.cgi?id=479000 + +Solution: Apply the appropriate updates. + +This update can be installed with the yum update program. Use +su -c 'yum update xterm' at the command line. +For more information, refer to Managing Software with yum, +available at http://docs.fedoraproject.org/yum/. + +https://secure1.securityspace.com/smysecure/catid.html?in=FEDORA-2009-0091 + +Risk factor : High"; + + script_description(english:desc["english"]); + + summary["english"] = "Fedora Core 10 FEDORA-2009-0091 (xterm)"; + script_summary(english:summary["english"]); + + script_category(ACT_GATHER_INFO); + + script_copyright(english:"Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com"); + family["english"] = "Fedora Local Security Checks"; + script_family(english:family["english"]); + script_dependencies("gather-package-list.nasl"); + script_require_keys("ssh/login/rpms"); + exit(0); +} + +# +# The script code starts here +# + +include("revisions-lib.inc"); +include("pkg-lib-rpm.inc"); +vuln = 0; +if(isrpmvuln(pkg:"xterm", rpm:"xterm~238~1.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"xterm-debuginfo", rpm:"xterm-debuginfo~238~1.fc10", rls:"FC10")) { + vuln = 1; +} + +if(vuln) { + security_hole(0); +} Added: trunk/openvas-plugins/scripts/fcore_2009_0154.nasl =================================================================== --- trunk/openvas-plugins/scripts/fcore_2009_0154.nasl 2009-01-07 22:13:08 UTC (rev 2159) +++ trunk/openvas-plugins/scripts/fcore_2009_0154.nasl 2009-01-07 22:16:01 UTC (rev 2160) @@ -0,0 +1,101 @@ +# OpenVAS Vulnerability Test +# $Id$ +# Description: Auto-generated from advisory FEDORA-2009-0154 (xterm) +# +# Authors: +# Thomas Reinke +# +# Copyright: +# Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com +# Text descriptions are largely excerpted from the referenced +# advisory, and are Copyright (c) the respective author(s) +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2, +# or at your option, GNU General Public License version 3, +# as published by the Free Software Foundation +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +# + +if(description) +{ + script_id(63121); + script_cve_id("CVE-2003-0063", "CVE-2003-0071", "CVE-2008-2383"); + script_version ("$"); + name["english"] = "Fedora Core 8 FEDORA-2009-0154 (xterm)"; + script_name(english:name["english"]); + + desc["english"] = " +The remote host is missing an update to xterm +announced via advisory FEDORA-2009-0154. + +Update Information: + +This update fixes the following security issue: CRLF injection vulnerability +in xterm allows user-assisted attackers to execute arbitrary commands via LF +(aka \n) characters surrounding a command name within a Device Control Request +Status String (DECRQSS) escape sequence in a text file, a related issue to +CVE-2003-0063 and CVE-2003-0071. + +ChangeLog: + +* Tue Jan 6 2009 Miroslav Lichvar 238-1 +- update to 238 (#479000, CVE-2008-2383) +- set default values of allowWindowOps and allowFontOps resources to false + +References: + +[ 1 ] Bug #479000 - xterm executes arbitrary commands +https://bugzilla.redhat.com/show_bug.cgi?id=479000 + +Solution: Apply the appropriate updates. + +This update can be installed with the yum update program. Use +su -c 'yum update xterm' at the command line. +For more information, refer to Managing Software with yum, +available at http://docs.fedoraproject.org/yum/. + +https://secure1.securityspace.com/smysecure/catid.html?in=FEDORA-2009-0154 + +Risk factor : High"; + + script_description(english:desc["english"]); + + summary["english"] = "Fedora Core 8 FEDORA-2009-0154 (xterm)"; + script_summary(english:summary["english"]); + + script_category(ACT_GATHER_INFO); + + script_copyright(english:"Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com"); + family["english"] = "Fedora Local Security Checks"; + script_family(english:family["english"]); + script_dependencies("gather-package-list.nasl"); + script_require_keys("ssh/login/rpms"); + exit(0); +} + +# +# The script code starts here +# + +include("revisions-lib.inc"); +include("pkg-lib-rpm.inc"); +vuln = 0; +if(isrpmvuln(pkg:"xterm", rpm:"xterm~238~1.fc8", rls:"FC8")) { + vuln = 1; +} +if(isrpmvuln(pkg:"xterm-debuginfo", rpm:"xterm-debuginfo~238~1.fc8", rls:"FC8")) { + vuln = 1; +} + +if(vuln) { + security_hole(0); +} Added: trunk/openvas-plugins/scripts/fcore_2009_0160.nasl =================================================================== --- trunk/openvas-plugins/scripts/fcore_2009_0160.nasl 2009-01-07 22:13:08 UTC (rev 2159) +++ trunk/openvas-plugins/scripts/fcore_2009_0160.nasl 2009-01-07 22:16:01 UTC (rev 2160) @@ -0,0 +1,137 @@ +# OpenVAS Vulnerability Test +# $Id$ +# Description: Auto-generated from advisory FEDORA-2009-0160 (samba) +# +# Authors: +# Thomas Reinke +# +# Copyright: +# Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com +# Text descriptions are largely excerpted from the referenced +# advisory, and are Copyright (c) the respective author(s) +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2, +# or at your option, GNU General Public License version 3, +# as published by the Free Software Foundation +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +# + +if(description) +{ + script_id(63122); + script_cve_id("CVE-2009-0022", "CVE-2008-4314"); + script_version ("$"); + name["english"] = "Fedora Core 10 FEDORA-2009-0160 (samba)"; + script_name(english:name["english"]); + + desc["english"] = " +The remote host is missing an update to samba +announced via advisory FEDORA-2009-0160. + +Update Information: + +Security fix for CVE-2009-0022 + +ChangeLog: + +* Mon Jan 5 2009 Guenther Deschner - 3.2.7-0.25 +- Update to 3.2.7 (Security fix for CVE-2009-0022) +* Wed Dec 10 2008 Guenther Deschner - 3.2.6-0.24 +- Update to 3.2.6 +* Thu Nov 27 2008 Guenther Deschner - 3.2.5-0.23 +- Update to 3.2.5 (Security fix for CVE-2008-4314) + +Solution: Apply the appropriate updates. + +This update can be installed with the yum update program. Use +su -c 'yum update samba' at the command line. +For more information, refer to Managing Software with yum, +available at http://docs.fedoraproject.org/yum/. + +https://secure1.securityspace.com/smysecure/catid.html?in=FEDORA-2009-0160 + +Risk factor : High"; + + script_description(english:desc["english"]); + + summary["english"] = "Fedora Core 10 FEDORA-2009-0160 (samba)"; + script_summary(english:summary["english"]); + + script_category(ACT_GATHER_INFO); + + script_copyright(english:"Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com"); + family["english"] = "Fedora Local Security Checks"; + script_family(english:family["english"]); + script_dependencies("gather-package-list.nasl"); + script_require_keys("ssh/login/rpms"); + exit(0); +} + +# +# The script code starts here +# + +include("revisions-lib.inc"); +include("pkg-lib-rpm.inc"); +vuln = 0; +if(isrpmvuln(pkg:"libsmbclient", rpm:"libsmbclient~3.2.7~0.25.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"libsmbclient-devel", rpm:"libsmbclient-devel~3.2.7~0.25.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"libtalloc", rpm:"libtalloc~1.2.0~25.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"libtalloc-devel", rpm:"libtalloc-devel~1.2.0~25.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"libtdb", rpm:"libtdb~1.1.1~25.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"libtdb-devel", rpm:"libtdb-devel~1.1.1~25.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"samba", rpm:"samba~3.2.7~0.25.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"samba-client", rpm:"samba-client~3.2.7~0.25.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"samba-common", rpm:"samba-common~3.2.7~0.25.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"samba-doc", rpm:"samba-doc~3.2.7~0.25.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"samba-domainjoin-gui", rpm:"samba-domainjoin-gui~3.2.7~0.25.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"samba-swat", rpm:"samba-swat~3.2.7~0.25.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"samba-winbind", rpm:"samba-winbind~3.2.7~0.25.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"samba-winbind-devel", rpm:"samba-winbind-devel~3.2.7~0.25.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"tdb-tools", rpm:"tdb-tools~1.1.1~25.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"samba-debuginfo", rpm:"samba-debuginfo~3.2.7~0.25.fc10", rls:"FC10")) { + vuln = 1; +} + +if(vuln) { + security_hole(0); +} Added: trunk/openvas-plugins/scripts/fcore_2009_0183.nasl =================================================================== --- trunk/openvas-plugins/scripts/fcore_2009_0183.nasl 2009-01-07 22:13:08 UTC (rev 2159) +++ trunk/openvas-plugins/scripts/fcore_2009_0183.nasl 2009-01-07 22:16:01 UTC (rev 2160) @@ -0,0 +1,96 @@ +# OpenVAS Vulnerability Test +# $Id$ +# Description: Auto-generated from advisory FEDORA-2009-0183 (thunderbird) +# +# Authors: +# Thomas Reinke +# +# Copyright: +# Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com +# Text descriptions are largely excerpted from the referenced +# advisory, and are Copyright (c) the respective author(s) +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2, +# or at your option, GNU General Public License version 3, +# as published by the Free Software Foundation +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +# + +if(description) +{ + script_id(63124); + script_version ("$"); + name["english"] = "Fedora Core 10 FEDORA-2009-0183 (thunderbird)"; + script_name(english:name["english"]); + + desc["english"] = " +The remote host is missing an update to thunderbird +announced via advisory FEDORA-2009-0183. + +Update Information: + +Update to the new upstream Thunderbird 2.0.0.19 fixing multiple security issues: +http://www.mozilla.org/security/known-vulnerabilities/thunderbird20.html#thunderbird2.0.0.19 + +Note: after the updated packages are installed, Thunderbird must be +restarted for the update to take effect. + +ChangeLog: + +* Mon Jan 5 2009 Christopher Aillon 2.0.0.19-1 +- Update to 2.0.0.19 +* Wed Nov 19 2008 Christopher Aillon 2.0.0.18-1 +- Update to 2.0.0.18 + +Solution: Apply the appropriate updates. + +This update can be installed with the yum update program. Use +su -c 'yum update thunderbird' at the command line. +For more information, refer to Managing Software with yum, +available at http://docs.fedoraproject.org/yum/. + +https://secure1.securityspace.com/smysecure/catid.html?in=FEDORA-2009-0183 + +Risk factor : High"; + + script_description(english:desc["english"]); + + summary["english"] = "Fedora Core 10 FEDORA-2009-0183 (thunderbird)"; + script_summary(english:summary["english"]); + + script_category(ACT_GATHER_INFO); + + script_copyright(english:"Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com"); + family["english"] = "Fedora Local Security Checks"; + script_family(english:family["english"]); + script_dependencies("gather-package-list.nasl"); + script_require_keys("ssh/login/rpms"); + exit(0); +} + +# +# The script code starts here +# + +include("revisions-lib.inc"); +include("pkg-lib-rpm.inc"); +vuln = 0; +if(isrpmvuln(pkg:"thunderbird", rpm:"thunderbird~2.0.0.19~1.fc10", rls:"FC10")) { + vuln = 1; +} +if(isrpmvuln(pkg:"thunderbird-debuginfo", rpm:"thunderbird-debuginfo~2.0.0.19~1.fc10", rls:"FC10")) { + vuln = 1; +} + +if(vuln) { + security_hole(0); +} Added: trunk/openvas-plugins/scripts/fcore_2009_0187.nasl =================================================================== --- trunk/openvas-plugins/scripts/fcore_2009_0187.nasl 2009-01-07 22:13:08 UTC (rev 2159) +++ trunk/openvas-plugins/scripts/fcore_2009_0187.nasl 2009-01-07 22:16:01 UTC (rev 2160) @@ -0,0 +1,96 @@ +# OpenVAS Vulnerability Test +# $Id$ +# Description: Auto-generated from advisory FEDORA-2009-0187 (thunderbird) +# +# Authors: +# Thomas Reinke +# +# Copyright: +# Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com +# Text descriptions are largely excerpted from the referenced +# advisory, and are Copyright (c) the respective author(s) +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2, +# or at your option, GNU General Public License version 3, +# as published by the Free Software Foundation +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +# + +if(description) +{ + script_id(63125); + script_version ("$"); + name["english"] = "Fedora Core 9 FEDORA-2009-0187 (thunderbird)"; + script_name(english:name["english"]); + + desc["english"] = " +The remote host is missing an update to thunderbird +announced via advisory FEDORA-2009-0187. + +Update Information: + +Update to the new upstream Thunderbird 2.0.0.19 fixing multiple security issues: +http://www.mozilla.org/security/known-vulnerabilities/thunderbird20.html#thunderbird2.0.0.19 + +Note: after the updated packages are installed, Thunderbird must be +restarted for the update to take effect. + +ChangeLog: + +* Mon Jan 5 2009 Christopher Aillon 2.0.0.19-1 +- Update to 2.0.0.19 +* Wed Nov 19 2008 Christopher Aillon 2.0.0.18-1 +- Update to 2.0.0.18 + +Solution: Apply the appropriate updates. + +This update can be installed with the yum update program. Use +su -c 'yum update thunderbird' at the command line. +For more information, refer to Managing Software with yum, +available at http://docs.fedoraproject.org/yum/. + +https://secure1.securityspace.com/smysecure/catid.html?in=FEDORA-2009-0187 + +Risk factor : High"; + + script_description(english:desc["english"]); + + summary["english"] = "Fedora Core 9 FEDORA-2009-0187 (thunderbird)"; + script_summary(english:summary["english"]); + + script_category(ACT_GATHER_INFO); + + script_copyright(english:"Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com"); + family["english"] = "Fedora Local Security Checks"; + script_family(english:family["english"]); + script_dependencies("gather-package-list.nasl"); + script_require_keys("ssh/login/rpms"); + exit(0); +} + +# +# The script code starts here +# + +include("revisions-lib.inc"); +include("pkg-lib-rpm.inc"); +vuln = 0; +if(isrpmvuln(pkg:"thunderbird", rpm:"thunderbird~2.0.0.19~1.fc9", rls:"FC9")) { + vuln = 1; +} +if(isrpmvuln(pkg:"thunderbird-debuginfo", rpm:"thunderbird-debuginfo~2.0.0.19~1.fc9", rls:"FC9")) { + vuln = 1; +} + +if(vuln) { + security_hole(0); +} Added: trunk/openvas-plugins/scripts/fcore_2009_0195.nasl =================================================================== --- trunk/openvas-plugins/scripts/fcore_2009_0195.nasl 2009-01-07 22:13:08 UTC (rev 2159) +++ trunk/openvas-plugins/scripts/fcore_2009_0195.nasl 2009-01-07 22:16:01 UTC (rev 2160) @@ -0,0 +1,111 @@ +# OpenVAS Vulnerability Test +# $Id$ +# Description: Auto-generated from advisory FEDORA-2009-0195 (proftpd) +# +# Authors: +# Thomas Reinke +# +# Copyright: +# Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com +# Text descriptions are largely excerpted from the referenced +# advisory, and are Copyright (c) the respective author(s) +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2, +# or at your option, GNU General Public License version 3, +# as published by the Free Software Foundation +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +# + +if(description) +{ + script_id(63128); + script_cve_id("CVE-2008-4242"); + script_version ("$"); + name["english"] = "Fedora Core 8 FEDORA-2009-0195 (proftpd)"; + script_name(english:name["english"]); + + desc["english"] = " +The remote host is missing an update to proftpd +announced via advisory FEDORA-2009-0195. + +Update Information: + +This update fixes a security issue where an attacker could conduct cross-site +request forgery (CSRF) attacks and execute arbitrary FTP commands. It +also fixes some SSL shutdown issues seen with certain clients. + +ChangeLog: + +* Fri Jan 2 2009 Matthias Saou 1.3.1-8 +- Update default configuration to have a lit of available modules and more +example configuration for them. +- Include patches to fix TLS issues (#457280). +* Fri Jan 2 2009 Matthias Saou 1.3.1-7 +- Add Debian patch to fix CSRF vulnerability (#464127, upstream #3115). + +References: + +[ 1 ] Bug #464127 - CVE-2008-4242 proftpd CSRF attack +https://bugzilla.redhat.com/show_bug.cgi?id=464127 + +Solution: Apply the appropriate updates. + +This update can be installed with the yum update program. Use +su -c 'yum update proftpd' at the command line. +For more information, refer to Managing Software with yum, +available at http://docs.fedoraproject.org/yum/. + +https://secure1.securityspace.com/smysecure/catid.html?in=FEDORA-2009-0195 + +Risk factor : High"; + + script_description(english:desc["english"]); + + summary["english"] = "Fedora Core 8 FEDORA-2009-0195 (proftpd)"; + script_summary(english:summary["english"]); + + script_category(ACT_GATHER_INFO); + + script_copyright(english:"Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com"); + family["english"] = "Fedora Local Security Checks"; + script_family(english:family["english"]); + script_dependencies("gather-package-list.nasl"); + script_require_keys("ssh/login/rpms"); + exit(0); +} + +# +# The script code starts here +# + +include("revisions-lib.inc"); +include("pkg-lib-rpm.inc"); +vuln = 0; +if(isrpmvuln(pkg:"proftpd", rpm:"proftpd~1.3.1~8.fc8", rls:"FC8")) { + vuln = 1; +} +if(isrpmvuln(pkg:"proftpd-ldap", rpm:"proftpd-ldap~1.3.1~8.fc8", rls:"FC8")) { + vuln = 1; +} +if(isrpmvuln(pkg:"proftpd-mysql", rpm:"proftpd-mysql~1.3.1~8.fc8", rls:"FC8")) { + vuln = 1; +} +if(isrpmvuln(pkg:"proftpd-postgresql", rpm:"proftpd-postgresql~1.3.1~8.fc8", rls:"FC8")) { + vuln = 1; +} +if(isrpmvuln(pkg:"proftpd-debuginfo", rpm:"proftpd-debuginfo~1.3.1~8.fc8", rls:"FC8")) { + vuln = 1; +} + +if(vuln) { + security_hole(0); +} Added: trunk/openvas-plugins/scripts/freebsd_awstats3.nasl =================================================================== --- trunk/openvas-plugins/scripts/freebsd_awstats3.nasl 2009-01-07 22:13:08 UTC (rev 2159) +++ trunk/openvas-plugins/scripts/freebsd_awstats3.nasl 2009-01-07 22:16:01 UTC (rev 2160) @@ -0,0 +1,102 @@ +# +#VID 27d78386-d35f-11dd-b800-001b77d09812 +# OpenVAS Vulnerability Test +# $ +# Description: Auto generated from VID 27d78386-d35f-11dd-b800-001b77d09812 +# +# Authors: +# Thomas Reinke +# +# Copyright: +# Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com +# Text descriptions are largely excerpted from the referenced +# advisories, and are Copyright (c) the respective author(s) +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2, +# as published by the Free Software Foundation +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +# + +if(description) +{ + script_id(63106); + script_cve_id("CVE-2008-3714", "CVE-2008-5080"); + script_version ("$"); + name["english"] = "FreeBSD Ports: awstats"; + script_name(english:name["english"]); + + desc["english"] = " +The remote host is missing an update to the system +as announced in the referenced advisory. + +The following packages are affected: + awstats + awstats-devel + +CVE-2008-3714 +Cross-site scripting (XSS) vulnerability in awstats.pl in AWStats 6.8 +allows remote attackers to inject arbitrary web script or HTML via the +query_string, a different vulnerability than CVE-2006-3681 and +CVE-2006-1945. + +CVE-2008-5080 +awstats.pl in AWStats 6.8 and earlier does not properly remove quote +characters, which allows remote attackers to conduct cross-site +scripting (XSS) attacks via the query_string parameter. NOTE: this +issue exists because of an incomplete fix for CVE-2008-3714. + +Solution: +Update your system with the appropriate patches or +software upgrades. + +http://secunia.com/advisories/31519 +http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=495432 +http://www.vuxml.org/freebsd/27d78386-d35f-11dd-b800-001b77d09812.html + +Risk factor : High"; + + script_description(english:desc["english"]); + + summary["english"] = "FreeBSD Ports: awstats"; + script_summary(english:summary["english"]); + + script_category(ACT_GATHER_INFO); + + script_copyright(english:"Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com"); + family["english"] = "FreeBSD Local Security Checks"; + script_family(english:family["english"]); + script_dependencies("gather-package-list.nasl"); + script_require_keys("ssh/login/freebsdrel"); + exit(0); +} + +# +# The script code starts here +# + +include("revisions-lib.inc"); +include("pkg-lib-bsd.inc"); +vuln = 0; +bver = portver(pkg:"awstats"); +if(!isnull(bver) && revcomp(a:bver, b:"6.9,1")<0) { + security_note(0, data:"Package awstats version " + bver + " is installed which is known to be vulnerable."); + vuln = 1; +} +bver = portver(pkg:"awstats-devel"); +if(!isnull(bver) && revcomp(a:bver, b:"0")>0) { + security_note(0, data:"Package awstats-devel version " + bver + " is installed which is known to be vulnerable."); + vuln = 1; +} + +if(vuln) { + security_hole(0); +} Added: trunk/openvas-plugins/scripts/freebsd_p5-File-Path.nasl =================================================================== --- trunk/openvas-plugins/scripts/freebsd_p5-File-Path.nasl 2009-01-07 22:13:08 UTC (rev 2159) +++ trunk/openvas-plugins/scripts/freebsd_p5-File-Path.nasl 2009-01-07 22:16:01 UTC (rev 2160) @@ -0,0 +1,89 @@ +# +#VID 13b0c8c8-bee0-11dd-a708-001fc66e7203 +# OpenVAS Vulnerability Test +# $ +# Description: Auto generated from VID 13b0c8c8-bee0-11dd-a708-001fc66e7203 +# +# Authors: +# Thomas Reinke +# +# Copyright: +# Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com +# Text descriptions are largely excerpted from the referenced +# advisories, and are Copyright (c) the respective author(s) +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2, +# as published by the Free Software Foundation +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +# + +if(description) +{ + script_id(63107); + script_cve_id("CVE-2005-0448"); + script_version ("$"); + name["english"] = "FreeBSD Ports: p5-File-Path"; + script_name(english:name["english"]); + + desc["english"] = " +The remote host is missing an update to the system +as announced in the referenced advisory. + +The following package is affected: p5-File-Path + +CVE-2005-0448 +Race condition in the rmtree function in File::Path.pm in Perl before +5.8.4 allows local users to create arbitrary setuid binaries in the +tree being deleted, a different vulnerability than CVE-2004-0452. + +Solution: +Update your system with the appropriate patches or +software upgrades. + +http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=286905 +http://www.openwall.com/lists/oss-security/2008/11/28/1 +http://www.gossamer-threads.com/lists/perl/porters/233699#233699 +http://www.vuxml.org/freebsd/13b0c8c8-bee0-11dd-a708-001fc66e7203.html + +Risk factor : High"; + + script_description(english:desc["english"]); + + summary["english"] = "FreeBSD Ports: p5-File-Path"; + script_summary(english:summary["english"]); + + script_category(ACT_GATHER_INFO); + + script_copyright(english:"Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com"); + family["english"] = "FreeBSD Local Security Checks"; + script_family(english:family["english"]); + script_dependencies("gather-package-list.nasl"); + script_require_keys("ssh/login/freebsdrel"); + exit(0); +} + +# +# The script code starts here +# + +include("revisions-lib.inc"); +include("pkg-lib-bsd.inc"); +vuln = 0; +bver = portver(pkg:"p5-File-Path"); +if(!isnull(bver) && revcomp(a:bver, b:"2.07_1")<0) { + security_note(0, data:"Package p5-File-Path version " + bver + " is installed which is known to be vulnerable."); + vuln = 1; +} + +if(vuln) { + security_hole(0); +} Added: trunk/openvas-plugins/scripts/freebsd_php5-gd.nasl =================================================================== --- trunk/openvas-plugins/scripts/freebsd_php5-gd.nasl 2009-01-07 22:13:08 UTC (rev 2159) +++ trunk/openvas-plugins/scripts/freebsd_php5-gd.nasl 2009-01-07 22:16:01 UTC (rev 2160) @@ -0,0 +1,89 @@ +# +#VID 58a3c266-db01-11dd-ae30-001cc0377035 +# OpenVAS Vulnerability Test +# $ +# Description: Auto generated from VID 58a3c266-db01-11dd-ae30-001cc0377035 +# +# Authors: +# Thomas Reinke +# +# Copyright: +# Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com +# Text descriptions are largely excerpted from the referenced +# advisories, and are Copyright (c) the respective author(s) +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2, +# as published by the Free Software Foundation +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +# + +if(description) +{ + script_id(63105); + script_cve_id("CVE-2008-5498"); + script_bugtraq_id(33002); + script_version ("$"); + name["english"] = "FreeBSD Ports: php5-gd"; + script_name(english:name["english"]); + + desc["english"] = " +The remote host is missing an update to the system +as announced in the referenced advisory. + +The following package is affected: php5-gd + +CVE-2008-5498 +Array index error in the imageRotate function in PHP 5.2.8 and earlier +allows context-dependent attackers to read the contents of arbitrary +memory locations via a crafted value of the third argument (aka the +bgd_color or clrBack argument) for an indexed image. + +Solution: +Update your system with the appropriate patches or +software upgrades. + +http://www.securiteam.com/unixfocus/6G00Y0ANFU.html +http://www.vuxml.org/freebsd/58a3c266-db01-11dd-ae30-001cc0377035.html + +Risk factor : High"; + + script_description(english:desc["english"]); + + summary["english"] = "FreeBSD Ports: php5-gd"; + script_summary(english:summary["english"]); + + script_category(ACT_GATHER_INFO); + + script_copyright(english:"Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com"); + family["english"] = "FreeBSD Local Security Checks"; + script_family(english:family["english"]); + script_dependencies("gather-package-list.nasl"); + script_require_keys("ssh/login/freebsdrel"); + exit(0); +} + +# +# The script code starts here +# + +include("revisions-lib.inc"); +include("pkg-lib-bsd.inc"); +vuln = 0; +bver = portver(pkg:"php5-gd"); +if(!isnull(bver) && revcomp(a:bver, b:"0")>0) { + security_note(0, data:"Package php5-gd version " + bver + " is installed which is known to be vulnerable."); + vuln = 1; +} + +if(vuln) { + security_hole(0); +} Added: trunk/openvas-plugins/scripts/freebsd_xterm.nasl =================================================================== --- trunk/openvas-plugins/scripts/freebsd_xterm.nasl 2009-01-07 22:13:08 UTC (rev 2159) +++ trunk/openvas-plugins/scripts/freebsd_xterm.nasl 2009-01-07 22:16:01 UTC (rev 2160) @@ -0,0 +1,90 @@ +# +#VID d5e1aac8-db0b-11dd-ae30-001cc0377035 +# OpenVAS Vulnerability Test +# $ +# Description: Auto generated from VID d5e1aac8-db0b-11dd-ae30-001cc0377035 +# +# Authors: +# Thomas Reinke +# +# Copyright: +# Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com +# Text descriptions are largely excerpted from the referenced +# advisories, and are Copyright (c) the respective author(s) +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2, +# as published by the Free Software Foundation +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +# + +if(description) +{ + script_id(63104); + script_cve_id("CVE-2008-2383"); + script_bugtraq_id(33060); + script_version ("$"); + name["english"] = "FreeBSD Ports: xterm"; + script_name(english:name["english"]); + + desc["english"] = " +The remote host is missing an update to the system +as announced in the referenced advisory. + +The following package is affected: xterm + +CVE-2008-2383 +CRLF injection vulnerability in xterm allows user-assisted attackers +to execute arbitrary commands via LF (aka \n) characters surrounding a +command name within a Device Control Request Status String (DECRQSS) +escape sequence in a text file, a related issue to CVE-2003-0063 and +CVE-2003-0071. + +Solution: +Update your system with the appropriate patches or +software upgrades. + +http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=510030 +http://www.vuxml.org/freebsd/d5e1aac8-db0b-11dd-ae30-001cc0377035.html + +Risk factor : High"; + + script_description(english:desc["english"]); + + summary["english"] = "FreeBSD Ports: xterm"; + script_summary(english:summary["english"]); + + script_category(ACT_GATHER_INFO); + + script_copyright(english:"Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com"); + family["english"] = "FreeBSD Local Security Checks"; + script_family(english:family["english"]); + script_dependencies("gather-package-list.nasl"); + script_require_keys("ssh/login/freebsdrel"); + exit(0); +} + +# +# The script code starts here +# + +include("revisions-lib.inc"); +include("pkg-lib-bsd.inc"); +vuln = 0; +bver = portver(pkg:"xterm"); +if(!isnull(bver) && revcomp(a:bver, b:"238")<0) { + security_note(0, data:"Package xterm version " + bver + " is installed which is known to be vulnerable."); + vuln = 1; +} + +if(vuln) { + security_hole(0); +} Modified: trunk/openvas-plugins/scripts/gather-package-list.nasl =================================================================== --- trunk/openvas-plugins/scripts/gather-package-list.nasl 2009-01-07 22:13:08 UTC (rev 2159) +++ trunk/openvas-plugins/scripts/gather-package-list.nasl 2009-01-07 22:16:01 UTC (rev 2160) @@ -181,21 +181,21 @@ security_note(port:port, data:string("We are able to login and detect that you are running ", rls)); exit(0); } -if(egrep(pattern:"Red Hat Enterprise.*release 3 ", string:rls)) { +if(egrep(pattern:"Red Hat Enterprise.*release 3[ .]", string:rls)) { set_kb_item(name: "ssh/login/release", value: "RHENT_3"); buf = ssh_cmd(socket:sock, cmd:"/bin/rpm -qa --qf '%{NAME}~%{VERSION}~%{RELEASE}~%{SIGGPG:pgpsig};\n'"); set_kb_item(name: "ssh/login/rpms", value: ";" + buf); security_note(port:port, data:string("We are able to login and detect that you are running ", rls)); exit(0); } -if(egrep(pattern:"Red Hat Enterprise.*release 4 ", string:rls)) { +if(egrep(pattern:"Red Hat Enterprise.*release 4[ .]", string:rls)) { set_kb_item(name: "ssh/login/release", value: "RHENT_4"); buf = ssh_cmd(socket:sock, cmd:"/bin/rpm -qa --qf '%{NAME}~%{VERSION}~%{RELEASE}~%{SIGGPG:pgpsig};\n'"); set_kb_item(name: "ssh/login/rpms", value: ";" + buf); security_note(port:port, data:string("We are able to login and detect that you are running ", rls)); exit(0); } -if(egrep(pattern:"Red Hat Enterprise.*release 5 ", string:rls)) { +if(egrep(pattern:"Red Hat Enterprise.*release 5[ .]", string:rls)) { set_kb_item(name: "ssh/login/release", value: "RHENT_5"); buf = ssh_cmd(socket:sock, cmd:"/bin/rpm -qa --qf '%{NAME}~%{VERSION}~%{RELEASE}~%{SIGGPG:pgpsig};\n'"); set_kb_item(name: "ssh/login/rpms", value: ";" + buf); Added: trunk/openvas-plugins/scripts/ubuntu_702_1.nasl =================================================================== --- trunk/openvas-plugins/scripts/ubuntu_702_1.nasl 2009-01-07 22:13:08 UTC (rev 2159) +++ trunk/openvas-plugins/scripts/ubuntu_702_1.nasl 2009-01-07 22:16:01 UTC (rev 2160) @@ -0,0 +1,142 @@ +# OpenVAS Vulnerability Test +# $Id$ +# Description: Auto-generated from advisory USN-702-1 (samba) +# +# Authors: +# Thomas Reinke +# +# Copyright: +# Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com +# Text descriptions are largely excerpted from the referenced +# advisory, and are Copyright (c) the respective author(s) +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2, +# or at your option, GNU General Public License version 3, +# as published by the Free Software Foundation +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +# + +if(description) +{ + script_id(63102); + script_cve_id("CVE-2009-0022", "CVE-2006-7236", "CVE-2008-2383", "CVE-2008-2382"); + script_version ("$"); + name["english"] = "Ubuntu USN-702-1 (samba)"; + script_name(english:name["english"]); + + desc["english"] = " +The remote host is missing an update to samba +announced via advisory USN-702-1. + +Details follow: + +Gunter H?ckel discovered that Samba with registry shares enabled did not +properly validate share names. An authenticated user could gain access to the +root filesystem by using an older version of smbclient and specifying an +empty string as a share name. This is only an issue if registry shares are +enabled on the server by setting registry shares = yes, include = registry, +or config backend = registry, which is not the default. + +Solution: +The problem can be corrected by upgrading your system to the +following package versions: + +Ubuntu 8.10: + samba 2:3.2.3-1ubuntu3.4 + +In general, a standard system upgrade is sufficient to effect the +necessary changes. + +https://secure1.securityspace.com/smysecure/catid.html?in=USN-702-1 + +Risk factor : High"; + + script_description(english:desc["english"]); + + summary["english"] = "Ubuntu USN-702-1 (samba)"; + script_summary(english:summary["english"]); + + script_category(ACT_GATHER_INFO); + + script_copyright(english:"Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com"); + family["english"] = "Ubuntu Local Security Checks"; + script_family(english:family["english"]); + script_dependencies("gather-package-list.nasl"); + script_require_keys("ssh/login/packages"); + exit(0); +} + +# +# The script code starts here +# + +include("revisions-lib.inc"); +include("pkg-lib-deb.inc"); +vuln = 0; +if(isdpkgvuln(pkg:"samba-doc-pdf", ver:"3.2.3-1ubuntu3.4", rls:"UBUNTU8.10")) { + vuln = 1; +} +if(isdpkgvuln(pkg:"samba-doc", ver:"3.2.3-1ubuntu3.4", rls:"UBUNTU8.10")) { + vuln = 1; +} +if(isdpkgvuln(pkg:"libpam-smbpass", ver:"3.2.3-1ubuntu3.4", rls:"UBUNTU8.10")) { + vuln = 1; +} +if(isdpkgvuln(pkg:"libsmbclient-dev", ver:"3.2.3-1ubuntu3.4", rls:"UBUNTU8.10")) { + vuln = 1; +} +if(isdpkgvuln(pkg:"libsmbclient", ver:"3.2.3-1ubuntu3.4", rls:"UBUNTU8.10")) { + vuln = 1; +} +if(isdpkgvuln(pkg:"libwbclient0", ver:"3.2.3-1ubuntu3.4", rls:"UBUNTU8.10")) { + vuln = 1; +} +if(isdpkgvuln(pkg:"samba-common", ver:"3.2.3-1ubuntu3.4", rls:"UBUNTU8.10")) { + vuln = 1; +} +if(isdpkgvuln(pkg:"samba-dbg", ver:"3.2.3-1ubuntu3.4", rls:"UBUNTU8.10")) { + vuln = 1; +} +if(isdpkgvuln(pkg:"samba-tools", ver:"3.2.3-1ubuntu3.4", rls:"UBUNTU8.10")) { + vuln = 1; +} +if(isdpkgvuln(pkg:"samba", ver:"3.2.3-1ubuntu3.4", rls:"UBUNTU8.10")) { + vuln = 1; +} +if(isdpkgvuln(pkg:"smbclient", ver:"3.2.3-1ubuntu3.4", rls:"UBUNTU8.10")) { + vuln = 1; +} +if(isdpkgvuln(pkg:"smbfs", ver:"3.2.3-1ubuntu3.4", rls:"UBUNTU8.10")) { + vuln = 1; +} +if(isdpkgvuln(pkg:"swat", ver:"3.2.3-1ubuntu3.4", rls:"UBUNTU8.10")) { + vuln = 1; +} +if(isdpkgvuln(pkg:"winbind", ver:"3.2.3-1ubuntu3.4", rls:"UBUNTU8.10")) { + vuln = 1; +} +if(isdpkgvuln(pkg:"xterm", ver:"208-3.1ubuntu3.1", rls:"UBUNTU6.06 LTS")) { + vuln = 1; +} +if(isdpkgvuln(pkg:"xterm", ver:"229-1ubuntu0.1", rls:"UBUNTU7.10")) { + vuln = 1; +} +if(isdpkgvuln(pkg:"xterm", ver:"229-1ubuntu1.1", rls:"UBUNTU8.04 LTS")) { + vuln = 1; +} +if(isdpkgvuln(pkg:"xterm", ver:"235-1ubuntu1.1", rls:"UBUNTU8.10")) { + vuln = 1; +} + +if(vuln) { + security_hole(0); +} Added: trunk/openvas-plugins/scripts/ubuntu_703_1.nasl =================================================================== --- trunk/openvas-plugins/scripts/ubuntu_703_1.nasl 2009-01-07 22:13:08 UTC (rev 2159) +++ trunk/openvas-plugins/scripts/ubuntu_703_1.nasl 2009-01-07 22:16:01 UTC (rev 2160) @@ -0,0 +1,108 @@ +# OpenVAS Vulnerability Test +# $Id$ +# Description: Auto-generated from advisory USN-703-1 (xterm) +# +# Authors: +# Thomas Reinke +# +# Copyright: +# Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com +# Text descriptions are largely excerpted from the referenced +# advisory, and are Copyright (c) the respective author(s) +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2, +# or at your option, GNU General Public License version 3, +# as published by the Free Software Foundation +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +# + +if(description) +{ + script_id(63103); + script_cve_id("CVE-2006-7236", "CVE-2008-2383", "CVE-2008-2382"); + script_version ("$"); + name["english"] = "Ubuntu USN-703-1 (xterm)"; + script_name(english:name["english"]); + + desc["english"] = " +The remote host is missing an update to xterm +announced via advisory USN-703-1. + +Details follow: + +Paul Szabo discovered that the DECRQSS escape sequences were not handled +correctly by xterm. Additionally, window title operations were also not +safely handled. If a user were tricked into viewing a specially crafted +series of characters while in xterm, a remote attacker could execute +arbitrary commands with user privileges. (CVE-2006-7236, CVE-2008-2382) + +Solution: +The problem can be corrected by upgrading your system to the +following package versions: + +Ubuntu 6.06 LTS: + xterm 208-3.1ubuntu3.1 + +Ubuntu 7.10: + xterm 229-1ubuntu0.1 + +Ubuntu 8.04 LTS: + xterm 229-1ubuntu1.1 + +Ubuntu 8.10: + xterm 235-1ubuntu1.1 + +After a standard system upgrade you need to restart any running xterms to +effect the necessary changes. + +https://secure1.securityspace.com/smysecure/catid.html?in=USN-703-1 + +Risk factor : High"; + + script_description(english:desc["english"]); + + summary["english"] = "Ubuntu USN-703-1 (xterm)"; + script_summary(english:summary["english"]); + + script_category(ACT_GATHER_INFO); + + script_copyright(english:"Copyright (c) 2009 E-Soft Inc. http://www.securityspace.com"); + family["english"] = "Ubuntu Local Security Checks"; + script_family(english:family["english"]); + script_dependencies("gather-package-list.nasl"); + script_require_keys("ssh/login/packages"); + exit(0); +} + +# +# The script code starts here +# + +include("revisions-lib.inc"); +include("pkg-lib-deb.inc"); +vuln = 0; +if(isdpkgvuln(pkg:"xterm", ver:"208-3.1ubuntu3.1", rls:"UBUNTU6.06 LTS")) { + vuln = 1; +} +if(isdpkgvuln(pkg:"xterm", ver:"229-1ubuntu0.1", rls:"UBUNTU7.10")) { + vuln = 1; +} +if(isdpkgvuln(pkg:"xterm", ver:"229-1ubuntu1.1", rls:"UBUNTU8.04 LTS")) { + vuln = 1; +} +if(isdpkgvuln(pkg:"xterm", ver:"235-1ubuntu1.1", rls:"UBUNTU8.10")) { + vuln = 1; +} + +if(vuln) { + security_hole(0); +} From scm-commit at wald.intevation.org Thu Jan 8 00:59:43 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Thu, 8 Jan 2009 00:59:43 +0100 (CET) Subject: [Openvas-commits] r2161 - in trunk/openvas-libraries: . libopenvas Message-ID: <20090107235943.EC8954071F@pyrosoma.intevation.org> Author: jan Date: 2009-01-08 00:59:43 +0100 (Thu, 08 Jan 2009) New Revision: 2161 Modified: trunk/openvas-libraries/ChangeLog trunk/openvas-libraries/libopenvas/store.c Log: * libopenvas/store.c (store_load_plugin): Fixed memory leaks. Modified: trunk/openvas-libraries/ChangeLog =================================================================== --- trunk/openvas-libraries/ChangeLog 2009-01-07 22:16:01 UTC (rev 2160) +++ trunk/openvas-libraries/ChangeLog 2009-01-07 23:59:43 UTC (rev 2161) @@ -1,3 +1,7 @@ +2009-01-08 Jan-Oliver Wagner + + * libopenvas/store.c (store_load_plugin): Fixed memory leaks. + 2009-01-04 Jan-Oliver Wagner Name change for cached ("description") files for NVTs. Modified: trunk/openvas-libraries/libopenvas/store.c =================================================================== --- trunk/openvas-libraries/libopenvas/store.c 2009-01-07 22:16:01 UTC (rev 2160) +++ trunk/openvas-libraries/libopenvas/store.c 2009-01-07 23:59:43 UTC (rev 2161) @@ -273,7 +273,8 @@ * * @param dir Path to location of plugin file * - * @param file Filename of the plugin (e.g. detect_openvas.nasl ). + * @param file Filename of the plugin (e.g. "detect_openvas.nasl" + * or "subdir1/subdir2/scriptname.nasl" ). * * @param prefs Plugin preference arglist. * @@ -284,8 +285,6 @@ * 3) the magic number test failed (other file format expected). * 4) an internal error occured. * - * TODO: In case of errors (returning NULL), memory is not cleanly released. - * * @return Pointer to plugin as arglist or NULL. */ struct arglist * store_load_plugin(char * dir, char * file, @@ -307,14 +306,22 @@ g_free(dummy); - if (desc_file == NULL || asc_file == NULL || plug_file == NULL) + if (desc_file == NULL || asc_file == NULL || plug_file == NULL) { + g_free(desc_file); + g_free(asc_file); + g_free(plug_file); return NULL; // g_build_filename failed + } bzero(pp, sizeof(pp)); /* Plugin and cache file have to exist */ - if ( stat(plug_file, &stat_plug) < 0 || stat(desc_file, &stat_desc) < 0) + if ( stat(plug_file, &stat_plug) < 0 || stat(desc_file, &stat_desc) < 0) { + g_free(desc_file); + g_free(asc_file); + g_free(plug_file); return NULL; + } /* * Look if the plugin (.nasl/.oval etc) or the signature (.asc) is newer than @@ -322,8 +329,12 @@ * the plugin and signatures mtime is not in the future... */ if( stat_plug.st_mtime > stat_desc.st_mtime - && stat_asc.st_mtime > stat_desc.st_mtime ) - return NULL; + && stat_asc.st_mtime > stat_desc.st_mtime ) { + g_free(desc_file); + g_free(asc_file); + g_free(plug_file); + return NULL; + } /* * Look if a signature file (.asc) exists. If so and it is newer than @@ -331,16 +342,22 @@ */ if( stat(asc_file, &stat_asc) && stat_asc.st_mtime > stat_desc.st_mtime - && stat_asc.st_mtime <= time(NULL) ) - return NULL; + && stat_asc.st_mtime <= time(NULL) ) { + g_free(desc_file); + g_free(asc_file); + g_free(plug_file); + return NULL; + } - if(store_get_plugin_f(&p, pp, desc_file) < 0) - return NULL; + if((store_get_plugin_f(&p, pp, desc_file) < 0) || + (p.magic != MAGIC) || + (p.oid == NULL)) { + g_free(desc_file); + g_free(asc_file); + g_free(plug_file); + return NULL; + } - if(p.magic != MAGIC) return NULL; - - if(p.oid == NULL) return NULL; - ret = emalloc(sizeof(struct arglist)); plug_set_oid(ret, p.oid); plug_set_category(ret, p.category); @@ -393,7 +410,9 @@ * which is placed in the cache directory. * * @param plugin Data structure that contains a plugin description - * @param file Name of corresponding plugin file (e.g. x.nasl, x.nes or x.oval) + * @param file Name of corresponding plugin file (e.g. "x.nasl", "x.nes" + * or "x.oval". It can also be something like + * "subdir1/subdir2/scriptname.nasl"). */ void store_plugin(struct arglist * plugin, char * file) { From scm-commit at wald.intevation.org Thu Jan 8 01:20:57 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Thu, 8 Jan 2009 01:20:57 +0100 (CET) Subject: [Openvas-commits] r2162 - trunk/openvas-plugins/scripts Message-ID: <20090108002057.771974070A@pyrosoma.intevation.org> Author: reinke Date: 2009-01-08 01:20:55 +0100 (Thu, 08 Jan 2009) New Revision: 2162 Modified: trunk/openvas-plugins/scripts/RHSA_2008_0787.nasl Log: Modified: trunk/openvas-plugins/scripts/RHSA_2008_0787.nasl =================================================================== --- trunk/openvas-plugins/scripts/RHSA_2008_0787.nasl 2009-01-07 23:59:43 UTC (rev 2161) +++ trunk/openvas-plugins/scripts/RHSA_2008_0787.nasl 2009-01-08 00:20:55 UTC (rev 2162) @@ -41,63 +41,9 @@ The remote host is missing updates to the kernel announced in advisory RHSA-2008:0787. -These updated packages fix the following security issues: +For details on the issues addressed with this update, please +visit the referenced security advisories. -* a flaw was found in the IPv4 forwarding base that allowed a local, -unprivileged user to cause an out-of-bounds access. (CVE-2007-2172, -Important) - -* a flaw was found in the handling of process death signals. This allowed a -local, unprivileged user to send arbitrary signals to the suid-process -executed by that user. Successful exploitation of this flaw depended on the -structure of the suid-program and its signal handling. (CVE-2007-3848, -Important) - -* when accessing kernel memory locations, certain Linux kernel drivers -registering a fault handler did not perform required range checks. A local, -unprivileged user could use this flaw to gain read or write access to -arbitrary kernel memory, or possibly cause a kernel crash. (CVE-2008-0007, -Important) - -* a possible kernel memory leak was found in the Linux kernel Simple -Internet Transition (SIT) INET6 implementation. This could allow a local, -unprivileged user to cause a denial of service. (CVE-2008-2136, Important) - -* missing capability checks were found in the SBNI WAN driver which could -allow a local, unprivileged user to bypass intended capability -restrictions. (CVE-2008-3525, Important) - -* a flaw was found in the way files were written using truncate() or -ftruncate(). This could allow a local, unprivileged user to acquire the -privileges of a different group and obtain access to sensitive information. -(CVE-2008-4210, Important) - -* a flaw was found in the ELF handling on Itanium-based systems. This -triggered a cross-region memory-mapping and allowed a local, unprivileged -user to cause a local denial of service. (CVE-2006-4538, Moderate) - -* a race condition in the mincore system core allowed a local, unprivileged -user to cause a local denial of service (system hang). (CVE-2006-4814, -Moderate) - -* a flaw was found in the aacraid SCSI driver. This allowed a local, -unprivileged user to make ioctl calls to the driver which should otherwise -be restricted to privileged users. (CVE-2007-4308, Moderate) - -* two buffer overflow flaws were found in the Integrated Services Digital -Network (ISDN) subsystem. A local, unprivileged user could use these flaws -to cause a denial of service. (CVE-2007-6063, CVE-2007-6151, Moderate) - -* a flaw was found in the way core dump files were created. If a local, -unprivileged user could make a root-owned process dump a core file into a -user-writable directory, the user could gain read access to that core file, -potentially compromising sensitive information. (CVE-2007-6206, Moderate) - -* a deficiency was found in the Linux kernel virtual file system (VFS) -implementation. This could allow a local, unprivileged user to attempt file -creation within deleted directories, possibly causing a local denial of -service. (CVE-2008-3275, Moderate) - All users of Red Hat Enterprise Linux 2.1 on 64-bit architectures should upgrade to these updated packages, which contain backported patches to resolve these issues. From scm-commit at wald.intevation.org Thu Jan 8 07:43:31 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Thu, 8 Jan 2009 07:43:31 +0100 (CET) Subject: [Openvas-commits] r2163 - in trunk/openvas-plugins: . scripts Message-ID: <20090108064331.0A7B94071F@pyrosoma.intevation.org> Author: chandra Date: 2009-01-08 07:43:30 +0100 (Thu, 08 Jan 2009) New Revision: 2163 Added: trunk/openvas-plugins/scripts/gb_kerio_mailserver_detect.nasl trunk/openvas-plugins/scripts/gb_kerio_mailserver_mult_xss_vuln.nasl trunk/openvas-plugins/scripts/gb_ms_win_live_messenger_detect.nasl trunk/openvas-plugins/scripts/gb_ms_win_live_messenger_info_dis_vuln.nasl trunk/openvas-plugins/scripts/gb_php_display_errors_xss_vuln.nasl trunk/openvas-plugins/scripts/gb_php_sql_inj_vuln.nasl Modified: trunk/openvas-plugins/ChangeLog Log: Added new plugins Modified: trunk/openvas-plugins/ChangeLog =================================================================== --- trunk/openvas-plugins/ChangeLog 2009-01-08 00:20:55 UTC (rev 2162) +++ trunk/openvas-plugins/ChangeLog 2009-01-08 06:43:30 UTC (rev 2163) @@ -1,3 +1,12 @@ +2008-01-08 Chandrashekhar B + * scripts/gb_ms_win_live_messenger_info_dis_vuln.nasl, + scripts/gb_ms_win_live_messenger_detect.nasl, + scripts/gb_kerio_mailserver_mult_xss_vuln.nasl, + scripts/gb_php_display_errors_xss_vuln.nasl, + scripts/gb_kerio_mailserver_detect.nasl, + scripts/gb_php_sql_inj_vuln.nasl: + Added new plugins + 2009-01-02 Thomas Reinke * deb_1694_1.nasl deb_1694_2.nasl deb_1695_1.nasl freebsd_awstats3.nasl freebsd_p5-File-Path.nasl freebsd_php5-gd.nasl Added: trunk/openvas-plugins/scripts/gb_kerio_mailserver_detect.nasl =================================================================== --- trunk/openvas-plugins/scripts/gb_kerio_mailserver_detect.nasl 2009-01-08 00:20:55 UTC (rev 2162) +++ trunk/openvas-plugins/scripts/gb_kerio_mailserver_detect.nasl 2009-01-08 06:43:30 UTC (rev 2163) @@ -0,0 +1,75 @@ +############################################################################### +# OpenVAS Vulnerability Test +# $Id: gb_kerio_mailserver_detect.nasl 800 2009-01-06 16:27:27Z jan $ +# +# Kerio Mail Server Version Detection +# +# Authors: +# Chandan S +# +# Copyright: +# Copyright (c) 2009 Intevation GmbH, http://www.intevation.net +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 +# (or any later version), as published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +############################################################################### + +if(description) +{ + script_id(800098); + script_version("$Revision: 1.0 $"); + script_name(english:"Kerio Mail Server Version Detection"); + desc["english"] = " + + Overview: This script will detect the version of Kerio Mail Server Web Mail + on the remote host and sets the KB. + + Risk factor: Informational"; + + script_description(english:desc["english"]); + script_summary(english:"Set KB for the version of Kerio Mail Server"); + script_category(ACT_GATHER_INFO); + script_copyright(english:"Copyright (C) 2009 Intevation GmbH"); + script_family(english:"General"); + script_dependencies("find_service.nes"); + exit(0); +} + + +smtpPort = get_kb_item("Services/smtp"); +if(!smtpPort){ + smtpPort = 25; +} + +imapPort = get_kb_item("Services/imap"); +if(!imapPort){ + imapPort = 143; +} + +popPort = get_kb_item("Services/pop3"); +if(!popPort){ + popPort = 110; +} + +foreach port (make_list(smtpPort, imapPort, popPort)) +{ + banner = get_kb_item(string("Banner/", port)); + if("Kerio MailServer" >< banner) + { + ver = eregmatch(pattern:"Kerio MailServer ([0-9.]+)", string:banner); + if(ver[1] != NULL){ + set_kb_item(name:"KerioMailServer/Ver", value:ver[1]); + } + exit(0); + } +} Added: trunk/openvas-plugins/scripts/gb_kerio_mailserver_mult_xss_vuln.nasl =================================================================== --- trunk/openvas-plugins/scripts/gb_kerio_mailserver_mult_xss_vuln.nasl 2009-01-08 00:20:55 UTC (rev 2162) +++ trunk/openvas-plugins/scripts/gb_kerio_mailserver_mult_xss_vuln.nasl 2009-01-08 06:43:30 UTC (rev 2163) @@ -0,0 +1,87 @@ +############################################################################### +# OpenVAS Vulnerability Test +# $Id: gb_kerio_mailserver_mult_xss_vuln.nasl 800 2009-01-06 11:54:58Z jan $ +# +# Kerio Mail Server Multiple Cross Site Scripting vulnerabilities +# +# Authors: +# Chandan S +# +# Copyright: +# Copyright (c) 2009 Intevation GmbH, http://www.intevation.net +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 +# (or any later version), as published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +############################################################################### + +if(description) +{ + script_id(800099); + script_version("$Revision: 1.0 $"); + script_cve_id("CVE-2008-5760", "CVE-2008-5769"); + script_bugtraq_id(32863); + script_name(english:"Kerio Mail Server Multiple Cross Site Scripting vulnerabilities"); + desc["english"] = " + + Overview: The host is running Kerio Mail Server and is prone to multiple + cross site scripting vulnerabilities. + + Vulnerability Insight: + Issues are due to, + - a folder and daytime parameters in mailCompose.php and calendarEdit.php + files is not properly sanitised before being returned to the user. + - input passed to the sent parameter in error413.php is not properly + sanitised before being returned to the user. + + Impact: + Successful exploitation could result in insertion of arbitrary HTML and + script code in a user's browser session in the context of an affected site. + + Impact Level: Application + + Affected Software/OS: + Kerio MailServer before 6.6.2 on all running platform. + + Fix: Upgrade to Kerio MailServer 6.6.2 + http://www.kerio.com/kms_download.html + + References: + http://secunia.com/advisories/32955 + http://xforce.iss.net/xforce/xfdb/47398 + + CVSS Score: + CVSS Base Score : 4.3 (AV:N/AC:M/Au:NR/C:N/I:P/A:N) + CVSS Temporal Score : 3.2 + Risk factor: Medium"; + + script_description(english:desc["english"]); + script_summary(english:"Check for the version of Kerio Mail Server"); + script_category(ACT_GATHER_INFO); + script_copyright(english:"Copyright (C) 2009 Intevation GmbH"); + script_family(english:"Web application abuses"); + script_dependencies("gb_kerio_mailserver_detect.nasl"); + script_require_keys("KerioMailServer/Ver"); + exit(0); +} + + +include("version_func.inc"); + +kerioVer = get_kb_item("KerioMailServer/Ver"); +if(!kerioVer){ + exit(0); +} + +if(version_is_less(version:kerioVer, test_version:"6.6.2")){ + security_warning(0); +} Added: trunk/openvas-plugins/scripts/gb_ms_win_live_messenger_detect.nasl =================================================================== --- trunk/openvas-plugins/scripts/gb_ms_win_live_messenger_detect.nasl 2009-01-08 00:20:55 UTC (rev 2162) +++ trunk/openvas-plugins/scripts/gb_ms_win_live_messenger_detect.nasl 2009-01-08 06:43:30 UTC (rev 2163) @@ -0,0 +1,75 @@ +############################################################################### +# OpenVAS Vulnerability Test +# $Id: gb_ms_win_live_messenger_detect.nasl 814 2009-01-06 12:01:29Z jan $ +# +# Microsoft Windows Live Messenger Client Version Detection +# +# Authors: +# Sharath S +# +# Copyright: +# Copyright (c) 2009 Intevation GmbH, http://www.intevation.net +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 +# (or any later version), as published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +############################################################################### + +if(description) +{ + script_id(800331); + script_version("$Revision: 1.0 $"); + script_name(english:"Microsoft Windows Live Messenger Client Version Detection"); + desc["english"] = " + Overview: This script detects the version of Microsoft Windows Live Messenger + Client on remote host and sets the KB. + + Risk Factor: Informational"; + + script_description(english:desc["english"]); + script_summary(english:"Set KB for the version of Windows Live Messenger"); + script_category(ACT_GATHER_INFO); + script_copyright(english:"Copyright (C) 2009 Intevation GmbH"); + script_family(english:"General"); + script_dependencies("secpod_reg_enum.nasl"); + script_require_keys("SMB/WindowsVersion"); + exit(0); +} + + +include("smb_nt.inc"); +include("secpod_smb_func.inc"); + +if(!get_kb_item("SMB/WindowsVersion")){ + exit(0); +} + +if(!registry_key_exists(key:"SOFTWARE\Microsoft\MessengerService\Clients" + + "\MSN Messenger")){ + exit(0); +} + +key = "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\"; +foreach item (registry_enum_keys(key:key)) +{ + if("Windows Live Messenger" >< registry_get_sz(key:key + item, + item:"DisplayName")) + { + wlmVer = registry_get_sz(key:key + item, item:"DisplayVersion"); + if(!wlmVer){ + exit(0); + } + + set_kb_item(name:"MS/LiveMessenger/Ver", value:wlmVer); + exit(0); + } +} Property changes on: trunk/openvas-plugins/scripts/gb_ms_win_live_messenger_detect.nasl ___________________________________________________________________ Name: svn:executable + * Added: trunk/openvas-plugins/scripts/gb_ms_win_live_messenger_info_dis_vuln.nasl =================================================================== --- trunk/openvas-plugins/scripts/gb_ms_win_live_messenger_info_dis_vuln.nasl 2009-01-08 00:20:55 UTC (rev 2162) +++ trunk/openvas-plugins/scripts/gb_ms_win_live_messenger_info_dis_vuln.nasl 2009-01-08 06:43:30 UTC (rev 2163) @@ -0,0 +1,86 @@ +############################################################################### +# OpenVAS Vulnerability Test +# $Id: gb_ms_win_live_messenger_info_dis_vuln.nasl 814 2009-01-06 13:16:24Z jan $ +# +# Microsoft Windows Live Messenger Information Disclosure Vulnerability +# +# Authors: +# Sharath S +# +# Copyright: +# Copyright (c) 2009 Intevation GmbH, http://www.intevation.net +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 +# (or any later version), as published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +############################################################################### + +if(description) +{ + script_id(800332); + script_version("$Revision: 1.0 $"); + script_cve_id("CVE-2008-5828"); + script_bugtraq_id(33125); + script_name(english:"Microsoft Windows Live Messenger Information Disclosure Vulnerability"); + desc["english"] = " + + Overview: This host has Windows Live Messenger Client installed and is prone + to Information Disclosure vulnerability. + + Vulnerability Insight: + The vulnerability is caused due to field error in IPv4InternalAddrsAndPorts, + IPv4Internal-Addrs and IPv4Internal-Port headers, which allow to discover + IP address and port numbers via MSNP15 protocol used over a NAT session. + + Impact: + Successful exploitation could lead to unauthorized information disclosure. + + Impact Level: System/Application + + Affected Software/OS: + Microsoft, Windows Live Messenger Client version 8.5.1302.1018 and prior. + + Fix: No solution or patch is available as on 07th January, 2009. Information + regarding this issue will be updated once the solution details are available. + For updates refer, http://get.live.com/messenger/overview + + References: + http://securityreason.com/securityalert/4862 + http://www.securityfocus.com/archive/1/archive/1/499624/100/0/threaded + + CVSS Score: + CVSS Base Score : 5.0 (AV:N/AC:L/Au:NR/C:P/I:N/A:N) + CVSS Temporal Score : 4.2 + Risk factor: Medium"; + + script_description(english:desc["english"]); + script_summary(english:"Check for the Version of Windows Live Messenger"); + script_category(ACT_GATHER_INFO); + script_copyright(english:"Copyright (C) 2009 Intevation GmbH"); + script_family(english:"Web application abuses"); + script_dependencies("gb_ms_win_live_messenger_detect.nasl"); + script_require_keys("MS/LiveMessenger/Ver"); + exit(0); +} + + +include("version_func.inc"); + +lmVer = get_kb_item("MS/LiveMessenger/Ver"); +if(!lmVer){ + exit(0); +} + +# Grep for the version 8.5.1302.1018 and prior +if(version_is_less_equal(version:lmVer, test_version:"8.5.1302.1018")){ + security_warning(0); +} Property changes on: trunk/openvas-plugins/scripts/gb_ms_win_live_messenger_info_dis_vuln.nasl ___________________________________________________________________ Name: svn:executable + * Added: trunk/openvas-plugins/scripts/gb_php_display_errors_xss_vuln.nasl =================================================================== --- trunk/openvas-plugins/scripts/gb_php_display_errors_xss_vuln.nasl 2009-01-08 00:20:55 UTC (rev 2162) +++ trunk/openvas-plugins/scripts/gb_php_display_errors_xss_vuln.nasl 2009-01-08 06:43:30 UTC (rev 2163) @@ -0,0 +1,90 @@ +############################################################################### +# OpenVAS Vulnerability Test +# $Id: gb_php_display_errors_xss_vuln.nasl 808 2009-01-07 13:45:56Z jan $ +# +# PHP display_errors Cross-Site Scripting Vulnerability +# +# Authors: +# Sharath S +# +# Copyright: +# Copyright (c) 2009 Intevation GmbH, http://www.intevation.net +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 +# (or any later version), as published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +############################################################################### + +if(description) +{ + script_id(800334); + script_version("$Revision: 1.0 $"); + script_cve_id("CVE-2008-5814"); + script_name(english:"PHP display_errors Cross-Site Scripting Vulnerability"); + desc["english"] = " + + Overview: The host is running PHP and is prone to Cross-Site Scripting + vulnerability. + + Vulnerability Insight: + The flaw is caused due to improper handling of certain inputs when + display_errors settings is enabled. + + Impact: + Successful exploitation could allow attackers to inject arbitrary web script + or HTML via unspecified vectors and conduct Cross-Site Scripting attacks. + + Impact Level: Application + + Affected Software/OS: + PHP, PHP version 5.2.7 and prior on all running platform. + + Fix: Upgrade to version 5.2.8 or later + http://www.php.net/downloads.php + + References: + http://jvn.jp/en/jp/JVN50327700/index.html + http://jvndb.jvn.jp/en/contents/2008/JVNDB-2008-000084.html + + CVSS Score: + CVSS Base Score : 2.6 (AV:N/AC:H/Au:NR/C:N/I:P/A:N) + CVSS Temporal Score : 1.9 + Risk factor : Low"; + + script_description(english:desc["english"]); + script_summary(english:"Check for the version of PHP"); + script_category(ACT_GATHER_INFO); + script_copyright(english:"Copyright (C) 2009 Intevation GmbH"); + script_family(english:"Web application abuses"); + script_dependencies("gb_php_detect.nasl"); + script_require_ports("Services/www", 80); + exit(0); +} + + +include("http_func.inc"); +include("version_func.inc"); + +port = get_http_port(default:80); +if(!port){ + exit(0); +} + +phpVer = get_kb_item("PHP/Version"); +if(!phpVer){ + exit(0); +} + +# Check PHP version 5.2.7 and prior +if(version_is_less_equal(version:phpVer, test_version:"5.2.7")){ + security_warning(port); +} Property changes on: trunk/openvas-plugins/scripts/gb_php_display_errors_xss_vuln.nasl ___________________________________________________________________ Name: svn:executable + * Added: trunk/openvas-plugins/scripts/gb_php_sql_inj_vuln.nasl =================================================================== --- trunk/openvas-plugins/scripts/gb_php_sql_inj_vuln.nasl 2009-01-08 00:20:55 UTC (rev 2162) +++ trunk/openvas-plugins/scripts/gb_php_sql_inj_vuln.nasl 2009-01-08 06:43:30 UTC (rev 2163) @@ -0,0 +1,90 @@ +############################################################################### +# OpenVAS Vulnerability Test +# $Id: gb_php_sql_inj_vuln.nasl 818 2009-01-06 15:14:56Z jan $ +# +# FILTER_UNSAFE_RAW SQL Injection Vulnerability in PHP +# +# Authors: +# Sharath S +# +# Copyright: +# Copyright (c) 2009 Intevation GmbH, http://www.intevation.net +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 +# (or any later version), as published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +############################################################################### + +if(description) +{ + script_id(800333); + script_version("$Revision: 1.0 $"); + script_cve_id("CVE-2008-5844"); + script_bugtraq_id(32673); + script_name(english:"FILTER_UNSAFE_RAW SQL Injection Vulnerability in PHP"); + desc["english"] = " + + Overview: The host is running PHP and is prone to SQL Injection vulnerability. + + Vulnerability Insight: + The flaw is caused due to improper field change in FILTER_UNSAFE_RAW. These + can be exploited when magic_quotes_gpc settings is disabled. + + Impact: + Successful exploitation could allow attackers to inject SQL code in the + affected user application, and this may lead to other attacks also. + + Impact Level: Application + + Affected Software/OS: + PHP, PHP version 5.2.7 on all running platform. + + Fix: Upgrade to higher version, + http://www.php.net/downloads.php + + References: + http://bugs.php.net/bug.php?id=42718 + http://www.php.net/archive/2008.php#id2008-12-08-1 + http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2008-5844 + + CVSS Score: + CVSS Base Score : 7.5 (AV:N/AC:L/Au:NR/C:P/I:P/A:P) + CVSS Temporal Score : 5.5 + Risk factor : High"; + + script_description(english:desc["english"]); + script_summary(english:"Check for the version of PHP"); + script_category(ACT_GATHER_INFO); + script_copyright(english:"Copyright (C) 2009 Intevation GmbH"); + script_family(english:"Web application abuses"); + script_dependencies("gb_php_detect.nasl"); + script_require_ports("Services/www", 80); + exit(0); +} + + +include("http_func.inc"); + +port = get_http_port(default:80); +if(!port){ + exit(0); +} + +phpVer = get_kb_item("PHP/Version"); +if(!phpVer){ + exit(0); +} + +# Check PHP version 5.2.7 +if(phpVer =~ "5.2.7"){ + security_hole(port); +} Property changes on: trunk/openvas-plugins/scripts/gb_php_sql_inj_vuln.nasl ___________________________________________________________________ Name: svn:executable + * From scm-commit at wald.intevation.org Thu Jan 8 09:08:09 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Thu, 8 Jan 2009 09:08:09 +0100 (CET) Subject: [Openvas-commits] r2164 - in trunk/openvas-client: . nessus Message-ID: <20090108080809.19462406DE@pyrosoma.intevation.org> Author: felix Date: 2009-01-08 09:08:08 +0100 (Thu, 08 Jan 2009) New Revision: 2164 Modified: trunk/openvas-client/ChangeLog trunk/openvas-client/nessus/read_target_file.c Log: * nessus/read_target_file.c: Comments and newlines to help reader understanding the defines, whitespace garbage removed. * nessus/read_target_file.c(target_file_select): brief doc. * nessus/read_target_file.c(target_file_to_list): doc improved. * nessus/read_target_file.c(target_translate): doc improved, indentation Modified: trunk/openvas-client/ChangeLog =================================================================== --- trunk/openvas-client/ChangeLog 2009-01-08 06:43:30 UTC (rev 2163) +++ trunk/openvas-client/ChangeLog 2009-01-08 08:08:08 UTC (rev 2164) @@ -1,3 +1,14 @@ +2009-01-08 Felix Wolfsteller + + * nessus/read_target_file.c: Comments and newlines to help reader + understanding the defines, whitespace garbage removed. + + * nessus/read_target_file.c(target_file_select): brief doc. + + * nessus/read_target_file.c(target_file_to_list): doc improved. + + * nessus/read_target_file.c(target_translate): doc improved, indentation + 2009-01-07 Felix Wolfsteller * nessus/prefs_dialog/prefs_dialog_plugins_prefs.c: Removed obsolete Modified: trunk/openvas-client/nessus/read_target_file.c =================================================================== --- trunk/openvas-client/nessus/read_target_file.c 2009-01-08 06:43:30 UTC (rev 2163) +++ trunk/openvas-client/nessus/read_target_file.c 2009-01-08 08:08:08 UTC (rev 2164) @@ -6,7 +6,8 @@ #ifdef USE_GTK #include #include "read_target_file.h" -#endif +#endif /* USE_GTK */ + #include "error_dlg.h" #include "globals.h" @@ -16,15 +17,17 @@ # define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG) # endif # define lstat(x,y) _stat(x,y) -#else +#else /* HAVE__STAT */ typedef struct stat struct_stat ; # ifndef HAVE_LSTAT # define lstat(x,y) stat(x,y) # endif #endif + #ifdef HAVE_SYS_TYPES_H # include #endif + #ifdef HAVE_SYS_STAT_H # include #endif @@ -33,10 +36,13 @@ #define MAP_FAILED ((__ptr_t) -1) #endif -#ifdef USE_GTK +#ifdef USE_GTK /** - * Callback for click on + * @brief Shows a file selection dialog and attempts to read the selected file + * if OK is clicked. + * + * Callback for click on "Read file" in the target frame. * Shows up a file selection dialog and attempts to read that target file if * OK is clicked. */ @@ -70,11 +76,15 @@ if(!entry)return; gtk_entry_set_text(GTK_ENTRY(entry), estrdup(target)); } -#endif - +#endif /* USE_GTK */ + + /** - * Returns a string assembled out of the lines in file filename. + * @brief Returns a string assembled out of the lines in file filename. * + * The string will contain all the content of the file where newlines have been + * replaced with commata and carriage returns replaced with spaces. + * * @param filename File to read. * * @return Content of file with newlines being replaced by commata or NULL if an @@ -125,26 +135,36 @@ /* * trailing garbage */ - + len = strlen(ret); while(len > 0 && ( ret[len-1]==',' || ret[len-1] == ' ' ) ) { ret[len-1]='\0'; - len--; + len--; } return(ret); } #ifdef USE_GTK - +/** + * @brief Returns target specification string (conditionally read from a file). + * + * If the string starts with "file:", returns the file as string with newlines + * replaced by commata. If it does not, return a copy of it. + * + * @param target Either path to file (prepended with "file:") or target string. + * + * @return Copy of the string target if it does not start with "file:", file + * content as string otherwise. + */ char * -target_translate(const char* target) +target_translate (const char* target) { - if(!strncmp(target, "file:", 5)) - return target_file_to_list(target+strlen("file:")); - else - return strdup(target); + if (!strncmp (target, "file:", 5) ) + return target_file_to_list (target + strlen ("file:") ); + else + return strdup(target); } /** @@ -177,4 +197,4 @@ gtk_widget_hide(gtkw); gtk_widget_destroy(gtkw); } -#endif +#endif /* USE_GTK */ From scm-commit at wald.intevation.org Thu Jan 8 09:10:12 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Thu, 8 Jan 2009 09:10:12 +0100 (CET) Subject: [Openvas-commits] r2165 - in trunk/openvas-client: . nessus Message-ID: <20090108081012.21765406DE@pyrosoma.intevation.org> Author: felix Date: 2009-01-08 09:10:11 +0100 (Thu, 08 Jan 2009) New Revision: 2165 Modified: trunk/openvas-client/ChangeLog trunk/openvas-client/nessus/read_target_file.c trunk/openvas-client/nessus/read_target_file.h Log: * nessus/read_target_file.h, nessus/read_target_file.c: GPL/header added. Modified: trunk/openvas-client/ChangeLog =================================================================== --- trunk/openvas-client/ChangeLog 2009-01-08 08:08:08 UTC (rev 2164) +++ trunk/openvas-client/ChangeLog 2009-01-08 08:10:11 UTC (rev 2165) @@ -1,5 +1,10 @@ 2009-01-08 Felix Wolfsteller + * nessus/read_target_file.h, nessus/read_target_file.c: GPL/header + added. + +2009-01-08 Felix Wolfsteller + * nessus/read_target_file.c: Comments and newlines to help reader understanding the defines, whitespace garbage removed. Modified: trunk/openvas-client/nessus/read_target_file.c =================================================================== --- trunk/openvas-client/nessus/read_target_file.c 2009-01-08 08:08:08 UTC (rev 2164) +++ trunk/openvas-client/nessus/read_target_file.c 2009-01-08 08:10:11 UTC (rev 2165) @@ -1,3 +1,34 @@ +/* Nessus + * Copyright (C) 1998 - 2001 Renaud Deraison + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * In addition, as a special exception, Renaud Deraison + * gives permission to link the code of this program with any + * version of the OpenSSL library which is distributed under a + * license identical to that listed in the included COPYING.OpenSSL + * file, and distribute linked combinations including the two. + * You must obey the GNU General Public License in all respects + * for all of the code used other than OpenSSL. If you modify + * this file, you may extend this exception to your version of the + * file, but you are not obligated to do so. If you do not wish to + * do so, delete this exception statement from your version. + * + * Functions related to target files. + * + */ + #include #include Modified: trunk/openvas-client/nessus/read_target_file.h =================================================================== --- trunk/openvas-client/nessus/read_target_file.h 2009-01-08 08:08:08 UTC (rev 2164) +++ trunk/openvas-client/nessus/read_target_file.h 2009-01-08 08:10:11 UTC (rev 2165) @@ -1,3 +1,34 @@ +/* Nessus + * Copyright (C) 1998 - 2001 Renaud Deraison + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * In addition, as a special exception, Renaud Deraison + * gives permission to link the code of this program with any + * version of the OpenSSL library which is distributed under a + * license identical to that listed in the included COPYING.OpenSSL + * file, and distribute linked combinations including the two. + * You must obey the GNU General Public License in all respects + * for all of the code used other than OpenSSL. If you modify + * this file, you may extend this exception to your version of the + * file, but you are not obligated to do so. If you do not wish to + * do so, delete this exception statement from your version. + * + * Header for target file functions. + * + */ + #ifndef NESSUS_READ_TARGET_FILE_H__ #define NESSUS_READ_TARGER_FILE_H__ void target_file_select(); From scm-commit at wald.intevation.org Thu Jan 8 10:53:57 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Thu, 8 Jan 2009 10:53:57 +0100 (CET) Subject: [Openvas-commits] r2166 - trunk/doc/website Message-ID: <20090108095357.966CD406DE@pyrosoma.intevation.org> Author: kost Date: 2009-01-08 10:53:57 +0100 (Thu, 08 Jan 2009) New Revision: 2166 Added: trunk/doc/website/openvas-cr-26.htm4 Log: Change Request 26: Adding new NASL phases: ACT_TARGETS and ACT_HOSTGROUP Added: trunk/doc/website/openvas-cr-26.htm4 =================================================================== --- trunk/doc/website/openvas-cr-26.htm4 2009-01-08 08:10:11 UTC (rev 2165) +++ trunk/doc/website/openvas-cr-26.htm4 2009-01-08 09:53:57 UTC (rev 2166) @@ -0,0 +1,99 @@ +m4_dnl -*-html-*- +m4_include(`template.m4') + +m4_dnl OpenVAS +m4_dnl $Id$ +m4_dnl Description: OpenVAS Change Request #25 +m4_dnl +m4_dnl Authors: +m4_dnl Vlatko Kosturjak +m4_dnl +m4_dnl Copyright: +m4_dnl Copyright (C) 2008 Kost +m4_dnl +m4_dnl This program is free software; you can redistribute it and/or modify +m4_dnl it under the terms of the GNU General Public License version 2, +m4_dnl as published by the Free Software Foundation. +m4_dnl +m4_dnl This program is distributed in the hope that it will be useful, +m4_dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +m4_dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +m4_dnl GNU General Public License for more details. +m4_dnl +m4_dnl You should have received a copy of the GNU General Public License +m4_dnl along with this program; if not, write to the Free Software +m4_dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + + +PAGE_START +

OpenVAS Change Request #26: OpenVAS-server: Introduction of more phases in NASL

+ +

+Status: In discusssion. +

+ +

Purpose

+ +

+To achieve better flexibility in NASL and better integration with external tools. +

+ +

Rationale

+ +

+Currently, OpenVAS is host-oriented vulnerability scanner. That means that it forks +for each IP tested. There is some cases when it is memory-effective and speed-effective +to launch the scan against the hostgroup or whole targets. Launching nmap is one of +the examples. +

+ +

+NASL have following categories/phases: +{ "ACT_INIT", ACT_INIT }, - phase to set KB items +{ "ACT_GATHER_INFO", ACT_GATHER_INFO }, +{ "ACT_ATTACK", ACT_ATTACK }, +{ "ACT_MIXED_ATTACK", ACT_MIXED_ATTACK }, +{ "ACT_DESTRUCTIVE_ATTACK", ACT_DESTRUCTIVE_ATTACK }, +{ "ACT_DENIAL", ACT_DENIAL }, +{ "ACT_SCANNER", ACT_SCANNER }, - single host port scanner +{ "ACT_SETTINGS", ACT_SETTINGS }, +{ "ACT_KILL_HOST", ACT_KILL_HOST }, +{ "ACT_FLOOD", ACT_FLOOD }, +{ "ACT_END", ACT_END }, +

+ +

+Proposal would add following categories/phases: +{ "ACT_TARGETS", ACT_TARGETS }, - launched before ACT_SCANNER - executes NASLs on whole target specified +{ "ACT_HOSTGROUPS", ACT_HOSTGROUPS }, - launched after ACT_TARGETS - executes NASLs on whole hostgroup +

+ +

Effects

+ +

Advantages

+

+This would, +

+- help us in removing C plugins 
+- provide better nmap(and similar tools) integration
+- more flexible NASLs
+
+ +

Disadvantages

+

+additional work +

+ +

Design and Implementation

+

+This CR needs changing of openvas-libnasl and openvas-server in order to introduce two +new phases. As most of the NASLs are single host oriented, it might not be trivial task. +

+ +

History

+ +
    +
  • 2008-12-30 Vlatko Kosturjak <kost at linux dot hrgt;:
    + Initial text. +
    • +
From scm-commit at wald.intevation.org Thu Jan 8 11:36:19 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Thu, 8 Jan 2009 11:36:19 +0100 (CET) Subject: [Openvas-commits] r2167 - in trunk/openvas-client: . src src/util Message-ID: <20090108103619.ED13C40717@pyrosoma.intevation.org> Author: felix Date: 2009-01-08 11:36:19 +0100 (Thu, 08 Jan 2009) New Revision: 2167 Added: trunk/openvas-client/src/util/ trunk/openvas-client/src/util/Makefile trunk/openvas-client/src/util/g_hash_table_file.c trunk/openvas-client/src/util/g_hash_table_file.h Modified: trunk/openvas-client/ChangeLog trunk/openvas-client/MANIFEST Log: New Module to save and load GHashTables to / from disk. * MANIFEST: Updated with the new files. * src/util: Added (for non-OpenVAS specific code). * src/util/Makefile: Added. * src/util/g_hash_table_file.c: New module for (de-)serialization of GHashTables in a human readable form. * src/util/g_hash_table_file.h: Header of new module. Modified: trunk/openvas-client/ChangeLog =================================================================== --- trunk/openvas-client/ChangeLog 2009-01-08 09:53:57 UTC (rev 2166) +++ trunk/openvas-client/ChangeLog 2009-01-08 10:36:19 UTC (rev 2167) @@ -1,5 +1,20 @@ 2009-01-08 Felix Wolfsteller + New Module to save and load GHashTables to / from disk. + + * Manifest: Updated with the new files. + + * src/util: Added (non-OpenVAS specific code). + + * src/util/Makefile: Added. + + * src/util/g_hash_table_file.c: New module for (de-)serialization of + GHashTables in a human readable form. + + * src/util/g_hash_table_file.h: Header of new module. + +2009-01-08 Felix Wolfsteller + * nessus/read_target_file.h, nessus/read_target_file.c: GPL/header added. Modified: trunk/openvas-client/MANIFEST =================================================================== --- trunk/openvas-client/MANIFEST 2009-01-08 09:53:57 UTC (rev 2166) +++ trunk/openvas-client/MANIFEST 2009-01-08 10:36:19 UTC (rev 2167) @@ -222,6 +222,9 @@ src/openvas-lib/openvas_ssh_login.c src/openvas-lib/openvas_ssh_login.h src/README +src/util/g_hash_table_file.c +src/util/g_hash_table_file.h +src/util/Makefile src/xpm/logo_bsi_de.xpm src/xpm/logo_bsi.xpm src/xpm/logo_intevation.xpm Added: trunk/openvas-client/src/util/Makefile =================================================================== --- trunk/openvas-client/src/util/Makefile 2009-01-08 09:53:57 UTC (rev 2166) +++ trunk/openvas-client/src/util/Makefile 2009-01-08 10:36:19 UTC (rev 2167) @@ -0,0 +1,65 @@ +# OpenVAS-Client +# $Id$ +# Description: Makefile for clients utility functions. +# +# Authors: +# Felix Wolfsteller +# +# Copyright: +# Copyright (C) 2008 Intevation GmbH +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2, +# or, at your option, any later version as published by the Free +# Software Foundation +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# In addition, as a special exception, you have +# permission to link the code of this program with the OpenSSL +# library (or with modified versions of OpenSSL that use the same +# license as OpenSSL), and distribute linked combinations including +# the two. You must obey the GNU General Public License in all +# respects for all of the code used other than OpenSSL. If you +# modify this file, you may extend this exception to your version +# of the file, but you are not obligated to do so. If you do not +# wish to do so, delete this exception statement from your version. +#/ + +include ../../nessus.tmpl + +GTKLIBS= $(GTKCONFIG_LIBS) +INCLUDE = ${include} $(GTKCONFIG_CFLAGS) -I../../nessus -I.. -I../../include + +NESSUS_INCLUDE=`sh ./cflags` +CFLAGS+=-Wall + +# Add some specific Windows compile options for Cygwin +SYSTEM:=$(shell uname -o) +ifeq ($(SYSTEM), Cygwin) +CFLAGS+=-mms-bitfields +LDFLAGS+=-mwindows +endif + +OBJS=g_hash_table_file.o + +all : cflags $(OBJS) + +cflags : Makefile + @echo "$(NESSUS_CFLAGS) $(NESSUS_DEFS) -DPACKAGE=\"OpenVAS-Client\" $(INCLUDE)" | sed 's/\"/\\\"/g' > cflags.tmp + @echo "echo \"`cat cflags.tmp`\"" > cflags + @rm cflags.tmp + @chmod +x cflags + +g_hash_table_file.o : cflags g_hash_table_file.h + $(CC) $(CFLAGS) $(NESSUS_INCLUDE) -c g_hash_table_file.c + +clean : + rm -f *.o cflags Added: trunk/openvas-client/src/util/g_hash_table_file.c =================================================================== --- trunk/openvas-client/src/util/g_hash_table_file.c 2009-01-08 09:53:57 UTC (rev 2166) +++ trunk/openvas-client/src/util/g_hash_table_file.c 2009-01-08 10:36:19 UTC (rev 2167) @@ -0,0 +1,168 @@ +/* OpenVAS-Client + * $Id$ + * Description: Functions to write and read a GHashTable to / from a file. + * + * Authors: + * Felix Wolfsteller + * + * Copyright: + * Copyright (C) 2008 Intevation GmbH + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, + * or, at your option, any later version as published by the Free + * Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * In addition, as a special exception, you have + * permission to link the code of this program with the OpenSSL + * library (or with modified versions of OpenSSL that use the same + * license as OpenSSL), and distribute linked combinations including + * the two. You must obey the GNU General Public License in all + * respects for all of the code used other than OpenSSL. If you + * modify this file, you may extend this exception to your version + * of the file, but you are not obligated to do so. If you do not + * wish to do so, delete this exception statement from your version. + */ + +/** + * @file + * Functions to create a GKeyFile from a GHashTable to vice versa. + * Both are assumed to contain strings only. + * Groups are ignored for the time being. + * + */ + +#include "includes.h" + +#include "g_hash_table_file.h" + +/** + * Groupname placeholder. So far, no further order (like groups) has been + * needed. + */ +#define GROUP_NONE "GHashTableGKeyFile" + +/** + * @brief Adds a key/value pair of strings to a keyfile. + * + * The group for this entry will be GROUP_NONE (define). + * Of main use within a g_hash_table_foreach. + * + * @param key The key to add. + * @param value The value to add. + * @param file The Key/value file (userdata). + */ +static void +add_to_keyfile (char* key_str, char* value_str, GKeyFile* keyfile) +{ + g_key_file_set_string (keyfile, GROUP_NONE, key_str, value_str); +} + +/** + * @brief Writes key/value pairs from a g_hash_table into a key/value file. + * + * This procedure will only work with string keys and string values. + * The file format follows freedesktop.org specifications, the group will be + * GROUP_NONE (define). + * + * @param ghashtable The hashtable to read key/value pairs from. + * @param filename The filename for the key/value file. + * + * @return TRUE in case of success, FALSE otherwise. + * + * @see g_hash_table_file_read + * @see GKeyFile + */ +gboolean +g_hash_table_file_write (GHashTable* ghashtable, char* filename) +{ + int fd; + gchar* keyfile_data; + gsize data_length; + GKeyFile* file; + + // Initialize the key file + file = g_key_file_new (); + g_key_file_set_comment (file, GROUP_NONE, NULL, + "Automatically generated file - please to not edit", + NULL); + // Add the entries of the hashtable to the keyfile (in mem) + g_hash_table_foreach (ghashtable, (GHFunc) add_to_keyfile, file); + + // Open a file to write content to. + // (with GLIB >= 2.8 we can use file_set_contents) + fd = open (filename, O_RDWR|O_CREAT|O_TRUNC, 0600); + if (!fd) + { + g_key_file_free (file); + return FALSE; + } + + // "Export" data and write it to file. + keyfile_data = g_key_file_to_data (file, &data_length, NULL); + int written = write (fd, keyfile_data, data_length); + + // Clean up + close (fd); + g_free(keyfile_data); + g_key_file_free(file); + + if (written != data_length) + { + return FALSE; + } + + // Assume that went just fine + return TRUE; +} + +/** + * @brief Reads key/value pairs (strings) from a file back into a GHashtable. + * + * The file has to follow freedesktop.org specifications. + * + * @param filename The filename to read from. + * @return A GHashTable, mirroring the file or NULL in case of an error. + * + * @see g_hash_table_file_write + * @see GKeyFile + */ +GHashTable* +g_hash_table_read (char* filename) +{ + GKeyFile* file = NULL; + gchar** keys; + gsize length; + GHashTable* returntable = NULL; + + // Load key file into mem + g_key_file_load_from_file (file, filename, G_KEY_FILE_NONE, NULL); + if (file == NULL) + { + g_key_file_free(file); + return NULL; + } + + returntable = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); + + keys = g_key_file_get_keys (file, GROUP_NONE, &length, NULL); + + // Add each key / value pair from file + while ( (*keys) != NULL) + { + char* value = g_key_file_get_value (file, GROUP_NONE, (*keys), NULL); + g_hash_table_insert (returntable, (*keys), value); + ++keys; + } + + return returntable; +} Added: trunk/openvas-client/src/util/g_hash_table_file.h =================================================================== --- trunk/openvas-client/src/util/g_hash_table_file.h 2009-01-08 09:53:57 UTC (rev 2166) +++ trunk/openvas-client/src/util/g_hash_table_file.h 2009-01-08 10:36:19 UTC (rev 2167) @@ -0,0 +1,43 @@ +/* OpenVAS-Client + * $Id$ + * Description: Functions to write and read a g_hash_table to / from a file. + * + * Authors: + * Felix Wolfsteller + * + * Copyright: + * Copyright (C) 2008 Intevation GmbH + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, + * or, at your option, any later version as published by the Free + * Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * In addition, as a special exception, you have + * permission to link the code of this program with the OpenSSL + * library (or with modified versions of OpenSSL that use the same + * license as OpenSSL), and distribute linked combinations including + * the two. You must obey the GNU General Public License in all + * respects for all of the code used other than OpenSSL. If you + * modify this file, you may extend this exception to your version + * of the file, but you are not obligated to do so. If you do not + * wish to do so, delete this exception statement from your version. + */ +#ifndef _OPENVAS_CLIENT_HASH_TABLE_FILE_H +#define _OPENVAS_CLIENT_HASH_TABLE_FILE_H + +#include + +gboolean g_hash_table_file_write(GHashTable* ghashtable, char* filename); +GHashTable* g_hash_table_read(char* filename); + +#endif From scm-commit at wald.intevation.org Thu Jan 8 12:55:05 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Thu, 8 Jan 2009 12:55:05 +0100 (CET) Subject: [Openvas-commits] r2168 - trunk/doc/website Message-ID: <20090108115505.80ED9406DE@pyrosoma.intevation.org> Author: chandra Date: 2009-01-08 12:55:05 +0100 (Thu, 08 Jan 2009) New Revision: 2168 Added: trunk/doc/website/openvas-cr-27.htm4 Modified: trunk/doc/website/openvas-crs.htm4 Log: Added CR #27 Added: trunk/doc/website/openvas-cr-27.htm4 =================================================================== --- trunk/doc/website/openvas-cr-27.htm4 2009-01-08 10:36:19 UTC (rev 2167) +++ trunk/doc/website/openvas-cr-27.htm4 2009-01-08 11:55:05 UTC (rev 2168) @@ -0,0 +1,174 @@ +m4_dnl -*-html-*- +m4_include(`template.m4') + +m4_dnl OpenVAS +m4_dnl $Id$ +m4_dnl Description: OpenVAS Change Request #27 +m4_dnl +m4_dnl Authors: +m4_dnl Stjepan Gros +m4_dnl +m4_dnl This program is free software; you can redistribute it and/or modify +m4_dnl it under the terms of the GNU General Public License version 2, +m4_dnl as published by the Free Software Foundation. +m4_dnl +m4_dnl This program is distributed in the hope that it will be useful, +m4_dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +m4_dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +m4_dnl GNU General Public License for more details. +m4_dnl +m4_dnl You should have received a copy of the GNU General Public License +m4_dnl along with this program; if not, write to the Free Software +m4_dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + + +PAGE_START +

OpenVAS Change Request #27: IPv6 support

+ +

+Status: In discusssion. +

+ +

Purpose

+ +

+To introduce IPv6 support into OpenVAS +

+ +

References

+ +

+IPv6 and a text about OpenVAS on InternetNews +

+ +

Rationale

+ +

+In the current version OpenVAS only supports IPv4 protocol. This is now +a dominant protocol on the Internet. The problems with IPv4 are long +known, e.g. shortage of addresses, and a subset of those problems is expected +to be solved by a new protocol, IPv6. IPv6 is now supported on all the +major operating systems, network devices and in the applications and +the IPv6 deployment is growing steadily but certainly. This means that +the OpenVAS, in order to stay viable solution for the security testings, +has to be extended to support IPv6. +

+ +

+More specifically, supporting IPv6 in OpenVAS means at least the following: +

+ +

+

    +
  1. It means that you can enter IPv6 address(es) in the OpenVAS client + and then those hosts, whith those addresses, are scanned.
    2. + +
  2. It means that when you enter hostname (or FQDN) which resolves to + IPv6 address, this address will be used
    3. +
+

+ +

Effects

+ +

+The code changes will not impact any existing functionality. They +will allow existing checks to be used over the IPv6 network. Additionally, +it will be possible to write new tests specialized for IPv6 weaknesses. +

+ +

Design and Implementation

+ +

+The following changes will be necessary: +

+ +

+

    +
  • Much of the core socket functions used currently in OpenVAS + are specific to IPv4 and they have to be changed.
    • +
  • There is a code in OpenVAS for forging IP packets. This code has to + be enhanced to know how to construct IPv6 packets.
    • +
  • NASL laguage has to be enhanced to accept IPv6 addresses, and + potentially IPv6 specific extensions.
    • +
+

+ +

+Specifically, the following modules will undergo changes, +

    +
  • +openvas-libnasl: +
    +- capture_packet.c - Used by packet forgery
+- nasl_packet_forgery.c - all functions need to be changed and additional
+  functions for IPv6
+- nasl.c - command line tool
+- nasl_host.c  - deals with remote host
+- nasl_socket.c
+- The include files structures
+
    +
    • + +
  • +openvas-libraries: +
    +- ids_send.c - IDS evasion techniques
+- network.c
+- pcap.c
+- resolve.c
+- www_funcs.c
+- Host Gatherer module
+
    +
    • +
  • +openvas-server: +
    +- openvasd.c
+
    +
    • + +
  • +openvas-client: +
    +- network.c
+- system.c
+- resolv.c
+
    +
    • +
+

+ +

+The proposed development steps are: +

+ +

+

    +
  1. Phase I: + Allow IPv6 addresses to be entered by the user, even though + they are not used, i.e. when user enters IPv6 the address is + ignored with appropriate warning or error message.
    2. +
  2. Phase II: + Refactor the current IPv4 specific code into separate module + and/or functions.
    3. +
  3. Phase III: + Then, in the next step this code is extended so that it transparently + supports IPv6 in addition to IPv4.
    4. +
  4. Phase IV: + Add the code to handle raw IPv6 packets. +
  5. Debug... and then debug more. :) +
+I believe we should introduce libdnet +into the OpenVAS? +

+ +

History

+ +
    +
  • 2009-01-06 Stjepan Gros <sgros.ml at gmail.com>:
    + Initial text.
    • +
+
    +
  • 2009-01-08 Chandrashekhar B <bchandra at secpod.com>:
    + Updated module level details.
    • +
Modified: trunk/doc/website/openvas-crs.htm4 =================================================================== --- trunk/doc/website/openvas-crs.htm4 2009-01-08 10:36:19 UTC (rev 2167) +++ trunk/doc/website/openvas-crs.htm4 2009-01-08 11:55:05 UTC (rev 2168) @@ -69,6 +69,10 @@
  • OpenVAS Change Request #23: OpenVAS-libnasl: Standardize Script Families for NVT (in discussion)
  • OpenVAS Change Request #24: OpenVAS-Server: Reorganize NVTs in Subdirectories (in progress)
  • OpenVAS Change Request #25: OpenVAS-libnasl: Integration of SAMBA or WMI (in discussion) +
  • OpenVAS Change Request #26: OpenVAS-server: OpenVAS-server: Introduction of more phases in NASL (in discussion) +
  • OpenVAS Change Request #27: IPv6 support (in discussion) + +OpenVAS-server: Introduction of more phases in NASL

    How to write a change request

    From scm-commit at wald.intevation.org Thu Jan 8 14:06:06 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Thu, 8 Jan 2009 14:06:06 +0100 (CET) Subject: [Openvas-commits] r2169 - in trunk/openvas-plugins: . scripts Message-ID: <20090108130606.B7E734070A@pyrosoma.intevation.org> Author: chandra Date: 2009-01-08 14:06:04 +0100 (Thu, 08 Jan 2009) New Revision: 2169 Added: trunk/openvas-plugins/scripts/gb_foxmail_detect.nasl trunk/openvas-plugins/scripts/gb_foxmail_mailto_bof_vuln.nasl trunk/openvas-plugins/scripts/gb_ms_money_detect.nasl trunk/openvas-plugins/scripts/gb_ms_money_dos_vuln.nasl Modified: trunk/openvas-plugins/ChangeLog Log: Added new plugins Modified: trunk/openvas-plugins/ChangeLog =================================================================== --- trunk/openvas-plugins/ChangeLog 2009-01-08 11:55:05 UTC (rev 2168) +++ trunk/openvas-plugins/ChangeLog 2009-01-08 13:06:04 UTC (rev 2169) @@ -1,4 +1,11 @@ 2008-01-08 Chandrashekhar B + * scripts/gb_foxmail_detect.nasl, + scripts/gb_ms_money_dos_vuln.nasl, + scripts/gb_foxmail_mailto_bof_vuln.nasl, + scripts/gb_ms_money_detect.nasl: + Added new plugins + +2008-01-08 Chandrashekhar B * scripts/gb_ms_win_live_messenger_info_dis_vuln.nasl, scripts/gb_ms_win_live_messenger_detect.nasl, scripts/gb_kerio_mailserver_mult_xss_vuln.nasl, Added: trunk/openvas-plugins/scripts/gb_foxmail_detect.nasl =================================================================== --- trunk/openvas-plugins/scripts/gb_foxmail_detect.nasl 2009-01-08 11:55:05 UTC (rev 2168) +++ trunk/openvas-plugins/scripts/gb_foxmail_detect.nasl 2009-01-08 13:06:04 UTC (rev 2169) @@ -0,0 +1,68 @@ +############################################################################### +# OpenVAS Vulnerability Test +# $Id: gb_foxmail_detect.nasl 816 2009-01-07 15:30:24Z jan $ +# +# FoxMail Version Detection +# +# Authors: +# Sujit Ghosal +# +# Copyright: +# Copyright (c) 2009 Intevation GmbH, http://www.intevation.net +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 +# (or any later version), as published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +############################################################################### + +if(description) +{ + script_id(800219); + script_version("$Revision: 1.0 $"); + script_name(english:"FoxMail Version Detection"); + desc["english"] = " + Overview : This script finds the installed FoxMail Version and saves in KB. + + Risk factor : Informational"; + + script_description(english:desc["english"]); + script_summary(english:"Set Version of FoxMail in KB"); + script_category(ACT_GATHER_INFO); + script_copyright(english:"Copyright (C) 2009 Intevation GmbH"); + script_family(english:"General"); + script_dependencies("secpod_reg_enum.nasl"); + script_require_keys("SMB/WindowsVersion"); + exit(0); +} + + +include("smb_nt.inc"); +include("secpod_smb_func.inc"); + +if(!get_kb_item("SMB/WindowsVersion")){ + exit(0); +} + +if(!registry_key_exists(key:"SOFTWARE\Tencent\Foxmail")){ + exit(0); +} + +key = "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Foxmail_is1\"; +if("Foxmail" >< registry_get_sz(key:key, item:"DisplayName")) +{ + name = registry_get_sz(key:key, item:"DisplayName"); + foxmailVer = eregmatch(pattern:"Foxmail ([0-9.]+)", string:name); + if(foxmailVer[1] != NULL){ + set_kb_item(name:"Foxmail/Win/Ver", value:foxmailVer[1]); + } + exit(0); +} Property changes on: trunk/openvas-plugins/scripts/gb_foxmail_detect.nasl ___________________________________________________________________ Name: svn:executable + * Added: trunk/openvas-plugins/scripts/gb_foxmail_mailto_bof_vuln.nasl =================================================================== --- trunk/openvas-plugins/scripts/gb_foxmail_mailto_bof_vuln.nasl 2009-01-08 11:55:05 UTC (rev 2168) +++ trunk/openvas-plugins/scripts/gb_foxmail_mailto_bof_vuln.nasl 2009-01-08 13:06:04 UTC (rev 2169) @@ -0,0 +1,86 @@ +############################################################################### +# OpenVAS Vulnerability Test +# $Id: gb_foxmail_buffer_overflow_vuln.nasl 816 2009-01-07 15:41:24Z jan $ +# +# FoxMail Client Buffer Overflow Vulnerability +# +# Authors: +# Sujit Ghosal +# +# Copyright: +# Copyright (c) 2009 Intevation GmbH, http://www.intevation.net +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 +# (or any later version), as published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +############################################################################### + +if(description) +{ + script_id(800220); + script_version("$Revision: 1.0 $"); + script_cve_id("CVE-2008-5839"); + script_bugtraq_id(31294); + script_name(english:"FoxMail Client Buffer Overflow vulnerability"); + desc["english"] = " + + Overview: This host is installed with FoxMail Client and is prone to Buffer + Overflow Vulnerability. + + Vulnerability Insight: + This flaw is due to lack of sanitization and boundary check in the user + supplied data which can be exploited by adding a long URL length in the + HREF attribute of an A element. + + Impact: + Successful exploitation will let the attacker to insert a long crafted + URI in the MAILTO field and can cause a stack overflow to the application. + + Impact Level: Application + + Affected Software/OS: + Foxmail version 6.5 or prior on Windows. + + Fix: No solution or patch is available as on 08th January, 2008. Information + regarding this issue will be updated once the solution details are available. + For updates refer, http://www.foxmail.com.cn + + References: + http://www.sebug.net/exploit/4681 + http://xforce.iss.net/xforce/xfdb/45343 + + CVSS Score: + CVSS Base Score : 9.3 (AV:N/AC:M/Au:NR/C:C/I:C/A:C) + CVSS Temporal Score : 8.4 + Risk factor: Critical"; + + script_description(english:desc["english"]); + script_summary(english:"Check for the Version of Foxmail Client"); + script_category(ACT_GATHER_INFO); + script_copyright(english:"Copyright (C) 2009 Intevation GmbH"); + script_family(english:"Buffer overflow"); + script_dependencies("gb_foxmail_detect.nasl"); + exit(0); +} + + +include("version_func.inc"); + +fmVer = get_kb_item("Foxmail/Win/Ver"); +if(!fmVer){ + exit(0); +} + +# Check for Foxmail version 6.5 or prior +if(version_is_less_equal(version:fmVer, test_version:"6.5")){ + security_hole(0); +} Property changes on: trunk/openvas-plugins/scripts/gb_foxmail_mailto_bof_vuln.nasl ___________________________________________________________________ Name: svn:executable + * Added: trunk/openvas-plugins/scripts/gb_ms_money_detect.nasl =================================================================== --- trunk/openvas-plugins/scripts/gb_ms_money_detect.nasl 2009-01-08 11:55:05 UTC (rev 2168) +++ trunk/openvas-plugins/scripts/gb_ms_money_detect.nasl 2009-01-08 13:06:04 UTC (rev 2169) @@ -0,0 +1,72 @@ +############################################################################### +# OpenVAS Vulnerability Test +# $Id: gb_ms_money_detect.nasl 812 2009-01-07 13:30:24Z jan $ +# +# Microsoft Money Version Detection +# +# Authors: +# Sujit Ghosal +# +# Copyright: +# Copyright (c) 2009 Intevation GmbH, http://www.intevation.net +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 +# (or any later version), as published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +############################################################################### + +if(description) +{ + script_id(800217); + script_version("$Revision: 1.0 $"); + script_name(english:"Microsoft Money Version Detection"); + desc["english"] = " + Overview : This script finds the installed Microsoft Money Version and + saves in KB. + + Risk factor : Informational"; + + script_description(english:desc["english"]); + script_summary(english:"Set Version of Microsoft Money in KB"); + script_category(ACT_GATHER_INFO); + script_copyright(english:"Copyright (C) 2009 Intevation GmbH"); + script_family(english:"General"); + script_dependencies("secpod_reg_enum.nasl"); + script_require_keys("SMB/WindowsVersion"); + exit(0); +} + + +include("smb_nt.inc"); +include("secpod_smb_func.inc"); + +if(!get_kb_item("SMB/WindowsVersion")){ + exit(0); +} + +if(!registry_key_exists(key:"SOFTWARE\Microsoft\Money")){ + exit(0); +} + +key = "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\"; +foreach item (registry_enum_keys(key:key)) +{ + if("Microsoft Money" >< registry_get_sz(key:key + item, item:"DisplayName")) + { + name = registry_get_sz(key:key + item, item:"DisplayName"); + ver = eregmatch(pattern:"Microsoft Money ([0-9]+)", string:name); + if(ver[1] != NULL){ + set_kb_item(name:"MS/Money/Version", value:ver[1]); + } + exit(0); + } +} Property changes on: trunk/openvas-plugins/scripts/gb_ms_money_detect.nasl ___________________________________________________________________ Name: svn:executable + * Added: trunk/openvas-plugins/scripts/gb_ms_money_dos_vuln.nasl =================================================================== --- trunk/openvas-plugins/scripts/gb_ms_money_dos_vuln.nasl 2009-01-08 11:55:05 UTC (rev 2168) +++ trunk/openvas-plugins/scripts/gb_ms_money_dos_vuln.nasl 2009-01-08 13:06:04 UTC (rev 2169) @@ -0,0 +1,82 @@ +############################################################################### +# OpenVAS Vulnerability Test +# $Id: gb_ms_money_dos_vuln.nasl 812 2009-01-07 13:40:24Z jan $ +# +# Microsoft Money 'prtstb06.dll' Denial of Service Vulnerability +# +# Authors: +# Sujit Ghosal +# +# Copyright: +# Copyright (c) 2009 Intevation GmbH, http://www.intevation.net +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 +# (or any later version), as published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA. +############################################################################### + +if(description) +{ + script_id(800218); + script_version("$Revision: 1.0 $"); + script_cve_id("CVE-2008-5823"); + script_name(english:"Microsoft Money 'prtstb06.dll' Denial of Service vulnerability"); + desc["english"] = " + + Overview: This host has Microsoft Money installed and is prone to Denial + of Service Vulnerability. + + Vulnerability Insight: + The flaw is due to an error in the Windows Based Script Host which lets + the attacker execute arbitrary codes in the vulnerable buffer to crash + the application. + + Impact: + Successful exploitation will let the attacker to change the vulnerable + EIP value and can cause denial of service to the application. + + Impact Level: Application + + Affected Software/OS: + Microsoft Money 2006 on Windows. + + Fix: No solution or patch is available as on 08th January, 2009. Information + regarding this issue will be updated once the solution details are available. + For updates refer, http://www.microsoft.com/MONEY/default.mspx + + References: + http://jbrownsec.blogspot.com/2008/12/new-year-research-are-upon-us.html + + CVSS Score: + CVSS Base Score : 4.3 (AV:N/AC:M/Au:N/C:N/I:N/A:P) + CVSS Temporal Score : 3.7 + Risk factor: Medium"; + + script_description(english:desc["english"]); + script_summary(english:"Check for the Version of Microsoft Money"); + script_category(ACT_GATHER_INFO); + script_copyright(english:"Copyright (C) 2009 Intevation GmbH"); + script_family(english:"Denial of Service"); + script_dependencies("gb_ms_money_detect.nasl"); + exit(0); +} + + +msmVer = get_kb_item("MS/Money/Version"); +if(!msmVer){ + exit(0); +} + +# Check for version Microsoft Money 2006 +if(msmVer =~ "2006"){ + security_warning(0); +} Property changes on: trunk/openvas-plugins/scripts/gb_ms_money_dos_vuln.nasl ___________________________________________________________________ Name: svn:executable + * From scm-commit at wald.intevation.org Thu Jan 8 15:21:59 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Thu, 8 Jan 2009 15:21:59 +0100 (CET) Subject: [Openvas-commits] r2170 - trunk/doc/website Message-ID: <20090108142159.F3D2340729@pyrosoma.intevation.org> Author: jan Date: 2009-01-08 15:21:59 +0100 (Thu, 08 Jan 2009) New Revision: 2170 Added: trunk/doc/website/openvas-cr-28.htm4 Modified: trunk/doc/website/openvas-crs.htm4 Log: Adding CR#28. Added: trunk/doc/website/openvas-cr-28.htm4 =================================================================== --- trunk/doc/website/openvas-cr-28.htm4 2009-01-08 13:06:04 UTC (rev 2169) +++ trunk/doc/website/openvas-cr-28.htm4 2009-01-08 14:21:59 UTC (rev 2170) @@ -0,0 +1,1168 @@ +m4_dnl -*-html-*- +m4_include(`template.m4') + +m4_dnl OpenVAS +m4_dnl $Id$ +m4_dnl Description: OpenVAS Change Request #26 +m4_dnl +m4_dnl Authors: +m4_dnl Michael Wiegand +m4_dnl +m4_dnl Copyright: +m4_dnl Copyright (C) 2009 Intevation GmbH +m4_dnl +m4_dnl This program is free software; you can redistribute it and/or modify +m4_dnl it under the terms of the GNU General Public License version 2, +m4_dnl as published by the Free Software Foundation. +m4_dnl +m4_dnl This program is distributed in the hope that it will be useful, +m4_dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +m4_dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +m4_dnl GNU General Public License for more details. +m4_dnl +m4_dnl You should have received a copy of the GNU General Public License +m4_dnl along with this program; if not, write to the Free Software +m4_dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + + +PAGE_START +

    OpenVAS Change Request #28: OpenVAS Management Protocol (OMP)

    + +

    +Status: In discussion. +

    + +

    Purpose

    + +

    +To introduce a new protocol for the communication between OpenVAS client and +server applications that finally does drop the design flaws of NTP/OTP. +

    + +

    +To allow for consistent, privilege-separating server-side management of user +data like tasks, reports etc. +

    + +

    +To allow for easy HTTP/XML-based implementations. +

    + +

    References

    + +

    +(none) +

    + +

    Rationale

    + +

    +The OpenVAS server and client use the OpenVAS Transfer Protocol (OTP) for +communication. OTP is a descendant of the Nessus Transfer Protocol (NTP). +OTP cleaned up unused, dangerous and inconsistent elemements from NTP +and introduced some small helpful extra-features, but it still inherited +various design weaknesses of NTP such as broken escaping, newlines etc. +OMP aims to implement existing functionality in a clean and modern manner +and to be open for future improvements. +

    + +

    +The design goals for this new protocol should be: +

    + +
      +
    • + Allow for easy and fast parsing of the protocol while retaining + human-readability for debugging and development purposes. +
      • +
    • + Make the protocol as stateless as possible to avoid unnecessary delays in + the communication process. +
      • +
    • + Allow for easy intergration into other protocols and communication channels. +
      • +
    + +

    +This change request proposes an XML based approach to satisfy the goals +described above. A first draft of the proposed protocol is available +in the section "Design and Implementation" of this Change Request. +

    + +

    Effects

    + +

    +Client and server elements need to be provided with the ability +and communicate via OMP. On the OpenVAS-Client-side this can be done +by offering OMP as an alternative protocol and thus OpenVAS-Client +will remain compatible with OTP servers. +

    + +

    +It will be possible to develop "light" clients without local storage +because OMP offers to store user data. +

    + +

    +The server side will need a comprehensive re-design to allow for the features +of OMP, namely the user data. For transistion phase it is fairly simple +to translate OMP into OTP which essentially means that it is possible to leave +openvasd untouched and place a OMP layer between clients and openvasd. +Consequently, OTP will always be available as a fall back and thus +no users are not confronted with a mandatory change of concept, they can decide +on their own. +

    + +

    Design and Implementation

    + +

    +The main implementation strategy is to implement a new layer +between openvasd and the clients as "openvas-manager" which uses +OMP to communicate with the clients, stores user data and communicates +via OTP with openvasd. Based on this, OpenVAS-Client can be provided with +OMP abilities addtional to OTP. Eventually openvasd can be drastically +minimized to do the core job only and thus allow for privilege separation. +

    + +

    Design Considerations

    + +

    +The OpenVAS Management Protocol is intended for use between an OpenVAS clients +and an OpenVAS Manager component. +

    + +

    +The current specification proposes an XML based approach. This is intended to +allow for easy integration into other XML capable protocols and communication +methods, e.g. Web Services/SOAP, XmlHttpRequest, REST or other methods of +invoking remote functionality. +

    + +

    +One design consideration is to keep the actual syntax adaptable for different +communication technologies. The present specification assumes a simple XML-based +communication protocol. Possible alternatives are implementations of the OMP +functionality using the very same keywords e.g. based on HTTP GET/POST +technology. Thus, any implementation of OMP should keep the actual +communication technology separate from the implementation of the semantic +functionality. +

    + +

    +Human-readable strings are encoded as UTF-8. +

    + +

    +Files or other binary data is expected to be Base64 encoded. +

    + +

    +TODO: It might be desirable to send a reference to a file location (e.g. an URL) +instead of the actual file. +

    + +

    +Numerical response codes:
    +The OpenVAS manager uses numerical response codes to indicate whether a command +issued by the client could be executed successfully. The response codes are +similar to the response codes used by HTTP as specified in RFC 2616; a response code in the +2xx range indicates that the command has been successfully received, understood, +and accepted. A response code in the 4xx range indicates that the command issued +could not be executed due to error made by the client. A response in the 5xx +range indicates that an error occurred in the manager during the processing of +this command.
    +Implementations which transfer OMP using a response-code aware protocol (e.g. +HTTP) might want to consider including this status code in the message generated +by this protocol. +

    + +

    +TODO: Unique ID scheme:
    +This proposal uses random UUIDs as described in RFC 4122. The actual ID scheme +may differ from this. +

    + +

    +Authentication:
    +The client is expected to send an authentication element with each request. +Initially, this element will be expected to look like the following: +

    +<authentication>
+  <credentials>
+    <username>FooBar</username>
+    <password>276LkeFHJWnCaD6ynSlP6mnf9</password>
+  </credentials>
+</authentication>
+
    +Over time, other types of credentials are to be expected. +If the credentials supplied by the client are not sufficient, the manager must +reply with: +
    +<authentication_response>
+  <status>403</status>
+</authentication_response>
+
    +and must not handle the actual request made by the client. +

    + +

    Protocol Primitives / Commands

    + +

    new_task

    + +

    +The client uses the new_task command to create a new task. This command must +include a file specifying the task and an human-readable identifier assigned by +the user. The command may include a comment. +

    + +

    +If there was no error with the command sent by the client, the manager will +assign an unique ID to the task and include this ID in its reply to the client. +

    + +

    +Command elements: +

      +
    • <task file> is a file describing the task. As of OMP 1.0, this file is a file +in the openvasrc format. The file must be Base64 encoded. +
    • <identifier> is a human-readable identifier up to 100 characters in length. +
    • <comment> is a human-readable text up to 4000 characters in length. +
    +

    + +
    Example:
    + +

    +C: +

    + +
    +<new_task>
+  <task_file>asdf3235saf3kjBVF...</task_file>
+  <identifier>Scan Webserver</identifier>
+  <comment>Hourly scan of the webserver</comment>
+</new_task>
+
    + +

    +M: +

    + +
    +<new_task_response>
+  <status>201</status>
+  <task_id>254cd3ef-bbe1-4d58-859d-21b8d0c046c6</task_id>
+</new_task_response>
+
    + +

    +M: +

    + +
    +<new_task_response>
+  <status>4xx</status>
+</new_task_response>
+
    + +

    +M: +

    + +
    +<new_task_response>
+  <status>5xx</status>
+</new_task_response>
+
    + +

    modify_task

    + +

    +The client uses the modify_task command to change an existing task. This +command must include the ID of an existing task and is expected to include at +least one parameter and the new value for said parameter. +

    + +

    +If there was no error with the command sent by the client, the manager will +apply the changes to the task and will reply with a response code indicating +success. +

    + +

    +Command elements: +

      +
    • <task_id> is the id of the task which should be changed. +
    • <parameter> is the name of the parameter to change (e.g. task_file, identifier, +execution_interval, comment). +
    • <value> is the new value for the parameter in question. +
    +

    + +
    Example:
    + +

    +C: +

    + +
    +<modify_task>
+  <task_id>254cd3ef-bbe1-4d58-859d-21b8d0c046c6</task_id>
+  <parameter>task_file</parameter>
+  <value>HAFawrAsfdgJFGE374...</value>
+</modify_task>
+
    + +

    +M: +

    + +
    +<modify_task_response>
+  <status>201</status>
+</modify_task_response>
+
    + +

    +M: +

    + +
    +<modify_task_response>
+  <status>4xx</status>
+</modify_task_response>
+
    + +

    +M: +

    + +
    +<modify_task_response>
+  <status>5xx</status>
+</modify_task_response>
+
    + +

    delete_task

    + +

    +The client uses the delete_task command to delete an existing task. This +command must include the ID of an existing task. +

    + +

    +If there was no error with the command sent by the client, the manager will +delete the task and all relevant objects (reports etc.) and will reply with a +response code indicating success. +

    + +

    +Since this a destructive command, the client is advised to ask for confirmation +from the user before sending this command to the manager. +

    + +

    +Command elements: +

      +
    • <task_id> is the id of the task which should be deleted. +
    +

    + +
    Example:
    + +

    +C: +

    + +
    +<delete_task>
+  <task_id>254cd3ef-bbe1-4d58-859d-21b8d0c046c6</task_id>
+</delete_task>
+
    + +

    +M: +

    + +
    +<delete_task_response>
+  <status>201</status>
+</delete_task_response>
+
    + +

    +M: +

    + +
    +<delete_task_response>
+  <status>4xx</status>
+</delete_task_response>
+
    + +

    +M: +

    + +
    +<delete_task_response>
+  <status>5xx</status>
+</delete_task_response>
+
    + +

    start_task

    + +

    +The client uses the start_task command to manually start an existing task. This +command must include the ID of an existing task. +

    + +

    +If there was no error with the command sent by the client, the manager will +start the task and will reply with a response code indicating success. +

    + +

    +Command elements: +

      +
    • <task_id> is the id of the task which should be started. +
    +

    + +
    Example:
    + +

    +C: +

    + +
    +<start_task>
+  <task_id>825a5d10-24b2-4473-a4e0-55f8cfd4bf23</task_id>
+</start_task>
+
    + +

    +M: +

    + +
    +<start_task_response>
+  <status>201</status>
+</start_task_response>
+
    + +

    +M: +

    + +
    +<start_task_response>
+  <status>4xx</status>
+</start_task_response>
+
    + +

    +M: +

    + +
    +<start_task_response>
+  <status>5xx</status>
+</start_task_response>
+
    + +

    abort_task

    + +

    +The client uses the start_task command to abort a running task. This +command must include the ID of an existing task. +

    + +

    +If an optional criterion is specified, the manager will abort the scanning of +hosts matching this criterion, if possible, but continue with the rest of the +task. +

    + +

    +If there was no error with the command sent by the client, the manager will +abort the task and will reply with a response code indicating success. +

    + +

    +Command elements: +

      +
    • <task_id> is the id of the task which should be aborted. +
    • <criterion>, <value> indicates the hosts for which the scan should be aborted +(e.g. "ip 192.168.1.1"). +
    +

    + +
    Example:
    + +

    +C: +

    + +
     
+<abort_task>
+  <task_id>825a5d10-24b2-4473-a4e0-55f8cfd4bf23</task_id>
+  <criterion>ip</criterion>
+  <value>192.168.1.1</value>
+</abort_task>
+
    + +

    +M: +

    + +
    +<abort_task_response>
+  <status>201</status>
+</abort_task_response>
+
    + +

    +M: +

    + +
    +<abort_task_response>
+  <status>4xx</status>
+</abort_task_response>
+
    + +

    +M: +

    + +
    +<abort_task_response>
+  <status>5xx</status>
+</abort_task_response>
+
    + +

    status

    + +

    +The client uses the status command to request information regarding the status +of its task. +

    + +

    +If the status command is sent without a task ID, the manager will respond with +the number of tasks and a list of the tasks that have been stored for the user +issuing this command. The list will include the ID of the task, the +human-readable identifier, an element describing the state of the report +(Running, Done etc.) and five numbers indicating the number of security holes, +security notes, security infos, log messages and debug messages discovered +during the last run of this task. +

    + +

    +If the status command is sent with a task ID, the manager will respond with +detailed information on the requested task ID. +If the task is not currently running, the response will include the number of +reports that are available for this task and a list containing the IDs of the +reports, a timestamp indicating when this report was created and five numbers +indicating the number of security holes, security notes, security infos, log +messages and debug messages described in this report. If there is a comment +include in the report, it will be sent as well. +If the task is currently running, the response will include the IP of the host +currently being scanned and five numbers indicating the number of security +holes, security notes, security infos, log messages and debug messages which +have been received so far during this run of the task. +

    + +

    +Command elements: +

      +
    • <task_id> is the id of the task which should be queried. +
    +

    + +
    Example:
    + +

    +C: +

    + +
    +<status/>
+
    + +

    +M: +

    + +
    +<status_response>
+  <status>200</status>
+  <task_count>2</task_count>
+  <task>
+    <task_id>254cd3ef-bbe1-4d58-859d-21b8d0c046c6</task_id>
+    <identifier>Scan Webserver</identifier>
+    <task_status>Running</task_status>
+    <messages>
+      <hole>0</hole>
+      <warning>0</warning>
+      <info>0</info>
+      <log>0</log>
+      <debug>0</debug>
+    </messages>
+  </task>
+  <task>
+    <task_id>f14747d3-a4d7-4e79-99bb-a0a1276cb78c</task_id>
+    <identifier>Scan Mailserver</identifier>
+    <task_status>Done</task_status>
+    <messages>
+      <hole>0</hole>
+      <warning>2</warning>
+      <info>5</info>
+      <log>0</log>
+      <debug>7</debug>
+    </messages>
+  </task>
+</status_response>
+
    + +

    +C: +

    + +
    +<status>
+  <task_id>f14747d3-a4d7-4e79-99bb-a0a1276cb78c</task_id>
+</status>
+
    + +

    +M: +

    + +
    +<status_response>
+  <status>200</status>
+  <report_count>5</report_count>
+  <report>
+    <report_id>fc2ae4a9-8819-4159-b94b-5210db2f6f38</report_id>
+    <timestamp>2009-03-10T10:21Z</timestamp>
+    <messages>
+      <hole>1</hole>
+      <warning>2</warning>
+      <info>5</info>
+      <log>3</log>
+      <debug>3</debug>
+    </messages>
+    <comment/>
+  </report>
+  <report>
+    <report_id>bcfeca57-0068-494b-a0bc-7b056649bd8b</report_id>
+    <timestamp>2009-03-10T10:29Z</timestamp>
+    <messages>
+      <hole>0</hole>
+      <warning>1</warning>
+      <info>5</info>
+      <log>2</log>
+      <debug>3</debug>
+    </messages>
+    <comment>Applied patch</comment>
+  </report>
+  <report>
+    <report_id>0c176f64-faf8-4544-8de7-12dbccb3831c</report_id>
+    <timestamp>2009-03-10T11:19Z</timestamp>
+    <messages>
+      <hole>0</hole>
+      <warning>0</warning>
+      <info>3</info>
+      <log>2</log>
+      <debug>3</debug>
+    </messages>
+    <comment/>
+  </report>
+  <report>
+    <report_id>80d0096d-4216-42a7-b727-e6955c08f97b</report_id>
+    <timestamp>2009-03-11T16:42Z</timestamp>
+    <messages>
+      <hole>0</hole>
+      <warning>0</warning>
+      <info>2</info>
+      <log>2</log>
+      <debug>3</debug>
+    </messages>
+    <comment/>
+  </report>
+  <report>
+    <report_id>5d6294dd-e634-4f06-ae64-ef97e68b0e43</report_id>
+    <timestamp>2009-03-11T17:02Z</timestamp>
+    <messages>
+      <hole>0</hole>
+      <warning>0</warning>
+      <info>1</info>
+      <log>1</log>
+      <debug>3</debug>
+    </messages>
+    <comment/>
+  </report>
+</status_response>
+
    + +

    +C: +

    + +
    +<status>
+  <task_id>254cd3ef-bbe1-4d58-859d-21b8d0c046c6</task_id>
+</status>
+
    + +

    +M: +

    + +
    +<status_response>
+  <status>200</status>
+  <task>
+    <current_ip>192.168.1.5</current_ip>
+    <messages>
+      <hole>0</hole>
+      <warning>0</warning>
+      <info>1</info>
+      <log>1</log>
+      <debug>3</debug>
+    </messages>
+  </task>
+</status_response>
+
    + +

    get_report

    + +

    +The client uses the get_report command to request a specific report identified +by its unique ID. The client may request the report to be sent in a specific +format. +

    + +

    +If there was no error with the command sent by the client, the manager will send +the report as a Base64 encoded element and will reply with a response code +indicating success. +

    + +

    +Command elements: +

      +
    • <report_id> is the id of the report which should be retrieved. +
    • <format> is a string up to 10 characters in length describing the requested +format. +
    +

    + +
    Example:
    + +

    +C: +

    + +
    +<get_report>
+  <report_id>267a3405-e84a-47da-97b2-5fa0d2e8995e</report_id>
+  <format>PDF</format>
+</get_report>
+
    + +

    +M: +

    + +
    +<get_report_response>
+  <status>200</status>
+  <report>hsisn3qaVFhkjFRG4...</report>
+</get_report_response>
+
    + +

    modify_report

    + +

    +The client uses the modify_report command to modify an existing report +identified by its unique ID. This can be used to add a comment to a report. +

    + +

    +If there was no error with the command sent by the client, the manager will +add the comment to the report and will reply with a response code indicating +success. +

    + +

    +Command elements: +

      +
    • <report_id> is the id of the report which should be retrieved. +
    • <param_id> is the id of the parameter to change (e.g. comment). +
    • <value> is the new value for the parameter in question. +
    +

    + +
    Example:
    + +

    +C: +

    + +
    +<modify_report>
+ <report_id>65defe9b-bb28-4e85-9ed7-3f2a57ac8263</report_id>
+ <parameter>comment</parameter>
+ <value>This is the report where vulnerability XYZ was found on our Webserver.</value>
+</modify_report>
+
    + +

    +M: +

    + +
    +<modify_report_response>
+  <status>200</status>
+</modify_report_response>
+
    + +

    delete_report

    + +

    +The client uses the delete_report command to delete an existing report. This +command must include the ID of an existing report. +

    + +

    +If there was no error with the command sent by the client, the manager will +delete the report and will reply with a response code indicating success. +

    + +

    +Since this a destructive command, the client is advised to ask for confirmation +from the user before sending this command to the manager. +

    + +

    +Command elements: +

      +
    • <report_id> is the id of the report which should be deleted. +
    +

    + +
    Example:
    + +

    +C: +

    + +
    +<delete_report>
+  <report_id>267a3405-e84a-47da-97b2-5fa0d2e8995e</report_id>
+</delete_report>
+
    + +

    +M: +

    + +
    +<delete_report_response>
+  <status>200</status>
+</delete_report_response>
+
    + +

    get_nvt_feed_checksum

    + +

    +The client uses the get_nvt_feed_checksum command to request a checksum for the +complete NVT collection available through this manager. The client may specify +an algorithm to be used for computing this checksum. +

    + +

    +If the client does not specify a checksum algorithm, the manager is expected to +use the MD5 algorithm for computing the checksum. +

    + +

    +If the manager possesses such a collection, it will reply with a response code +indicating success, and the checksum over all NVT files. If the manager +cannot access a list of available NVTs at present, it will reply with a response +code in the 5xx range. +

    + +

    +Command elements: +

      +
    • <algorithm> is the algorithm which should be used for computing the + checksum. +
    +

    + +
    Example:
    + +

    +C: +

    + +
    +<get_nvt_feed_checksum>
+  <algorithm>md5</algorithm>
+</get_nvt_feed_checksum>
+
    + +

    +M: +

    + +
    +<get_nvt_feed_checksum_response>
+  <status>200</status>
+  <algorithm>md5</algorithm>
+  <checksum>931db829a06b9a440a2ecaeb68c03715</checksum>
+</get_nvt_feed_checksum_response>
+
    + +

    get_nvt_all

    + +

    +The client uses the get_nvt_all command to request the OIDs and names of the +complete NVT collection available through this manager. +

    + +

    +The client may specify an algorithm to be used for computing checksums. If the +client does not specify a checksum algorithm, the manager is expected to use the +MD5 algorithm for computing checksums. +

    + +

    +If the manager possesses such a collection, it will reply with a response code +indicating success, the number of NVTs available and the OID, name and a +checksum of all NVT files. If the manager cannot access a list of available NVTs +at present, it will reply with a response code in the 5xx range. +

    + +

    +Command elements: +

      +
    • (n/a) +
    +

    + +
    Example:
    + +

    +C: +

    + +
    +<get_nvt_all/>
+
    + +

    +M: +

    + +
    +<get_nvt_all_response>
+  <status>200</status>
+  <nvt_count>2432</nvt_count>
+  <feed_checksum>
+    <algorithm>md5</algorithm>
+    <checksum>931db829a06b9a440a2ecaeb68c03715</checksum>
+  </feed_checksum>
+  <nvt>
+    <oid>1.3.6.1.4.1.25623.1.7.13005</oid>
+    <name>FooBar 1.5 installed</name>
+    <nvt_checksum>
+      <algorithm>md5</algorithm>
+      <checksum>2ebef00ea4617c096849fb708864b0e7</checksum>
+    </nvt_checksum>
+  </nvt>
+  <nvt>
+    <oid>1.3.6.1.4.1.25623.1.7.13006</oid>
+    <name>FooBar 2.1 XSS vulnerability</name>
+    <nvt_checksum>
+      <algorithm>md5</algorithm>
+      <checksum>ff4c6c4eab15bfc86bbb56f77b787929</checksum>
+    </nvt_checksum>
+  </nvt>
+  ...
+  <nvt>
+    <oid>1.3.6.1.4.1.25623.1.7.16021</oid>
+    <name>XYZ 1.1 vulnerability</name>
+    <nvt_checksum>
+      <algorithm>md5</algorithm>
+      <checksum>f4a09716c3b3df391072c77f42dff363</checksum>
+    </nvt_checksum>
+  </nvt>
+</get_nvt_all_response>
+
    + +

    get_nvt_details_oid

    + +

    +The client uses the get_nvt_details_oid command to request all details of a +specific NVT identified by the OID parameter. +

    + +

    +If the manager is able to retrieve the details from its list, it will reply with +a response code indicating success and all available details. +

    + +

    +Command elements: +

      +
    • <oid> is the OID of the NVT for which the details are requested. +
    +

    + +
    Example:
    + +

    +C: +

    + +
    +<get_nvt_details_oid>
+  <oid>1.3.6.1.4.1.25623.1.7.13005</oid>
+</get_nvt_details_oid>
+
    + +

    +M: +

    + +
    +<get_nvt_details_oid_response>
+  <status>200</status>
+  <nvt>
+    <oid>1.3.6.1.4.1.25623.1.7.13005</oid>
+    <cve>CVE-2008-4877</cve>
+    <cve>CVE-2008-4881</cve>
+    <bugtraq_id>12345</bugtraq_id>
+    <filename>foobar_15_detect.nasl</filename>
+    <description>This script detects whether FooBar 1.5 is installed.</description>
+  </nvt>
+</get_nvt_details_oid_response>
+
    + +

    get_nvt_details_all

    + +

    +The client uses the get_nvt_details_all command to request all details for all +NVTs available through this manager. If the manager possesses such a collection, +it will reply with a response code indicating success, and the details for all +NVT files. The output is identical to the output of get_nvt_details_oid. If the +manager cannot access a list of available NVTs at present, it will reply with a +response code in the 5xx range. +

    + +

    +Command elements: +

      +
    • (n/a) +
    +

    + +
    Example:
    + +

    +C: +

    + +
    +<get_nvt_details_all/>
+
    + +

    +M: +

    + +
    +<get_nvt_details_all_response>
+  <status>200</status>
+  <nvt>
+    <oid>1.3.6.1.4.1.25623.1.7.13005</oid>
+    <cve>CVE-2008-4877</cve>
+    <cve>CVE-2008-4881</cve>
+    <bugtraq_id>12345</bugtraq_id>
+    <filename>foobar_15_detect.nasl</filename>
+    <description>This script detects whether FooBar 1.5 is installed.</description>
+  </nvt>
+  <nvt>
+    <oid>1.3.6.1.4.1.25623.1.7.13006</oid>
+    <cve>CVE-2008-5142</cve>
+    <bugtraq_id>12478</bugtraq_id>
+    <filename>foobar_21_xss.nasl</filename>
+    <description>This script detects whether the FooBar 2.1 XSS vulnerability is present.</description>
+  </nvt>
+  ...
+</get_nvt_details_all_response>
+
    + +(TODO: Are protocol command desirable to request details for specific groups of +NVTs (e.g. GET_NVT_DETAILS_FAMILY)? Or should this kind of filtering happen in +the client?) + + +

    omp_version

    + +

    +The client uses the omp_version command to request a list of protocol versions +which may be used when communicating with this manager. The manager will reply +with a response code indicating success and a list of acceptable versions. The +versions are sent in a sequence indicating preferability; the first version +named is the protocol version preferred by the manager. +

    + +

    +The client is advised to use this command before using any other command. +

    + +

    +Command elements: +

      +
    • (n/a) +
    +

    + +
    Example:
    + +

    +C: +

    + +
    +<omp_version/>
+
    + +

    +M: +

    + +
    +<omp_version_response>
+  <status>200</status>
+  <version preferred="yes">1.5</version>
+  <version>1.1</version>
+  <version>1.0</version>
+</omp_version_response>
+
    + +

    History

    + +
      +
    • 2009-01-08 Michael Wiegand <michael.wiegand at intevation.de>:
      + Initial text.
      • +
    Modified: trunk/doc/website/openvas-crs.htm4 =================================================================== --- trunk/doc/website/openvas-crs.htm4 2009-01-08 13:06:04 UTC (rev 2169) +++ trunk/doc/website/openvas-crs.htm4 2009-01-08 14:21:59 UTC (rev 2170) @@ -9,7 +9,7 @@ m4_dnl Jan-Oliver Wagner m4_dnl m4_dnl Copyright: -m4_dnl Copyright (C) 2008 Intevation GmbH +m4_dnl Copyright (C) 2008, 2009 Intevation GmbH m4_dnl m4_dnl This program is free software; you can redistribute it and/or modify m4_dnl it under the terms of the GNU General Public License version 2, @@ -71,8 +71,7 @@
  • OpenVAS Change Request #25: OpenVAS-libnasl: Integration of SAMBA or WMI (in discussion)
  • OpenVAS Change Request #26: OpenVAS-server: OpenVAS-server: Introduction of more phases in NASL (in discussion)
  • OpenVAS Change Request #27: IPv6 support (in discussion) - -OpenVAS-server: Introduction of more phases in NASL +
  • OpenVAS Change Request #28: OpenVAS Management Protocol (OMP) (in discussion)

    How to write a change request

    From scm-commit at wald.intevation.org Fri Jan 9 08:31:33 2009 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Fri, 9 Jan 2009 08:31:33 +0100 (CET) Subject: [Openvas-commits] r2171 - trunk/doc/website Message-ID: <20090109073133.3382140732@pyrosoma.intevation.org> Author: kost Date: 2009-01-09 08:31:32 +0100 (Fri, 09 Jan 2009) New Revision: 2171 Modified: trunk/doc/website/openvas-crs.htm4 Log: Typo fix Modified: trunk/doc/website/openvas-crs.htm4 ==============================================