s3-rpc_cli: pass down ndr_interface_table to rpc_pipe_open_interface().

Guenther

Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/source3/printing/nt_printing_migrate_internal.c b/source3/printing/nt_printing_migrate_internal.c
index 200db07fe2f529f5a300b67924a3df250f480b11..6bc7ea2e8ecb8792a538c2a5518c023cfd9fc99b 100644 (file)
--- a/source3/printing/nt_printing_migrate_internal.c
+++ b/source3/printing/nt_printing_migrate_internal.c
@@ -211,7 +211,7 @@ bool nt_printing_tdb_migrate(struct messaging_context *msg_ctx)
        }
 
        status = rpc_pipe_open_interface(tmp_ctx,
-                                       &ndr_table_winreg.syntax_id,
+                                       &ndr_table_winreg,
                                        session_info,
                                        NULL,
                                        msg_ctx,

diff --git a/source3/printing/printspoolss.c b/source3/printing/printspoolss.c
index fc1e9c12e31ea5d75196fc6ae8c3b562047889cd..0507e834466eb7ed6680219f90c539d144e6819c 100644 (file)
--- a/source3/printing/printspoolss.c
+++ b/source3/printing/printspoolss.c
@@ -154,7 +154,7 @@ NTSTATUS print_spool_open(files_struct *fsp,
         * a job id */
 
        status = rpc_pipe_open_interface(fsp->conn,
-                                        &ndr_table_spoolss.syntax_id,
+                                        &ndr_table_spoolss,
                                         fsp->conn->session_info,
                                         fsp->conn->sconn->remote_address,
                                         fsp->conn->sconn->msg_ctx,
@@ -343,7 +343,7 @@ void print_spool_terminate(struct connection_struct *conn,
        rap_jobid_delete(print_file->svcname, print_file->jobid);
 
        status = rpc_pipe_open_interface(conn,
-                                        &ndr_table_spoolss.syntax_id,
+                                        &ndr_table_spoolss,
                                         conn->session_info,
                                         conn->sconn->remote_address,
                                         conn->sconn->msg_ctx,

diff --git a/source3/rpc_server/rpc_ncacn_np.c b/source3/rpc_server/rpc_ncacn_np.c
index b4602a91d5ab1bc73d617a84c6a6c31e7a1c9114..7389b3ec70228b6797bd00d2fcb446491e064c91 100644 (file)
--- a/source3/rpc_server/rpc_ncacn_np.c
+++ b/source3/rpc_server/rpc_ncacn_np.c
@@ -758,7 +758,7 @@ done:
  */
 
 NTSTATUS rpc_pipe_open_interface(TALLOC_CTX *mem_ctx,
-                                const struct ndr_syntax_id *syntax,
+                                const struct ndr_interface_table *table,
                                 const struct auth_session_info *session_info,
                                 const struct tsocket_address *remote_address,
                                 struct messaging_context *msg_ctx,
@@ -783,7 +783,7 @@ NTSTATUS rpc_pipe_open_interface(TALLOC_CTX *mem_ctx,
                return NT_STATUS_NO_MEMORY;
        }
 
-       pipe_name = get_pipe_name_from_syntax(tmp_ctx, syntax);
+       pipe_name = get_pipe_name_from_syntax(tmp_ctx, &table->syntax_id);
        if (pipe_name == NULL) {
                status = NT_STATUS_INVALID_PARAMETER;
                goto done;
@@ -800,7 +800,7 @@ NTSTATUS rpc_pipe_open_interface(TALLOC_CTX *mem_ctx,
        switch (pipe_mode) {
        case RPC_SERVICE_MODE_EMBEDDED:
                status = rpc_pipe_open_internal(tmp_ctx,
-                                               syntax, session_info,
+                                               &table->syntax_id, session_info,
                                                remote_address, msg_ctx,
                                                &cli);
                if (!NT_STATUS_IS_OK(status)) {
@@ -813,7 +813,7 @@ NTSTATUS rpc_pipe_open_interface(TALLOC_CTX *mem_ctx,
                 * to spoolssd. */
 
                status = rpc_pipe_open_external(tmp_ctx,
-                                               pipe_name, syntax,
+                                               pipe_name, &table->syntax_id,
                                                session_info,
                                                &cli);
                if (!NT_STATUS_IS_OK(status)) {

diff --git a/source3/rpc_server/rpc_ncacn_np.h b/source3/rpc_server/rpc_ncacn_np.h
index 586d61bea2cfa660955cee67852f13fa88c1ef6d..67cd8a1285400bba3b4e94ad24c561fd9ce29b81 100644 (file)
--- a/source3/rpc_server/rpc_ncacn_np.h
+++ b/source3/rpc_server/rpc_ncacn_np.h
@@ -50,7 +50,7 @@ NTSTATUS rpcint_binding_handle(TALLOC_CTX *mem_ctx,
                               struct messaging_context *msg_ctx,
                               struct dcerpc_binding_handle **binding_handle);
 NTSTATUS rpc_pipe_open_interface(TALLOC_CTX *mem_ctx,
-                                const struct ndr_syntax_id *syntax,
+                                const struct ndr_interface_table *table,
                                 const struct auth_session_info *session_info,
                                 const struct tsocket_address *remote_address,
                                 struct messaging_context *msg_ctx,

diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c
index 9278a3f71613717d328e7d111acff588711d81f6..51d5fbf2233b19b8141fa794be49870f35b4b1f6 100644 (file)
--- a/source3/smbd/lanman.c
+++ b/source3/smbd/lanman.c
@@ -832,7 +832,7 @@ static bool api_DosPrintQGetInfo(struct smbd_server_connection *sconn,
        }
 
        status = rpc_pipe_open_interface(conn,
-                                        &ndr_table_spoolss.syntax_id,
+                                        &ndr_table_spoolss,
                                         conn->session_info,
                                         conn->sconn->remote_address,
                                         conn->sconn->msg_ctx,
@@ -1029,7 +1029,7 @@ static bool api_DosPrintQEnum(struct smbd_server_connection *sconn,
        }
 
        status = rpc_pipe_open_interface(conn,
-                                        &ndr_table_spoolss.syntax_id,
+                                        &ndr_table_spoolss,
                                         conn->session_info,
                                         conn->sconn->remote_address,
                                         conn->sconn->msg_ctx,
@@ -2255,7 +2255,7 @@ static bool api_RNetShareAdd(struct smbd_server_connection *sconn,
                return false;
        }
 
-       status = rpc_pipe_open_interface(mem_ctx, &ndr_table_srvsvc.syntax_id,
+       status = rpc_pipe_open_interface(mem_ctx, &ndr_table_srvsvc,
                                        conn->session_info,
                                        conn->sconn->remote_address,
                                        conn->sconn->msg_ctx,
@@ -2367,7 +2367,7 @@ static bool api_RNetGroupEnum(struct smbd_server_connection *sconn,
        }
 
        status = rpc_pipe_open_interface(
-               talloc_tos(), &ndr_table_samr.syntax_id,
+               talloc_tos(), &ndr_table_samr,
                conn->session_info, conn->sconn->remote_address,
                conn->sconn->msg_ctx, &samr_pipe);
        if (!NT_STATUS_IS_OK(status)) {
@@ -2573,7 +2573,7 @@ static bool api_NetUserGetGroups(struct smbd_server_connection *sconn,
        endp = *rdata + *rdata_len;
 
        status = rpc_pipe_open_interface(
-               talloc_tos(), &ndr_table_samr.syntax_id,
+               talloc_tos(), &ndr_table_samr,
                conn->session_info, conn->sconn->remote_address,
                conn->sconn->msg_ctx, &samr_pipe);
        if (!NT_STATUS_IS_OK(status)) {
@@ -2765,7 +2765,7 @@ static bool api_RNetUserEnum(struct smbd_server_connection *sconn,
        endp = *rdata + *rdata_len;
 
        status = rpc_pipe_open_interface(
-               talloc_tos(), &ndr_table_samr.syntax_id,
+               talloc_tos(), &ndr_table_samr,
                conn->session_info, conn->sconn->remote_address,
                conn->sconn->msg_ctx, &samr_pipe);
        if (!NT_STATUS_IS_OK(status)) {
@@ -3030,7 +3030,7 @@ static bool api_SetUserPassword(struct smbd_server_connection *sconn,
        ZERO_STRUCT(domain_handle);
        ZERO_STRUCT(user_handle);
 
-       status = rpc_pipe_open_interface(mem_ctx, &ndr_table_samr.syntax_id,
+       status = rpc_pipe_open_interface(mem_ctx, &ndr_table_samr,
                                        conn->session_info,
                                        conn->sconn->remote_address,
                                        conn->sconn->msg_ctx,
@@ -3281,7 +3281,7 @@ static bool api_SamOEMChangePassword(struct smbd_server_connection *sconn,
        memcpy(password.data, data, 516);
        memcpy(hash.hash, data+516, 16);
 
-       status = rpc_pipe_open_interface(mem_ctx, &ndr_table_samr.syntax_id,
+       status = rpc_pipe_open_interface(mem_ctx, &ndr_table_samr,
                                        conn->session_info,
                                        conn->sconn->remote_address,
                                        conn->sconn->msg_ctx,
@@ -3378,7 +3378,7 @@ static bool api_RDosPrintJobDel(struct smbd_server_connection *sconn,
        ZERO_STRUCT(handle);
 
        status = rpc_pipe_open_interface(conn,
-                                        &ndr_table_spoolss.syntax_id,
+                                        &ndr_table_spoolss,
                                         conn->session_info,
                                         conn->sconn->remote_address,
                                         conn->sconn->msg_ctx,
@@ -3506,7 +3506,7 @@ static bool api_WPrintQueueCtrl(struct smbd_server_connection *sconn,
        ZERO_STRUCT(handle);
 
        status = rpc_pipe_open_interface(conn,
-                                        &ndr_table_spoolss.syntax_id,
+                                        &ndr_table_spoolss,
                                         conn->session_info,
                                         conn->sconn->remote_address,
                                         conn->sconn->msg_ctx,
@@ -3688,7 +3688,7 @@ static bool api_PrintJobInfo(struct smbd_server_connection *sconn,
        ZERO_STRUCT(handle);
 
        status = rpc_pipe_open_interface(conn,
-                                        &ndr_table_spoolss.syntax_id,
+                                        &ndr_table_spoolss,
                                         conn->session_info,
                                         conn->sconn->remote_address,
                                         conn->sconn->msg_ctx,
@@ -3865,7 +3865,7 @@ static bool api_RNetServerGetInfo(struct smbd_server_connection *sconn,
        p = *rdata;
        p2 = p + struct_len;
 
-       status = rpc_pipe_open_interface(mem_ctx, &ndr_table_srvsvc.syntax_id,
+       status = rpc_pipe_open_interface(mem_ctx, &ndr_table_srvsvc,
                                        conn->session_info,
                                        conn->sconn->remote_address,
                                        conn->sconn->msg_ctx,
@@ -4296,7 +4296,7 @@ static bool api_RNetUserGetInfo(struct smbd_server_connection *sconn,
        ZERO_STRUCT(domain_handle);
        ZERO_STRUCT(user_handle);
 
-       status = rpc_pipe_open_interface(mem_ctx, &ndr_table_samr.syntax_id,
+       status = rpc_pipe_open_interface(mem_ctx, &ndr_table_samr,
                                        conn->session_info,
                                        conn->sconn->remote_address,
                                        conn->sconn->msg_ctx,
@@ -4825,7 +4825,7 @@ static bool api_WPrintJobGetInfo(struct smbd_server_connection *sconn,
        ZERO_STRUCT(handle);
 
        status = rpc_pipe_open_interface(conn,
-                                        &ndr_table_spoolss.syntax_id,
+                                        &ndr_table_spoolss,
                                         conn->session_info,
                                         conn->sconn->remote_address,
                                         conn->sconn->msg_ctx,
@@ -4967,7 +4967,7 @@ static bool api_WPrintJobEnumerate(struct smbd_server_connection *sconn,
        ZERO_STRUCT(handle);
 
        status = rpc_pipe_open_interface(conn,
-                                        &ndr_table_spoolss.syntax_id,
+                                        &ndr_table_spoolss,
                                         conn->session_info,
                                         conn->sconn->remote_address,
                                         conn->sconn->msg_ctx,
@@ -5167,7 +5167,7 @@ static bool api_WPrintDestGetInfo(struct smbd_server_connection *sconn,
        ZERO_STRUCT(handle);
 
        status = rpc_pipe_open_interface(conn,
-                                        &ndr_table_spoolss.syntax_id,
+                                        &ndr_table_spoolss,
                                         conn->session_info,
                                         conn->sconn->remote_address,
                                         conn->sconn->msg_ctx,
@@ -5299,7 +5299,7 @@ static bool api_WPrintDestEnum(struct smbd_server_connection *sconn,
        queuecnt = 0;
 
        status = rpc_pipe_open_interface(conn,
-                                        &ndr_table_spoolss.syntax_id,
+                                        &ndr_table_spoolss,
                                         conn->session_info,
                                         conn->sconn->remote_address,
                                         conn->sconn->msg_ctx,
@@ -5610,7 +5610,7 @@ static bool api_RNetSessionEnum(struct smbd_server_connection *sconn,
        }
 
        status = rpc_pipe_open_interface(conn,
-                                        &ndr_table_srvsvc.syntax_id,
+                                        &ndr_table_srvsvc,
                                         conn->session_info,
                                         conn->sconn->remote_address,
                                         conn->sconn->msg_ctx,

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 2ae3ff4b1e68193fad3ceb8707c7df7fcb495847..3f59df8a261bea4d1f9ab6db2930194d22ee6ef9 100644 (file)
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -5636,7 +5636,7 @@ void reply_printqueue(struct smb_request *req)
                ZERO_STRUCT(handle);
 
                status = rpc_pipe_open_interface(conn,
-                                                &ndr_table_spoolss.syntax_id,
+                                                &ndr_table_spoolss,
                                                 conn->session_info,
                                                 conn->sconn->remote_address,
                                                 conn->sconn->msg_ctx,