summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim McDonough <jmcd@samba.org>2004-02-12 16:10:35 +0000
committerJim McDonough <jmcd@samba.org>2004-02-12 16:10:35 +0000
commit595bec7bc9bb469d1209368aa5c04713fc9f4b6f (patch)
tree809bdf221b696871ae771aafa6bf50d130a61288
parent8437fd40bee34353ee7fe080b9d94d20eb3d6ee6 (diff)
downloadsamba-595bec7bc9bb469d1209368aa5c04713fc9f4b6f.tar.gz
samba-595bec7bc9bb469d1209368aa5c04713fc9f4b6f.tar.bz2
samba-595bec7bc9bb469d1209368aa5c04713fc9f4b6f.zip
More sync between HEAD and SAMBA_3_0
- passdb.h: replace UNKNOWN_3 with FIELDS_PRESENT - parse_samr.c: put comment back in...seems like we shouldn't lose info like this (This used to be commit 6b9efd2f4cd5cf042e2a04a08719a9fe83d54116)
-rw-r--r--source3/include/passdb.h2
-rw-r--r--source3/rpc_parse/parse_samr.c9
2 files changed, 10 insertions, 1 deletions
diff --git a/source3/include/passdb.h b/source3/include/passdb.h
index add286816c..139a753e8b 100644
--- a/source3/include/passdb.h
+++ b/source3/include/passdb.h
@@ -92,7 +92,7 @@ enum pdb_elements {
PDB_UNKNOWNSTR,
PDB_MUNGEDDIAL,
PDB_HOURS,
- PDB_UNKNOWN3,
+ PDB_FIELDS_PRESENT,
PDB_BAD_PASSWORD_COUNT,
PDB_LOGON_COUNT,
PDB_UNKNOWN6,
diff --git a/source3/rpc_parse/parse_samr.c b/source3/rpc_parse/parse_samr.c
index 7b2d886deb..d6f371d471 100644
--- a/source3/rpc_parse/parse_samr.c
+++ b/source3/rpc_parse/parse_samr.c
@@ -5994,6 +5994,15 @@ NTSTATUS init_sam_user_info21A(SAM_USER_INFO_21 *usr, SAM_ACCOUNT *pw, DOM_SID *
usr->group_rid = group_rid;
usr->acb_info = pdb_get_acct_ctrl(pw);
+ /*
+ Look at a user on a real NT4 PDC with usrmgr, press
+ 'ok'. Then you will see that fields_present is set to
+ 0x08f827fa. Look at the user immediately after that again,
+ and you will see that 0x00fffff is returned. This solves
+ the problem that you get access denied after having looked
+ at the user.
+ -- Volker
+ */
usr->fields_present = pdb_build_fields_present(pw);
usr->logon_divs = pdb_get_logon_divs(pw);