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/libsmb | |
| 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/libsmb')
| -rw-r--r-- | source3/libsmb/clifsinfo.c | 2 | ||||
| -rw-r--r-- | source3/libsmb/ntlmssp_wrap.c | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/source3/libsmb/clifsinfo.c b/source3/libsmb/clifsinfo.c index e0e42bded7..ff15624c60 100644 --- a/source3/libsmb/clifsinfo.c +++ b/source3/libsmb/clifsinfo.c @@ -610,7 +610,7 @@ NTSTATUS cli_raw_ntlm_smb_encryption_start(struct cli_state *cli, DATA_BLOB blob_out = data_blob_null; DATA_BLOB param_out = data_blob_null; NTSTATUS status = NT_STATUS_UNSUCCESSFUL; - struct auth_ntlmssp_state *auth_ntlmssp_state; + struct auth_generic_state *auth_ntlmssp_state; struct smb_trans_enc_state *es = make_cli_enc_state(SMB_TRANS_ENC_NTLM); if (!es) { diff --git a/source3/libsmb/ntlmssp_wrap.c b/source3/libsmb/ntlmssp_wrap.c index 5b11db0ee4..de3d0a1bf2 100644 --- a/source3/libsmb/ntlmssp_wrap.c +++ b/source3/libsmb/ntlmssp_wrap.c @@ -26,21 +26,21 @@ #include "librpc/rpc/dcerpc.h" #include "lib/param/param.h" -NTSTATUS auth_ntlmssp_set_username(struct auth_ntlmssp_state *ans, +NTSTATUS auth_ntlmssp_set_username(struct auth_generic_state *ans, const char *user) { cli_credentials_set_username(ans->credentials, user, CRED_SPECIFIED); return NT_STATUS_OK; } -NTSTATUS auth_ntlmssp_set_domain(struct auth_ntlmssp_state *ans, +NTSTATUS auth_ntlmssp_set_domain(struct auth_generic_state *ans, const char *domain) { cli_credentials_set_domain(ans->credentials, domain, CRED_SPECIFIED); return NT_STATUS_OK; } -NTSTATUS auth_ntlmssp_set_password(struct auth_ntlmssp_state *ans, +NTSTATUS auth_ntlmssp_set_password(struct auth_generic_state *ans, const char *password) { cli_credentials_set_password(ans->credentials, password, CRED_SPECIFIED); @@ -153,15 +153,15 @@ static const struct gensec_security_ops gensec_ntlmssp3_client_ops = { .priority = GENSEC_NTLMSSP }; -NTSTATUS auth_ntlmssp_client_prepare(TALLOC_CTX *mem_ctx, struct auth_ntlmssp_state **auth_ntlmssp_state) +NTSTATUS auth_ntlmssp_client_prepare(TALLOC_CTX *mem_ctx, struct auth_generic_state **auth_ntlmssp_state) { - struct auth_ntlmssp_state *ans; + struct auth_generic_state *ans; NTSTATUS nt_status; struct gensec_settings *gensec_settings; struct loadparm_context *lp_ctx; - ans = talloc_zero(mem_ctx, struct auth_ntlmssp_state); + ans = talloc_zero(mem_ctx, struct auth_generic_state); if (!ans) { DEBUG(0,("auth_ntlmssp_start: talloc failed!\n")); return NT_STATUS_NO_MEMORY; @@ -203,7 +203,7 @@ NTSTATUS auth_ntlmssp_client_prepare(TALLOC_CTX *mem_ctx, struct auth_ntlmssp_st return NT_STATUS_OK; } -NTSTATUS auth_ntlmssp_client_start(struct auth_ntlmssp_state *ans) +NTSTATUS auth_ntlmssp_client_start(struct auth_generic_state *ans) { NTSTATUS status; |