Changes 2.0.10a:

* Fixed MacOS X portability issues
* Non-intrusive OS-fingerprinting (based on xprobe's techniques)
* DNS fingerprinting
* killall -1 nessusd does not restart the bpf server on BSD systems
* longer connect() timeout for TCP sockets
* Fixed hydra.nes
* WWW fingerprinting
* IP addresses are now sorted in EVERY reports
* Automagically rewrite banners to handle distributions which do
  backporting of security fixes (ie: Debian)

3 files changed, 116 insertions, 11 deletions

diff --git a/security/nessus-plugins/Makefile b/security/nessus-plugins/Makefile
index 8eec953e3fb..28dea46e358 100644
--- a/security/nessus-plugins/Makefile
+++ b/security/nessus-plugins/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2004/05/03 05:52:55 snj Exp $
-#
+# $NetBSD: Makefile,v 1.13 2004/05/19 16:23:53 adam Exp $
 
 DISTNAME=	nessus-plugins-${VERS}
-PKGREVISION=	1
 .include	"../nessus/Makefile.common"
 
 COMMENT=	Plugins for the Nessus Network Security Scanner
diff --git a/security/nessus-plugins/PLIST b/security/nessus-plugins/PLIST
index 2e126ee86bb..93ae9b5424d 100644
--- a/security/nessus-plugins/PLIST
+++ b/security/nessus-plugins/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2003/11/08 07:40:17 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.11 2004/05/19 16:23:53 adam Exp $
 bin/nessus-build
 lib/nessus/plugins/12planet_chat_server_path_disclosure.nasl
 lib/nessus/plugins/12planet_chat_server_plaintext_password.nasl
@@ -111,6 +111,7 @@ lib/nessus/plugins/PHPAdsNew.nasl
 lib/nessus/plugins/PWS_DoS.nasl
 lib/nessus/plugins/PagesPro_dir_trav.nasl
 lib/nessus/plugins/RA_ssh_detect.nasl
+lib/nessus/plugins/RA_www_css.nasl
 lib/nessus/plugins/RA_www_detect.nasl
 lib/nessus/plugins/SHN_MySQL_Privilege_Escalation.nasl
 lib/nessus/plugins/SHN_Sendmail_DoublePipe.nasl
@@ -125,6 +126,7 @@ lib/nessus/plugins/X.nasl
 lib/nessus/plugins/Xeneo_Web_Server_2.2.9.0_DoS.nasl
 lib/nessus/plugins/Xerver_DoS.nasl
 lib/nessus/plugins/a1stats.nasl
+lib/nessus/plugins/aardvark_topsites_multiple.nasl
 lib/nessus/plugins/abyss_dos.nasl
 lib/nessus/plugins/abyss_overflow.nasl
 lib/nessus/plugins/acc.nasl
@@ -179,6 +181,7 @@ lib/nessus/plugins/alcatel_adsl_firewalling.nasl
 lib/nessus/plugins/alcatel_backdoor_switch.nasl
 lib/nessus/plugins/alcatel_pabx4400_detect.nasl
 lib/nessus/plugins/alchemy_eye_http.nasl
+lib/nessus/plugins/alexa_detection.nasl
 lib/nessus/plugins/alexandriadev_upload_spoofing.nasl
 lib/nessus/plugins/alibaba.nasl
 lib/nessus/plugins/alibaba_get32.nasl
@@ -246,10 +249,12 @@ lib/nessus/plugins/ath0_hangup.nasl
 lib/nessus/plugins/atomicboard_file_read.nasl
 lib/nessus/plugins/auctiondeluxe_xss.nasl
 lib/nessus/plugins/auktion_cgi.nasl
+lib/nessus/plugins/aureate_detection.nasl
 lib/nessus/plugins/auth_enabled.nasl
 lib/nessus/plugins/avengers_news_system_command_execution.nasl
 lib/nessus/plugins/avirt_gateway_telnet.nasl
 lib/nessus/plugins/avirt_proxy_overflow.nasl
+lib/nessus/plugins/avotus_mm.nasl
 lib/nessus/plugins/awol_injection.nasl
 lib/nessus/plugins/axent_raptor_dos.nasl
 lib/nessus/plugins/axis.nasl
@@ -257,13 +262,16 @@ lib/nessus/plugins/axis2400_webcams.nasl
 lib/nessus/plugins/axis_camera.nasl
 lib/nessus/plugins/b2cafelog_command_injection.nasl
 lib/nessus/plugins/backorifice1.nasl
+lib/nessus/plugins/backport.inc
 lib/nessus/plugins/badblue_directory_traversal.nasl
 lib/nessus/plugins/badblue_get_DoS.nasl
 lib/nessus/plugins/badblue_null_byte.nasl
 lib/nessus/plugins/badblue_remote_administrative_access.nasl
 lib/nessus/plugins/badblue_remote_administrative_access2.nasl
+lib/nessus/plugins/bagle_remover.nasl
 lib/nessus/plugins/bakfiles.nasl
 lib/nessus/plugins/bandmin_xss.nasl
+lib/nessus/plugins/bargainbuddy_detection.nasl
 lib/nessus/plugins/basilix_inc_files.nasl
 lib/nessus/plugins/basilix_webmail.nasl
 lib/nessus/plugins/basit_xss.nasl
@@ -273,6 +281,7 @@ lib/nessus/plugins/bb-hist.nasl
 lib/nessus/plugins/bb-hostsvc.nasl
 lib/nessus/plugins/bboard.nasl
 lib/nessus/plugins/benhur_ftp_firewall.nasl
+lib/nessus/plugins/betterinternet_detection.nasl
 lib/nessus/plugins/bftelnet.nasl
 lib/nessus/plugins/bftpd_chown.nasl
 lib/nessus/plugins/bftpd_format_string.nasl
@@ -285,6 +294,7 @@ lib/nessus/plugins/bind_authors.nasl
 lib/nessus/plugins/bind_covert_overflows.nasl
 lib/nessus/plugins/bind_dnsstorm.nasl
 lib/nessus/plugins/bind_iquery.nasl
+lib/nessus/plugins/bind_negative_cache_dos.nasl
 lib/nessus/plugins/bind_query.nasl
 lib/nessus/plugins/bind_resolver_overflow.nasl
 lib/nessus/plugins/bind_sig_cached_rr_overflow.nasl
@@ -303,11 +313,14 @@ lib/nessus/plugins/blackmoon_ftp_users_enum.nasl
 lib/nessus/plugins/blnews_code_injection.nasl
 lib/nessus/plugins/bonk.nasl
 lib/nessus/plugins/bonsai_flaws.nasl
+lib/nessus/plugins/bonzi_buddy.nasl
 lib/nessus/plugins/bootparamd.nasl
 lib/nessus/plugins/boozt_admin_overflow.nasl
+lib/nessus/plugins/brilliant_digital_detection.nasl
 lib/nessus/plugins/broadvision_path_disclosure.nasl
 lib/nessus/plugins/broker_ftp.nasl
 lib/nessus/plugins/browsegate_http_overflows.nasl
+lib/nessus/plugins/bsml_info_disclosure.nasl
 lib/nessus/plugins/bttlxe_sql_injection.nasl
 lib/nessus/plugins/bugbear.nasl
 lib/nessus/plugins/bugbear_b.nasl
@@ -364,6 +377,7 @@ lib/nessus/plugins/cisco_catalyst.nasl
 lib/nessus/plugins/cisco_dos.nasl
 lib/nessus/plugins/cisco_gsr_acl.nasl
 lib/nessus/plugins/cisco_gsr_unreachable.nasl
+lib/nessus/plugins/cisco_h323_dos.nasl
 lib/nessus/plugins/cisco_http_admin_access.nasl
 lib/nessus/plugins/cisco_http_dos.nasl
 lib/nessus/plugins/cisco_ids_manager_detect.nasl
@@ -385,6 +399,7 @@ lib/nessus/plugins/cold_fusion_admin_dos.nasl
 lib/nessus/plugins/commerce_cgi.nasl
 lib/nessus/plugins/communigatepro_overflow.nasl
 lib/nessus/plugins/communigatepro_referer_field.nasl
+lib/nessus/plugins/compaq_wbem_SSI_DoS.nasl
 lib/nessus/plugins/compaq_wbem_detect.nasl
 lib/nessus/plugins/compaq_web_mgmt_password.nasl
 lib/nessus/plugins/consolehelp.nasl
@@ -406,14 +421,21 @@ lib/nessus/plugins/csnews.nasl
 lib/nessus/plugins/cups_browseable_printers_list.nasl
 lib/nessus/plugins/cups_vulns.nasl
 lib/nessus/plugins/cuteftp_flaws.nasl
+lib/nessus/plugins/cutenews_phpinfo.nasl
 lib/nessus/plugins/cvs_detect.nasl
+lib/nessus/plugins/cvs_dir_create.nasl
 lib/nessus/plugins/cvs_double_free.nasl
 lib/nessus/plugins/cvs_in_www.nasl
+lib/nessus/plugins/cvs_pserver_cmd_exec.nasl
 lib/nessus/plugins/cvs_public_pserver.nasl
 lib/nessus/plugins/cvsweb_shell.nasl
 lib/nessus/plugins/cvsweb_version.nasl
 lib/nessus/plugins/cwmail.nasl
+lib/nessus/plugins/cydoor_detection.nasl
 lib/nessus/plugins/cyrus_imap_prelogin_overflow.nasl
+lib/nessus/plugins/cyrus_imsp_overflow.nasl
+lib/nessus/plugins/dame.nasl
+lib/nessus/plugins/dameware_mini_remote_control_disclosure.nasl
 lib/nessus/plugins/dangerous_cgis.nasl
 lib/nessus/plugins/dansie_cart.nasl
 lib/nessus/plugins/daytime.nasl
@@ -444,6 +466,7 @@ lib/nessus/plugins/directoryphp.nasl
 lib/nessus/plugins/directorypro.nasl
 lib/nessus/plugins/dlink_router_overflow.nasl
 lib/nessus/plugins/dmail_overflow.nasl
+lib/nessus/plugins/dns_fingerprint.nasl
 lib/nessus/plugins/dns_server.nasl
 lib/nessus/plugins/dns_xfer.nasl
 lib/nessus/plugins/doc_browsable.nasl
@@ -457,10 +480,13 @@ lib/nessus/plugins/domino_fs_config.nasl
 lib/nessus/plugins/domino_http_dos.nasl
 lib/nessus/plugins/domino_traversal.nasl
 lib/nessus/plugins/domino_xss.nasl
+lib/nessus/plugins/dont_scan_printers.nasl
+lib/nessus/plugins/downloadware_detection.nasl
 lib/nessus/plugins/dragandzip_overflow.nasl
 lib/nessus/plugins/dragon_ftp.nasl
 lib/nessus/plugins/dragon_telnet.nasl
 lib/nessus/plugins/drweb_overflow.nasl
+lib/nessus/plugins/dssagent_detection.nasl
 lib/nessus/plugins/dtspcd.nasl
 lib/nessus/plugins/dump.inc
 lib/nessus/plugins/dumpenv.nasl
@@ -469,6 +495,8 @@ lib/nessus/plugins/dwhttp_format_string.nasl
 lib/nessus/plugins/e107_db_dump.nasl
 lib/nessus/plugins/eDonkey_detect.nasl
 lib/nessus/plugins/eXtremail_format_strings.nasl
+lib/nessus/plugins/easydynamicpages_code_injection.nasl
+lib/nessus/plugins/ebola_overflow.nasl
 lib/nessus/plugins/ecartis_hidden_username.nasl
 lib/nessus/plugins/echo.nasl
 lib/nessus/plugins/eftp_bufferoverflow.nasl
@@ -495,6 +523,7 @@ lib/nessus/plugins/exchange_dos.nasl
 lib/nessus/plugins/exchange_public_folders_information_leak.nasl
 lib/nessus/plugins/exchange_xexch50_overflow.nasl
 lib/nessus/plugins/exim_heap_overflow.nasl
+lib/nessus/plugins/ezcontents_code_execution.nasl
 lib/nessus/plugins/ezpublish_config_disclosure.nasl
 lib/nessus/plugins/ezpublish_dir_xss.nasl
 lib/nessus/plugins/ezpublish_xss.nasl
@@ -518,16 +547,21 @@ lib/nessus/plugins/finger_freebsd.nasl
 lib/nessus/plugins/finger_redirection.nasl
 lib/nessus/plugins/finger_solaris_disclosure.nasl
 lib/nessus/plugins/firewall1_dos.nasl
+lib/nessus/plugins/flash_ftp_server_directory_traversal.nasl
+lib/nessus/plugins/flash_player_local_files.nasl
 lib/nessus/plugins/flash_player_overflows.nasl
 lib/nessus/plugins/flashfxp_overflow.nasl
 lib/nessus/plugins/formhandler.nasl
 lib/nessus/plugins/formmail_pl.nasl
 lib/nessus/plugins/formmail_version_disclosure.nasl
 lib/nessus/plugins/forum51_user_disclosure.nasl
+lib/nessus/plugins/foxweb_dll.nasl
 lib/nessus/plugins/fp_fpcount.nasl
 lib/nessus/plugins/fp_htimage.nasl
+lib/nessus/plugins/freecmty_detection.nasl
 lib/nessus/plugins/frontpage.nasl
 lib/nessus/plugins/frontpage_authors.nasl
+lib/nessus/plugins/frontpage_chunked_overflow.nasl
 lib/nessus/plugins/frontpage_dos.nasl
 lib/nessus/plugins/frontpage_dvwssr.nasl
 lib/nessus/plugins/frontpage_overflow.nasl
@@ -535,6 +569,8 @@ lib/nessus/plugins/frontpage_passwordless.nasl
 lib/nessus/plugins/frontpage_shtml.nasl
 lib/nessus/plugins/frontpage_shtml_overflow.nasl
 lib/nessus/plugins/frontpage_xss.nasl
+lib/nessus/plugins/fsp_detection.nasl
+lib/nessus/plugins/fspd_directory_traversal.nasl
 lib/nessus/plugins/ftgate_pro_dos.nasl
 lib/nessus/plugins/ftp_administrator.nasl
 lib/nessus/plugins/ftp_anonymous.nasl
@@ -579,6 +615,7 @@ lib/nessus/plugins/gallery_xss.nasl
 lib/nessus/plugins/gamespy_detect.nasl
 lib/nessus/plugins/gatecrasher.nasl
 lib/nessus/plugins/gator.nasl
+lib/nessus/plugins/gator_detection.nasl
 lib/nessus/plugins/gauntlet_overflow.nasl
 lib/nessus/plugins/geeklog_admin_access.nasl
 lib/nessus/plugins/generic_WEB-INF.nasl
@@ -609,6 +646,7 @@ lib/nessus/plugins/homefree.nasl
 lib/nessus/plugins/horde_test_disclosure.nasl
 lib/nessus/plugins/horde_turba_path_disclosure.nasl
 lib/nessus/plugins/hosting_controller.nasl
+lib/nessus/plugins/hotnews_code_injection.nasl
 lib/nessus/plugins/hotsync.nasl
 lib/nessus/plugins/hp_instant_toptools_dos.nasl
 lib/nessus/plugins/hp_jetdirect_vulns.nasl
@@ -702,6 +740,7 @@ lib/nessus/plugins/iisprotect_bypass.nasl
 lib/nessus/plugins/iisprotect_passwordless.nasl
 lib/nessus/plugins/iisprotect_sql_injection.nasl
 lib/nessus/plugins/ike_check.nasl
+lib/nessus/plugins/ike_detect.nasl
 lib/nessus/plugins/ikonboard_cmd_exec.nasl
 lib/nessus/plugins/imagefolio_default_password.nasl
 lib/nessus/plugins/imagemap.nasl
@@ -722,13 +761,17 @@ lib/nessus/plugins/info2www.nasl
 lib/nessus/plugins/informix_traversal.nasl
 lib/nessus/plugins/infosrch.nasl
 lib/nessus/plugins/inn.nasl
+lib/nessus/plugins/inn_control_message_overflow.nasl
 lib/nessus/plugins/innd_overflow.nasl
 lib/nessus/plugins/instaboard_sql_injection.nasl
 lib/nessus/plugins/interchange_detect.nasl
 lib/nessus/plugins/interscan_dos.nasl
 lib/nessus/plugins/interscan_vw_cgi.nasl
 lib/nessus/plugins/invision_power_board.nasl
+lib/nessus/plugins/invision_power_board_calendar_sql_injection.nasl
+lib/nessus/plugins/invision_power_top_site_sql_injection.nasl
 lib/nessus/plugins/ion_p.nasl
+lib/nessus/plugins/ipinsight_detection.nasl
 lib/nessus/plugins/iplanet_app_server_detection.nasl
 lib/nessus/plugins/iplanet_app_server_overflow.nasl
 lib/nessus/plugins/iplanet_chunked_encoding.nasl
@@ -758,6 +801,7 @@ lib/nessus/plugins/jj.nasl
 lib/nessus/plugins/jmf_privs_escalation.nasl
 lib/nessus/plugins/jolt.nasl
 lib/nessus/plugins/jolt2.nasl
+lib/nessus/plugins/jordan_telnet_overflow.nasl
 lib/nessus/plugins/jrun.nasl
 lib/nessus/plugins/jrun_dir_listing.nasl
 lib/nessus/plugins/jrun_getdir.nasl
@@ -776,6 +820,8 @@ lib/nessus/plugins/kerio_PF_udpbypass.nasl
 lib/nessus/plugins/kerio_webmail_multiple_flaws.nasl
 lib/nessus/plugins/kietu_code_injection.nasl
 lib/nessus/plugins/knfs_dos.nasl
+lib/nessus/plugins/knowledge_builder_code_execution.nasl
+lib/nessus/plugins/kpym_telnet_overflow.nasl
 lib/nessus/plugins/krb_pingpong.nasl
 lib/nessus/plugins/kuang2_the_virus.nasl
 lib/nessus/plugins/kw_whois.nasl
@@ -799,6 +845,7 @@ lib/nessus/plugins/limewire_installed.nasl
 lib/nessus/plugins/line_overflow.nasl
 lib/nessus/plugins/linksys_ap_default_password.nasl
 lib/nessus/plugins/linksys_dos.nasl
+lib/nessus/plugins/linksys_empty_GET_DoS.nasl
 lib/nessus/plugins/linksys_gozila_cgi_DoS.nasl
 lib/nessus/plugins/linux_tftp.nes
 lib/nessus/plugins/linux_zero_len_fragment.nasl
@@ -807,6 +854,7 @@ lib/nessus/plugins/lion.nasl
 lib/nessus/plugins/listrec.nasl
 lib/nessus/plugins/localweb2k.nasl
 lib/nessus/plugins/logins.nasl
+lib/nessus/plugins/lop_detection.nasl
 lib/nessus/plugins/lotus_bounce_DoS.nasl
 lib/nessus/plugins/lotus_envid.nasl
 lib/nessus/plugins/lotus_esmtp_overflow.nasl
@@ -830,7 +878,9 @@ lib/nessus/plugins/mailnews.nasl
 lib/nessus/plugins/mailreader.nasl
 lib/nessus/plugins/mailsweeper_ppt_dos.nasl
 lib/nessus/plugins/mambo.nasl
+lib/nessus/plugins/mambo_code_injection.nasl
 lib/nessus/plugins/mambo_xss.nasl
+lib/nessus/plugins/manpage_file_disclosure.nasl
 lib/nessus/plugins/mantis_detect.nasl
 lib/nessus/plugins/mantis_multiple_vulns.nasl
 lib/nessus/plugins/marconi_dos.nasl
@@ -850,8 +900,10 @@ lib/nessus/plugins/mercure_expn_overflow.nasl
 lib/nessus/plugins/mercure_imap_read_any_file.nasl
 lib/nessus/plugins/mercure_webview.nasl
 lib/nessus/plugins/messenger_ms03-043.nasl
+lib/nessus/plugins/metadot_sql_injection.nasl
 lib/nessus/plugins/metainfo_mail.nasl
 lib/nessus/plugins/mibiisa_overflow.nasl
+lib/nessus/plugins/minibb_xss.nasl
 lib/nessus/plugins/miniportail_admin_access.nasl
 lib/nessus/plugins/minivend_view_page.nasl
 lib/nessus/plugins/misc_format_string.nasl
@@ -870,13 +922,16 @@ lib/nessus/plugins/mod_jk_chunked_encoding_dos.nasl
 lib/nessus/plugins/mod_mylo_overflow.nasl
 lib/nessus/plugins/mod_ntlm.nasl
 lib/nessus/plugins/mod_python_handle.nasl
+lib/nessus/plugins/mod_python_malformed_query.nasl
 lib/nessus/plugins/mod_ssl_offby1.nasl
 lib/nessus/plugins/mod_ssl_overflow.nasl
 lib/nessus/plugins/mod_ssl_wildcard_dns_xss.nasl
 lib/nessus/plugins/mod_survey_sql_injection.nasl
+lib/nessus/plugins/monkeyweb_post_DoS.nasl
 lib/nessus/plugins/monkeyweb_too_big_post.nasl
 lib/nessus/plugins/mountd_overflow.nasl
 lib/nessus/plugins/mpcsw_guestbook_database.nasl
+lib/nessus/plugins/mq_toolbar_detection.nasl
 lib/nessus/plugins/ms_index_server.nasl
 lib/nessus/plugins/ms_siteserver_info_disclosure.nasl
 lib/nessus/plugins/ms_telnet_overflow.nasl
@@ -907,6 +962,8 @@ lib/nessus/plugins/multicsp_detect.nasl
 lib/nessus/plugins/multihtml.nasl
 lib/nessus/plugins/multiple_ftpd_dos.nasl
 lib/nessus/plugins/multitech_proxy_default_pwd.nasl
+lib/nessus/plugins/my_egallery_cmd_exec.nasl
+lib/nessus/plugins/my_little_forum_xss.nasl
 lib/nessus/plugins/mycio_detect.nasl
 lib/nessus/plugins/mycio_directory_traversal.nasl
 lib/nessus/plugins/myguestbk_admin_access.nasl
@@ -926,6 +983,7 @@ lib/nessus/plugins/nai_webshield_info.nasl
 lib/nessus/plugins/nai_webshield_overflow.nasl
 lib/nessus/plugins/napster_detect.nasl
 lib/nessus/plugins/ncacn_http.nasl
+lib/nessus/plugins/ncase_detection.nasl
 lib/nessus/plugins/ncbook_cgi.nasl
 lib/nessus/plugins/ncl_items.nasl
 lib/nessus/plugins/ncl_items_2.nasl
@@ -948,6 +1006,7 @@ lib/nessus/plugins/netgear_prosafe_dos.nasl
 lib/nessus/plugins/netinfo_detect.nasl
 lib/nessus/plugins/netinfo_passwd.nasl
 lib/nessus/plugins/netinfo_rpc.nasl
+lib/nessus/plugins/netobserve_command_execution.nasl
 lib/nessus/plugins/netscape_PageServices.nasl
 lib/nessus/plugins/netscape_accept_overflow.nasl
 lib/nessus/plugins/netscape_adminpw.nasl
@@ -974,10 +1033,10 @@ lib/nessus/plugins/nfs_portmap.nasl
 lib/nessus/plugins/nfs_xlog_overflow.nasl
 lib/nessus/plugins/nikto_wrapper.nes
 lib/nessus/plugins/nimda.nasl
+lib/nessus/plugins/niprint_dos.nasl
 lib/nessus/plugins/nis_server.nasl
 lib/nessus/plugins/nisd_overflow.nasl
 lib/nessus/plugins/niteserver_ftp_dir_trav.nasl
-lib/nessus/plugins/nmap_osfingerprint.nes
 lib/nessus/plugins/nmap_tcp_connect.nes
 lib/nessus/plugins/nmap_wrapper.nes
 lib/nessus/plugins/nntp_info.nasl
@@ -1035,6 +1094,7 @@ lib/nessus/plugins/openssh_uselogin_environment.nasl
 lib/nessus/plugins/openssl_overflow_generic_test.nasl
 lib/nessus/plugins/openssl_password_interception.nasl
 lib/nessus/plugins/openwebmail_cmd_exec.nasl
+lib/nessus/plugins/opera_arbitrary_file_dropping.nasl
 lib/nessus/plugins/opera_heap_corruption.nasl
 lib/nessus/plugins/opera_href_overflow.nasl
 lib/nessus/plugins/opera_multiple_flaws.nasl
@@ -1052,6 +1112,7 @@ lib/nessus/plugins/oracle9i_mod_plsql_overflow.nasl
 lib/nessus/plugins/oracle9i_mod_plsql_traversal.nasl
 lib/nessus/plugins/oracle9i_modplsql_css.nasl
 lib/nessus/plugins/oracle9i_owautil.nasl
+lib/nessus/plugins/oracle9i_portaldemo_orgchart.nasl
 lib/nessus/plugins/oracle9i_soapconfig.nasl
 lib/nessus/plugins/oracle9i_soapdocs.nasl
 lib/nessus/plugins/oracle9i_soaprouter.nasl
@@ -1067,6 +1128,8 @@ lib/nessus/plugins/orange_dos.nasl
 lib/nessus/plugins/osCommerce_xss.nasl
 lib/nessus/plugins/osX_apache_finder.nasl
 lib/nessus/plugins/osX_apache_finder_content.nasl
+lib/nessus/plugins/os_fingerprint.nasl
+lib/nessus/plugins/oscommerce_session_id_xss.nasl
 lib/nessus/plugins/oshare.nasl
 lib/nessus/plugins/ospf_detect.nasl
 lib/nessus/plugins/overnet.nasl
@@ -1123,17 +1186,24 @@ lib/nessus/plugins/php_nuke_installed.nasl
 lib/nessus/plugins/php_nuke_opendir.nasl
 lib/nessus/plugins/php_nuke_sql_debug.nasl
 lib/nessus/plugins/php_overflow.nasl
+lib/nessus/plugins/php_ping_code_execution.nasl
 lib/nessus/plugins/php_proxima_file_reading.nasl
 lib/nessus/plugins/php_safe_mode.nasl
 lib/nessus/plugins/php_socket_iovec_alloc_overflow.nasl
 lib/nessus/plugins/php_split_mime.nasl
 lib/nessus/plugins/phpay_info_disclosure.nasl
 lib/nessus/plugins/phpbb_sql_injection.nasl
+lib/nessus/plugins/phpbb_sql_injection2.nasl
+lib/nessus/plugins/phpcatalog_sql_injection.nasl
+lib/nessus/plugins/phpdig_code_injection.nasl
+lib/nessus/plugins/phpgedview_multiple_flaws.nasl
 lib/nessus/plugins/phpgroupware_file_include.nasl
 lib/nessus/plugins/phpinfo.nasl
 lib/nessus/plugins/phpix.nasl
+lib/nessus/plugins/phpix_cmd_exec.nasl
 lib/nessus/plugins/phpping_code_execution.nasl
 lib/nessus/plugins/phprocketaddin_traversal.nasl
+lib/nessus/plugins/phpshop_sql_injection.nasl
 lib/nessus/plugins/phptonuke_dir_trav.nasl
 lib/nessus/plugins/phpwebsite_multiple_flaws.nasl
 lib/nessus/plugins/pi3web_dos.nasl
@@ -1193,8 +1263,10 @@ lib/nessus/plugins/proxy_port.nasl
 lib/nessus/plugins/proxy_post.nasl
 lib/nessus/plugins/proxy_use.nasl
 lib/nessus/plugins/psunami_cmd_exec.nasl
+lib/nessus/plugins/psychoblogger_sql_injection.nasl
 lib/nessus/plugins/psynch_multiple_vulns.nasl
 lib/nessus/plugins/ptnews_admin.nasl
+lib/nessus/plugins/pwrsearch_detection.nasl
 lib/nessus/plugins/pxe_overflow.nasl
 lib/nessus/plugins/qmtp_detect.nasl
 lib/nessus/plugins/qpopper.nasl
@@ -1204,9 +1276,11 @@ lib/nessus/plugins/qpopper_list.nasl
 lib/nessus/plugins/qpopper_qvsnprinf_overflow.nasl
 lib/nessus/plugins/quake3_dos.nasl
 lib/nessus/plugins/quickstore.nasl
+lib/nessus/plugins/quickstore2.nasl
 lib/nessus/plugins/quicktime_admin.nasl
 lib/nessus/plugins/quicktime_player_overflow.nasl
 lib/nessus/plugins/quote.nasl
+lib/nessus/plugins/radiate_detection.nasl
 lib/nessus/plugins/radius_detect.nasl
 lib/nessus/plugins/radmin_detect.nasl
 lib/nessus/plugins/ramcrash.nasl
@@ -1222,6 +1296,7 @@ lib/nessus/plugins/relative_field_vulnerability.nasl
 lib/nessus/plugins/remote_pc_detect.nasl
 lib/nessus/plugins/remwatch.nasl
 lib/nessus/plugins/resin_path_disclosure.nasl
+lib/nessus/plugins/resin_server_status.nasl
 lib/nessus/plugins/resin_traversal.nasl
 lib/nessus/plugins/rexecd.nasl
 lib/nessus/plugins/rfparalyze.nasl
@@ -1287,12 +1362,14 @@ lib/nessus/plugins/rsh.nasl
 lib/nessus/plugins/rsh_null.nasl
 lib/nessus/plugins/rsh_users.nasl
 lib/nessus/plugins/rsync_array_overflow.nasl
+lib/nessus/plugins/rsync_heap_overflow.nasl
 lib/nessus/plugins/rsync_modules.nasl
 lib/nessus/plugins/rtsp_detect.nasl
 lib/nessus/plugins/rusers_output.nasl
 lib/nessus/plugins/rwalld_format_string.nasl
 lib/nessus/plugins/rwhois_format_string.nasl
 lib/nessus/plugins/rwhois_format_string2.nasl
+lib/nessus/plugins/sahagent_detection.nasl
 lib/nessus/plugins/samba_arbitrary_file_creation.nasl
 lib/nessus/plugins/samba_frags_overflow.nasl
 lib/nessus/plugins/samba_possible_overflow.nasl
@@ -1311,10 +1388,12 @@ lib/nessus/plugins/sambar_search_cgi.nasl
 lib/nessus/plugins/sambar_sendmail.nasl
 lib/nessus/plugins/sambar_sysadmin.nasl
 lib/nessus/plugins/sambar_xss.nasl
+lib/nessus/plugins/sapdb_detect.nasl
 lib/nessus/plugins/savant_cgi_download.nasl
 lib/nessus/plugins/savant_cgitest.nasl
 lib/nessus/plugins/savant_content_length_DoS.nasl
 lib/nessus/plugins/savant_percent_dos.nasl
+lib/nessus/plugins/savenow_detection.nasl
 lib/nessus/plugins/sawmill.nasl
 lib/nessus/plugins/sawmill_password.nasl
 lib/nessus/plugins/scozbook.nasl
@@ -1348,10 +1427,14 @@ lib/nessus/plugins/sendmail_queue_destruction.nasl
 lib/nessus/plugins/sendmail_redirection.nasl
 lib/nessus/plugins/sendmail_sun_forward.nasl
 lib/nessus/plugins/sendtemp.nasl
+lib/nessus/plugins/ser_missing_to_in_ack_dos.nasl
+lib/nessus/plugins/ser_register_overflow.nasl
 lib/nessus/plugins/servletExec_DoS.nasl
 lib/nessus/plugins/servletExec_File_Reading.nasl
 lib/nessus/plugins/servletExec_Path_Disclosure.nasl
 lib/nessus/plugins/sfm_xss.nasl
+lib/nessus/plugins/sgdynamo_path.nasl
+lib/nessus/plugins/sgdynamo_xss.nasl
 lib/nessus/plugins/sgi_rpc_passwd.nasl
 lib/nessus/plugins/sglmerchant_information_disclosure.nasl
 lib/nessus/plugins/shaft.nasl
@@ -1364,6 +1447,7 @@ lib/nessus/plugins/shiva_default_pass.nasl
 lib/nessus/plugins/shlwapi_dll_dos.nasl
 lib/nessus/plugins/shopping_cart_information_disclosure.nasl
 lib/nessus/plugins/shopplus_information_disclosure.nasl
+lib/nessus/plugins/shopsearch_sql_injection.nasl
 lib/nessus/plugins/shoutcast_admin_cgi_overflow.nasl
 lib/nessus/plugins/shoutcast_log_xss.nasl
 lib/nessus/plugins/shoutcast_version.nasl
@@ -1374,6 +1458,8 @@ lib/nessus/plugins/silverstream_dirlisting.nasl
 lib/nessus/plugins/simple_chat_user_disclosure.nasl
 lib/nessus/plugins/simpleserverwww_dos.nasl
 lib/nessus/plugins/simplewww.nasl
+lib/nessus/plugins/sip_detection.nasl
+lib/nessus/plugins/sip_status_server.nasl
 lib/nessus/plugins/siteUserMod.nasl
 lib/nessus/plugins/siteframe_xss.nasl
 lib/nessus/plugins/sitescope_management_server.nasl
@@ -1505,7 +1591,13 @@ lib/nessus/plugins/smb_nt_ms03-037.nasl
 lib/nessus/plugins/smb_nt_ms03-041.nasl
 lib/nessus/plugins/smb_nt_ms03-042.nasl
 lib/nessus/plugins/smb_nt_ms03-043.nasl
+lib/nessus/plugins/smb_nt_ms03-044.nasl
 lib/nessus/plugins/smb_nt_ms03-045.nasl
+lib/nessus/plugins/smb_nt_ms03-049.nasl
+lib/nessus/plugins/smb_nt_ms03-050.nasl
+lib/nessus/plugins/smb_nt_ms04-001.nasl
+lib/nessus/plugins/smb_nt_ms04-002.nasl
+lib/nessus/plugins/smb_nt_ms04-003.nasl
 lib/nessus/plugins/smb_null_params_dos.nasl
 lib/nessus/plugins/smb_reg_MTS_access.nasl
 lib/nessus/plugins/smb_reg_autologon.nasl
@@ -1561,6 +1653,8 @@ lib/nessus/plugins/smtp_too_long_line.nasl
 lib/nessus/plugins/smtpscan.nasl
 lib/nessus/plugins/smtpserver_detect.nasl
 lib/nessus/plugins/snapstream_dir_trav.nasl
+lib/nessus/plugins/sniff_css.nasl
+lib/nessus/plugins/sniff_file_disclosure.nasl
 lib/nessus/plugins/snitz_cmd_exec.nasl
 lib/nessus/plugins/snitz_forums_2000_xss.nasl
 lib/nessus/plugins/snmpXdmid.nasl
@@ -1628,6 +1722,7 @@ lib/nessus/plugins/story.nasl
 lib/nessus/plugins/stream.nasl
 lib/nessus/plugins/stronghold.nasl
 lib/nessus/plugins/stronghold_swish.nasl
+lib/nessus/plugins/stun_detection.nasl
 lib/nessus/plugins/subseven.nasl
 lib/nessus/plugins/sun_cobalt_adaptive_firewall_detect.nasl
 lib/nessus/plugins/sun_one_jsp_source.nasl
@@ -1651,6 +1746,7 @@ lib/nessus/plugins/tcp_seq.nasl
 lib/nessus/plugins/tcpip_ambiguities.nasl
 lib/nessus/plugins/teardrop.nasl
 lib/nessus/plugins/technote.nasl
+lib/nessus/plugins/telcondex.nasl
 lib/nessus/plugins/telnet.nasl
 lib/nessus/plugins/telnet_func.inc
 lib/nessus/plugins/telnetserver_detect_type_nd_version.nasl
@@ -1670,6 +1766,7 @@ lib/nessus/plugins/thttpd_buffer_overflow.nasl
 lib/nessus/plugins/thttpd_bug.nasl
 lib/nessus/plugins/thttpd_ssi.nasl
 lib/nessus/plugins/thttpd_virtualhost_escape.nasl
+lib/nessus/plugins/timesink_detection.nasl
 lib/nessus/plugins/tiny_proxy_heap_overflow.nasl
 lib/nessus/plugins/tinyweb.nasl
 lib/nessus/plugins/tivoli_relay_overflow.nasl
@@ -1718,6 +1815,8 @@ lib/nessus/plugins/ustorekeeper.nasl
 lib/nessus/plugins/uw_imap_overflow.nasl
 lib/nessus/plugins/uw_imap_overflow_two.nasl
 lib/nessus/plugins/vbulletin_calender_command_execution.nasl
+lib/nessus/plugins/vbulletin_calender_sql_injection.nasl
+lib/nessus/plugins/vcatch_detection.nasl
 lib/nessus/plugins/vchat_logs.nasl
 lib/nessus/plugins/vftpd_overflow.nasl
 lib/nessus/plugins/view_source_cgi.nasl
@@ -1742,6 +1841,7 @@ lib/nessus/plugins/vxworks_ftpd.nasl
 lib/nessus/plugins/vxworks_ftpdDOS.nasl
 lib/nessus/plugins/w3msql_overflow.nasl
 lib/nessus/plugins/wayboard.nasl
+lib/nessus/plugins/web3000_detection.nasl
 lib/nessus/plugins/web_chat_xss.nasl
 lib/nessus/plugins/web_traversal.nasl
 lib/nessus/plugins/webactive_log.nasl
@@ -1763,6 +1863,7 @@ lib/nessus/plugins/webfind.nasl
 lib/nessus/plugins/webfroot_shoutbox_file_injection.nasl
 lib/nessus/plugins/webfroot_shoutbox_traversal.nasl
 lib/nessus/plugins/webgais.nasl
+lib/nessus/plugins/webhancer_detection.nasl
 lib/nessus/plugins/weblogic_adm_servlet.nasl
 lib/nessus/plugins/weblogic_casigned_cert_spoofing.nasl
 lib/nessus/plugins/weblogic_cleartext_password.nasl
@@ -1796,9 +1897,9 @@ lib/nessus/plugins/wfchat_user_disclosure.nasl
 lib/nessus/plugins/wftp.nasl
 lib/nessus/plugins/wftp_241_dos.nasl
 lib/nessus/plugins/wftp_dos.nasl
-lib/nessus/plugins/whisker_wrapper.nes
 lib/nessus/plugins/whois_raw.nasl
 lib/nessus/plugins/wihphoto_file_read.nasl
+lib/nessus/plugins/wildtangent_detection.nasl
 lib/nessus/plugins/win_trinoo.nasl
 lib/nessus/plugins/winamp_buffer_overflow.nasl
 lib/nessus/plugins/windmail.nasl
@@ -1820,6 +1921,7 @@ lib/nessus/plugins/wnn_overflow.nasl
 lib/nessus/plugins/wordit_logbook.nasl
 lib/nessus/plugins/wordpress_flaws.nasl
 lib/nessus/plugins/worldclient_server_detection.nasl
+lib/nessus/plugins/worldflash_detection.nasl
 lib/nessus/plugins/worldspan_gw_DoS.nasl
 lib/nessus/plugins/wrap.nasl
 lib/nessus/plugins/writesrv.nasl
@@ -1835,7 +1937,7 @@ lib/nessus/plugins/wu_ftpd_site_exec.nasl
 lib/nessus/plugins/wu_ftpd_site_newer.nasl
 lib/nessus/plugins/wuftpd_ls_DoS.nasl
 lib/nessus/plugins/www_default_page.nasl
-lib/nessus/plugins/www_fingerprinting.nasl
+lib/nessus/plugins/www_fingerprinting_hmap.nasl
 lib/nessus/plugins/www_hosting_copyrighted_material.nasl
 lib/nessus/plugins/www_infinite_request_DoS.nasl
 lib/nessus/plugins/www_server_name.nasl
@@ -1856,11 +1958,13 @@ lib/nessus/plugins/xdmcp.nasl
 lib/nessus/plugins/xeneo_percent_DoS.nasl
 lib/nessus/plugins/xfs_overflow.nasl
 lib/nessus/plugins/xfstt_overflow.nasl
+lib/nessus/plugins/xitami_POST_DoS.nasl
 lib/nessus/plugins/xitami_overflow.nasl
 lib/nessus/plugins/xmail_overflow.nasl
 lib/nessus/plugins/xmb_sql_injection.nasl
 lib/nessus/plugins/xmb_xss.nasl
 lib/nessus/plugins/xolox_installed.nasl
+lib/nessus/plugins/xoops_myheader_url_xss.nasl
 lib/nessus/plugins/xoops_path_disclosure.nasl
 lib/nessus/plugins/xoops_xss.nasl
 lib/nessus/plugins/xpressions_sql_injection.nasl
@@ -1870,12 +1974,15 @@ lib/nessus/plugins/xtelw_detect.nasl
 lib/nessus/plugins/xtramail_control.nasl
 lib/nessus/plugins/xtramail_helo.nasl
 lib/nessus/plugins/xtramail_pop_overflow.nasl
+lib/nessus/plugins/xtreme_gallery_sql_injection.nasl
 lib/nessus/plugins/xtux_server.nasl
 lib/nessus/plugins/yabb.nasl
 lib/nessus/plugins/yabbse_cmd_exec.nasl
 lib/nessus/plugins/yahoo_dos.nasl
 lib/nessus/plugins/yahoo_installed.nasl
+lib/nessus/plugins/yahoo_msg_running.nasl
 lib/nessus/plugins/yppasswdd.nasl
+lib/nessus/plugins/zebra_dos.nasl
 lib/nessus/plugins/zentrack_code_injection.nasl
 lib/nessus/plugins/zentrack_read_files.nasl
 lib/nessus/plugins/zeus.nasl
@@ -1885,6 +1992,7 @@ lib/nessus/plugins/zope.nasl
 lib/nessus/plugins/zope_dos.nasl
 lib/nessus/plugins/zope_img_updating.nasl
 lib/nessus/plugins/zope_invalid_query_path_disclosure.nasl
+lib/nessus/plugins/zope_multiple_flaws.nasl
 lib/nessus/plugins/zope_path_disclosure.nasl
 lib/nessus/plugins/zope_zclass.nasl
 lib/nessus/plugins/zyxel_pwd.nasl
@@ -1894,7 +2002,6 @@ lib/nessus/plugins_factory/nessus.tmpl
 man/man1/nessus-build.1
 man/man8/nessus-update-plugins.8
 sbin/nessus-update-plugins
-var/nessus/nmap-os-fingerprints
 @dirrm var/nessus
 @dirrm lib/nessus/plugins_factory
 @dirrm lib/nessus/plugins
diff --git a/security/nessus-plugins/distinfo b/security/nessus-plugins/distinfo
index 64f6e831495..7d9b1f1946f 100644
--- a/security/nessus-plugins/distinfo
+++ b/security/nessus-plugins/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2003/11/08 07:40:17 xtraeme Exp $
+$NetBSD: distinfo,v 1.12 2004/05/19 16:23:53 adam Exp $
 
-SHA1 (nessus-plugins-2.0.9.tar.gz) = ff4344c88ac72a7d97e503018efce338d424e037
-Size (nessus-plugins-2.0.9.tar.gz) = 1491175 bytes
+SHA1 (nessus-plugins-2.0.10a.tar.gz) = df2ed524b5a70b5b89f6283659fbf2a0d63d3864
+Size (nessus-plugins-2.0.10a.tar.gz) = 1443420 bytes