diff options
author | Andrew Bartlett <abartlet@samba.org> | 2011-12-16 16:07:24 +1100 |
---|---|---|
committer | Stefan Metzmacher <metze@samba.org> | 2011-12-22 19:25:10 +0100 |
commit | 6391fff9dad8a2bd7033930e7d6ff5c8617701c6 (patch) | |
tree | 9ac96abf761a33af76cb3e397f71f4ebdfaaa7b9 /source3/include | |
parent | 0b7bc1c45c73beddc60e6da2fc415f2506b36e43 (diff) | |
download | samba-6391fff9dad8a2bd7033930e7d6ff5c8617701c6.tar.gz samba-6391fff9dad8a2bd7033930e7d6ff5c8617701c6.tar.bz2 samba-6391fff9dad8a2bd7033930e7d6ff5c8617701c6.zip |
s3-auth rename auth_ntlmssp_state -> auth_generic_state
This structure handles more than NTLMSSP now, at least when we are an AD DC
and so changing the name may avoid some confusion in the future.
Andrew Bartlett
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3/include')
-rw-r--r-- | source3/include/auth.h | 2 | ||||
-rw-r--r-- | source3/include/ntlmssp_wrap.h | 12 | ||||
-rw-r--r-- | source3/include/smb.h | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/source3/include/auth.h b/source3/include/auth.h index 5be5701baa..9d043bf54f 100644 --- a/source3/include/auth.h +++ b/source3/include/auth.h @@ -137,7 +137,7 @@ struct auth_init_function_entry { struct auth_init_function_entry *prev, *next; }; -struct auth_ntlmssp_state; +struct auth_generic_state; /* Changed from 1 -> 2 to add the logon_parameters field. */ /* Changed from 2 -> 3 when we reworked many auth structures to use IDL or be in common with Samba4 */ diff --git a/source3/include/ntlmssp_wrap.h b/source3/include/ntlmssp_wrap.h index 68032bbebc..4d791c335a 100644 --- a/source3/include/ntlmssp_wrap.h +++ b/source3/include/ntlmssp_wrap.h @@ -23,7 +23,7 @@ struct gensec_security; -struct auth_ntlmssp_state { +struct auth_generic_state { /* used only by server implementation */ struct auth_context *auth_context; @@ -34,14 +34,14 @@ struct auth_ntlmssp_state { struct gensec_security *gensec_security; }; -NTSTATUS auth_ntlmssp_set_username(struct auth_ntlmssp_state *ans, +NTSTATUS auth_ntlmssp_set_username(struct auth_generic_state *ans, const char *user); -NTSTATUS auth_ntlmssp_set_domain(struct auth_ntlmssp_state *ans, +NTSTATUS auth_ntlmssp_set_domain(struct auth_generic_state *ans, const char *domain); -NTSTATUS auth_ntlmssp_set_password(struct auth_ntlmssp_state *ans, +NTSTATUS auth_ntlmssp_set_password(struct auth_generic_state *ans, const char *password); NTSTATUS auth_ntlmssp_client_prepare(TALLOC_CTX *mem_ctx, - struct auth_ntlmssp_state **_ans); -NTSTATUS auth_ntlmssp_client_start(struct auth_ntlmssp_state *ans); + struct auth_generic_state **_ans); +NTSTATUS auth_ntlmssp_client_start(struct auth_generic_state *ans); #endif /* _NTLMSSP_WRAP_ */ diff --git a/source3/include/smb.h b/source3/include/smb.h index fed1f38359..1a116103f4 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -1215,7 +1215,7 @@ typedef struct user_struct { struct auth_session_info *session_info; - struct auth_ntlmssp_state *auth_ntlmssp_state; + struct auth_generic_state *auth_ntlmssp_state; } user_struct; /* |