diff options
| author | Matthias Dieter Wallnöfer <mdw@samba.org> | 2010-07-04 22:34:43 +0200 |
|---|---|---|
| committer | Matthias Dieter Wallnöfer <mdw@samba.org> | 2010-07-05 15:35:54 +0200 |
| commit | 915ddf0dc74d2b36d5da2c1bf377a289291c13b8 (patch) | |
| tree | 141fa25d7bd40c2a9c26d2e39ae2dea2518b2984 | |
| parent | 3278554b3e8864bc412926b67faf8a924a4416c7 (diff) | |
| download | samba-915ddf0dc74d2b36d5da2c1bf377a289291c13b8.tar.gz samba-915ddf0dc74d2b36d5da2c1bf377a289291c13b8.tar.bz2 samba-915ddf0dc74d2b36d5da2c1bf377a289291c13b8.zip | |
samr.idl:UserInfo structures - fix some names according to MS-SAMR documentation
See MS-SAMR section "FULL IDL"
| -rw-r--r-- | librpc/idl/samr.idl | 6 | ||||
| -rw-r--r-- | source3/lib/netapi/user.c | 4 | ||||
| -rw-r--r-- | source3/rpc_server/srv_samr_nt.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/librpc/idl/samr.idl b/librpc/idl/samr.idl index da7b1aa82e..d977ddd427 100644 --- a/librpc/idl/samr.idl +++ b/librpc/idl/samr.idl @@ -806,7 +806,7 @@ import "misc.idl", "lsa.idl", "security.idl"; typedef struct { lsa_String comment; - lsa_String unknown; /* settable, but doesn't stick. probably obsolete */ + lsa_String reserved; /* settable, but doesn't stick. probably obsolete */ uint16 country_code; uint16 code_page; } samr_UserInfo2; @@ -982,7 +982,7 @@ import "misc.idl", "lsa.idl", "security.idl"; lsa_BinaryString parameters; lsa_BinaryString lm_owf_password; lsa_BinaryString nt_owf_password; - lsa_String unknown3; + lsa_String private_data; uint32 buf_count; [size_is(buf_count)] uint8 *buffer; uint32 rid; @@ -997,7 +997,7 @@ import "misc.idl", "lsa.idl", "security.idl"; uint8 lm_password_set; uint8 nt_password_set; uint8 password_expired; - uint8 unknown4; + uint8 private_data_sensitive; } samr_UserInfo21; typedef [public, flag(NDR_PAHEX)] struct { diff --git a/source3/lib/netapi/user.c b/source3/lib/netapi/user.c index dcc28e7af9..7107b32d88 100644 --- a/source3/lib/netapi/user.c +++ b/source3/lib/netapi/user.c @@ -113,7 +113,7 @@ static void convert_USER_INFO_X_to_samr_user_info21(struct USER_INFO_X *infoX, info21->parameters = zero_parameters; info21->lm_owf_password = zero_parameters; info21->nt_owf_password = zero_parameters; - info21->unknown3.string = NULL; + info21->private_data.string = NULL; info21->buf_count = 0; info21->buffer = NULL; info21->rid = infoX->usriX_user_id; @@ -128,7 +128,7 @@ static void convert_USER_INFO_X_to_samr_user_info21(struct USER_INFO_X *infoX, info21->lm_password_set = 0; info21->nt_password_set = 0; info21->password_expired = infoX->usriX_password_expired; - info21->unknown4 = 0; + info21->private_data_sensitive = 0; } /**************************************************************** diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c index 499f959475..7b74fd8e60 100644 --- a/source3/rpc_server/srv_samr_nt.c +++ b/source3/rpc_server/srv_samr_nt.c @@ -2464,7 +2464,7 @@ static NTSTATUS get_user_info_2(TALLOC_CTX *mem_ctx, struct samu *pw) { r->comment.string = talloc_strdup(mem_ctx, pdb_get_comment(pw)); - r->unknown.string = NULL; + r->reserved.string = NULL; r->country_code = 0; r->code_page = 0; |