The branch, v3-4-test has been updated
via e13b545ca914d3d84b94f1d7ecb958f093f3143b (commit)
from 74ce96d6b3762df63dafb69444ae8159495006b5 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -----------------------------------------------------------------
commit e13b545ca914d3d84b94f1d7ecb958f093f3143b
Author: Günther Deschner <[email protected]>
Date: Wed Mar 18 13:22:51 2009 +0100
s3-spoolss: remove custom syntax_spoolss and use the syntax defined in IDL.
Guenther
(cherry picked from commit 9fdeb7f7b319dca5dbd1fdaf24f01fb19e124fe6)
-----------------------------------------------------------------------
Summary of changes:
source3/include/rpc_dce.h | 2 -
source3/rpc_client/cli_pipe.c | 2 +-
source3/rpc_parse/parse_rpc.c | 10 -----
source3/rpc_server/srv_spoolss_nt.c | 2 +-
source3/rpcclient/cmd_spoolss.c | 68 +++++++++++++++++-----------------
source3/utils/net_ads.c | 2 +-
source3/utils/net_rpc.c | 36 +++++++++---------
source3/utils/net_rpc_printer.c | 10 +++---
8 files changed, 60 insertions(+), 72 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/rpc_dce.h b/source3/include/rpc_dce.h
index b63f0ea..580b14f 100644
--- a/source3/include/rpc_dce.h
+++ b/source3/include/rpc_dce.h
@@ -159,8 +159,6 @@ enum schannel_direction {
/* RPC_IFACE */
typedef struct ndr_syntax_id RPC_IFACE;
-extern const struct ndr_syntax_id syntax_spoolss;
-
#define RPC_IFACE_LEN (UUID_SIZE + 4)
/* RPC_HDR - dce rpc header */
diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index ef10c12..57f49fb 100644
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -65,7 +65,7 @@ static const struct pipe_id_info {
{ PIPE_SRVSVC, &ndr_table_srvsvc.syntax_id },
{ PIPE_WKSSVC, &ndr_table_wkssvc.syntax_id },
{ PIPE_WINREG, &ndr_table_winreg.syntax_id },
- { PIPE_SPOOLSS, &syntax_spoolss },
+ { PIPE_SPOOLSS, &ndr_table_spoolss.syntax_id },
{ PIPE_NETDFS, &ndr_table_netdfs.syntax_id },
{ PIPE_ECHO, &ndr_table_rpcecho.syntax_id },
{ PIPE_SHUTDOWN, &ndr_table_initshutdown.syntax_id },
diff --git a/source3/rpc_parse/parse_rpc.c b/source3/rpc_parse/parse_rpc.c
index 1477a4c..14a4eff 100644
--- a/source3/rpc_parse/parse_rpc.c
+++ b/source3/rpc_parse/parse_rpc.c
@@ -639,13 +639,3 @@ bool smb_io_rpc_auth_schannel_chk(const char *desc, int
auth_len,
return True;
}
-
-const struct ndr_syntax_id syntax_spoolss = {
- {
- 0x12345678, 0x1234, 0xabcd,
- { 0xef, 0x00 },
- { 0x01, 0x23,
- 0x45, 0x67, 0x89, 0xab }
- }, 0x01
-};
-
diff --git a/source3/rpc_server/srv_spoolss_nt.c
b/source3/rpc_server/srv_spoolss_nt.c
index 97223c9..2d191c1 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -2634,7 +2634,7 @@ static bool spoolss_connect_to_client(struct
rpc_pipe_client **pp_pipe,
* Now start the NT Domain stuff :-).
*/
- ret = cli_rpc_pipe_open_noauth(the_cli, &syntax_spoolss, pp_pipe);
+ ret = cli_rpc_pipe_open_noauth(the_cli, &ndr_table_spoolss.syntax_id,
pp_pipe);
if (!NT_STATUS_IS_OK(ret)) {
DEBUG(2,("spoolss_connect_to_client: unable to open the spoolss
pipe on machine %s. Error was : %s.\n",
remote_machine, nt_errstr(ret)));
diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c
index 053f0b2..ed877d0 100644
--- a/source3/rpcclient/cmd_spoolss.c
+++ b/source3/rpcclient/cmd_spoolss.c
@@ -2888,7 +2888,7 @@ static WERROR cmd_spoolss_printercmp(struct
rpc_pipe_client *cli,
if ( !NT_STATUS_IS_OK(nt_status) )
return WERR_GENERAL_FAILURE;
- nt_status = cli_rpc_pipe_open_noauth(cli_server2, &syntax_spoolss,
+ nt_status = cli_rpc_pipe_open_noauth(cli_server2,
&ndr_table_spoolss.syntax_id,
&cli2);
if (!NT_STATUS_IS_OK(nt_status)) {
printf("failed to open spoolss pipe on server %s (%s)\n",
@@ -3121,39 +3121,39 @@ struct cmd_set spoolss_commands[] = {
{ "SPOOLSS" },
- { "adddriver", RPC_RTYPE_WERROR, NULL,
cmd_spoolss_addprinterdriver, &syntax_spoolss, NULL, "Add a print driver",
"" },
- { "addprinter", RPC_RTYPE_WERROR, NULL,
cmd_spoolss_addprinterex, &syntax_spoolss, NULL, "Add a printer",
"" },
- { "deldriver", RPC_RTYPE_WERROR, NULL,
cmd_spoolss_deletedriver, &syntax_spoolss, NULL, "Delete a printer
driver", "" },
- { "deldriverex", RPC_RTYPE_WERROR, NULL,
cmd_spoolss_deletedriverex, &syntax_spoolss, NULL, "Delete a printer driver
with files", "" },
- { "enumdata", RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_data,
&syntax_spoolss, NULL, "Enumerate printer data", "" },
- { "enumdataex", RPC_RTYPE_WERROR, NULL,
cmd_spoolss_enum_data_ex, &syntax_spoolss, NULL, "Enumerate printer data
for a key", "" },
- { "enumkey", RPC_RTYPE_WERROR, NULL,
cmd_spoolss_enum_printerkey, &syntax_spoolss, NULL, "Enumerate printer
keys", "" },
- { "enumjobs", RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_jobs,
&syntax_spoolss, NULL, "Enumerate print jobs", "" },
- { "getjob", RPC_RTYPE_WERROR, NULL, cmd_spoolss_get_job,
&syntax_spoolss, NULL, "Get print job", "" },
- { "enumports", RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_ports,
&syntax_spoolss, NULL, "Enumerate printer ports", "" },
- { "enumdrivers", RPC_RTYPE_WERROR, NULL,
cmd_spoolss_enum_drivers, &syntax_spoolss, NULL, "Enumerate installed
printer drivers", "" },
- { "enumprinters", RPC_RTYPE_WERROR, NULL,
cmd_spoolss_enum_printers, &syntax_spoolss, NULL, "Enumerate printers",
"" },
- { "getdata", RPC_RTYPE_WERROR, NULL,
cmd_spoolss_getprinterdata, &syntax_spoolss, NULL, "Get print driver data",
"" },
- { "getdataex", RPC_RTYPE_WERROR, NULL,
cmd_spoolss_getprinterdataex, &syntax_spoolss, NULL, "Get printer driver data
with keyname", ""},
- { "getdriver", RPC_RTYPE_WERROR, NULL, cmd_spoolss_getdriver,
&syntax_spoolss, NULL, "Get print driver information", "" },
- { "getdriverdir", RPC_RTYPE_WERROR, NULL,
cmd_spoolss_getdriverdir, &syntax_spoolss, NULL, "Get print driver upload
directory", "" },
- { "getprinter", RPC_RTYPE_WERROR, NULL, cmd_spoolss_getprinter,
&syntax_spoolss, NULL, "Get printer info", "" },
- { "openprinter", RPC_RTYPE_WERROR, NULL,
cmd_spoolss_open_printer_ex, &syntax_spoolss, NULL, "Open printer handle",
"" },
- { "setdriver", RPC_RTYPE_WERROR, NULL, cmd_spoolss_setdriver,
&syntax_spoolss, NULL, "Set printer driver", "" },
- { "getprintprocdir", RPC_RTYPE_WERROR, NULL,
cmd_spoolss_getprintprocdir, &syntax_spoolss, NULL, "Get print processor
directory", "" },
- { "addform", RPC_RTYPE_WERROR, NULL, cmd_spoolss_addform,
&syntax_spoolss, NULL, "Add form", "" },
- { "setform", RPC_RTYPE_WERROR, NULL, cmd_spoolss_setform,
&syntax_spoolss, NULL, "Set form", "" },
- { "getform", RPC_RTYPE_WERROR, NULL, cmd_spoolss_getform,
&syntax_spoolss, NULL, "Get form", "" },
- { "deleteform", RPC_RTYPE_WERROR, NULL, cmd_spoolss_deleteform,
&syntax_spoolss, NULL, "Delete form", "" },
- { "enumforms", RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_forms,
&syntax_spoolss, NULL, "Enumerate forms", "" },
- { "setprinter", RPC_RTYPE_WERROR, NULL, cmd_spoolss_setprinter,
&syntax_spoolss, NULL, "Set printer comment", "" },
- { "setprintername", RPC_RTYPE_WERROR, NULL,
cmd_spoolss_setprintername, &syntax_spoolss, NULL, "Set printername",
"" },
- { "setprinterdata", RPC_RTYPE_WERROR, NULL,
cmd_spoolss_setprinterdata, &syntax_spoolss, NULL, "Set REG_SZ printer
data", "" },
- { "rffpcnex", RPC_RTYPE_WERROR, NULL, cmd_spoolss_rffpcnex,
&syntax_spoolss, NULL, "Rffpcnex test", "" },
- { "printercmp", RPC_RTYPE_WERROR, NULL, cmd_spoolss_printercmp,
&syntax_spoolss, NULL, "Printer comparison test", "" },
- { "enumprocs", RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_procs,
&syntax_spoolss, NULL, "Enumerate Print Processors", "" },
- { "enumprocdatatypes", RPC_RTYPE_WERROR, NULL,
cmd_spoolss_enum_proc_data_types, &syntax_spoolss, NULL, "Enumerate Print
Processor Data Types", "" },
- { "enummonitors", RPC_RTYPE_WERROR, NULL,
cmd_spoolss_enum_monitors, &syntax_spoolss, NULL, "Enumerate Print
Monitors", "" },
+ { "adddriver", RPC_RTYPE_WERROR, NULL,
cmd_spoolss_addprinterdriver, &ndr_table_spoolss.syntax_id, NULL, "Add a
print driver", "" },
+ { "addprinter", RPC_RTYPE_WERROR, NULL,
cmd_spoolss_addprinterex, &ndr_table_spoolss.syntax_id, NULL, "Add a
printer", "" },
+ { "deldriver", RPC_RTYPE_WERROR, NULL,
cmd_spoolss_deletedriver, &ndr_table_spoolss.syntax_id, NULL, "Delete a
printer driver", "" },
+ { "deldriverex", RPC_RTYPE_WERROR, NULL,
cmd_spoolss_deletedriverex, &ndr_table_spoolss.syntax_id, NULL, "Delete a
printer driver with files", "" },
+ { "enumdata", RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_data,
&ndr_table_spoolss.syntax_id, NULL, "Enumerate printer data",
"" },
+ { "enumdataex", RPC_RTYPE_WERROR, NULL,
cmd_spoolss_enum_data_ex, &ndr_table_spoolss.syntax_id, NULL, "Enumerate
printer data for a key", "" },
+ { "enumkey", RPC_RTYPE_WERROR, NULL,
cmd_spoolss_enum_printerkey, &ndr_table_spoolss.syntax_id, NULL, "Enumerate
printer keys", "" },
+ { "enumjobs", RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_jobs,
&ndr_table_spoolss.syntax_id, NULL, "Enumerate print jobs",
"" },
+ { "getjob", RPC_RTYPE_WERROR, NULL, cmd_spoolss_get_job,
&ndr_table_spoolss.syntax_id, NULL, "Get print job",
"" },
+ { "enumports", RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_ports,
&ndr_table_spoolss.syntax_id, NULL, "Enumerate printer ports",
"" },
+ { "enumdrivers", RPC_RTYPE_WERROR, NULL,
cmd_spoolss_enum_drivers, &ndr_table_spoolss.syntax_id, NULL, "Enumerate
installed printer drivers", "" },
+ { "enumprinters", RPC_RTYPE_WERROR, NULL,
cmd_spoolss_enum_printers, &ndr_table_spoolss.syntax_id, NULL, "Enumerate
printers", "" },
+ { "getdata", RPC_RTYPE_WERROR, NULL,
cmd_spoolss_getprinterdata, &ndr_table_spoolss.syntax_id, NULL, "Get print
driver data", "" },
+ { "getdataex", RPC_RTYPE_WERROR, NULL,
cmd_spoolss_getprinterdataex, &ndr_table_spoolss.syntax_id, NULL, "Get
printer driver data with keyname", ""},
+ { "getdriver", RPC_RTYPE_WERROR, NULL, cmd_spoolss_getdriver,
&ndr_table_spoolss.syntax_id, NULL, "Get print driver information",
"" },
+ { "getdriverdir", RPC_RTYPE_WERROR, NULL,
cmd_spoolss_getdriverdir, &ndr_table_spoolss.syntax_id, NULL, "Get print
driver upload directory", "" },
+ { "getprinter", RPC_RTYPE_WERROR, NULL, cmd_spoolss_getprinter,
&ndr_table_spoolss.syntax_id, NULL, "Get printer info",
"" },
+ { "openprinter", RPC_RTYPE_WERROR, NULL,
cmd_spoolss_open_printer_ex, &ndr_table_spoolss.syntax_id, NULL, "Open
printer handle", "" },
+ { "setdriver", RPC_RTYPE_WERROR, NULL, cmd_spoolss_setdriver,
&ndr_table_spoolss.syntax_id, NULL, "Set printer driver",
"" },
+ { "getprintprocdir", RPC_RTYPE_WERROR, NULL,
cmd_spoolss_getprintprocdir, &ndr_table_spoolss.syntax_id, NULL, "Get print
processor directory", "" },
+ { "addform", RPC_RTYPE_WERROR, NULL, cmd_spoolss_addform,
&ndr_table_spoolss.syntax_id, NULL, "Add form",
"" },
+ { "setform", RPC_RTYPE_WERROR, NULL, cmd_spoolss_setform,
&ndr_table_spoolss.syntax_id, NULL, "Set form",
"" },
+ { "getform", RPC_RTYPE_WERROR, NULL, cmd_spoolss_getform,
&ndr_table_spoolss.syntax_id, NULL, "Get form",
"" },
+ { "deleteform", RPC_RTYPE_WERROR, NULL, cmd_spoolss_deleteform,
&ndr_table_spoolss.syntax_id, NULL, "Delete form",
"" },
+ { "enumforms", RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_forms,
&ndr_table_spoolss.syntax_id, NULL, "Enumerate forms",
"" },
+ { "setprinter", RPC_RTYPE_WERROR, NULL, cmd_spoolss_setprinter,
&ndr_table_spoolss.syntax_id, NULL, "Set printer comment",
"" },
+ { "setprintername", RPC_RTYPE_WERROR, NULL,
cmd_spoolss_setprintername, &ndr_table_spoolss.syntax_id, NULL, "Set
printername", "" },
+ { "setprinterdata", RPC_RTYPE_WERROR, NULL,
cmd_spoolss_setprinterdata, &ndr_table_spoolss.syntax_id, NULL, "Set REG_SZ
printer data", "" },
+ { "rffpcnex", RPC_RTYPE_WERROR, NULL, cmd_spoolss_rffpcnex,
&ndr_table_spoolss.syntax_id, NULL, "Rffpcnex test", "" },
+ { "printercmp", RPC_RTYPE_WERROR, NULL, cmd_spoolss_printercmp,
&ndr_table_spoolss.syntax_id, NULL, "Printer comparison test", "" },
+ { "enumprocs", RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_procs,
&ndr_table_spoolss.syntax_id, NULL, "Enumerate Print Processors",
"" },
+ { "enumprocdatatypes", RPC_RTYPE_WERROR, NULL,
cmd_spoolss_enum_proc_data_types, &ndr_table_spoolss.syntax_id, NULL,
"Enumerate Print Processor Data Types", "" },
+ { "enummonitors", RPC_RTYPE_WERROR, NULL,
cmd_spoolss_enum_monitors, &ndr_table_spoolss.syntax_id, NULL, "Enumerate
Print Monitors", "" },
{ NULL }
};
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 58bbb70..2a66619 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -1662,7 +1662,7 @@ static int net_ads_printer_publish(struct net_context *c,
int argc, const char *
SAFE_FREE(srv_cn_escaped);
SAFE_FREE(printername_escaped);
- nt_status = cli_rpc_pipe_open_noauth(cli, &syntax_spoolss, &pipe_hnd);
+ nt_status = cli_rpc_pipe_open_noauth(cli, &ndr_table_spoolss.syntax_id,
&pipe_hnd);
if (!NT_STATUS_IS_OK(nt_status)) {
d_fprintf(stderr, "Unable to open a connnection to the spoolss
pipe on %s\n",
servername);
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index 241924f..42756f6 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -6421,30 +6421,30 @@ static int rpc_printer_migrate_all(struct net_context
*c, int argc,
return -1;
}
- ret = run_rpc_command(c, NULL, &syntax_spoolss, 0,
+ ret = run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0,
rpc_printer_migrate_printers_internals, argc,
argv);
if (ret)
return ret;
- ret = run_rpc_command(c, NULL, &syntax_spoolss, 0,
+ ret = run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0,
rpc_printer_migrate_drivers_internals, argc,
argv);
if (ret)
return ret;
- ret = run_rpc_command(c, NULL, &syntax_spoolss, 0,
+ ret = run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0,
rpc_printer_migrate_forms_internals, argc, argv);
if (ret)
return ret;
- ret = run_rpc_command(c, NULL, &syntax_spoolss, 0,
+ ret = run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0,
rpc_printer_migrate_settings_internals, argc,
argv);
if (ret)
return ret;
- return run_rpc_command(c, NULL, &syntax_spoolss, 0,
+ return run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0,
rpc_printer_migrate_security_internals, argc,
argv);
@@ -6475,7 +6475,7 @@ static int rpc_printer_migrate_drivers(struct net_context
*c, int argc,
return -1;
}
- return run_rpc_command(c, NULL, &syntax_spoolss, 0,
+ return run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0,
rpc_printer_migrate_drivers_internals,
argc, argv);
}
@@ -6505,7 +6505,7 @@ static int rpc_printer_migrate_forms(struct net_context
*c, int argc,
return -1;
}
- return run_rpc_command(c, NULL, &syntax_spoolss, 0,
+ return run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0,
rpc_printer_migrate_forms_internals,
argc, argv);
}
@@ -6535,7 +6535,7 @@ static int rpc_printer_migrate_printers(struct
net_context *c, int argc,
return -1;
}
- return run_rpc_command(c, NULL, &syntax_spoolss, 0,
+ return run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0,
rpc_printer_migrate_printers_internals,
argc, argv);
}
@@ -6565,7 +6565,7 @@ static int rpc_printer_migrate_security(struct
net_context *c, int argc,
return -1;
}
- return run_rpc_command(c, NULL, &syntax_spoolss, 0,
+ return run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0,
rpc_printer_migrate_security_internals,
argc, argv);
}
@@ -6595,7 +6595,7 @@ static int rpc_printer_migrate_settings(struct
net_context *c, int argc,
return -1;
}
- return run_rpc_command(c, NULL, &syntax_spoolss, 0,
+ return run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0,
rpc_printer_migrate_settings_internals,
argc, argv);
}
@@ -6691,7 +6691,7 @@ static int rpc_printer_list(struct net_context *c, int
argc, const char **argv)
return 0;
}
- return run_rpc_command(c, NULL, &syntax_spoolss, 0,
+ return run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0,
rpc_printer_list_internals,
argc, argv);
}
@@ -6716,7 +6716,7 @@ static int rpc_printer_driver_list(struct net_context *c,
int argc,
return 0;
}
- return run_rpc_command(c, NULL, &syntax_spoolss, 0,
+ return run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0,
rpc_printer_driver_list_internals,
argc, argv);
}
@@ -6741,7 +6741,7 @@ static int rpc_printer_publish_publish(struct net_context
*c, int argc,
return 0;
}
- return run_rpc_command(c, NULL, &syntax_spoolss, 0,
+ return run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0,
rpc_printer_publish_publish_internals,
argc, argv);
}
@@ -6765,7 +6765,7 @@ static int rpc_printer_publish_update(struct net_context
*c, int argc, const cha
return 0;
}
- return run_rpc_command(c, NULL, &syntax_spoolss, 0,
+ return run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0,
rpc_printer_publish_update_internals,
argc, argv);
}
@@ -6790,7 +6790,7 @@ static int rpc_printer_publish_unpublish(struct
net_context *c, int argc,
return 0;
}
- return run_rpc_command(c, NULL, &syntax_spoolss, 0,
+ return run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0,
rpc_printer_publish_unpublish_internals,
argc, argv);
}
@@ -6815,7 +6815,7 @@ static int rpc_printer_publish_list(struct net_context
*c, int argc,
return 0;
}
- return run_rpc_command(c, NULL, &syntax_spoolss, 0,
+ return run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0,
rpc_printer_publish_list_internals,
argc, argv);
}
@@ -6880,7 +6880,7 @@ static int rpc_printer_publish(struct net_context *c, int
argc,
net_display_usage_from_functable(func);
return 0;
}
- return run_rpc_command(c, NULL, &syntax_spoolss, 0,
+ return run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0,
rpc_printer_publish_list_internals,
argc, argv);
}
@@ -6983,7 +6983,7 @@ int net_rpc_printer(struct net_context *c, int argc,
const char **argv)
net_display_usage_from_functable(func);
return 0;
}
- return run_rpc_command(c, NULL, &syntax_spoolss, 0,
+ return run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0,
rpc_printer_list_internals,
argc, argv);
}
diff --git a/source3/utils/net_rpc_printer.c b/source3/utils/net_rpc_printer.c
index 6c55487..41fc50c 100644
--- a/source3/utils/net_rpc_printer.c
+++ b/source3/utils/net_rpc_printer.c
@@ -1479,7 +1479,7 @@ NTSTATUS rpc_printer_migrate_security_internals(struct
net_context *c,
/* connect destination PI_SPOOLSS */
nt_status = connect_dst_pipe(c, &cli_dst, &pipe_hnd_dst,
- &syntax_spoolss);
+ &ndr_table_spoolss.syntax_id);
if (!NT_STATUS_IS_OK(nt_status))
return nt_status;
@@ -1627,7 +1627,7 @@ NTSTATUS rpc_printer_migrate_forms_internals(struct
net_context *c,
/* connect destination PI_SPOOLSS */
nt_status = connect_dst_pipe(c, &cli_dst, &pipe_hnd_dst,
- &syntax_spoolss);
+ &ndr_table_spoolss.syntax_id);
if (!NT_STATUS_IS_OK(nt_status))
return nt_status;
@@ -1790,7 +1790,7 @@ NTSTATUS rpc_printer_migrate_drivers_internals(struct
net_context *c,
DEBUG(3,("copying printer-drivers\n"));
nt_status = connect_dst_pipe(c, &cli_dst, &pipe_hnd_dst,
- &syntax_spoolss);
+ &ndr_table_spoolss.syntax_id);
if (!NT_STATUS_IS_OK(nt_status))
return nt_status;
@@ -1997,7 +1997,7 @@ NTSTATUS rpc_printer_migrate_printers_internals(struct
net_context *c,
/* connect destination PI_SPOOLSS */
nt_status = connect_dst_pipe(c, &cli_dst, &pipe_hnd_dst,
- &syntax_spoolss);
+ &ndr_table_spoolss.syntax_id);
if (!NT_STATUS_IS_OK(nt_status))
return nt_status;
@@ -2160,7 +2160,7 @@ NTSTATUS rpc_printer_migrate_settings_internals(struct
net_context *c,
/* connect destination PI_SPOOLSS */
nt_status = connect_dst_pipe(c, &cli_dst, &pipe_hnd_dst,
- &syntax_spoolss);
+ &ndr_table_spoolss.syntax_id);
if (!NT_STATUS_IS_OK(nt_status))
return nt_status;
--
Samba Shared Repository
