s3:ntlmssp: remove unused get_global_myname() and get_domain() from ntlmssp_state

Inspired by the NTLMSSP merge work by Andrew Bartlett.

metze

Signed-off-by: Günther Deschner <gd@samba.org>

diff --git a/source3/include/ntlmssp.h b/source3/include/ntlmssp.h
index afed1901e511796f135fc553b3650f313fcb535e..0cf44885e5021511da5ed241e1b95abac4fe7ea7 100644 (file)
--- a/source3/include/ntlmssp.h
+++ b/source3/include/ntlmssp.h
@@ -125,9 +125,6 @@ struct ntlmssp_state
         */
        NTSTATUS (*check_password)(struct ntlmssp_state *ntlmssp_state, DATA_BLOB *nt_session_key, DATA_BLOB *lm_session_key);
 
-       const char *(*get_global_myname)(void);
-       const char *(*get_domain)(void);
-
        /* ntlmv2 */
 
        unsigned char send_sign_key[16];

diff --git a/source3/libsmb/ntlmssp.c b/source3/libsmb/ntlmssp.c
index e2bf4f224788bad6eff0a06cebbc3b6a01d6366a..1ca9810b5d09d33920829d3e2b5befaae737c4a8 100644 (file)
--- a/source3/libsmb/ntlmssp.c
+++ b/source3/libsmb/ntlmssp.c
@@ -941,10 +941,6 @@ NTSTATUS ntlmssp_server_start(TALLOC_CTX *mem_ctx,
                return NT_STATUS_NO_MEMORY;
        }
 
-       /* TODO: remove this */
-       ntlmssp_state->get_global_myname = global_myname;
-       ntlmssp_state->get_domain = lp_workgroup;
-
        *_ntlmssp_state = ntlmssp_state;
        return NT_STATUS_OK;
 }
@@ -1358,10 +1354,6 @@ NTSTATUS ntlmssp_client_start(TALLOC_CTX *mem_ctx,
                return NT_STATUS_NO_MEMORY;
        }
 
-       /* TODO: remove this */
-       ntlmssp_state->get_global_myname = global_myname;
-       ntlmssp_state->get_domain = lp_workgroup;
-
        *_ntlmssp_state = ntlmssp_state;
        return NT_STATUS_OK;
 }

diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c
index 929c11f5a9e284478879e5ceaefacce5b66a206c..226772eba8fc7a6bbe306626c9bf85e05921ca2f 100644 (file)
--- a/source3/utils/ntlm_auth.c
+++ b/source3/utils/ntlm_auth.c
@@ -729,12 +729,8 @@ static NTSTATUS ntlm_auth_start_ntlmssp_server(struct ntlmssp_state **ntlmssp_st
        /* Have we been given a local password, or should we ask winbind? */
        if (opt_password) {
                (*ntlmssp_state)->check_password = local_pw_check;
-               (*ntlmssp_state)->get_domain = lp_workgroup;
-               (*ntlmssp_state)->get_global_myname = global_myname;
        } else {
                (*ntlmssp_state)->check_password = winbind_pw_check;
-               (*ntlmssp_state)->get_domain = get_winbind_domain;
-               (*ntlmssp_state)->get_global_myname = get_winbind_netbios_name;
        }
        return NT_STATUS_OK;
 }