From 056661e5ddf3e60b1f1b8339cd9e44103892bd72 Mon Sep 17 00:00:00 2001
From: Tod Beardsley <tod_beardsley@rapid7.com>
Date: Thu, 26 Dec 2013 10:26:01 -0600
Subject: [PATCH 1/5] No at-signs in names please.

---
 modules/auxiliary/scanner/rdp/ms12_020_check.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/auxiliary/scanner/rdp/ms12_020_check.rb b/modules/auxiliary/scanner/rdp/ms12_020_check.rb
index 3114a85d2a..16b1c4e3d8 100644
--- a/modules/auxiliary/scanner/rdp/ms12_020_check.rb
+++ b/modules/auxiliary/scanner/rdp/ms12_020_check.rb
@@ -28,8 +28,8 @@ class Metasploit3 < Msf::Auxiliary
         ],
       'Author'         =>
         [
-          'Royce Davis @R3dy_ <rdavis[at]accuvant.com>',
-          'Brandon McCann @zeknox <bmccann[at]accuvant.com>'
+          'Royce Davis "R3dy" <rdavis[at]accuvant.com>',
+          'Brandon McCann "zeknox" <bmccann[at]accuvant.com>'
         ],
       'License'        => MSF_LICENSE
     ))

From 47765a1c4f6df48cf8769d37eab3c6536c8b2e79 Mon Sep 17 00:00:00 2001
From: Tod Beardsley <tod_beardsley@rapid7.com>
Date: Thu, 26 Dec 2013 10:29:11 -0600
Subject: [PATCH 2/5] Fix chargen probe title, comment on the CVE

---
 modules/auxiliary/scanner/chargen/chargen_probe.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/auxiliary/scanner/chargen/chargen_probe.rb b/modules/auxiliary/scanner/chargen/chargen_probe.rb
index c92dba6fda..2332fe5995 100644
--- a/modules/auxiliary/scanner/chargen/chargen_probe.rb
+++ b/modules/auxiliary/scanner/chargen/chargen_probe.rb
@@ -14,7 +14,7 @@ class Metasploit3 < Msf::Auxiliary
 
   def initialize
     super(
-      'Name'        => 'Identifies Open Chargen Service Checking The Answer.',
+      'Name'        => 'Chargen Probe Utility',
       'Description' => %q{
         Chargen is a debugging and measurement tool and a character
         generator service. A character generator service simply sends
@@ -31,7 +31,7 @@ class Metasploit3 < Msf::Auxiliary
       'License'     => MSF_LICENSE,
       'References'  =>
         [
-          [ 'CVE', '1999-0103' ],
+          [ 'CVE', '1999-0103' ], # Note, does not actually trigger a flood.
           [ 'URL', 'https://www.cert.be/pro/docs/chargensnmp-ddos-attacks-rise' ],
           [ 'URL', 'http://tools.ietf.org/html/rfc864' ],
         ],

From c34a5f37586d057a5514a243f12558146502fd59 Mon Sep 17 00:00:00 2001
From: Tod Beardsley <tod_beardsley@rapid7.com>
Date: Thu, 26 Dec 2013 10:30:30 -0600
Subject: [PATCH 3/5] Unacronym the title on Poison Ivy C&C

---
 modules/auxiliary/scanner/misc/poisonivy_control_scanner.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/auxiliary/scanner/misc/poisonivy_control_scanner.rb b/modules/auxiliary/scanner/misc/poisonivy_control_scanner.rb
index 40667e8afb..53a274dc81 100644
--- a/modules/auxiliary/scanner/misc/poisonivy_control_scanner.rb
+++ b/modules/auxiliary/scanner/misc/poisonivy_control_scanner.rb
@@ -14,9 +14,9 @@ class Metasploit3 < Msf::Auxiliary
 
   def initialize
     super(
-      'Name'        => 'Poison Ivy C&C Scanner',
+      'Name'        => 'Poison Ivy Command and Control Scanner',
       'Description' => %q{
-        Enumerate Poison Ivy C&C on ports 3460,80,8080 and 443. Adaptation of iTrust Python script.
+        Enumerate Poison Ivy Command and Control (C&C) on ports 3460, 80, 8080 and 443. Adaptation of iTrust Python script.
       },
       'References'  =>
         [

From 5ce862a5b5c4d8f71fb9d6d65d235868fd84a40f Mon Sep 17 00:00:00 2001
From: Tod Beardsley <tod_beardsley@rapid7.com>
Date: Thu, 26 Dec 2013 10:33:46 -0600
Subject: [PATCH 4/5] Add OSVDB

---
 .../exploits/linux/http/synology_dsm_sliceupload_exec_noauth.rb  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/exploits/linux/http/synology_dsm_sliceupload_exec_noauth.rb b/modules/exploits/linux/http/synology_dsm_sliceupload_exec_noauth.rb
index 6af3cd3e5d..5ed6644527 100644
--- a/modules/exploits/linux/http/synology_dsm_sliceupload_exec_noauth.rb
+++ b/modules/exploits/linux/http/synology_dsm_sliceupload_exec_noauth.rb
@@ -35,6 +35,7 @@ class Metasploit3 < Msf::Exploit::Remote
       'References'     =>
         [
           [ 'CVE', '2013-6955' ],
+          [ 'OSVDB', '101247' ]
         ],
       'Privileged'     => false,
       'Platform'       => ['unix'],

From d6a63433a6b2a3b192f2469c9477166f4a33edb2 Mon Sep 17 00:00:00 2001
From: Tod Beardsley <tod_beardsley@rapid7.com>
Date: Thu, 26 Dec 2013 10:37:18 -0600
Subject: [PATCH 5/5] Space at EOL

---
 modules/post/osx/gather/safari_lastsession.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/post/osx/gather/safari_lastsession.rb b/modules/post/osx/gather/safari_lastsession.rb
index a617aa6903..b1ce88251a 100644
--- a/modules/post/osx/gather/safari_lastsession.rb
+++ b/modules/post/osx/gather/safari_lastsession.rb
@@ -14,7 +14,7 @@ class Metasploit3 < Msf::Post
     super( update_info( info,
       'Name'          => 'OSX Gather Safari LastSession.plist',
       'Description'   => %q{
-        This module downloads the LastSession.plist file from the target machine. 
+        This module downloads the LastSession.plist file from the target machine.
         LastSession.plist is used by Safari to track active websites in the current session,
         and sometimes contains sensitive information such as usernames and passwords.