s4:librpc: Rename ncacn_push_auth to dcerpc_ncacn_push_auth

Next commit will move this function to common librpc

Signed-off-by: Samuel Cabrero <scabrero@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c
index 21ae5bcbd8ddf7e9ebc6af723878caf5383df4b5..87a99a8df89e0550565388e9622780a596836015 100644 (file)
--- a/source4/librpc/rpc/dcerpc.c
+++ b/source4/librpc/rpc/dcerpc.c
@@ -1041,8 +1041,10 @@ struct tevent_req *dcerpc_bind_send(TALLOC_CTX *mem_ctx,
        pkt.u.bind.auth_info = data_blob(NULL, 0);
 
        /* construct the NDR form of the packet */
-       status = ncacn_push_auth(&blob, state, &pkt,
-                                p->conn->security_state.tmp_auth_info.out);
+       status = dcerpc_ncacn_push_auth(&blob,
+                               state,
+                               &pkt,
+                               p->conn->security_state.tmp_auth_info.out);
        if (tevent_req_nterror(req, status)) {
                return tevent_req_post(req, ev);
        }
@@ -1290,8 +1292,10 @@ NTSTATUS dcerpc_auth3(struct dcerpc_pipe *p,
        }
 
        /* construct the NDR form of the packet */
-       status = ncacn_push_auth(&blob, mem_ctx, &pkt,
-                                p->conn->security_state.tmp_auth_info.out);
+       status = dcerpc_ncacn_push_auth(&blob,
+                               mem_ctx,
+                               &pkt,
+                               p->conn->security_state.tmp_auth_info.out);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
@@ -2126,8 +2130,10 @@ struct tevent_req *dcerpc_alter_context_send(TALLOC_CTX *mem_ctx,
        pkt.u.alter.auth_info = data_blob(NULL, 0);
 
        /* construct the NDR form of the packet */
-       status = ncacn_push_auth(&blob, state, &pkt,
-                                p->conn->security_state.tmp_auth_info.out);
+       status = dcerpc_ncacn_push_auth(&blob,
+                               state,
+                               &pkt,
+                               p->conn->security_state.tmp_auth_info.out);
        if (tevent_req_nterror(req, status)) {
                return tevent_req_post(req, ev);
        }

diff --git a/source4/librpc/rpc/dcerpc_util.c b/source4/librpc/rpc/dcerpc_util.c
index 294ccfc174330e144bc1df2a1cb4969295df4c54..f2db5875af35278862d75722cdf13f25e5cf0e4f 100644 (file)
--- a/source4/librpc/rpc/dcerpc_util.c
+++ b/source4/librpc/rpc/dcerpc_util.c
@@ -52,9 +52,10 @@ const struct ndr_interface_call *dcerpc_iface_find_call(const struct ndr_interfa
 /* 
    push a ncacn_packet into a blob, potentially with auth info
 */
-NTSTATUS ncacn_push_auth(DATA_BLOB *blob, TALLOC_CTX *mem_ctx, 
-                        struct ncacn_packet *pkt,
-                        struct dcerpc_auth *auth_info)
+NTSTATUS dcerpc_ncacn_push_auth(DATA_BLOB *blob,
+                               TALLOC_CTX *mem_ctx,
+                               struct ncacn_packet *pkt,
+                               struct dcerpc_auth *auth_info)
 {
        struct ndr_push *ndr;
        enum ndr_err_code ndr_err;

diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c
index c16d76e0436fd6c5b54d5a371e42ce7e1c698388..e879cba82f8d9c8c81353b7a35602e46300daa8d 100644 (file)
--- a/source4/rpc_server/dcerpc_server.c
+++ b/source4/rpc_server/dcerpc_server.c
@@ -762,7 +762,7 @@ static NTSTATUS dcesrv_bind_nak(struct dcesrv_call_state *call, uint32_t reason)
                return NT_STATUS_NO_MEMORY;
        }
 
-       status = ncacn_push_auth(&rep->blob, call, &pkt, NULL);
+       status = dcerpc_ncacn_push_auth(&rep->blob, call, &pkt, NULL);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
@@ -1287,8 +1287,10 @@ static NTSTATUS dcesrv_auth_reply(struct dcesrv_call_state *call)
                return NT_STATUS_NO_MEMORY;
        }
 
-       status = ncacn_push_auth(&rep->blob, call, pkt,
-                                call->out_auth_info);
+       status = dcerpc_ncacn_push_auth(&rep->blob,
+                                       call,
+                                       pkt,
+                                       call->out_auth_info);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }

diff --git a/source4/rpc_server/dcesrv_reply.c b/source4/rpc_server/dcesrv_reply.c
index 68e0bd9e5189161f678b80a4a82bc888532ddec0..33f2e51db907606fc07fe9ca7d1456d8b30e43d3 100644 (file)
--- a/source4/rpc_server/dcesrv_reply.c
+++ b/source4/rpc_server/dcesrv_reply.c
@@ -116,7 +116,7 @@ NTSTATUS dcesrv_fault_with_flags(struct dcesrv_call_state *call,
                return NT_STATUS_NO_MEMORY;
        }
 
-       status = ncacn_push_auth(&rep->blob, call, &pkt, NULL);
+       status = dcerpc_ncacn_push_auth(&rep->blob, call, &pkt, NULL);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }