Skip to content

Commit 1884cd3

Browse files
authored
Merge pull request #1202 from Pennyw0rth/neff-allow-commands-and-modules
Allow proto flags in combination with modules
2 parents cb8912a + 32a7d5a commit 1884cd3

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

nxc/connection.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -255,13 +255,12 @@ def proto_flow(self):
255255

256256
self.print_host_info()
257257
if self.login() or (self.username == "" and self.password == ""):
258-
if hasattr(self.args, "module") and self.args.module:
258+
self.logger.debug("Calling command arguments")
259+
self.call_cmd_args()
260+
if self.args.module:
259261
self.load_modules()
260262
self.logger.debug("Calling modules")
261263
self.call_modules()
262-
else:
263-
self.logger.debug("Calling command arguments")
264-
self.call_cmd_args()
265264
self.disconnect()
266265

267266
def call_cmd_args(self):

0 commit comments

Comments
 (0)