s3-auth remove auth_ntlmssp_start(), call auth_generic_start() directly

[mat/samba.git] / source3 / smbd / sesssetup.c

diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index b7daa9e4f0988aee9daac047c901483f2115a7c4..04783a4fcd4482129efa7084c9a484de40b4bd3f 100644 (file)
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -636,7 +636,7 @@ static void reply_spnego_negotiate(struct smb_request *req,
 
        gensec_want_feature((*auth_ntlmssp_state)->gensec_security, GENSEC_FEATURE_SESSION_KEY);
 
-       status = auth_ntlmssp_start(*auth_ntlmssp_state);
+       status = auth_generic_start(*auth_ntlmssp_state, GENSEC_OID_NTLMSSP);
        if (!NT_STATUS_IS_OK(status)) {
                /* Kill the intermediate vuid */
                invalidate_vuid(sconn, vuid);
@@ -748,7 +748,7 @@ static void reply_spnego_auth(struct smb_request *req,
 
                gensec_want_feature((*auth_ntlmssp_state)->gensec_security, GENSEC_FEATURE_SESSION_KEY);
 
-               status = auth_ntlmssp_start(*auth_ntlmssp_state);
+               status = auth_generic_start(*auth_ntlmssp_state, GENSEC_OID_NTLMSSP);
                if (!NT_STATUS_IS_OK(status)) {
                        /* Kill the intermediate vuid */
                        invalidate_vuid(sconn, vuid);
@@ -1160,7 +1160,7 @@ static void reply_sesssetup_and_X_spnego(struct smb_request *req)
                        if (sconn->use_gensec_hook) {
                                status = auth_generic_start(vuser->auth_ntlmssp_state, GENSEC_OID_SPNEGO);
                        } else {
-                               status = auth_ntlmssp_start(vuser->auth_ntlmssp_state);
+                               status = auth_generic_start(vuser->auth_ntlmssp_state, GENSEC_OID_NTLMSSP);
                        }
                        if (!NT_STATUS_IS_OK(status)) {
                                /* Kill the intermediate vuid */