The Samba-Bugzilla – Attachment 7162 Details for
Bug 8618
nt_printing_migrate writes path to driver files into registry
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
proposed fix
fix-migrate-printer-code-bug-8618.patch (text/plain), 2.24 KB, created by
Björn Baumbach
on 2011-12-06 15:18:50 UTC
(
hide
)
Description:
proposed fix
Filename:
MIME Type:
Creator:
Björn Baumbach
Created:
2011-12-06 15:18:50 UTC
Size:
2.24 KB
patch
obsolete
>From f94132f40236026abd932ef729e68dc8eeebdf98 Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?Bj=C3=B6rn=20Baumbach?= <bb@sernet.de> >Date: Fri, 18 Nov 2011 18:54:56 +0100 >Subject: [PATCH] s3-printing: fix migrate printer code (bug 8618) > >Removed path from driver files. >We only need the basenames. >--- > source3/printing/nt_printing_migrate.c | 27 +++++++++++++++++++++++++++ > 1 files changed, 27 insertions(+), 0 deletions(-) > >diff --git a/source3/printing/nt_printing_migrate.c b/source3/printing/nt_printing_migrate.c >index e927a23..6eb2f44 100644 >--- a/source3/printing/nt_printing_migrate.c >+++ b/source3/printing/nt_printing_migrate.c >@@ -3,6 +3,7 @@ > * RPC Pipe client / server routines > * > * Copyright (c) Andreas Schneider 2010. >+ * Copyright (C) Bjoern Baumbach <bb@sernet.de> 2011 > * > * This program is free software; you can redistribute it and/or modify > * it under the terms of the GNU General Public License as published by >@@ -27,6 +28,20 @@ > #include "librpc/gen_ndr/ndr_security.h" > #include "rpc_client/cli_winreg_spoolss.h" > >+static const char *driver_file_basename(const char *file) >+{ >+ const char *basefile; >+ >+ basefile = strrchr(file, '\\'); >+ if (basefile == NULL) { >+ basefile = file; >+ } else { >+ basefile++; >+ } >+ >+ return basefile; >+} >+ > NTSTATUS printing_tdb_migrate_form(TALLOC_CTX *mem_ctx, > struct rpc_pipe_client *winreg_pipe, > const char *key_name, >@@ -100,6 +115,7 @@ NTSTATUS printing_tdb_migrate_driver(TALLOC_CTX *mem_ctx, > WERROR result; > const char *driver_name; > uint32_t driver_version; >+ int i; > > blob = data_blob_const(data, length); > >@@ -118,8 +134,19 @@ NTSTATUS printing_tdb_migrate_driver(TALLOC_CTX *mem_ctx, > ZERO_STRUCT(d3); > ZERO_STRUCT(a); > >+ /* remove paths from file names */ >+ if (r.dependent_files != NULL) { >+ for (i = 0 ; r.dependent_files[i] != NULL; i++) { >+ r.dependent_files[i] = driver_file_basename(r.dependent_files[i]); >+ } >+ } > a.string = r.dependent_files; > >+ r.driverpath = driver_file_basename(r.driverpath); >+ r.configfile = driver_file_basename(r.configfile); >+ r.datafile = driver_file_basename(r.datafile); >+ r.helpfile = driver_file_basename(r.helpfile); >+ > d3.architecture = r.environment; > d3.config_file = r.configfile; > d3.data_file = r.datafile; >-- >1.7.3.4 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Flags:
asn
:
review+
gd
:
review+
Actions:
View
Attachments on
bug 8618
:
7120
|
7125
|
7126
| 7162 |
12540
|
12568
|
12569
|
12570