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

Fixing Netapi32Util.getDomainTrusts() includes "empty" domain object #145

Merged
merged 3 commits into from
Oct 24, 2012
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
8 changes: 8 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
Release 3.5.1
=============

Bug Fixes
---------
* Fix `Netapi32Util.getDomainTrusts() includes "empty" domain object` - [@aikidojohn](https://github.com/aikidojohn).
* Fixed problem with Netapi32.getDC() - added missing fields in DOMAIN_CONTROLLER_INFO - [@aikidojohn](https://github.com/aikidojohn).

Release 3.5.0
=============

Expand Down
3 changes: 2 additions & 1 deletion contrib/platform/src/com/sun/jna/platform/win32/DsGetDC.java
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public DOMAIN_CONTROLLER_INFO(Pointer memory) {
public WString ClientSiteName;

protected List getFieldOrder() {
return Arrays.asList(new String[] { "DomainControllerName", "DomainControllerAddress", "DomainGuid", "DomainName", "DnsForestName", "Flags", "DcSiteName", "ClientSiteName"});
return Arrays.asList(new String[] { "DomainControllerName", "DomainControllerAddress", "DomainControllerAddressType", "DomainGuid", "DomainName", "DnsForestName", "Flags", "DcSiteName", "ClientSiteName"});
}
}

Expand Down Expand Up @@ -214,6 +214,7 @@ public DS_DOMAIN_TRUSTS() {

public DS_DOMAIN_TRUSTS(Pointer p) {
super(p);
read();
}
};
}