From 8a26459cfd20d577d71fd63e8086fc90ef00be92 Mon Sep 17 00:00:00 2001
From: david <david@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Thu, 8 Apr 2010 19:44:20 +0000
Subject: [PATCH] Add @output sections for http-passwd, db2-info, db2-das-info,
 and pptp-version.

---
 scripts/db2-das-info.nse | 49 +++++++++++++++++++++++++++++++++++++++-
 scripts/db2-info.nse     |  9 ++++++++
 scripts/http-passwd.nse  | 15 ++++++++++++
 scripts/pptp-version.nse |  6 +++++
 4 files changed, 78 insertions(+), 1 deletion(-)

diff --git a/scripts/db2-das-info.nse b/scripts/db2-das-info.nse
index db08c7de0..984defd70 100644
--- a/scripts/db2-das-info.nse
+++ b/scripts/db2-das-info.nse
@@ -7,7 +7,54 @@ requested.
 ]]
 
 -- rev 1.1 (2010-01-28)
-  
+
+---
+-- @output
+-- PORT    STATE SERVICE VERSION
+-- 523/tcp open  ibm-db2 IBM DB2 Database Server 9.07.0
+-- | db2-das-info: DB2 Administration Server Settings
+-- | ;DB2 Server Database Access Profile
+-- | ;Use BINARY file transfer
+-- | ;Comment lines start with a ";"
+-- | ;Other lines must be one of the following two types:
+-- | ;Type A: [section_name]
+-- | ;Type B: keyword=value
+-- |
+-- | [File_Description]
+-- | Application=DB2/LINUX 9.7.0
+-- | Platform=18
+-- | File_Content=DB2 Server Definitions
+-- | File_Type=CommonServer
+-- | File_Format_Version=1.0
+-- | DB2System=MYBIGDATABASESERVER
+-- | ServerType=DB2LINUX
+-- |
+-- | [adminst>dasusr1]
+-- | NodeType=1
+-- | DB2Comm=TCPIP
+-- | Authentication=SERVER
+-- | HostName=MYBIGDATABASESERVER
+-- | PortNumber=523
+-- | IpAddress=127.0.1.1
+-- |
+-- | [inst>db2inst1]
+-- | NodeType=1
+-- | DB2Comm=TCPIP
+-- | Authentication=SERVER
+-- | HostName=MYBIGDATABASESERVER
+-- | ServiceName=db2c_db2inst1
+-- | PortNumber=50000
+-- | IpAddress=127.0.1.1
+-- | QuietMode=No
+-- | TMDatabase=1ST_CONN
+-- |
+-- | [db>db2inst1:TOOLSDB]
+-- | DBAlias=TOOLSDB
+-- | DBName=TOOLSDB
+-- | Drive=/home/db2inst1
+-- | Dir_entry_type=INDIRECT
+-- |_Authentication=NOTSPEC
+
 author = "Patrik Karlsson, Tom Sellers"
 
 license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
diff --git a/scripts/db2-info.nse b/scripts/db2-info.nse
index a87c9c8da..c732854ef 100644
--- a/scripts/db2-info.nse
+++ b/scripts/db2-info.nse
@@ -4,6 +4,15 @@ DB2 EXCSAT (exchange server attributes) command packet and parses the response.
 ]]
 
 -- rev 1.3 (2009-12-16)
+
+---
+-- @output
+-- PORT      STATE SERVICE
+-- 50000/tcp open  ibm-db2
+-- |  db2-info: DB2 Version: 8.02.9
+-- |  Server Platform: QDB2/SUN
+-- |  Instance Name:   db2inst1
+-- |_ External Name:   db2inst1db2agent00002B430
   
 author = "Tom Sellers"
 
diff --git a/scripts/http-passwd.nse b/scripts/http-passwd.nse
index 1ec012973..7a9026d32 100644
--- a/scripts/http-passwd.nse
+++ b/scripts/http-passwd.nse
@@ -4,6 +4,21 @@ retrieve <code>/etc/passwd</code> using various traversal methods such as
 requesting <code>../../../../etc/passwd</code>.
 ]]
 
+---
+-- @output
+-- PORT   STATE SERVICE
+-- 80/tcp open  http
+-- | http-passwd: Found with "//etc/passwd"
+-- | Printing first 250 bytes:
+-- | root:x:0:0:root:/root:/bin/bash
+-- | daemon:x:1:1:daemon:/usr/sbin:/bin/sh
+-- | bin:x:2:2:bin:/bin:/bin/sh
+-- | sys:x:3:3:sys:/dev:/bin/sh
+-- | sync:x:4:65534:sync:/bin:/bin/sync
+-- | games:x:5:60:games:/usr/games:/bin/sh
+-- | man:x:6:12:man:/var/cache/man:/bin/sh
+-- |_lp:x:7:7:lp:/va
+
 -- 07/20/2007:
 --   * Used Thomas Buchanan's HTTPAuth script as a starting point
 --   * Applied some great suggestions from Brandon Enright, thanks a lot man!
diff --git a/scripts/pptp-version.nse b/scripts/pptp-version.nse
index 199fddcd4..03f8f94c7 100644
--- a/scripts/pptp-version.nse
+++ b/scripts/pptp-version.nse
@@ -3,6 +3,12 @@ Attempts to extract system information from the point-to-point tunneling protoco
 ]]
 -- rev 0.2 (11-14-2007)
 
+---
+-- @output
+-- PORT     STATE SERVICE VERSION
+-- 1723/tcp open  pptp    YAMAHA Corporation (Firmware: 32838)
+-- Service Info: Host: RT57i
+
 author = "Thomas Buchanan"
 
 license = "Same as Nmap--See http://nmap.org/book/man-legal.html"