diff options
Diffstat (limited to 'source4/librpc')
| -rw-r--r-- | source4/librpc/idl/misc.idl | 4 | ||||
| -rw-r--r-- | source4/librpc/idl/netlogon.idl | 14 | ||||
| -rw-r--r-- | source4/librpc/idl/samr.idl | 28 |
3 files changed, 21 insertions, 25 deletions
diff --git a/source4/librpc/idl/misc.idl b/source4/librpc/idl/misc.idl index 240c0026e3..548deeb21b 100644 --- a/source4/librpc/idl/misc.idl +++ b/source4/librpc/idl/misc.idl @@ -120,4 +120,8 @@ interface misc uint16 units_per_week; [size_is(1260), length_is(units_per_week/8)] uint8 *bitmap; } samr_LogonHours; + + typedef [public, flag(NDR_PAHEX)] struct { + uint8 hash[16]; + } samr_Password; } diff --git a/source4/librpc/idl/netlogon.idl b/source4/librpc/idl/netlogon.idl index 386a98856d..64d9afeac3 100644 --- a/source4/librpc/idl/netlogon.idl +++ b/source4/librpc/idl/netlogon.idl @@ -101,14 +101,10 @@ interface netlogon netr_String workstation; } netr_IdentityInfo; - typedef [flag(NDR_PAHEX)] struct { - uint8 data[16]; - } netr_Password; - typedef struct { netr_IdentityInfo identity_info; - netr_Password lmpassword; - netr_Password ntpassword; + samr_Password lmpassword; + samr_Password ntpassword; } netr_PasswordInfo; typedef [flag(NDR_PAHEX)] struct { @@ -300,7 +296,7 @@ interface netlogon [in] uint16 secure_channel_type, [in] unistr computer_name, [in] netr_Authenticator credential, - [in] netr_Password new_password, + [in] samr_Password new_password, [out] netr_Authenticator return_authenticator ); @@ -344,8 +340,8 @@ interface netlogon NTTIME PwLastSet; NTTIME AccountExpires; uint32 AccountControl; - netr_Password lmpw; - netr_Password ntpw; + samr_Password lmpw; + samr_Password ntpw; bool8 NTPwPresent; bool8 LMPwPresent; bool8 PwExpired; diff --git a/source4/librpc/idl/samr.idl b/source4/librpc/idl/samr.idl index eb45513db0..8d0a6c0584 100644 --- a/source4/librpc/idl/samr.idl +++ b/source4/librpc/idl/samr.idl @@ -808,10 +808,6 @@ /************************/ /* Function 0x26 */ - typedef [flag(NDR_PAHEX)] struct { - uint8 hash[16]; - } samr_Hash; - /* this is a password change interface that doesn't give the server the plaintext password. Depricated. @@ -819,15 +815,15 @@ NTSTATUS samr_ChangePasswordUser( [in,ref] policy_handle *handle, [in] bool8 lm_present, - [in] samr_Hash *old_lm_crypted, - [in] samr_Hash *new_lm_crypted, + [in] samr_Password *old_lm_crypted, + [in] samr_Password *new_lm_crypted, [in] bool8 nt_present, - [in] samr_Hash *old_nt_crypted, - [in] samr_Hash *new_nt_crypted, + [in] samr_Password *old_nt_crypted, + [in] samr_Password *new_nt_crypted, [in] bool8 cross1_present, - [in] samr_Hash *nt_cross, + [in] samr_Password *nt_cross, [in] bool8 cross2_present, - [in] samr_Hash *lm_cross + [in] samr_Password *lm_cross ); /************************/ @@ -1090,7 +1086,7 @@ [in] samr_AsciiName *server, [in,ref] samr_AsciiName *account, [in] samr_CryptPassword *password, - [in] samr_Hash *hash + [in] samr_Password *hash ); /************************/ @@ -1099,10 +1095,10 @@ [in] samr_Name *server, [in,ref] samr_Name *account, [in] samr_CryptPassword *nt_password, - [in] samr_Hash *nt_verifier, + [in] samr_Password *nt_verifier, [in] bool8 lm_change, [in] samr_CryptPassword *lm_password, - [in] samr_Hash *lm_verifier + [in] samr_Password *lm_verifier ); /************************/ @@ -1186,10 +1182,10 @@ [in] samr_Name *server, [in,ref] samr_Name *account, [in] samr_CryptPassword *nt_password, - [in] samr_Hash *nt_verifier, + [in] samr_Password *nt_verifier, [in] bool8 lm_change, [in] samr_CryptPassword *lm_password, - [in] samr_Hash *lm_verifier, + [in] samr_Password *lm_verifier, [in] samr_CryptPassword *password3, [out] samr_DomInfo1 *dominfo, [out] samr_ChangeReject *reject @@ -1236,7 +1232,7 @@ NTSTATUS samr_SetDsrmPassword( [in] samr_Name *name, [in] uint32 unknown, - [in] samr_Hash *hash + [in] samr_Password *hash ); |