Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge remote branch 'rcvalle/rcvalle-update-author-information'

Resolved the conflict by accepting Ramon's preferred alias of his name.

[Closes #806]

Conflicts:
	lib/msf/core/module/author.rb
  • Loading branch information...
commit c19e9a80533d08399c3d61504411396a92a10f9c 2 parents a4eb75a + 11f82de
@todb todb authored
Showing with 40 additions and 41 deletions.
  1. +1 −2  lib/msf/core/module/author.rb
  2. +1 −1  modules/auxiliary/scanner/misc/ib_service_mgr_info.rb
  3. +1 −1  modules/auxiliary/scanner/snmp/aix_version.rb
  4. +1 −1  modules/exploits/aix/rpc_ttdbserverd_realpath.rb
  5. +1 −1  modules/exploits/linux/misc/ib_inet_connect.rb
  6. +1 −1  modules/exploits/linux/misc/ib_jrd8_create_database.rb
  7. +1 −1  modules/exploits/linux/misc/ib_open_marker_file.rb
  8. +1 −1  modules/exploits/linux/misc/ib_pwd_db_aliased.rb
  9. +1 −1  modules/exploits/linux/samba/lsa_transnames_heap.rb
  10. +1 −1  modules/exploits/osx/samba/lsa_transnames_heap.rb
  11. +1 −1  modules/exploits/solaris/samba/lsa_transnames_heap.rb
  12. +1 −1  modules/exploits/solaris/sunrpc/sadmind_adm_build_path.rb
  13. +1 −1  modules/exploits/windows/email/ms07_017_ani_loadimage_chunksize.rb
  14. +1 −1  modules/exploits/windows/misc/fb_isc_attach_database.rb
  15. +1 −1  modules/exploits/windows/misc/fb_isc_create_database.rb
  16. +1 −1  modules/exploits/windows/misc/fb_svc_attach.rb
  17. +1 −1  modules/exploits/windows/misc/ib_isc_attach_database.rb
  18. +1 −1  modules/exploits/windows/misc/ib_isc_create_database.rb
  19. +1 −1  modules/exploits/windows/misc/ib_svc_attach.rb
  20. +1 −1  modules/payloads/singles/aix/ppc/shell_bind_tcp.rb
  21. +1 −1  modules/payloads/singles/aix/ppc/shell_find_port.rb
  22. +1 −1  modules/payloads/singles/aix/ppc/shell_reverse_tcp.rb
  23. +1 −1  modules/payloads/singles/bsd/x86/shell_bind_tcp.rb
  24. +1 −1  modules/payloads/singles/bsd/x86/shell_find_port.rb
  25. +1 −1  modules/payloads/singles/bsd/x86/shell_reverse_tcp.rb
  26. +1 −1  modules/payloads/singles/linux/ppc/shell_bind_tcp.rb
  27. +1 −1  modules/payloads/singles/linux/ppc/shell_find_port.rb
  28. +1 −1  modules/payloads/singles/linux/ppc/shell_reverse_tcp.rb
  29. +1 −1  modules/payloads/singles/linux/ppc64/shell_bind_tcp.rb
  30. +1 −1  modules/payloads/singles/linux/ppc64/shell_find_port.rb
  31. +1 −1  modules/payloads/singles/linux/ppc64/shell_reverse_tcp.rb
  32. +1 −1  modules/payloads/singles/linux/x86/shell_bind_tcp.rb
  33. +1 −1  modules/payloads/singles/linux/x86/shell_find_port.rb
  34. +1 −1  modules/payloads/singles/linux/x86/shell_reverse_tcp.rb
  35. +1 −1  modules/payloads/singles/osx/x86/shell_bind_tcp.rb
  36. +1 −1  modules/payloads/singles/osx/x86/shell_find_port.rb
  37. +1 −1  modules/payloads/singles/osx/x86/shell_reverse_tcp.rb
  38. +1 −1  modules/payloads/singles/solaris/x86/shell_bind_tcp.rb
  39. +1 −1  modules/payloads/singles/solaris/x86/shell_find_port.rb
  40. +1 −1  modules/payloads/singles/solaris/x86/shell_reverse_tcp.rb
View
3  lib/msf/core/module/author.rb
@@ -24,7 +24,7 @@ class Msf::Module::Author
'pusscat' => 'pusscat' + 0x40.chr + 'metasploit.com',
'skylined' => 'skylined' + 0x40.chr + 'edup.tudelft.nl',
'patrick' => 'patrick' + 0x40.chr + 'osisecurity.com.au',
- 'ramon' => 'rcvalle' + 0x40.chr + 'metasploit.com',
+ 'Ramon de C Valle'=> 'rcvalle' + 0x40.chr + 'metasploit.com',
'I)ruid' => 'druid' + 0x40.chr + 'caughq.org',
'egypt' => 'egypt' + 0x40.chr + 'metasploit.com',
'kris katterjohn' => 'katterjohn' + 0x40.chr + 'gmail.com',
@@ -141,4 +141,3 @@ def name=(name)
attr_accessor :email
attr_reader :name
end
-
View
2  modules/auxiliary/scanner/misc/ib_service_mgr_info.rb
@@ -32,7 +32,7 @@ def initialize
'Version' => '$Revision$',
'Author' =>
[
- 'ramon',
+ 'Ramon de C Valle',
'Adriano Lima <adriano[at]risesecurity.org>',
],
'License' => MSF_LICENSE
View
2  modules/auxiliary/scanner/snmp/aix_version.rb
@@ -25,8 +25,8 @@ def initialize
'Description' => 'AIX SNMP Scanner Auxiliary Module',
'Author' =>
[
+ 'Ramon de C Valle',
'Adriano Lima <adriano[at]risesecurity.org>',
- 'ramon'
],
'License' => MSF_LICENSE
)
View
2  modules/exploits/aix/rpc_ttdbserverd_realpath.rb
@@ -27,8 +27,8 @@ def initialize(info = {})
},
'Author' =>
[
+ 'Ramon de C Valle',
'Adriano Lima <adriano[at]risesecurity.org>',
- 'ramon'
],
'Version' => '$Revision$',
'Platform' => [ 'aix' ],
View
2  modules/exploits/linux/misc/ib_inet_connect.rb
@@ -28,7 +28,7 @@ def initialize(info = {})
'Version' => '$Revision$',
'Author' =>
[
- 'ramon',
+ 'Ramon de C Valle',
'Adriano Lima <adriano[at]risesecurity.org>',
],
'Arch' => ARCH_X86,
View
2  modules/exploits/linux/misc/ib_jrd8_create_database.rb
@@ -28,7 +28,7 @@ def initialize(info = {})
'Version' => '$Revision$',
'Author' =>
[
- 'ramon',
+ 'Ramon de C Valle',
'Adriano Lima <adriano[at]risesecurity.org>',
],
'Arch' => ARCH_X86,
View
2  modules/exploits/linux/misc/ib_open_marker_file.rb
@@ -28,7 +28,7 @@ def initialize(info = {})
'Version' => '$Revision$',
'Author' =>
[
- 'ramon',
+ 'Ramon de C Valle',
'Adriano Lima <adriano[at]risesecurity.org>',
],
'Arch' => ARCH_X86,
View
2  modules/exploits/linux/misc/ib_pwd_db_aliased.rb
@@ -28,7 +28,7 @@ def initialize(info = {})
'Version' => '$Revision$',
'Author' =>
[
- 'ramon',
+ 'Ramon de C Valle',
'Adriano Lima <adriano[at]risesecurity.org>',
],
'Arch' => ARCH_X86,
View
2  modules/exploits/linux/samba/lsa_transnames_heap.rb
@@ -32,7 +32,7 @@ def initialize(info = {})
},
'Author' =>
[
- 'ramon',
+ 'Ramon de C Valle',
'Adriano Lima <adriano[at]risesecurity.org>',
'hdm'
],
View
2  modules/exploits/osx/samba/lsa_transnames_heap.rb
@@ -30,7 +30,7 @@ def initialize(info = {})
},
'Author' =>
[
- 'ramon',
+ 'Ramon de C Valle',
'Adriano Lima <adriano[at]risesecurity.org>',
'hdm'
],
View
2  modules/exploits/solaris/samba/lsa_transnames_heap.rb
@@ -32,7 +32,7 @@ def initialize(info = {})
},
'Author' =>
[
- 'ramon',
+ 'Ramon de C Valle',
'Adriano Lima <adriano[at]risesecurity.org>',
'hdm'
],
View
2  modules/exploits/solaris/sunrpc/sadmind_adm_build_path.rb
@@ -38,8 +38,8 @@ def initialize(info = {})
},
'Author' =>
[
+ 'Ramon de C Valle',
'Adriano Lima <adriano[at]risesecurity.org>',
- 'ramon',
],
'Version' => '$Revision$',
'Arch' => ARCH_X86,
View
2  modules/exploits/windows/email/ms07_017_ani_loadimage_chunksize.rb
@@ -116,7 +116,7 @@ def initialize(info = {})
],
#
- # Supplied by ramon[at]risesecurity.org
+ # Supplied by Ramon de C Valle
#
# call [ebx+4]
View
2  modules/exploits/windows/misc/fb_isc_attach_database.rb
@@ -27,7 +27,7 @@ def initialize(info = {})
'Version' => '$Revision$',
'Author' =>
[
- 'ramon',
+ 'Ramon de C Valle',
'Adriano Lima <adriano[at]risesecurity.org>',
],
'Arch' => ARCH_X86,
View
2  modules/exploits/windows/misc/fb_isc_create_database.rb
@@ -27,7 +27,7 @@ def initialize(info = {})
'Version' => '$Revision$',
'Author' =>
[
- 'ramon',
+ 'Ramon de C Valle',
'Adriano Lima <adriano[at]risesecurity.org>',
],
'Arch' => ARCH_X86,
View
2  modules/exploits/windows/misc/fb_svc_attach.rb
@@ -27,7 +27,7 @@ def initialize(info = {})
'Version' => '$Revision$',
'Author' =>
[
- 'ramon',
+ 'Ramon de C Valle',
'Adriano Lima <adriano[at]risesecurity.org>',
],
'Arch' => ARCH_X86,
View
2  modules/exploits/windows/misc/ib_isc_attach_database.rb
@@ -29,7 +29,7 @@ def initialize(info = {})
'Version' => '$Revision$',
'Author' =>
[
- 'ramon',
+ 'Ramon de C Valle',
'Adriano Lima <adriano[at]risesecurity.org>',
],
'Arch' => ARCH_X86,
View
2  modules/exploits/windows/misc/ib_isc_create_database.rb
@@ -29,7 +29,7 @@ def initialize(info = {})
'Version' => '$Revision$',
'Author' =>
[
- 'ramon',
+ 'Ramon de C Valle',
'Adriano Lima <adriano[at]risesecurity.org>',
],
'Arch' => ARCH_X86,
View
2  modules/exploits/windows/misc/ib_svc_attach.rb
@@ -29,7 +29,7 @@ def initialize(info = {})
'Version' => '$Revision$',
'Author' =>
[
- 'ramon',
+ 'Ramon de C Valle',
'Adriano Lima <adriano[at]risesecurity.org>',
],
'Arch' => ARCH_X86,
View
2  modules/payloads/singles/aix/ppc/shell_bind_tcp.rb
@@ -25,7 +25,7 @@ def initialize(info = {})
'Name' => 'AIX Command Shell, Bind TCP Inline',
'Version' => '$Revision$',
'Description' => 'Listen for a connection and spawn a command shell',
- 'Author' => 'ramon',
+ 'Author' => 'Ramon de C Valle',
'License' => MSF_LICENSE,
'Platform' => 'aix',
'Arch' => ARCH_PPC,
View
2  modules/payloads/singles/aix/ppc/shell_find_port.rb
@@ -25,7 +25,7 @@ def initialize(info = {})
'Name' => 'AIX Command Shell, Find Port Inline',
'Version' => '$Revision$',
'Description' => 'Spawn a shell on an established connection',
- 'Author' => 'ramon',
+ 'Author' => 'Ramon de C Valle',
'License' => MSF_LICENSE,
'Platform' => 'aix',
'Arch' => ARCH_PPC,
View
2  modules/payloads/singles/aix/ppc/shell_reverse_tcp.rb
@@ -25,7 +25,7 @@ def initialize(info = {})
'Name' => 'AIX Command Shell, Reverse TCP Inline',
'Version' => '$Revision$',
'Description' => 'Connect back to attacker and spawn a command shell',
- 'Author' => 'ramon',
+ 'Author' => 'Ramon de C Valle',
'License' => MSF_LICENSE,
'Platform' => 'aix',
'Arch' => ARCH_PPC,
View
2  modules/payloads/singles/bsd/x86/shell_bind_tcp.rb
@@ -25,7 +25,7 @@ def initialize(info = {})
'Name' => 'BSD Command Shell, Bind TCP Inline',
'Version' => '$Revision$',
'Description' => 'Listen for a connection and spawn a command shell',
- 'Author' => 'ramon',
+ 'Author' => 'Ramon de C Valle',
'License' => MSF_LICENSE,
'Platform' => 'bsd',
'Arch' => ARCH_X86,
View
2  modules/payloads/singles/bsd/x86/shell_find_port.rb
@@ -25,7 +25,7 @@ def initialize(info = {})
'Name' => 'BSD Command Shell, Find Port Inline',
'Version' => '$Revision$',
'Description' => 'Spawn a shell on an established connection',
- 'Author' => 'ramon',
+ 'Author' => 'Ramon de C Valle',
'License' => MSF_LICENSE,
'Platform' => 'bsd',
'Arch' => ARCH_X86,
View
2  modules/payloads/singles/bsd/x86/shell_reverse_tcp.rb
@@ -25,7 +25,7 @@ def initialize(info = {})
'Name' => 'BSD Command Shell, Reverse TCP Inline',
'Version' => '$Revision$',
'Description' => 'Connect back to attacker and spawn a command shell',
- 'Author' => 'ramon',
+ 'Author' => 'Ramon de C Valle',
'License' => MSF_LICENSE,
'Platform' => 'bsd',
'Arch' => ARCH_X86,
View
2  modules/payloads/singles/linux/ppc/shell_bind_tcp.rb
@@ -25,7 +25,7 @@ def initialize(info = {})
'Name' => 'Linux Command Shell, Bind TCP Inline',
'Version' => '$Revision$',
'Description' => 'Listen for a connection and spawn a command shell',
- 'Author' => 'ramon',
+ 'Author' => 'Ramon de C Valle',
'License' => MSF_LICENSE,
'Platform' => 'linux',
'Arch' => [ ARCH_PPC, ARCH_CBEA ],
View
2  modules/payloads/singles/linux/ppc/shell_find_port.rb
@@ -25,7 +25,7 @@ def initialize(info = {})
'Name' => 'Linux Command Shell, Find Port Inline',
'Version' => '$Revision$',
'Description' => 'Spawn a shell on an established connection',
- 'Author' => 'ramon',
+ 'Author' => 'Ramon de C Valle',
'License' => MSF_LICENSE,
'Platform' => 'linux',
'Arch' => [ ARCH_PPC, ARCH_CBEA ],
View
2  modules/payloads/singles/linux/ppc/shell_reverse_tcp.rb
@@ -25,7 +25,7 @@ def initialize(info = {})
'Name' => 'Linux Command Shell, Reverse TCP Inline',
'Version' => '$Revision$',
'Description' => 'Connect back to attacker and spawn a command shell',
- 'Author' => 'ramon',
+ 'Author' => 'Ramon de C Valle',
'License' => MSF_LICENSE,
'Platform' => 'linux',
'Arch' => [ ARCH_PPC, ARCH_CBEA ],
View
2  modules/payloads/singles/linux/ppc64/shell_bind_tcp.rb
@@ -25,7 +25,7 @@ def initialize(info = {})
'Name' => 'Linux Command Shell, Bind TCP Inline',
'Version' => '$Revision$',
'Description' => 'Listen for a connection and spawn a command shell',
- 'Author' => 'ramon',
+ 'Author' => 'Ramon de C Valle',
'License' => MSF_LICENSE,
'Platform' => 'linux',
'Arch' => [ ARCH_PPC64, ARCH_CBEA64 ],
View
2  modules/payloads/singles/linux/ppc64/shell_find_port.rb
@@ -25,7 +25,7 @@ def initialize(info = {})
'Name' => 'Linux Command Shell, Find Port Inline',
'Version' => '$Revision$',
'Description' => 'Spawn a shell on an established connection',
- 'Author' => 'ramon',
+ 'Author' => 'Ramon de C Valle',
'License' => MSF_LICENSE,
'Platform' => 'linux',
'Arch' => [ ARCH_PPC64, ARCH_CBEA64 ],
View
2  modules/payloads/singles/linux/ppc64/shell_reverse_tcp.rb
@@ -25,7 +25,7 @@ def initialize(info = {})
'Name' => 'Linux Command Shell, Reverse TCP Inline',
'Version' => '$Revision$',
'Description' => 'Connect back to attacker and spawn a command shell',
- 'Author' => 'ramon',
+ 'Author' => 'Ramon de C Valle',
'License' => MSF_LICENSE,
'Platform' => 'linux',
'Arch' => [ ARCH_PPC64, ARCH_CBEA64 ],
View
2  modules/payloads/singles/linux/x86/shell_bind_tcp.rb
@@ -25,7 +25,7 @@ def initialize(info = {})
'Name' => 'Linux Command Shell, Bind TCP Inline',
'Version' => '$Revision$',
'Description' => 'Listen for a connection and spawn a command shell',
- 'Author' => 'ramon',
+ 'Author' => 'Ramon de C Valle',
'License' => MSF_LICENSE,
'Platform' => 'linux',
'Arch' => ARCH_X86,
View
2  modules/payloads/singles/linux/x86/shell_find_port.rb
@@ -25,7 +25,7 @@ def initialize(info = {})
'Name' => 'Linux Command Shell, Find Port Inline',
'Version' => '$Revision$',
'Description' => 'Spawn a shell on an established connection',
- 'Author' => 'ramon',
+ 'Author' => 'Ramon de C Valle',
'License' => MSF_LICENSE,
'Platform' => 'linux',
'Arch' => ARCH_X86,
View
2  modules/payloads/singles/linux/x86/shell_reverse_tcp.rb
@@ -25,7 +25,7 @@ def initialize(info = {})
'Name' => 'Linux Command Shell, Reverse TCP Inline',
'Version' => '$Revision$',
'Description' => 'Connect back to attacker and spawn a command shell',
- 'Author' => 'ramon',
+ 'Author' => 'Ramon de C Valle',
'License' => MSF_LICENSE,
'Platform' => 'linux',
'Arch' => ARCH_X86,
View
2  modules/payloads/singles/osx/x86/shell_bind_tcp.rb
@@ -25,7 +25,7 @@ def initialize(info = {})
'Name' => 'OS X Command Shell, Bind TCP Inline',
'Version' => '$Revision$',
'Description' => 'Listen for a connection and spawn a command shell',
- 'Author' => 'ramon',
+ 'Author' => 'Ramon de C Valle',
'License' => MSF_LICENSE,
'Platform' => 'osx',
'Arch' => ARCH_X86,
View
2  modules/payloads/singles/osx/x86/shell_find_port.rb
@@ -25,7 +25,7 @@ def initialize(info = {})
'Name' => 'OS X Command Shell, Find Port Inline',
'Version' => '$Revision$',
'Description' => 'Spawn a shell on an established connection',
- 'Author' => 'ramon',
+ 'Author' => 'Ramon de C Valle',
'License' => MSF_LICENSE,
'Platform' => 'osx',
'Arch' => ARCH_X86,
View
2  modules/payloads/singles/osx/x86/shell_reverse_tcp.rb
@@ -25,7 +25,7 @@ def initialize(info = {})
'Name' => 'OS X Command Shell, Reverse TCP Inline',
'Version' => '$Revision$',
'Description' => 'Connect back to attacker and spawn a command shell',
- 'Author' => 'ramon',
+ 'Author' => 'Ramon de C Valle',
'License' => MSF_LICENSE,
'Platform' => 'osx',
'Arch' => ARCH_X86,
View
2  modules/payloads/singles/solaris/x86/shell_bind_tcp.rb
@@ -25,7 +25,7 @@ def initialize(info = {})
'Name' => 'Solaris Command Shell, Bind TCP Inline',
'Version' => '$Revision$',
'Description' => 'Listen for a connection and spawn a command shell',
- 'Author' => 'ramon',
+ 'Author' => 'Ramon de C Valle',
'License' => MSF_LICENSE,
'Platform' => 'solaris',
'Arch' => ARCH_X86,
View
2  modules/payloads/singles/solaris/x86/shell_find_port.rb
@@ -25,7 +25,7 @@ def initialize(info = {})
'Name' => 'Solaris Command Shell, Find Port Inline',
'Version' => '$Revision$',
'Description' => 'Spawn a shell on an established connection',
- 'Author' => 'ramon',
+ 'Author' => 'Ramon de C Valle',
'License' => MSF_LICENSE,
'Platform' => 'solaris',
'Arch' => ARCH_X86,
View
2  modules/payloads/singles/solaris/x86/shell_reverse_tcp.rb
@@ -25,7 +25,7 @@ def initialize(info = {})
'Name' => 'Solaris Command Shell, Reverse TCP Inline',
'Version' => '$Revision$',
'Description' => 'Connect back to attacker and spawn a command shell',
- 'Author' => 'ramon',
+ 'Author' => 'Ramon de C Valle',
'License' => MSF_LICENSE,
'Platform' => 'solaris',
'Arch' => ARCH_X86,
Please sign in to comment.
Something went wrong with that request. Please try again.