Skip to content

Commit 91b748a

Browse files
committed
Make it clear where we failed
Even when VERBOSE=false
1 parent bc88732 commit 91b748a

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

lib/msf/core/exploit/smb/psexec.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def psexec(command)
6868
scm_handle = dcerpc.last_response.stub_data[0,20]
6969
end
7070
rescue ::Exception => e
71-
print_error("#{peer} - Error: #{e}")
71+
print_error("#{peer} - Error getting scm handle: #{e}")
7272
return false
7373
end
7474
servicename = Rex::Text.rand_text_alpha(11)
@@ -98,7 +98,7 @@ def psexec(command)
9898
svc_status = dcerpc.last_response.stub_data[24,4]
9999
end
100100
rescue ::Exception => e
101-
print_error("#{peer} - Error: #{e}")
101+
print_error("#{peer} - Error creating service: #{e}")
102102
return false
103103
end
104104
vprint_status("#{peer} - Closing service handle...")
@@ -114,7 +114,7 @@ def psexec(command)
114114
svc_handle = dcerpc.last_response.stub_data[0,20]
115115
end
116116
rescue ::Exception => e
117-
print_error("#{peer} - Error: #{e}")
117+
print_error("#{peer} - Error opening service: #{e}")
118118
return false
119119
end
120120
vprint_status("#{peer} - Starting the service...")
@@ -124,7 +124,7 @@ def psexec(command)
124124
if dcerpc.last_response != nil and dcerpc.last_response.stub_data != nil
125125
end
126126
rescue ::Exception => e
127-
print_error("#{peer} - Error: #{e}")
127+
print_error("#{peer} - Error starting service: #{e}")
128128
return false
129129
end
130130
vprint_status("#{peer} - Removing the service...")
@@ -134,13 +134,13 @@ def psexec(command)
134134
if dcerpc.last_response != nil and dcerpc.last_response.stub_data != nil
135135
end
136136
rescue ::Exception => e
137-
print_error("#{peer} - Error: #{e}")
137+
print_error("#{peer} - Error removing service: #{e}")
138138
end
139139
vprint_status("#{peer} - Closing service handle...")
140140
begin
141141
response = dcerpc.call(0x0, svc_handle)
142142
rescue ::Exception => e
143-
print_error("#{peer} - Error: #{e}")
143+
print_error("#{peer} - Error closing service handle: #{e}")
144144
end
145145
select(nil, nil, nil, 1.0)
146146
simple.disconnect("\\\\#{datastore['RHOST']}\\IPC$")

0 commit comments

Comments
 (0)