From 16d5a946870c9392b9eb3a010c1b1fd202fa6613 Mon Sep 17 00:00:00 2001 From: Steve Date: Wed, 2 Jun 2021 18:07:46 -0400 Subject: [PATCH] ActiveDirectory require password if username is supplied --- .../Commands/ActiveDirectoryBase.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/HavokMultimedia.Utilities.Console/Commands/ActiveDirectoryBase.cs b/HavokMultimedia.Utilities.Console/Commands/ActiveDirectoryBase.cs index ac249de..9a14f18 100644 --- a/HavokMultimedia.Utilities.Console/Commands/ActiveDirectoryBase.cs +++ b/HavokMultimedia.Utilities.Console/Commands/ActiveDirectoryBase.cs @@ -42,8 +42,10 @@ protected override void ExecuteInternal() if (!Constant.OS_WINDOWS) throw new Exception("This function is only supported on Windows clients"); host = GetArgParameterOrConfigRequired("host", "h"); port = GetArgParameterOrConfigInt("port", "o", Ldap.LDAP_PORT).ToString().ToUShort(); - username = GetArgParameterOrConfig("username", "u"); - password = GetArgParameterOrConfig("password", "p"); + username = GetArgParameterOrConfig("username", "u").TrimOrNull(); + if (username != null) password = GetArgParameterOrConfigRequired("password", "p"); + else GetArgParameterOrConfig("password", "p"); + domainName = GetArgParameterOrConfig("domainName", "d"); using (var ad = GetActiveDirectory())