diff options
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/auth.h | 25 | ||||
| -rw-r--r-- | source3/include/proto.h | 26 |
2 files changed, 17 insertions, 34 deletions
diff --git a/source3/include/auth.h b/source3/include/auth.h index b7089b8c0a..659c6be103 100644 --- a/source3/include/auth.h +++ b/source3/include/auth.h @@ -19,27 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ -struct auth_usersupplied_info { - DATA_BLOB lm_resp; - DATA_BLOB nt_resp; - DATA_BLOB lm_interactive_pwd; - DATA_BLOB nt_interactive_pwd; - DATA_BLOB plaintext_password; - - bool encrypted; - struct { - char *account_name; /* username before/after mapping */ - char *domain_name; /* username before/after mapping */ - } client, mapped; - - bool was_mapped; /* Did the username map actually match? */ - char *internal_username; /* username after mapping */ - const char *workstation_name; /* workstation name (netbios calling - * name) unicode string */ - - uint32 logon_parameters; - -}; +#include "../auth/common_auth.h" struct extra_auth_info { struct dom_sid user_sid; @@ -155,6 +135,7 @@ struct auth_init_function_entry { struct auth_ntlmssp_state; /* Changed from 1 -> 2 to add the logon_parameters field. */ -#define AUTH_INTERFACE_VERSION 2 +/* Changed from 2 -> 3 when we reworked many auth structures to use IDL or be in common with Samba4 */ +#define AUTH_INTERFACE_VERSION 3 #endif /* _SMBAUTH_H_ */ diff --git a/source3/include/proto.h b/source3/include/proto.h index bc55eaff07..02faf880ec 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -79,13 +79,15 @@ NTSTATUS auth_unix_init(void); /* The following definitions come from auth/auth_util.c */ NTSTATUS make_user_info_map(struct auth_usersupplied_info **user_info, - const char *smb_name, - const char *client_domain, + const char *smb_name, + const char *client_domain, const char *workstation_name, - DATA_BLOB *lm_pwd, DATA_BLOB *nt_pwd, - DATA_BLOB *lm_interactive_pwd, DATA_BLOB *nt_interactive_pwd, - DATA_BLOB *plaintext, - bool encrypted); + DATA_BLOB *lm_pwd, + DATA_BLOB *nt_pwd, + const struct samr_Password *lm_interactive_pwd, + const struct samr_Password *nt_interactive_pwd, + const char *plaintext, + enum auth_password_state password_state); bool make_user_info_netlogon_network(struct auth_usersupplied_info **user_info, const char *smb_name, const char *client_domain, @@ -160,7 +162,7 @@ bool is_trusted_domain(const char* dom_name); /* The following definitions come from auth/user_info.c */ -NTSTATUS make_user_info(struct auth_usersupplied_info **user_info, +NTSTATUS make_user_info(struct auth_usersupplied_info **ret_user_info, const char *smb_name, const char *internal_username, const char *client_domain, @@ -168,10 +170,10 @@ NTSTATUS make_user_info(struct auth_usersupplied_info **user_info, const char *workstation_name, const DATA_BLOB *lm_pwd, const DATA_BLOB *nt_pwd, - const DATA_BLOB *lm_interactive_pwd, - const DATA_BLOB *nt_interactive_pwd, - const DATA_BLOB *plaintext, - bool encrypted); + const struct samr_Password *lm_interactive_pwd, + const struct samr_Password *nt_interactive_pwd, + const char *plaintext_password, + enum auth_password_state password_state); void free_user_info(struct auth_usersupplied_info **user_info); /* The following definitions come from auth/auth_winbind.c */ @@ -226,7 +228,7 @@ bool smb_pam_close_session(char *in_user, char *tty, char *rhost); void dfs_unlogin(void); NTSTATUS pass_check(const struct passwd *pass, const char *user, const char *password, - int pwlen, bool (*fn) (const char *, const char *), bool run_cracker); + bool (*fn) (const char *, const char *), bool run_cracker); /* The following definitions come from auth/token_util.c */ |