diff options
| author | Günther Deschner <gd@samba.org> | 2011-07-01 15:39:11 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2011-07-04 15:06:41 +0200 |
| commit | ff94539f276bdef73bd12c67bff1f34e697ccbfc (patch) | |
| tree | 467d34718dd4eb23d27175a65c0faf7bb6d334b7 /source3/utils | |
| parent | 0ac4f6492803b58bff1d49a4b94524bc33750cd7 (diff) | |
| download | samba-ff94539f276bdef73bd12c67bff1f34e697ccbfc.tar.gz samba-ff94539f276bdef73bd12c67bff1f34e697ccbfc.tar.bz2 samba-ff94539f276bdef73bd12c67bff1f34e697ccbfc.zip | |
s3-printing: open up a winreg pipe handle for the migration code.
Guenther
Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Mon Jul 4 15:06:41 CEST 2011 on sn-devel-104
Diffstat (limited to 'source3/utils')
| -rw-r--r-- | source3/utils/net_printing.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/source3/utils/net_printing.c b/source3/utils/net_printing.c index c919d3775e..9c2f70082d 100644 --- a/source3/utils/net_printing.c +++ b/source3/utils/net_printing.c @@ -23,10 +23,12 @@ #include "system/filesys.h" #include "utils/net.h" #include "rpc_client/rpc_client.h" +#include "rpc_client/cli_pipe.h" #include "librpc/gen_ndr/ndr_ntprinting.h" #include "librpc/gen_ndr/ndr_spoolss.h" #include "../libcli/security/security.h" #include "../librpc/gen_ndr/ndr_security.h" +#include "../librpc/gen_ndr/ndr_winreg.h" #include "util_tdb.h" #include "printing/nt_printing_migrate.h" @@ -231,12 +233,22 @@ static NTSTATUS printing_migrate_internal(struct net_context *c, TDB_CONTEXT *tdb; TDB_DATA kbuf, dbuf; NTSTATUS status; + struct rpc_pipe_client *winreg_pipe = NULL; tmp_ctx = talloc_new(mem_ctx); if (tmp_ctx == NULL) { return NT_STATUS_NO_MEMORY; } + status = cli_rpc_pipe_open_noauth(rpc_pipe_np_smb_conn(pipe_hnd), + &ndr_table_winreg.syntax_id, + &winreg_pipe); + if (!NT_STATUS_IS_OK(status)) { + d_fprintf(stderr, _("failed to open winreg pipe: %s\n"), + nt_errstr(status)); + goto done; + } + tdb = tdb_open_log(argv[0], 0, TDB_DEFAULT, O_RDONLY, 0600); if (tdb == NULL) { d_fprintf(stderr, _("failed to open tdb file: %s\n"), argv[0]); @@ -256,6 +268,7 @@ static NTSTATUS printing_migrate_internal(struct net_context *c, if (strncmp((const char *) kbuf.dptr, FORMS_PREFIX, strlen(FORMS_PREFIX)) == 0) { printing_tdb_migrate_form(tmp_ctx, pipe_hnd, + winreg_pipe, (const char *) kbuf.dptr + strlen(FORMS_PREFIX), dbuf.dptr, dbuf.dsize); @@ -266,6 +279,7 @@ static NTSTATUS printing_migrate_internal(struct net_context *c, if (strncmp((const char *) kbuf.dptr, DRIVERS_PREFIX, strlen(DRIVERS_PREFIX)) == 0) { printing_tdb_migrate_driver(tmp_ctx, pipe_hnd, + winreg_pipe, (const char *) kbuf.dptr + strlen(DRIVERS_PREFIX), dbuf.dptr, dbuf.dsize); @@ -276,6 +290,7 @@ static NTSTATUS printing_migrate_internal(struct net_context *c, if (strncmp((const char *) kbuf.dptr, PRINTERS_PREFIX, strlen(PRINTERS_PREFIX)) == 0) { printing_tdb_migrate_printer(tmp_ctx, pipe_hnd, + winreg_pipe, (const char *) kbuf.dptr + strlen(PRINTERS_PREFIX), dbuf.dptr, dbuf.dsize); @@ -286,6 +301,7 @@ static NTSTATUS printing_migrate_internal(struct net_context *c, if (strncmp((const char *) kbuf.dptr, SECDESC_PREFIX, strlen(SECDESC_PREFIX)) == 0) { printing_tdb_migrate_secdesc(tmp_ctx, pipe_hnd, + winreg_pipe, (const char *) kbuf.dptr + strlen(SECDESC_PREFIX), dbuf.dptr, dbuf.dsize); |