diff options
author | Gerald Carter <jerry@samba.org> | 2005-05-31 13:46:45 +0000 |
---|---|---|
committer | Gerald Carter <jerry@samba.org> | 2005-05-31 13:46:45 +0000 |
commit | a0ab7a47e277a4047d3daad43883dc6077979080 (patch) | |
tree | 31fc2c981f2de6044f41964d23a46ac51f82e419 /source/smbd/sesssetup.c | |
parent | 7e655eee5164362cb36d247d6251c848176c3a2f (diff) | |
download | samba-a0ab7a47e277a4047d3daad43883dc6077979080.tar.gz samba-a0ab7a47e277a4047d3daad43883dc6077979080.tar.xz samba-a0ab7a47e277a4047d3daad43883dc6077979080.zip |
r7139: trying to reduce the number of diffs between trunk and 3.0; changing version to 3.0.20pre1
Diffstat (limited to 'source/smbd/sesssetup.c')
-rw-r--r-- | source/smbd/sesssetup.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/source/smbd/sesssetup.c b/source/smbd/sesssetup.c index 9fbf0b1d51d..48524b472d2 100644 --- a/source/smbd/sesssetup.c +++ b/source/smbd/sesssetup.c @@ -25,12 +25,6 @@ uint32 global_client_caps = 0; -extern BOOL global_encrypted_passwords_negotiated; -extern BOOL global_spnego_negotiated; -extern enum protocol_types Protocol; -extern int max_send; -extern struct auth_context *negprot_global_auth_context; - static struct auth_ntlmssp_state *global_ntlmssp_state; /* @@ -319,9 +313,7 @@ static int reply_spnego_kerberos(connection_struct *conn, /* wrap that up in a nice GSS-API wrapping */ if (NT_STATUS_IS_OK(ret)) { - ap_rep_wrapped = spnego_gen_krb5_wrap( - ap_rep, - CONST_ADD(const uint8 *, TOK_ID_KRB_AP_REP)); + ap_rep_wrapped = spnego_gen_krb5_wrap(ap_rep, TOK_ID_KRB_AP_REP); } else { ap_rep_wrapped = data_blob(NULL, 0); } @@ -643,8 +635,13 @@ int reply_sesssetup_and_X(connection_struct *conn, char *inbuf,char *outbuf, fstring native_lanman; fstring primary_domain; static BOOL done_sesssetup = False; + extern BOOL global_encrypted_passwords_negotiated; + extern BOOL global_spnego_negotiated; + extern enum protocol_types Protocol; + extern int max_send; auth_usersupplied_info *user_info = NULL; + extern struct auth_context *negprot_global_auth_context; auth_serversupplied_info *server_info = NULL; NTSTATUS nt_status; |