diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-09-17 15:24:20 -0700 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-09-17 15:24:20 -0700 |
| commit | 39971fff27f71b514308d10d7a2d8c3fb58c2420 (patch) | |
| tree | 101f2adac9ef41af17579d22f6ddd56ada62ce5d /source4/auth/gensec/spnego.c | |
| parent | 23676b6e9e8aad0ac2aa78d04e65f637b4551527 (diff) | |
| parent | e71d9728f52e969e07927c5b38fa062c6ef6d1eb (diff) | |
| download | samba-39971fff27f71b514308d10d7a2d8c3fb58c2420.tar.gz samba-39971fff27f71b514308d10d7a2d8c3fb58c2420.tar.bz2 samba-39971fff27f71b514308d10d7a2d8c3fb58c2420.zip | |
Merge branch 'master' of /home/tridge/samba/git/combined
Diffstat (limited to 'source4/auth/gensec/spnego.c')
| -rw-r--r-- | source4/auth/gensec/spnego.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source4/auth/gensec/spnego.c b/source4/auth/gensec/spnego.c index b3567202c1..977d52ec10 100644 --- a/source4/auth/gensec/spnego.c +++ b/source4/auth/gensec/spnego.c @@ -23,7 +23,7 @@ */ #include "includes.h" -#include "auth/gensec/spnego.h" +#include "../libcli/auth/spnego.h" #include "librpc/gen_ndr/ndr_dcerpc.h" #include "auth/credentials/credentials.h" #include "auth/gensec/gensec.h" @@ -628,7 +628,8 @@ static NTSTATUS gensec_spnego_create_negTokenInit(struct gensec_security *gensec /* List the remaining mechs as options */ spnego_out.negTokenInit.mechTypes = send_mech_types; - spnego_out.negTokenInit.reqFlags = 0; + spnego_out.negTokenInit.reqFlags = null_data_blob; + spnego_out.negTokenInit.reqFlagsPadding = 0; if (spnego_state->state_position == SPNEGO_SERVER_START) { /* server credentials */ @@ -844,7 +845,8 @@ static NTSTATUS gensec_spnego_update(struct gensec_security *gensec_security, TA /* compose reply */ spnego_out.type = SPNEGO_NEG_TOKEN_INIT; spnego_out.negTokenInit.mechTypes = my_mechs; - spnego_out.negTokenInit.reqFlags = 0; + spnego_out.negTokenInit.reqFlags = null_data_blob; + spnego_out.negTokenInit.reqFlagsPadding = 0; spnego_out.negTokenInit.mechListMIC = null_data_blob; spnego_out.negTokenInit.mechToken = unwrapped_out; |