Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

xActiveDirectory: Fix RestoreFromRecycleBin description #308

Merged
merged 2 commits into from
Jun 2, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
if the computer account is created enabled or disabled.
- Moved examples from the README.md to separate example files in the
Examples folder.
- Fix the RestoreFromRecycleBin Description
- Changes to xADGroup
- Change the description of the property RestoreFromRecycleBin.
- Changes to xADObjectPermissionEntry
Expand Down
2 changes: 1 addition & 1 deletion DSCResources/MSFT_xADComputer/MSFT_xADComputer.schema.mof
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class MSFT_xADComputer : OMI_BaseResource
[Write, Description("Specifies the user account credentials to use to perform the task."), EmbeddedInstance("MSFT_Credential")] String DomainAdministratorCredential;
[Write, Description("Specifies the full path to the Offline Domain Join Request file to create.")] String RequestFile;
[Write, Description("Specifies whether the computer account is present or absent. Valid values are 'Present' and 'Absent'. The default is 'Present'."), ValueMap{"Present", "Absent"},Values{"Present", "Absent"}] String Ensure;
[Write, Description("Try to restore the organizational unit from the recycle bin before creating a new one.")] Boolean RestoreFromRecycleBin;
[Write, Description("Try to restore the computer account from the recycle bin before creating a new one.")] Boolean RestoreFromRecycleBin;
[Write, Description("Specifies if the computer account is created enabled or disabled. By default the Enabled property of the computer account will be set to the default value of the cmdlet New-ADComputer. This property is ignored if the parameter RequestFile is specified in the same configuration. This parameter does not enforce the property Enabled. To enforce the property Enabled see the resource xADObjectEnabledState.")] Boolean EnabledOnCreation;
[Read, Description("Returns the X.500 path of the computer object")] String DistinguishedName;
[Read, Description("Returns the security identifier of the computer object")] String SID;
Expand Down
2 changes: 1 addition & 1 deletion DSCResources/MSFT_xADGroup/MSFT_xADGroup.schema.mof
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ class MSFT_xADGroup : OMI_BaseResource
[Write, Description("Active Directory attribute used to perform membership operations"), ValueMap{"SamAccountName","DistinguishedName","ObjectGUID","SID"}, Values{"SamAccountName","DistinguishedName","ObjectGUID","SID"}] String MembershipAttribute;
[Write, Description("Active Directory managed by attribute specified as a DistinguishedName")] String ManagedBy;
[Write, Description("Active Directory group notes field")] String Notes;
[Write, Description("Try to restore the organizational unit from the recycle bin before creating a new one.")] Boolean RestoreFromRecycleBin;
[Write, Description("Try to restore the group from the recycle bin before creating a new one.")] Boolean RestoreFromRecycleBin;
};