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/auth | |
| 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/auth')
| -rw-r--r-- | source3/auth/auth_ntlmssp.c | 12 | ||||
| -rw-r--r-- | source3/auth/proto.h | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/source3/auth/auth_ntlmssp.c b/source3/auth/auth_ntlmssp.c index b57fda1ea7..082f10cf8c 100644 --- a/source3/auth/auth_ntlmssp.c +++ b/source3/auth/auth_ntlmssp.c @@ -211,13 +211,13 @@ static NTSTATUS auth_ntlmssp_check_password(struct ntlmssp_state *ntlmssp_state, } NTSTATUS auth_ntlmssp_prepare(const struct tsocket_address *remote_address, - struct auth_ntlmssp_state **auth_ntlmssp_state) + struct auth_generic_state **auth_ntlmssp_state) { struct auth_context *auth_context; - struct auth_ntlmssp_state *ans; + struct auth_generic_state *ans; NTSTATUS nt_status; - ans = talloc_zero(NULL, struct auth_ntlmssp_state); + ans = talloc_zero(NULL, struct auth_generic_state); if (!ans) { DEBUG(0,("auth_ntlmssp_start: talloc failed!\n")); return NT_STATUS_NO_MEMORY; @@ -371,7 +371,7 @@ static const struct gensec_security_ops gensec_ntlmssp3_server_ops = { .priority = GENSEC_NTLMSSP }; -NTSTATUS auth_generic_start(struct auth_ntlmssp_state *auth_ntlmssp_state, const char *oid) +NTSTATUS auth_generic_start(struct auth_generic_state *auth_ntlmssp_state, const char *oid) { struct gensec_ntlmssp_context *gensec_ntlmssp; NTSTATUS status; @@ -400,7 +400,7 @@ NTSTATUS auth_generic_start(struct auth_ntlmssp_state *auth_ntlmssp_state, const return NT_STATUS_OK; } -NTSTATUS auth_generic_authtype_start(struct auth_ntlmssp_state *auth_ntlmssp_state, +NTSTATUS auth_generic_authtype_start(struct auth_generic_state *auth_ntlmssp_state, uint8_t auth_type, uint8_t auth_level) { struct gensec_ntlmssp_context *gensec_ntlmssp; @@ -458,7 +458,7 @@ NTSTATUS auth_generic_authtype_start(struct auth_ntlmssp_state *auth_ntlmssp_sta return NT_STATUS_OK; } -NTSTATUS auth_ntlmssp_start(struct auth_ntlmssp_state *auth_ntlmssp_state) +NTSTATUS auth_ntlmssp_start(struct auth_generic_state *auth_ntlmssp_state) { return auth_generic_start(auth_ntlmssp_state, GENSEC_OID_NTLMSSP); } diff --git a/source3/auth/proto.h b/source3/auth/proto.h index bc2d58a811..b608c48e6e 100644 --- a/source3/auth/proto.h +++ b/source3/auth/proto.h @@ -70,10 +70,10 @@ NTSTATUS auth_netlogond_init(void); /* The following definitions come from auth/auth_ntlmssp.c */ NTSTATUS auth_ntlmssp_prepare(const struct tsocket_address *remote_address, - struct auth_ntlmssp_state **auth_ntlmssp_state); -NTSTATUS auth_ntlmssp_start(struct auth_ntlmssp_state *auth_ntlmssp_state); -NTSTATUS auth_generic_start(struct auth_ntlmssp_state *auth_ntlmssp_state, const char *oid); -NTSTATUS auth_generic_authtype_start(struct auth_ntlmssp_state *auth_ntlmssp_state, + struct auth_generic_state **auth_ntlmssp_state); +NTSTATUS auth_ntlmssp_start(struct auth_generic_state *auth_ntlmssp_state); +NTSTATUS auth_generic_start(struct auth_generic_state *auth_ntlmssp_state, const char *oid); +NTSTATUS auth_generic_authtype_start(struct auth_generic_state *auth_ntlmssp_state, uint8_t auth_type, uint8_t auth_level); |