Skip to content

Commit

Permalink
Merge pull request #20 from darrenjrobinson/master
Browse files Browse the repository at this point in the history
Fix Import Script Param & MA Type
  • Loading branch information
sorengranfeldt committed Mar 31, 2021
2 parents 7079a18 + a79babb commit 22b86c7
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<format-version>1</format-version>
<internal-version>1</internal-version>
<ma-companyname>Soren Granfeldt</ma-companyname>
<subtype>PowerShell (Soren Granfeldt)</subtype>
<ma-listname>PowerShell (Soren Granfeldt)</ma-listname>
<subtype>PowerShell</subtype>
<ma-listname>PowerShell</ma-listname>
<id>{C75B4BAD-B875-4863-89BE-3F5EBE1E080D}</id>
<category>Extensible2</category>
<password-sync-allowed>1</password-sync-allowed>
Expand Down
2 changes: 1 addition & 1 deletion Granfeldt.PowerShell.ManagementAgent/MA.Import.cs
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ public GetImportEntriesResults GetImportEntries(GetImportEntriesRunStep importRu
returnedCustomData = importRunStep.CustomData;

Command cmd = new Command(Path.GetFullPath(ImportScript));
cmd.Parameters.Add(new CommandParameter("User", Username));
cmd.Parameters.Add(new CommandParameter("Username", Username));
cmd.Parameters.Add(new CommandParameter("Password", Password));
cmd.Parameters.Add(new CommandParameter("Credentials", GetSecureCredentials(Username, SecureStringPassword)));

Expand Down
4 changes: 3 additions & 1 deletion Granfeldt.PowerShell.ManagementAgent/MA.cs
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,9 @@
// - added support for configuration parameters
// - merged try/catch pull request (#18 Added a try catch to the resolving of group names)
// - upped version to 5.6.3.2021

// march 31, 2021 | Darren J Robinson
// - fixed script parameter ($User => $Username)
// - fixed MA Type so PSMA can update historical MA's
// Information on assembly version numbers - http://support.microsoft.com/kb/556041

using Microsoft.MetadirectoryServices;
Expand Down

0 comments on commit 22b86c7

Please sign in to comment.