summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2003-11-19 05:26:11 +0000
committerAndrew Tridgell <tridge@samba.org>2003-11-19 05:26:11 +0000
commita0cd1069ce4edf69d31b88f5082d940ee4d47f2c (patch)
treeb68426498f77f09ac148bb40c6eceed3b8a11a8a
parent025236281b55a63207adcc1fa183b2ab16361764 (diff)
downloadsamba-a0cd1069ce4edf69d31b88f5082d940ee4d47f2c.tar.gz
samba-a0cd1069ce4edf69d31b88f5082d940ee4d47f2c.tar.bz2
samba-a0cd1069ce4edf69d31b88f5082d940ee4d47f2c.zip
fixed country code field in samr_UserInfo5
(This used to be commit d194247b1bac03fbe3fd8226b897fa6886c6ca4c)
-rw-r--r--source4/librpc/idl/samr.idl3
-rw-r--r--source4/librpc/ndr/ndr_samr.c6
-rw-r--r--source4/librpc/ndr/ndr_samr.h3
3 files changed, 8 insertions, 4 deletions
diff --git a/source4/librpc/idl/samr.idl b/source4/librpc/idl/samr.idl
index 2b47abe461..4aa757da34 100644
--- a/source4/librpc/idl/samr.idl
+++ b/source4/librpc/idl/samr.idl
@@ -485,7 +485,8 @@
NTTIME last_logoff;
uint32 units_per_week;
[size_is(1260), length_is(units_per_week/8)] uint8 *logon_hours;
- uint32 unknown;
+ uint16 bad_pwd_count;
+ uint16 num_logons;
NTTIME last_pwd_change;
NTTIME acct_expiry;
uint32 acct_flags;
diff --git a/source4/librpc/ndr/ndr_samr.c b/source4/librpc/ndr/ndr_samr.c
index 4669fd6270..7b4a637726 100644
--- a/source4/librpc/ndr/ndr_samr.c
+++ b/source4/librpc/ndr/ndr_samr.c
@@ -1680,7 +1680,8 @@ NTSTATUS ndr_pull_samr_UserInfo5(struct ndr_pull *ndr, int ndr_flags, struct sam
} else {
r->logon_hours = NULL;
}
- NDR_CHECK(ndr_pull_uint32(ndr, &r->unknown));
+ NDR_CHECK(ndr_pull_uint16(ndr, &r->bad_pwd_count));
+ NDR_CHECK(ndr_pull_uint16(ndr, &r->num_logons));
NDR_CHECK(ndr_pull_NTTIME(ndr, &r->last_pwd_change));
NDR_CHECK(ndr_pull_NTTIME(ndr, &r->acct_expiry));
NDR_CHECK(ndr_pull_uint32(ndr, &r->acct_flags));
@@ -3743,7 +3744,8 @@ void ndr_print_samr_UserInfo5(struct ndr_print *ndr, const char *name, struct sa
ndr_print_array_uint8(ndr, "logon_hours", r->logon_hours, r->units_per_week/8);
}
ndr->depth--;
- ndr_print_uint32(ndr, "unknown", r->unknown);
+ ndr_print_uint16(ndr, "bad_pwd_count", r->bad_pwd_count);
+ ndr_print_uint16(ndr, "num_logons", r->num_logons);
ndr_print_NTTIME(ndr, "last_pwd_change", r->last_pwd_change);
ndr_print_NTTIME(ndr, "acct_expiry", r->acct_expiry);
ndr_print_uint32(ndr, "acct_flags", r->acct_flags);
diff --git a/source4/librpc/ndr/ndr_samr.h b/source4/librpc/ndr/ndr_samr.h
index ef5f290680..11ae381639 100644
--- a/source4/librpc/ndr/ndr_samr.h
+++ b/source4/librpc/ndr/ndr_samr.h
@@ -736,7 +736,8 @@ struct samr_UserInfo5 {
NTTIME last_logoff;
uint32 units_per_week;
uint8 *logon_hours;
- uint32 unknown;
+ uint16 bad_pwd_count;
+ uint16 num_logons;
NTTIME last_pwd_change;
NTTIME acct_expiry;
uint32 acct_flags;