summaryrefslogtreecommitdiff
path: root/librpc
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-07-27 12:04:26 +1000
committerKarolin Seeger <kseeger@samba.org>2011-08-07 21:02:23 +0200
commit40fc990e9be34864c2c38461de771866eb4558cb (patch)
tree84eb610ab3652e826ab19e86f7f73797f882043f /librpc
parent1b9f6242e54048b086d3262e2bb3980b216e446f (diff)
downloadsamba-40fc990e9be34864c2c38461de771866eb4558cb.tar.gz
nbt: fix WinXP S3 domain join: alignment of nbt_netlogon_response_from_pdc
This fixes WinXP joining a Samba3 domain, which was broken on hosts with an even number of characters in the host name. The alignment requested in the structure was ignored because of the overall NDR_NOALIGN set on the packet. Andrew Bartlett Fix bug #8326 (WinXP cannot join a Samba3 domain with a 'even' hostname). (cherry picked from commit 24fe5fea8fb7839dcbcf39a346a31c9e90e7beb9)
Diffstat (limited to 'librpc')
-rw-r--r--librpc/idl/nbt.idl2
1 files changed, 1 insertions, 1 deletions
diff --git a/librpc/idl/nbt.idl b/librpc/idl/nbt.idl
index cbfa9666701..ee9a64ed3e5 100644
--- a/librpc/idl/nbt.idl
+++ b/librpc/idl/nbt.idl
@@ -494,7 +494,7 @@ interface nbt
} nbt_netlogon_query_for_pdc;
/* response from pdc */
- typedef [flag(NDR_NOALIGN),public] struct {
+ typedef [public] struct {
netlogon_command command;
astring pdc_name;
[flag(NDR_ALIGN2)] DATA_BLOB _pad;