Author: abartlet Date: 2006-10-24 08:08:03 +0000 (Tue, 24 Oct 2006) New Revision: 19479
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19479 Log: Remove more unused functions. These are handled via authentication abstractions now. Andrew Bartlett Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc.c branches/SAMBA_4_0/source/librpc/rpc/dcerpc_auth.c Changeset: Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc.c =================================================================== --- branches/SAMBA_4_0/source/librpc/rpc/dcerpc.c 2006-10-24 07:56:59 UTC (rev 19478) +++ branches/SAMBA_4_0/source/librpc/rpc/dcerpc.c 2006-10-24 08:08:03 UTC (rev 19479) @@ -52,7 +52,7 @@ /* initialise a dcerpc connection. the event context is optional */ -struct dcerpc_connection *dcerpc_connection_init(TALLOC_CTX *mem_ctx, +static struct dcerpc_connection *dcerpc_connection_init(TALLOC_CTX *mem_ctx, struct event_context *ev) { struct dcerpc_connection *c; @@ -734,22 +734,6 @@ } /* - perform a bind using the given syntax - - the auth_info structure is updated with the reply authentication info - on success -*/ -NTSTATUS dcerpc_bind(struct dcerpc_pipe *p, - TALLOC_CTX *mem_ctx, - const struct dcerpc_syntax_id *syntax, - const struct dcerpc_syntax_id *transfer_syntax) -{ - struct composite_context *creq; - creq = dcerpc_bind_send(p, mem_ctx, syntax, transfer_syntax); - return dcerpc_bind_recv(creq); -} - -/* perform a continued bind (and auth3) */ NTSTATUS dcerpc_auth3(struct dcerpc_connection *c, @@ -785,41 +769,6 @@ /* - return the rpc syntax and transfer syntax given the pipe uuid and version -*/ -NTSTATUS dcerpc_init_syntaxes(const struct dcerpc_interface_table *table, - struct dcerpc_syntax_id *syntax, - struct dcerpc_syntax_id *transfer_syntax) -{ - syntax->uuid = table->syntax_id.uuid; - syntax->if_version = table->syntax_id.if_version; - - *transfer_syntax = ndr_transfer_syntax; - - return NT_STATUS_OK; -} - -/* perform a dcerpc bind, using the uuid as the key */ -NTSTATUS dcerpc_bind_byuuid(struct dcerpc_pipe *p, - TALLOC_CTX *mem_ctx, - const struct dcerpc_interface_table *table) -{ - struct dcerpc_syntax_id syntax; - struct dcerpc_syntax_id transfer_syntax; - NTSTATUS status; - - status = dcerpc_init_syntaxes(table, - &syntax, &transfer_syntax); - if (!NT_STATUS_IS_OK(status)) { - DEBUG(2,("Invalid uuid string in dcerpc_bind_byuuid\n")); - return status; - } - - return dcerpc_bind(p, mem_ctx, &syntax, &transfer_syntax); -} - - -/* process a fragment received from the transport layer during a request Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc_auth.c =================================================================== --- branches/SAMBA_4_0/source/librpc/rpc/dcerpc_auth.c 2006-10-24 07:56:59 UTC (rev 19478) +++ branches/SAMBA_4_0/source/librpc/rpc/dcerpc_auth.c 2006-10-24 08:08:03 UTC (rev 19479) @@ -27,7 +27,22 @@ #include "auth/gensec/gensec.h" #include "librpc/rpc/dcerpc.h" +/* + return the rpc syntax and transfer syntax given the pipe uuid and version +*/ +static NTSTATUS dcerpc_init_syntaxes(const struct dcerpc_interface_table *table, + struct dcerpc_syntax_id *syntax, + struct dcerpc_syntax_id *transfer_syntax) +{ + syntax->uuid = table->syntax_id.uuid; + syntax->if_version = table->syntax_id.if_version; + *transfer_syntax = ndr_transfer_syntax; + + return NT_STATUS_OK; +} + + /* Send request to do a non-authenticated dcerpc bind */