diff options
| author | Günther Deschner <gd@samba.org> | 2008-10-29 01:14:08 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2008-10-29 08:57:51 +0100 |
| commit | 8e4c691c0aa406eedf52afb5cee33ff1540c0f8d (patch) | |
| tree | 12e546568675427c295dfa5f94ff477c33529ef0 /source4/librpc | |
| parent | 8f52c33401f0cd12184335507271ae9141618679 (diff) | |
| download | samba-8e4c691c0aa406eedf52afb5cee33ff1540c0f8d.tar.gz samba-8e4c691c0aa406eedf52afb5cee33ff1540c0f8d.tar.bz2 samba-8e4c691c0aa406eedf52afb5cee33ff1540c0f8d.zip | |
s4-netlogon: merge netr_ServerAuthenticate{2,3} from s3 idl.
Guenther
Diffstat (limited to 'source4/librpc')
| -rw-r--r-- | source4/librpc/idl/netlogon.idl | 9 | ||||
| -rw-r--r-- | source4/librpc/rpc/dcerpc_schannel.c | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/source4/librpc/idl/netlogon.idl b/source4/librpc/idl/netlogon.idl index 1c25ecbd13..9f6c1e756e 100644 --- a/source4/librpc/idl/netlogon.idl +++ b/source4/librpc/idl/netlogon.idl @@ -330,7 +330,8 @@ interface netlogon [in,string,charset(UTF16)] uint16 account_name[], [in] netr_SchannelType secure_channel_type, [in,string,charset(UTF16)] uint16 computer_name[], - [in,out,ref] netr_Credential *credentials + [in,ref] netr_Credential *credentials, + [out,ref] netr_Credential *return_credentials ); @@ -929,7 +930,8 @@ interface netlogon [in] [string,charset(UTF16)] uint16 account_name[], [in] netr_SchannelType secure_channel_type, [in] [string,charset(UTF16)] uint16 computer_name[], - [in,out,ref] netr_Credential *credentials, + [in,ref] netr_Credential *credentials, + [out,ref] netr_Credential *return_credentials, [in,out,ref] netr_NegotiateFlags *negotiate_flags ); @@ -1109,7 +1111,8 @@ interface netlogon [in] [string,charset(UTF16)] uint16 account_name[], [in] netr_SchannelType secure_channel_type, [in] [string,charset(UTF16)] uint16 computer_name[], - [in,out,ref] netr_Credential *credentials, + [in,ref] netr_Credential *credentials, + [out,ref] netr_Credential *return_credentials, [in,out,ref] netr_NegotiateFlags *negotiate_flags, [out,ref] uint32 *rid ); diff --git a/source4/librpc/rpc/dcerpc_schannel.c b/source4/librpc/rpc/dcerpc_schannel.c index 5588b43dcd..35adc8b42e 100644 --- a/source4/librpc/rpc/dcerpc_schannel.c +++ b/source4/librpc/rpc/dcerpc_schannel.c @@ -178,7 +178,7 @@ static void continue_srv_challenge(struct rpc_request *req) s->a.in.negotiate_flags = &s->negotiate_flags; s->a.in.credentials = &s->credentials3; s->a.out.negotiate_flags = &s->negotiate_flags; - s->a.out.credentials = &s->credentials3; + s->a.out.return_credentials = &s->credentials3; /* authenticate on the netlogon pipe - a rpc request over secondary pipe @@ -207,7 +207,7 @@ static void continue_srv_auth2(struct rpc_request *req) if (!composite_is_ok(c)) return; /* verify credentials */ - if (!creds_client_check(s->creds, s->a.out.credentials)) { + if (!creds_client_check(s->creds, s->a.out.return_credentials)) { composite_error(c, NT_STATUS_UNSUCCESSFUL); return; } |