sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code
a92b653af9
samba-mirror/source3/printing/nt_printing.c

5712 lines
161 KiB
C
Raw Normal View History

Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
/*
Stomped on some header file version numbers that have crept back in. (This used to be commit e66bdf1229ba84f64c19e817e2c4081dbbf0bee8)
2002-03-22 09:24:38 +03:00
* Unix SMB/CIFS implementation.
getprinter level 0: was to short, found most of the fields, undocumented, undecoded, nothing in MSDN, but now it works :-) cleanup of error codes. fixed some dfs declarations function. J.F. (This used to be commit 87da4404aba29a2ebd999886e4c06958c96d3e05)
2000-03-10 20:12:24 +03:00
* RPC Pipe client / server routines
* Copyright (C) Andrew Tridgell 1992-2000,
r196: merging struct uuid from trunk (This used to be commit 911a28361b9d8dd50597627f245ebfb57c6294fb)
2004-04-13 18:39:48 +04:00
* Copyright (C) Jean François Micouleau 1998-2000.
r8501: * disable printer handle object cache (was mostly used for NT4 clients enumerating printer data on slow CPUs) * fix pinter and secdesc record upgrade to normalize the key (rev'd printer tdb version) * fixed problem that was normalizing the printername name field in general, this should fix the issues upgrading print servers from 3.0.14a to 3.0.20 (This used to be commit d07179de2f2a6eb1d13d0e25ac10de1a21475559)
2005-07-15 18:26:11 +04:00
* Copyright (C) Gerald Carter 2002-2005.
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
*
getprinter level 0: was to short, found most of the fields, undocumented, undecoded, nothing in MSDN, but now it works :-) cleanup of error codes. fixed some dfs declarations function. J.F. (This used to be commit 87da4404aba29a2ebd999886e4c06958c96d3e05)
2000-03-10 20:12:24 +03:00
* 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
r23779: Change from v2 or later to v3 or later. Jeremy. (This used to be commit 407e6e695b8366369b7c76af1ff76869b45347b3)
2007-07-09 23:25:36 +04:00
* the Free Software Foundation; either version 3 of the License, or
getprinter level 0: was to short, found most of the fields, undocumented, undecoded, nothing in MSDN, but now it works :-) cleanup of error codes. fixed some dfs declarations function. J.F. (This used to be commit 87da4404aba29a2ebd999886e4c06958c96d3e05)
2000-03-10 20:12:24 +03:00
* (at your option) any later version.
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
*
getprinter level 0: was to short, found most of the fields, undocumented, undecoded, nothing in MSDN, but now it works :-) cleanup of error codes. fixed some dfs declarations function. J.F. (This used to be commit 87da4404aba29a2ebd999886e4c06958c96d3e05)
2000-03-10 20:12:24 +03:00
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
*
getprinter level 0: was to short, found most of the fields, undocumented, undecoded, nothing in MSDN, but now it works :-) cleanup of error codes. fixed some dfs declarations function. J.F. (This used to be commit 87da4404aba29a2ebd999886e4c06958c96d3e05)
2000-03-10 20:12:24 +03:00
* You should have received a copy of the GNU General Public License
r23801: The FSF has moved around a lot. This fixes their Mass Ave address. (This used to be commit 87c91e4362c51819032bfbebbb273c52e203b227)
2007-07-10 09:23:25 +04:00
* along with this program; if not, see <http://www.gnu.org/licenses/>.
getprinter level 0: was to short, found most of the fields, undocumented, undecoded, nothing in MSDN, but now it works :-) cleanup of error codes. fixed some dfs declarations function. J.F. (This used to be commit 87da4404aba29a2ebd999886e4c06958c96d3e05)
2000-03-10 20:12:24 +03:00
*/
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
#include "includes.h"
s3: only include gen_ndr headers where needed. This shrinks include/includes.h.gch by the size of 7 MB and reduces build time as follows: ccache build w/o patch real 4m21.529s ccache build with patch real 3m6.402s pch build w/o patch real 4m26.318s pch build with patch real 3m6.932s Guenther
2010-05-05 03:39:16 +04:00
#include "librpc/gen_ndr/messaging.h"
Make pcap headers private Signed-off-by: Günther Deschner <gd@samba.org>
2010-05-14 00:24:35 +04:00
#include "printing/pcap.h"
s3-registry: only include registry headers when really needed. Guenther
2009-10-02 02:17:06 +04:00
#include "registry.h"
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
split the nt_drivers.tdb in 3 separate tdb files. Should speed-up lookups J.F. (This used to be commit c08e22713ea4ddbc4951dc8dcc40609eb0039ddb)
2001-07-09 22:19:04 +04:00
static TDB_CONTEXT *tdb_forms; /* used for forms files */
static TDB_CONTEXT *tdb_drivers; /* used for driver files */
static TDB_CONTEXT *tdb_printers; /* used for printers files */
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
#define FORMS_PREFIX "FORMS/"
#define DRIVERS_PREFIX "DRIVERS/"
#define PRINTERS_PREFIX "PRINTERS/"
split the nt_drivers.tdb in 3 separate tdb files. Should speed-up lookups J.F. (This used to be commit c08e22713ea4ddbc4951dc8dcc40609eb0039ddb)
2001-07-09 22:19:04 +04:00
#define SECDESC_PREFIX "SECDESC/"
Bring printing in HEAD inline with 2.2.x and app-head. Jeremy. (This used to be commit 771ef92fc6e43725b7cc351079998a8acb74abef)
2002-02-09 07:10:24 +03:00
#define GLOBAL_C_SETPRINTER "GLOBALS/c_setprinter"
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
split the nt_drivers.tdb in 3 separate tdb files. Should speed-up lookups J.F. (This used to be commit c08e22713ea4ddbc4951dc8dcc40609eb0039ddb)
2001-07-09 22:19:04 +04:00
#define NTDRIVERS_DATABASE_VERSION_1 1
#define NTDRIVERS_DATABASE_VERSION_2 2
When re-writing tdb version numbers as little endian int32, we must change the version number also. Jeremy. (This used to be commit 3dec9cf99a82bd15626eb99e7d937ff00183cc05)
2002-01-09 08:24:07 +03:00
#define NTDRIVERS_DATABASE_VERSION_3 3 /* little endian version of v2 */
r7038: * upgrade version of nt*tdb files. Have to fix some issues in the printer security descriptors. Ensure that each printer sd has an oaner and group SID (BUILTIN\Administrators) and that we utilize more than the generic bits assigned in <= 3.0.14a. (This used to be commit c72182c1e20225a655376fd23915ac6053b94633)
2005-05-27 23:02:30 +04:00
#define NTDRIVERS_DATABASE_VERSION_4 4 /* fix generic bits in security descriptors */
r8501: * disable printer handle object cache (was mostly used for NT4 clients enumerating printer data on slow CPUs) * fix pinter and secdesc record upgrade to normalize the key (rev'd printer tdb version) * fixed problem that was normalizing the printername name field in general, this should fix the issues upgrading print servers from 3.0.14a to 3.0.20 (This used to be commit d07179de2f2a6eb1d13d0e25ac10de1a21475559)
2005-07-15 18:26:11 +04:00
#define NTDRIVERS_DATABASE_VERSION_5 5 /* normalize keys in ntprinters.tdb */
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
Changes from APPLIANCE_HEAD: source/Makefile.in - changes to ctags and etags rules that somehow got lost along the way. source/include/proto.h - make proto source/smbd/sec_ctx.c source/smbd/password.c - merge debugs for debugging user groups and NT token stuff. source/lib/util_str.c - capitalise domain name returned from parse_domain_user() source/nsswitch/wb_client.c - fix broken conditional in debug statement. source/include/rpc_secdes.h source/include/rpc_spoolss.h source/printing/nt_printing.c source/lib/util_seaccess.c - fix printer permission bugs related to ACE masks for printers. This adds mapping of generic access rights to object specific rights for NT printers. Still need to work out whether or not to ignore ACEs with certain flags set, though. See comments in util_seaccess.c:check_ace() for details. source/printing/nt_printing.c source/printing/printing.c - use PRINTER_ACCESS_ADMINISTER instead of JOB_ACCESS_ADMINISTER until we sort out printer/printjob permission stuff. (This used to be commit 1dba9c5cd1e6389734c648f6903abcb7c8d5b2f0)
2001-01-04 22:27:08 +03:00
/* Map generic permissions to printer object specific permissions */
r25534: Apply some const Why? It moves these structs from the data into the text segment, so they will never been copy-on-write copied. Not much, but as in German you say "Kleinvieh macht auch Mist...." (This used to be commit 0141e64ad4972232de867137064d0dae62da22ee)
2007-10-06 01:41:17 +04:00
const struct generic_mapping printer_generic_mapping = {
syncing up printing code with SAMBA_2_2 (already done some merges in the reverse). * add in new printer change notify code from SAMBA_2_2 * add in se_map_standard() from 2.2 in _spoolss_open_printer_ex() * sync up the _print_queue_struct in smb.h (why did someone change the user/file names in fs_user/fs_file (or vice-versa) ? ) * sync up some cli_spoolss_XXX functions (This used to be commit 5760315c1de4033fdc22684c940f18010010924f)
2002-03-15 11:14:10 +03:00
PRINTER_READ,
removed unnecessary memset (This used to be commit 233a24792ea305e92c15b43f57839391ca91d1b6)
2002-04-11 07:15:02 +04:00
PRINTER_WRITE,
syncing up printing code with SAMBA_2_2 (already done some merges in the reverse). * add in new printer change notify code from SAMBA_2_2 * add in se_map_standard() from 2.2 in _spoolss_open_printer_ex() * sync up the _print_queue_struct in smb.h (why did someone change the user/file names in fs_user/fs_file (or vice-versa) ? ) * sync up some cli_spoolss_XXX functions (This used to be commit 5760315c1de4033fdc22684c940f18010010924f)
2002-03-15 11:14:10 +03:00
PRINTER_EXECUTE,
PRINTER_ALL_ACCESS
};
r25534: Apply some const Why? It moves these structs from the data into the text segment, so they will never been copy-on-write copied. Not much, but as in German you say "Kleinvieh macht auch Mist...." (This used to be commit 0141e64ad4972232de867137064d0dae62da22ee)
2007-10-06 01:41:17 +04:00
const struct standard_mapping printer_std_mapping = {
Changes from APPLIANCE_HEAD: source/Makefile.in - changes to ctags and etags rules that somehow got lost along the way. source/include/proto.h - make proto source/smbd/sec_ctx.c source/smbd/password.c - merge debugs for debugging user groups and NT token stuff. source/lib/util_str.c - capitalise domain name returned from parse_domain_user() source/nsswitch/wb_client.c - fix broken conditional in debug statement. source/include/rpc_secdes.h source/include/rpc_spoolss.h source/printing/nt_printing.c source/lib/util_seaccess.c - fix printer permission bugs related to ACE masks for printers. This adds mapping of generic access rights to object specific rights for NT printers. Still need to work out whether or not to ignore ACEs with certain flags set, though. See comments in util_seaccess.c:check_ace() for details. source/printing/nt_printing.c source/printing/printing.c - use PRINTER_ACCESS_ADMINISTER instead of JOB_ACCESS_ADMINISTER until we sort out printer/printjob permission stuff. (This used to be commit 1dba9c5cd1e6389734c648f6903abcb7c8d5b2f0)
2001-01-04 22:27:08 +03:00
PRINTER_READ,
PRINTER_WRITE,
PRINTER_EXECUTE,
PRINTER_ALL_ACCESS
};
Merge of print server permission handling fixes from HEAD. (This used to be commit 62ee1f8c3fbcf83641bed881143a1a8c70f836ba)
2002-04-15 07:49:53 +04:00
/* Map generic permissions to print server object specific permissions */
r25534: Apply some const Why? It moves these structs from the data into the text segment, so they will never been copy-on-write copied. Not much, but as in German you say "Kleinvieh macht auch Mist...." (This used to be commit 0141e64ad4972232de867137064d0dae62da22ee)
2007-10-06 01:41:17 +04:00
const struct generic_mapping printserver_generic_mapping = {
Merge of print server permission handling fixes from HEAD. (This used to be commit 62ee1f8c3fbcf83641bed881143a1a8c70f836ba)
2002-04-15 07:49:53 +04:00
SERVER_READ,
SERVER_WRITE,
SERVER_EXECUTE,
SERVER_ALL_ACCESS
};
r25534: Apply some const Why? It moves these structs from the data into the text segment, so they will never been copy-on-write copied. Not much, but as in German you say "Kleinvieh macht auch Mist...." (This used to be commit 0141e64ad4972232de867137064d0dae62da22ee)
2007-10-06 01:41:17 +04:00
const struct generic_mapping printserver_std_mapping = {
Merge of print server permission handling fixes from HEAD. (This used to be commit 62ee1f8c3fbcf83641bed881143a1a8c70f836ba)
2002-04-15 07:49:53 +04:00
SERVER_READ,
SERVER_WRITE,
SERVER_EXECUTE,
SERVER_ALL_ACCESS
};
Try and fix bug #5095, "Manage Documents privilege is not functional". Should map the created sd to printer jobs, not printer. Jerry please test and I'll add to 3.2 if it passes. Thanks, Jeremy. (This used to be commit 0a1fe8d6013d925ab6695f6b7f189b731ec42ccc)
2008-05-06 03:24:52 +04:00
/* Map generic permissions to job object specific permissions */
const struct generic_mapping job_generic_mapping = {
JOB_READ,
JOB_WRITE,
JOB_EXECUTE,
JOB_ALL_ACCESS
};
Fix from John Reilly for forms ordering problems. Jeremy. (This used to be commit 837839eb3d0fae7fef5d61593862a2c1b00d6a07)
2000-09-29 01:33:08 +04:00
/* We need one default form to support our default printer. Msoft adds the
forms it wants and in the ORDER it wants them (note: DEVMODE papersize is an
array index). Letter is always first, so (for the current code) additions
always put things in the correct order. */
Merge from HEAD - make Samba compile with -Wwrite-strings without additional warnings. (Adds a lot of const). Andrew Bartlett (This used to be commit 3a7458f9472432ef12c43008414925fd1ce8ea0c)
2003-01-03 11:28:12 +03:00
static const nt_forms_struct default_forms[] = {
Sync up with new NT forms code. Jeremy. (This used to be commit 63ce316d870be0cf61ae669c955479ec175fdaef)
2001-04-04 02:41:31 +04:00
{"Letter",0x1,0x34b5c,0x44368,0x0,0x0,0x34b5c,0x44368},
{"Letter Small",0x1,0x34b5c,0x44368,0x0,0x0,0x34b5c,0x44368},
{"Tabloid",0x1,0x44368,0x696b8,0x0,0x0,0x44368,0x696b8},
{"Ledger",0x1,0x696b8,0x44368,0x0,0x0,0x696b8,0x44368},
{"Legal",0x1,0x34b5c,0x56d10,0x0,0x0,0x34b5c,0x56d10},
{"Statement",0x1,0x221b4,0x34b5c,0x0,0x0,0x221b4,0x34b5c},
{"Executive",0x1,0x2cf56,0x411cc,0x0,0x0,0x2cf56,0x411cc},
s3-spoolss: Added EN ISO 216, A0 and A1 to builtin forms. Signed-off-by: Andreas Schneider <asn@samba.org> Signed-off-by: Günther Deschner <gd@samba.org>
2010-05-12 20:36:30 +04:00
{"A0",0x1,0xcd528,0x122488,0x0,0x0,0xcd528,0x122488},
{"A1",0x1,0x91050,0xcd528,0x0,0x0,0x91050,0xcd528},
Sync up with new NT forms code. Jeremy. (This used to be commit 63ce316d870be0cf61ae669c955479ec175fdaef)
2001-04-04 02:41:31 +04:00
{"A3",0x1,0x48828,0x668a0,0x0,0x0,0x48828,0x668a0},
{"A4",0x1,0x33450,0x48828,0x0,0x0,0x33450,0x48828},
{"A4 Small",0x1,0x33450,0x48828,0x0,0x0,0x33450,0x48828},
{"A5",0x1,0x24220,0x33450,0x0,0x0,0x24220,0x33450},
{"B4 (JIS)",0x1,0x3ebe8,0x58de0,0x0,0x0,0x3ebe8,0x58de0},
{"B5 (JIS)",0x1,0x2c6f0,0x3ebe8,0x0,0x0,0x2c6f0,0x3ebe8},
{"Folio",0x1,0x34b5c,0x509d8,0x0,0x0,0x34b5c,0x509d8},
{"Quarto",0x1,0x347d8,0x43238,0x0,0x0,0x347d8,0x43238},
{"10x14",0x1,0x3e030,0x56d10,0x0,0x0,0x3e030,0x56d10},
{"11x17",0x1,0x44368,0x696b8,0x0,0x0,0x44368,0x696b8},
{"Note",0x1,0x34b5c,0x44368,0x0,0x0,0x34b5c,0x44368},
{"Envelope #9",0x1,0x18079,0x37091,0x0,0x0,0x18079,0x37091},
{"Envelope #10",0x1,0x19947,0x3ae94,0x0,0x0,0x19947,0x3ae94},
{"Envelope #11",0x1,0x1be7c,0x40565,0x0,0x0,0x1be7c,0x40565},
{"Envelope #12",0x1,0x1d74a,0x44368,0x0,0x0,0x1d74a,0x44368},
{"Envelope #14",0x1,0x1f018,0x47504,0x0,0x0,0x1f018,0x47504},
{"C size sheet",0x1,0x696b8,0x886d0,0x0,0x0,0x696b8,0x886d0},
{"D size sheet",0x1,0x886d0,0xd2d70,0x0,0x0,0x886d0,0xd2d70},
{"E size sheet",0x1,0xd2d70,0x110da0,0x0,0x0,0xd2d70,0x110da0},
{"Envelope DL",0x1,0x1adb0,0x35b60,0x0,0x0,0x1adb0,0x35b60},
{"Envelope C5",0x1,0x278d0,0x37e88,0x0,0x0,0x278d0,0x37e88},
{"Envelope C3",0x1,0x4f1a0,0x6fd10,0x0,0x0,0x4f1a0,0x6fd10},
{"Envelope C4",0x1,0x37e88,0x4f1a0,0x0,0x0,0x37e88,0x4f1a0},
{"Envelope C6",0x1,0x1bd50,0x278d0,0x0,0x0,0x1bd50,0x278d0},
{"Envelope C65",0x1,0x1bd50,0x37e88,0x0,0x0,0x1bd50,0x37e88},
{"Envelope B4",0x1,0x3d090,0x562e8,0x0,0x0,0x3d090,0x562e8},
{"Envelope B5",0x1,0x2af80,0x3d090,0x0,0x0,0x2af80,0x3d090},
{"Envelope B6",0x1,0x2af80,0x1e848,0x0,0x0,0x2af80,0x1e848},
{"Envelope",0x1,0x1adb0,0x38270,0x0,0x0,0x1adb0,0x38270},
{"Envelope Monarch",0x1,0x18079,0x2e824,0x0,0x0,0x18079,0x2e824},
{"6 3/4 Envelope",0x1,0x167ab,0x284ec,0x0,0x0,0x167ab,0x284ec},
{"US Std Fanfold",0x1,0x5c3e1,0x44368,0x0,0x0,0x5c3e1,0x44368},
{"German Std Fanfold",0x1,0x34b5c,0x4a6a0,0x0,0x0,0x34b5c,0x4a6a0},
{"German Legal Fanfold",0x1,0x34b5c,0x509d8,0x0,0x0,0x34b5c,0x509d8},
{"B4 (ISO)",0x1,0x3d090,0x562e8,0x0,0x0,0x3d090,0x562e8},
{"Japanese Postcard",0x1,0x186a0,0x24220,0x0,0x0,0x186a0,0x24220},
{"9x11",0x1,0x37cf8,0x44368,0x0,0x0,0x37cf8,0x44368},
{"10x11",0x1,0x3e030,0x44368,0x0,0x0,0x3e030,0x44368},
{"15x11",0x1,0x5d048,0x44368,0x0,0x0,0x5d048,0x44368},
{"Envelope Invite",0x1,0x35b60,0x35b60,0x0,0x0,0x35b60,0x35b60},
{"Reserved48",0x1,0x1,0x1,0x0,0x0,0x1,0x1},
{"Reserved49",0x1,0x1,0x1,0x0,0x0,0x1,0x1},
{"Letter Extra",0x1,0x3ae94,0x4a6a0,0x0,0x0,0x3ae94,0x4a6a0},
{"Legal Extra",0x1,0x3ae94,0x5d048,0x0,0x0,0x3ae94,0x5d048},
{"Tabloid Extra",0x1,0x4a6a0,0x6f9f0,0x0,0x0,0x4a6a0,0x6f9f0},
{"A4 Extra",0x1,0x397c2,0x4eb16,0x0,0x0,0x397c2,0x4eb16},
{"Letter Transverse",0x1,0x34b5c,0x44368,0x0,0x0,0x34b5c,0x44368},
{"A4 Transverse",0x1,0x33450,0x48828,0x0,0x0,0x33450,0x48828},
{"Letter Extra Transverse",0x1,0x3ae94,0x4a6a0,0x0,0x0,0x3ae94,0x4a6a0},
{"Super A",0x1,0x376b8,0x56ea0,0x0,0x0,0x376b8,0x56ea0},
{"Super B",0x1,0x4a768,0x76e58,0x0,0x0,0x4a768,0x76e58},
{"Letter Plus",0x1,0x34b5c,0x4eb16,0x0,0x0,0x34b5c,0x4eb16},
{"A4 Plus",0x1,0x33450,0x50910,0x0,0x0,0x33450,0x50910},
{"A5 Transverse",0x1,0x24220,0x33450,0x0,0x0,0x24220,0x33450},
{"B5 (JIS) Transverse",0x1,0x2c6f0,0x3ebe8,0x0,0x0,0x2c6f0,0x3ebe8},
{"A3 Extra",0x1,0x4e9d0,0x6ca48,0x0,0x0,0x4e9d0,0x6ca48},
{"A5 Extra",0x1,0x2a7b0,0x395f8,0x0,0x0,0x2a7b0,0x395f8},
{"B5 (ISO) Extra",0x1,0x31128,0x43620,0x0,0x0,0x31128,0x43620},
{"A2",0x1,0x668a0,0x91050,0x0,0x0,0x668a0,0x91050},
{"A3 Transverse",0x1,0x48828,0x668a0,0x0,0x0,0x48828,0x668a0},
{"A3 Extra Transverse",0x1,0x4e9d0,0x6ca48,0x0,0x0,0x4e9d0,0x6ca48},
{"Japanese Double Postcard",0x1,0x30d40,0x24220,0x0,0x0,0x30d40,0x24220},
{"A6",0x1,0x19a28,0x24220,0x0,0x0,0x19a28,0x24220},
{"Japanese Envelope Kaku #2",0x1,0x3a980,0x510e0,0x0,0x0,0x3a980,0x510e0},
{"Japanese Envelope Kaku #3",0x1,0x34bc0,0x43a08,0x0,0x0,0x34bc0,0x43a08},
{"Japanese Envelope Chou #3",0x1,0x1d4c0,0x395f8,0x0,0x0,0x1d4c0,0x395f8},
{"Japanese Envelope Chou #4",0x1,0x15f90,0x320c8,0x0,0x0,0x15f90,0x320c8},
{"Letter Rotated",0x1,0x44368,0x34b5c,0x0,0x0,0x44368,0x34b5c},
{"A3 Rotated",0x1,0x668a0,0x48828,0x0,0x0,0x668a0,0x48828},
{"A4 Rotated",0x1,0x48828,0x33450,0x0,0x0,0x48828,0x33450},
{"A5 Rotated",0x1,0x33450,0x24220,0x0,0x0,0x33450,0x24220},
{"B4 (JIS) Rotated",0x1,0x58de0,0x3ebe8,0x0,0x0,0x58de0,0x3ebe8},
{"B5 (JIS) Rotated",0x1,0x3ebe8,0x2c6f0,0x0,0x0,0x3ebe8,0x2c6f0},
{"Japanese Postcard Rotated",0x1,0x24220,0x186a0,0x0,0x0,0x24220,0x186a0},
{"Double Japan Postcard Rotated",0x1,0x24220,0x30d40,0x0,0x0,0x24220,0x30d40},
{"A6 Rotated",0x1,0x24220,0x19a28,0x0,0x0,0x24220,0x19a28},
{"Japan Envelope Kaku #2 Rotated",0x1,0x510e0,0x3a980,0x0,0x0,0x510e0,0x3a980},
{"Japan Envelope Kaku #3 Rotated",0x1,0x43a08,0x34bc0,0x0,0x0,0x43a08, 0x34bc0},
{"Japan Envelope Chou #3 Rotated",0x1,0x395f8,0x1d4c0,0x0,0x0,0x395f8,0x1d4c0},
{"Japan Envelope Chou #4 Rotated",0x1,0x320c8,0x15f90,0x0,0x0,0x320c8,0x15f90},
{"B6 (JIS)",0x1,0x1f400,0x2c6f0,0x0,0x0,0x1f400,0x2c6f0},
{"B6 (JIS) Rotated",0x1,0x2c6f0,0x1f400,0x0,0x0,0x2c6f0,0x1f400},
{"12x11",0x1,0x4a724,0x443e1,0x0,0x0,0x4a724,0x443e1},
{"Japan Envelope You #4",0x1,0x19a28,0x395f8,0x0,0x0,0x19a28,0x395f8},
{"Japan Envelope You #4 Rotated",0x1,0x395f8,0x19a28,0x0,0x0,0x395f8,0x19a28},
{"PRC 16K",0x1,0x2de60,0x3f7a0,0x0,0x0,0x2de60,0x3f7a0},
{"PRC 32K",0x1,0x1fbd0,0x2cec0,0x0,0x0,0x1fbd0,0x2cec0},
{"PRC 32K(Big)",0x1,0x222e0,0x318f8,0x0,0x0,0x222e0,0x318f8},
{"PRC Envelope #1",0x1,0x18e70,0x28488,0x0,0x0,0x18e70,0x28488},
{"PRC Envelope #2",0x1,0x18e70,0x2af80,0x0,0x0,0x18e70,0x2af80},
{"PRC Envelope #3",0x1,0x1e848,0x2af80,0x0,0x0,0x1e848,0x2af80},
{"PRC Envelope #4",0x1,0x1adb0,0x32c80,0x0,0x0,0x1adb0,0x32c80},
{"PRC Envelope #5",0x1,0x1adb0,0x35b60,0x0,0x0,0x1adb0,0x35b60},
{"PRC Envelope #6",0x1,0x1d4c0,0x38270,0x0,0x0,0x1d4c0,0x38270},
{"PRC Envelope #7",0x1,0x27100,0x38270,0x0,0x0,0x27100,0x38270},
{"PRC Envelope #8",0x1,0x1d4c0,0x4b708,0x0,0x0,0x1d4c0,0x4b708},
{"PRC Envelope #9",0x1,0x37e88,0x4f1a0,0x0,0x0,0x37e88,0x4f1a0},
{"PRC Envelope #10",0x1,0x4f1a0,0x6fd10,0x0,0x0,0x4f1a0,0x6fd10},
{"PRC 16K Rotated",0x1,0x3f7a0,0x2de60,0x0,0x0,0x3f7a0,0x2de60},
{"PRC 32K Rotated",0x1,0x2cec0,0x1fbd0,0x0,0x0,0x2cec0,0x1fbd0},
{"PRC 32K(Big) Rotated",0x1,0x318f8,0x222e0,0x0,0x0,0x318f8,0x222e0},
{"PRC Envelope #1 Rotated",0x1,0x28488,0x18e70,0x0,0x0,0x28488,0x18e70},
{"PRC Envelope #2 Rotated",0x1,0x2af80,0x18e70,0x0,0x0,0x2af80,0x18e70},
{"PRC Envelope #3 Rotated",0x1,0x2af80,0x1e848,0x0,0x0,0x2af80,0x1e848},
{"PRC Envelope #4 Rotated",0x1,0x32c80,0x1adb0,0x0,0x0,0x32c80,0x1adb0},
{"PRC Envelope #5 Rotated",0x1,0x35b60,0x1adb0,0x0,0x0,0x35b60,0x1adb0},
{"PRC Envelope #6 Rotated",0x1,0x38270,0x1d4c0,0x0,0x0,0x38270,0x1d4c0},
{"PRC Envelope #7 Rotated",0x1,0x38270,0x27100,0x0,0x0,0x38270,0x27100},
{"PRC Envelope #8 Rotated",0x1,0x4b708,0x1d4c0,0x0,0x0,0x4b708,0x1d4c0},
{"PRC Envelope #9 Rotated",0x1,0x4f1a0,0x37e88,0x0,0x0,0x4f1a0,0x37e88},
{"PRC Envelope #10 Rotated",0x1,0x6fd10,0x4f1a0,0x0,0x0,0x6fd10,0x4f1a0}
fixed!! yipee! the damn "device settings cannot be displayed" error is gone. We needed to supply a default set of forms. I've added A4 and Letter by default. (This used to be commit 36f1189be1609490b6a825a2608b9cf5dc682656)
2000-06-06 05:47:11 +04:00
};
s3-printing: no need to define struct table_node 4 times. Guenther
2009-05-12 16:15:01 +04:00
static const struct print_architecture_table_node archi_table[]= {
Merge the 'safe' parts of my StrnCpy patch - many of the users really wanted a pstrcpy/fstrcpy or at most a safe_strcpy(). These have the advantage of being compiler-verifiable. Get these out of the way, along with a rewrite of 'get_short_archi' in the spoolss client and server. (This pushes around const string pointers, rather than copied strings). Andrew Bartlett (This used to be commit 32fb801ddc035e8971e9911ed4b6e51892e9d1cc)
2003-04-23 17:27:35 +04:00
fix bug 294; win9x driver lookups should always use version 0 (This used to be commit 8cc1a49c13b24e8fe501caa0d7d695d34a58d08d)
2003-08-15 00:51:41 +04:00
{"Windows 4.0", SPL_ARCH_WIN40, 0 },
{"Windows NT x86", SPL_ARCH_W32X86, 2 },
{"Windows NT R4000", SPL_ARCH_W32MIPS, 2 },
{"Windows NT Alpha_AXP", SPL_ARCH_W32ALPHA, 2 },
{"Windows NT PowerPC", SPL_ARCH_W32PPC, 2 },
r1692: first commit :) * add IA64 to the architecture table of printer-drivers * add new "net"-subcommands: net rpc printer migrate {drivers|printers|forms|security|settings|all} [printer] net rpc share migrate {shares|files|all} [share] this is the first part of the migration suite. this will will (once feature-complete) allow to do 1:1 server-cloning in the best possible way by making heavy use of samba's rpc_client-functions. all migration-steps are implemented as rpc/smb-client-calls; net communicates via rpc/smb with two servers at the same time (a remote, source server and a destination server that currently defaults to the local smbd). this allows e. g. printer-driver migration including driverfiles, recursive mirroring of file-shares including file-acls, etc. almost any migration step can be called with a migrate-subcommand to provide more flexibility during a migration process (at the cost of quite some redundancy :) ). "net rpc printer migrate settings" is still in a bad condition (many open questions that hopefully can be adressed soon). "net rpc share migrate security" as an isolated call to just migrate share-ACLs will be added later. Before playing with it, make sure to use a test-server. Migration is a serious business and this tool-set can perfectly overwrite your existing file/print-shares. * along with the migration functions had to make I the following changes: - implement setprinter level 3 client-side - implement net_add_share level 502 client-side - allow security descriptor to be set in setprinterdata level 2 serverside guenther (This used to be commit 8f1716a29b7e85baf738bc14df7dabf03762f723)
2004-08-10 18:27:17 +04:00
{"Windows IA64", SPL_ARCH_IA64, 3 },
r2821: Adding "Windows x64" as architecture string and driverdir "x64" for the 64bit AMD platform. (This used to be "Windows AMD64" and "AMD64" in one of the release candidates of SP2 for Windows XP. AMD64 is obviously still supported but not documented.) Guenther (This used to be commit cc5892f0411b8eb5daebe746164a2cf21d3d4c68)
2004-10-05 02:13:57 +04:00
{"Windows x64", SPL_ARCH_X64, 3 },
Merge the 'safe' parts of my StrnCpy patch - many of the users really wanted a pstrcpy/fstrcpy or at most a safe_strcpy(). These have the advantage of being compiler-verifiable. Get these out of the way, along with a rewrite of 'get_short_archi' in the spoolss client and server. (This pushes around const string pointers, rather than copied strings). Andrew Bartlett (This used to be commit 32fb801ddc035e8971e9911ed4b6e51892e9d1cc)
2003-04-23 17:27:35 +04:00
{NULL, "", -1 }
};
r8501: * disable printer handle object cache (was mostly used for NT4 clients enumerating printer data on slow CPUs) * fix pinter and secdesc record upgrade to normalize the key (rev'd printer tdb version) * fixed problem that was normalizing the printername name field in general, this should fix the issues upgrading print servers from 3.0.14a to 3.0.20 (This used to be commit d07179de2f2a6eb1d13d0e25ac10de1a21475559)
2005-07-15 18:26:11 +04:00
/****************************************************************************
generate a new TDB_DATA key for storing a printer
****************************************************************************/
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
static TDB_DATA make_printer_tdbkey(TALLOC_CTX *ctx, const char *sharename )
r8501: * disable printer handle object cache (was mostly used for NT4 clients enumerating printer data on slow CPUs) * fix pinter and secdesc record upgrade to normalize the key (rev'd printer tdb version) * fixed problem that was normalizing the printername name field in general, this should fix the issues upgrading print servers from 3.0.14a to 3.0.20 (This used to be commit d07179de2f2a6eb1d13d0e25ac10de1a21475559)
2005-07-15 18:26:11 +04:00
{
fstring share;
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
char *keystr = NULL;
r8501: * disable printer handle object cache (was mostly used for NT4 clients enumerating printer data on slow CPUs) * fix pinter and secdesc record upgrade to normalize the key (rev'd printer tdb version) * fixed problem that was normalizing the printername name field in general, this should fix the issues upgrading print servers from 3.0.14a to 3.0.20 (This used to be commit d07179de2f2a6eb1d13d0e25ac10de1a21475559)
2005-07-15 18:26:11 +04:00
TDB_DATA key;
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
fstrcpy(share, sharename);
strlower_m(share);
keystr = talloc_asprintf(ctx, "%s%s", PRINTERS_PREFIX, share);
key = string_term_tdb_data(keystr ? keystr : "");
r8501: * disable printer handle object cache (was mostly used for NT4 clients enumerating printer data on slow CPUs) * fix pinter and secdesc record upgrade to normalize the key (rev'd printer tdb version) * fixed problem that was normalizing the printername name field in general, this should fix the issues upgrading print servers from 3.0.14a to 3.0.20 (This used to be commit d07179de2f2a6eb1d13d0e25ac10de1a21475559)
2005-07-15 18:26:11 +04:00
return key;
}
/****************************************************************************
generate a new TDB_DATA key for storing a printer security descriptor
****************************************************************************/
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
static TDB_DATA make_printers_secdesc_tdbkey(TALLOC_CTX *ctx,
const char* sharename )
r8501: * disable printer handle object cache (was mostly used for NT4 clients enumerating printer data on slow CPUs) * fix pinter and secdesc record upgrade to normalize the key (rev'd printer tdb version) * fixed problem that was normalizing the printername name field in general, this should fix the issues upgrading print servers from 3.0.14a to 3.0.20 (This used to be commit d07179de2f2a6eb1d13d0e25ac10de1a21475559)
2005-07-15 18:26:11 +04:00
{
fstring share;
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
char *keystr = NULL;
r21989: make use of tdb_*_bystring() and string_term_tdb_data() to avoid creating the TDB_DATA struct from strings "by hand" metze (This used to be commit 1897da9efcfe58ff3c190450731f33bef3ac2ebd)
2007-03-27 15:22:07 +04:00
TDB_DATA key;
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
fstrcpy(share, sharename );
strlower_m(share);
r8501: * disable printer handle object cache (was mostly used for NT4 clients enumerating printer data on slow CPUs) * fix pinter and secdesc record upgrade to normalize the key (rev'd printer tdb version) * fixed problem that was normalizing the printername name field in general, this should fix the issues upgrading print servers from 3.0.14a to 3.0.20 (This used to be commit d07179de2f2a6eb1d13d0e25ac10de1a21475559)
2005-07-15 18:26:11 +04:00
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
keystr = talloc_asprintf(ctx, "%s%s", SECDESC_PREFIX, share);
key = string_term_tdb_data(keystr ? keystr : "");
r21989: make use of tdb_*_bystring() and string_term_tdb_data() to avoid creating the TDB_DATA struct from strings "by hand" metze (This used to be commit 1897da9efcfe58ff3c190450731f33bef3ac2ebd)
2007-03-27 15:22:07 +04:00
return key;
r8501: * disable printer handle object cache (was mostly used for NT4 clients enumerating printer data on slow CPUs) * fix pinter and secdesc record upgrade to normalize the key (rev'd printer tdb version) * fixed problem that was normalizing the printername name field in general, this should fix the issues upgrading print servers from 3.0.14a to 3.0.20 (This used to be commit d07179de2f2a6eb1d13d0e25ac10de1a21475559)
2005-07-15 18:26:11 +04:00
}
/****************************************************************************
****************************************************************************/
RIP BOOL. Convert BOOL -> bool. I found a few interesting bugs in various places whilst doing this (places that assumed BOOL == int). I also need to fix the Samba4 pidl generation (next checkin). Jeremy. (This used to be commit f35a266b3cbb3e5fa6a86be60f34fe340a3ca71f)
2007-10-19 04:40:25 +04:00
static bool upgrade_to_version_3(void)
split the nt_drivers.tdb in 3 separate tdb files. Should speed-up lookups J.F. (This used to be commit c08e22713ea4ddbc4951dc8dcc40609eb0039ddb)
2001-07-09 22:19:04 +04:00
{
TDB_DATA kbuf, newkey, dbuf;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
When re-writing tdb version numbers as little endian int32, we must change the version number also. Jeremy. (This used to be commit 3dec9cf99a82bd15626eb99e7d937ff00183cc05)
2002-01-09 08:24:07 +03:00
DEBUG(0,("upgrade_to_version_3: upgrading print tdb's to version 3\n"));
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Fixup error returns in updating driver db version. Jeremy. (This used to be commit 5bd39ce233fd14d01f434f39ce53e3e77b428845)
2001-07-31 03:12:48 +04:00
for (kbuf = tdb_firstkey(tdb_drivers); kbuf.dptr;
Remove silly safe_free() function which is a wrapper around SAFE_FREE(). Since it's a function it just sets the local pointer to NULL and basically is an equivalent to free(). It also claims it's being used for callbacks but isn't used that way anywhere.
2008-10-19 15:06:14 +04:00
newkey = tdb_nextkey(tdb_drivers, kbuf), free(kbuf.dptr), kbuf=newkey) {
split the nt_drivers.tdb in 3 separate tdb files. Should speed-up lookups J.F. (This used to be commit c08e22713ea4ddbc4951dc8dcc40609eb0039ddb)
2001-07-09 22:19:04 +04:00
dbuf = tdb_fetch(tdb_drivers, kbuf);
r22009: change TDB_DATA from char * to unsigned char * and fix all compiler warnings in the users metze (This used to be commit 3a28443079c141a6ce8182c65b56ca210e34f37f)
2007-03-29 13:35:51 +04:00
if (strncmp((const char *)kbuf.dptr, FORMS_PREFIX, strlen(FORMS_PREFIX)) == 0) {
When re-writing tdb version numbers as little endian int32, we must change the version number also. Jeremy. (This used to be commit 3dec9cf99a82bd15626eb99e7d937ff00183cc05)
2002-01-09 08:24:07 +03:00
DEBUG(0,("upgrade_to_version_3:moving form\n"));
Fixup error returns in updating driver db version. Jeremy. (This used to be commit 5bd39ce233fd14d01f434f39ce53e3e77b428845)
2001-07-31 03:12:48 +04:00
if (tdb_store(tdb_forms, kbuf, dbuf, TDB_REPLACE) != 0) {
Lots of fixes for error paths where tdb_fetch() data need freeing. Found via a post from Arcady Chernyak <Arcady.Chernyak@efi.com>. Jeremy. (This used to be commit 5d5762d1787db4392d2dff16024097c638b2d494)
2002-11-23 05:52:36 +03:00
SAFE_FREE(dbuf.dptr);
When re-writing tdb version numbers as little endian int32, we must change the version number also. Jeremy. (This used to be commit 3dec9cf99a82bd15626eb99e7d937ff00183cc05)
2002-01-09 08:24:07 +03:00
DEBUG(0,("upgrade_to_version_3: failed to move form. Error (%s).\n", tdb_errorstr(tdb_forms)));
Fixup error returns in updating driver db version. Jeremy. (This used to be commit 5bd39ce233fd14d01f434f39ce53e3e77b428845)
2001-07-31 03:12:48 +04:00
return False;
}
if (tdb_delete(tdb_drivers, kbuf) != 0) {
Lots of fixes for error paths where tdb_fetch() data need freeing. Found via a post from Arcady Chernyak <Arcady.Chernyak@efi.com>. Jeremy. (This used to be commit 5d5762d1787db4392d2dff16024097c638b2d494)
2002-11-23 05:52:36 +03:00
SAFE_FREE(dbuf.dptr);
When re-writing tdb version numbers as little endian int32, we must change the version number also. Jeremy. (This used to be commit 3dec9cf99a82bd15626eb99e7d937ff00183cc05)
2002-01-09 08:24:07 +03:00
DEBUG(0,("upgrade_to_version_3: failed to delete form. Error (%s)\n", tdb_errorstr(tdb_drivers)));
Fixup error returns in updating driver db version. Jeremy. (This used to be commit 5bd39ce233fd14d01f434f39ce53e3e77b428845)
2001-07-31 03:12:48 +04:00
return False;
}
split the nt_drivers.tdb in 3 separate tdb files. Should speed-up lookups J.F. (This used to be commit c08e22713ea4ddbc4951dc8dcc40609eb0039ddb)
2001-07-09 22:19:04 +04:00
}
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r22009: change TDB_DATA from char * to unsigned char * and fix all compiler warnings in the users metze (This used to be commit 3a28443079c141a6ce8182c65b56ca210e34f37f)
2007-03-29 13:35:51 +04:00
if (strncmp((const char *)kbuf.dptr, PRINTERS_PREFIX, strlen(PRINTERS_PREFIX)) == 0) {
When re-writing tdb version numbers as little endian int32, we must change the version number also. Jeremy. (This used to be commit 3dec9cf99a82bd15626eb99e7d937ff00183cc05)
2002-01-09 08:24:07 +03:00
DEBUG(0,("upgrade_to_version_3:moving printer\n"));
Fixup error returns in updating driver db version. Jeremy. (This used to be commit 5bd39ce233fd14d01f434f39ce53e3e77b428845)
2001-07-31 03:12:48 +04:00
if (tdb_store(tdb_printers, kbuf, dbuf, TDB_REPLACE) != 0) {
Lots of fixes for error paths where tdb_fetch() data need freeing. Found via a post from Arcady Chernyak <Arcady.Chernyak@efi.com>. Jeremy. (This used to be commit 5d5762d1787db4392d2dff16024097c638b2d494)
2002-11-23 05:52:36 +03:00
SAFE_FREE(dbuf.dptr);
When re-writing tdb version numbers as little endian int32, we must change the version number also. Jeremy. (This used to be commit 3dec9cf99a82bd15626eb99e7d937ff00183cc05)
2002-01-09 08:24:07 +03:00
DEBUG(0,("upgrade_to_version_3: failed to move printer. Error (%s)\n", tdb_errorstr(tdb_printers)));
Fixup error returns in updating driver db version. Jeremy. (This used to be commit 5bd39ce233fd14d01f434f39ce53e3e77b428845)
2001-07-31 03:12:48 +04:00
return False;
}
if (tdb_delete(tdb_drivers, kbuf) != 0) {
Lots of fixes for error paths where tdb_fetch() data need freeing. Found via a post from Arcady Chernyak <Arcady.Chernyak@efi.com>. Jeremy. (This used to be commit 5d5762d1787db4392d2dff16024097c638b2d494)
2002-11-23 05:52:36 +03:00
SAFE_FREE(dbuf.dptr);
When re-writing tdb version numbers as little endian int32, we must change the version number also. Jeremy. (This used to be commit 3dec9cf99a82bd15626eb99e7d937ff00183cc05)
2002-01-09 08:24:07 +03:00
DEBUG(0,("upgrade_to_version_3: failed to delete printer. Error (%s)\n", tdb_errorstr(tdb_drivers)));
Fixup error returns in updating driver db version. Jeremy. (This used to be commit 5bd39ce233fd14d01f434f39ce53e3e77b428845)
2001-07-31 03:12:48 +04:00
return False;
}
split the nt_drivers.tdb in 3 separate tdb files. Should speed-up lookups J.F. (This used to be commit c08e22713ea4ddbc4951dc8dcc40609eb0039ddb)
2001-07-09 22:19:04 +04:00
}
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r22009: change TDB_DATA from char * to unsigned char * and fix all compiler warnings in the users metze (This used to be commit 3a28443079c141a6ce8182c65b56ca210e34f37f)
2007-03-29 13:35:51 +04:00
if (strncmp((const char *)kbuf.dptr, SECDESC_PREFIX, strlen(SECDESC_PREFIX)) == 0) {
When re-writing tdb version numbers as little endian int32, we must change the version number also. Jeremy. (This used to be commit 3dec9cf99a82bd15626eb99e7d937ff00183cc05)
2002-01-09 08:24:07 +03:00
DEBUG(0,("upgrade_to_version_3:moving secdesc\n"));
Fixup error returns in updating driver db version. Jeremy. (This used to be commit 5bd39ce233fd14d01f434f39ce53e3e77b428845)
2001-07-31 03:12:48 +04:00
if (tdb_store(tdb_printers, kbuf, dbuf, TDB_REPLACE) != 0) {
Lots of fixes for error paths where tdb_fetch() data need freeing. Found via a post from Arcady Chernyak <Arcady.Chernyak@efi.com>. Jeremy. (This used to be commit 5d5762d1787db4392d2dff16024097c638b2d494)
2002-11-23 05:52:36 +03:00
SAFE_FREE(dbuf.dptr);
When re-writing tdb version numbers as little endian int32, we must change the version number also. Jeremy. (This used to be commit 3dec9cf99a82bd15626eb99e7d937ff00183cc05)
2002-01-09 08:24:07 +03:00
DEBUG(0,("upgrade_to_version_3: failed to move secdesc. Error (%s)\n", tdb_errorstr(tdb_printers)));
Fixup error returns in updating driver db version. Jeremy. (This used to be commit 5bd39ce233fd14d01f434f39ce53e3e77b428845)
2001-07-31 03:12:48 +04:00
return False;
}
if (tdb_delete(tdb_drivers, kbuf) != 0) {
Lots of fixes for error paths where tdb_fetch() data need freeing. Found via a post from Arcady Chernyak <Arcady.Chernyak@efi.com>. Jeremy. (This used to be commit 5d5762d1787db4392d2dff16024097c638b2d494)
2002-11-23 05:52:36 +03:00
SAFE_FREE(dbuf.dptr);
When re-writing tdb version numbers as little endian int32, we must change the version number also. Jeremy. (This used to be commit 3dec9cf99a82bd15626eb99e7d937ff00183cc05)
2002-01-09 08:24:07 +03:00
DEBUG(0,("upgrade_to_version_3: failed to delete secdesc. Error (%s)\n", tdb_errorstr(tdb_drivers)));
Fixup error returns in updating driver db version. Jeremy. (This used to be commit 5bd39ce233fd14d01f434f39ce53e3e77b428845)
2001-07-31 03:12:48 +04:00
return False;
}
split the nt_drivers.tdb in 3 separate tdb files. Should speed-up lookups J.F. (This used to be commit c08e22713ea4ddbc4951dc8dcc40609eb0039ddb)
2001-07-09 22:19:04 +04:00
}
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
move to SAFE_FREE() (This used to be commit 09bf4425492fd96672ddd7a31d88854adcf7f0fe)
2001-09-17 13:25:57 +04:00
SAFE_FREE(dbuf.dptr);
split the nt_drivers.tdb in 3 separate tdb files. Should speed-up lookups J.F. (This used to be commit c08e22713ea4ddbc4951dc8dcc40609eb0039ddb)
2001-07-09 22:19:04 +04:00
}
Fixup error returns in updating driver db version. Jeremy. (This used to be commit 5bd39ce233fd14d01f434f39ce53e3e77b428845)
2001-07-31 03:12:48 +04:00
return True;
split the nt_drivers.tdb in 3 separate tdb files. Should speed-up lookups J.F. (This used to be commit c08e22713ea4ddbc4951dc8dcc40609eb0039ddb)
2001-07-09 22:19:04 +04:00
}
r7038: * upgrade version of nt*tdb files. Have to fix some issues in the printer security descriptors. Ensure that each printer sd has an oaner and group SID (BUILTIN\Administrators) and that we utilize more than the generic bits assigned in <= 3.0.14a. (This used to be commit c72182c1e20225a655376fd23915ac6053b94633)
2005-05-27 23:02:30 +04:00
/*******************************************************************
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Fix an issue with security descriptors. Printer sec_desc must
use more than the generic bits that were previously used
r7038: * upgrade version of nt*tdb files. Have to fix some issues in the printer security descriptors. Ensure that each printer sd has an oaner and group SID (BUILTIN\Administrators) and that we utilize more than the generic bits assigned in <= 3.0.14a. (This used to be commit c72182c1e20225a655376fd23915ac6053b94633)
2005-05-27 23:02:30 +04:00
in <= 3.0.14a. They must also have a owner and group SID assigned.
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Otherwise, any printers than have been migrated to a Windows
r7038: * upgrade version of nt*tdb files. Have to fix some issues in the printer security descriptors. Ensure that each printer sd has an oaner and group SID (BUILTIN\Administrators) and that we utilize more than the generic bits assigned in <= 3.0.14a. (This used to be commit c72182c1e20225a655376fd23915ac6053b94633)
2005-05-27 23:02:30 +04:00
host using printmig.exe will not be accessible.
*******************************************************************/
static int sec_desc_upg_fn( TDB_CONTEXT *the_tdb, TDB_DATA key,
TDB_DATA data, void *state )
{
s3-printing: use marshall/unmarshall_sec_desc_buf in sec_desc_upg_fn(). Guenther
2009-03-18 14:46:40 +03:00
NTSTATUS status;
s3-secdesc: remove "typedef struct sec_desc_buf SEC_DESC_BUF". Guenther
2010-05-18 04:56:17 +04:00
struct sec_desc_buf *sd_orig = NULL;
struct sec_desc_buf *sd_new, *sd_store;
s3-secdesc: remove "typedef struct security_descriptor SEC_DESC". Guenther
2010-05-18 12:29:34 +04:00
struct security_descriptor *sec, *new_sec;
r7038: * upgrade version of nt*tdb files. Have to fix some issues in the printer security descriptors. Ensure that each printer sd has an oaner and group SID (BUILTIN\Administrators) and that we utilize more than the generic bits assigned in <= 3.0.14a. (This used to be commit c72182c1e20225a655376fd23915ac6053b94633)
2005-05-27 23:02:30 +04:00
TALLOC_CTX *ctx = state;
int result, i;
r10154: Fix crash bug on security descriptor upgrade (as seen on x86_64). Guenther (This used to be commit daa61ef75b4f7cf510b17cd0b85f5830c73b9279)
2005-09-12 00:53:21 +04:00
uint32 sd_size;
size_t size_new_sec;
r7038: * upgrade version of nt*tdb files. Have to fix some issues in the printer security descriptors. Ensure that each printer sd has an oaner and group SID (BUILTIN\Administrators) and that we utilize more than the generic bits assigned in <= 3.0.14a. (This used to be commit c72182c1e20225a655376fd23915ac6053b94633)
2005-05-27 23:02:30 +04:00
r16365: Fix Klocwork #895, #898, #899, #915, #932, #938 and a few other problems Klocwork missed. Jeremy. (This used to be commit fe05769a1a85f924c67be7e5dcee4871a86948d7)
2006-06-20 01:36:19 +04:00
if (!data.dptr || data.dsize == 0) {
r7038: * upgrade version of nt*tdb files. Have to fix some issues in the printer security descriptors. Ensure that each printer sd has an oaner and group SID (BUILTIN\Administrators) and that we utilize more than the generic bits assigned in <= 3.0.14a. (This used to be commit c72182c1e20225a655376fd23915ac6053b94633)
2005-05-27 23:02:30 +04:00
return 0;
r16365: Fix Klocwork #895, #898, #899, #915, #932, #938 and a few other problems Klocwork missed. Jeremy. (This used to be commit fe05769a1a85f924c67be7e5dcee4871a86948d7)
2006-06-20 01:36:19 +04:00
}
r7038: * upgrade version of nt*tdb files. Have to fix some issues in the printer security descriptors. Ensure that each printer sd has an oaner and group SID (BUILTIN\Administrators) and that we utilize more than the generic bits assigned in <= 3.0.14a. (This used to be commit c72182c1e20225a655376fd23915ac6053b94633)
2005-05-27 23:02:30 +04:00
r22009: change TDB_DATA from char * to unsigned char * and fix all compiler warnings in the users metze (This used to be commit 3a28443079c141a6ce8182c65b56ca210e34f37f)
2007-03-29 13:35:51 +04:00
if ( strncmp((const char *) key.dptr, SECDESC_PREFIX, strlen(SECDESC_PREFIX) ) != 0 ) {
r7038: * upgrade version of nt*tdb files. Have to fix some issues in the printer security descriptors. Ensure that each printer sd has an oaner and group SID (BUILTIN\Administrators) and that we utilize more than the generic bits assigned in <= 3.0.14a. (This used to be commit c72182c1e20225a655376fd23915ac6053b94633)
2005-05-27 23:02:30 +04:00
return 0;
r16365: Fix Klocwork #895, #898, #899, #915, #932, #938 and a few other problems Klocwork missed. Jeremy. (This used to be commit fe05769a1a85f924c67be7e5dcee4871a86948d7)
2006-06-20 01:36:19 +04:00
}
r7038: * upgrade version of nt*tdb files. Have to fix some issues in the printer security descriptors. Ensure that each printer sd has an oaner and group SID (BUILTIN\Administrators) and that we utilize more than the generic bits assigned in <= 3.0.14a. (This used to be commit c72182c1e20225a655376fd23915ac6053b94633)
2005-05-27 23:02:30 +04:00
/* upgrade the security descriptor */
s3-printing: use marshall/unmarshall_sec_desc_buf in sec_desc_upg_fn(). Guenther
2009-03-18 14:46:40 +03:00
status = unmarshall_sec_desc_buf(ctx, data.dptr, data.dsize, &sd_orig);
if (!NT_STATUS_IS_OK(status)) {
r7038: * upgrade version of nt*tdb files. Have to fix some issues in the printer security descriptors. Ensure that each printer sd has an oaner and group SID (BUILTIN\Administrators) and that we utilize more than the generic bits assigned in <= 3.0.14a. (This used to be commit c72182c1e20225a655376fd23915ac6053b94633)
2005-05-27 23:02:30 +04:00
/* delete bad entries */
r22009: change TDB_DATA from char * to unsigned char * and fix all compiler warnings in the users metze (This used to be commit 3a28443079c141a6ce8182c65b56ca210e34f37f)
2007-03-29 13:35:51 +04:00
DEBUG(0,("sec_desc_upg_fn: Failed to parse original sec_desc for %si. Deleting....\n",
(const char *)key.dptr ));
r7038: * upgrade version of nt*tdb files. Have to fix some issues in the printer security descriptors. Ensure that each printer sd has an oaner and group SID (BUILTIN\Administrators) and that we utilize more than the generic bits assigned in <= 3.0.14a. (This used to be commit c72182c1e20225a655376fd23915ac6053b94633)
2005-05-27 23:02:30 +04:00
tdb_delete( tdb_printers, key );
return 0;
}
r16365: Fix Klocwork #895, #898, #899, #915, #932, #938 and a few other problems Klocwork missed. Jeremy. (This used to be commit fe05769a1a85f924c67be7e5dcee4871a86948d7)
2006-06-20 01:36:19 +04:00
if (!sd_orig) {
return 0;
}
r18745: Use the Samba4 data structures for security descriptors and security descriptor buffers. Make security access masks simply a uint32 rather than a structure with a uint32 in it. (This used to be commit b41c52b9db5fc4a553b20a7a5a051a4afced9366)
2006-09-21 02:23:12 +04:00
sec = sd_orig->sd;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r7038: * upgrade version of nt*tdb files. Have to fix some issues in the printer security descriptors. Ensure that each printer sd has an oaner and group SID (BUILTIN\Administrators) and that we utilize more than the generic bits assigned in <= 3.0.14a. (This used to be commit c72182c1e20225a655376fd23915ac6053b94633)
2005-05-27 23:02:30 +04:00
/* is this even valid? */
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r16365: Fix Klocwork #895, #898, #899, #915, #932, #938 and a few other problems Klocwork missed. Jeremy. (This used to be commit fe05769a1a85f924c67be7e5dcee4871a86948d7)
2006-06-20 01:36:19 +04:00
if ( !sec->dacl ) {
r7038: * upgrade version of nt*tdb files. Have to fix some issues in the printer security descriptors. Ensure that each printer sd has an oaner and group SID (BUILTIN\Administrators) and that we utilize more than the generic bits assigned in <= 3.0.14a. (This used to be commit c72182c1e20225a655376fd23915ac6053b94633)
2005-05-27 23:02:30 +04:00
return 0;
r16365: Fix Klocwork #895, #898, #899, #915, #932, #938 and a few other problems Klocwork missed. Jeremy. (This used to be commit fe05769a1a85f924c67be7e5dcee4871a86948d7)
2006-06-20 01:36:19 +04:00
}
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r7038: * upgrade version of nt*tdb files. Have to fix some issues in the printer security descriptors. Ensure that each printer sd has an oaner and group SID (BUILTIN\Administrators) and that we utilize more than the generic bits assigned in <= 3.0.14a. (This used to be commit c72182c1e20225a655376fd23915ac6053b94633)
2005-05-27 23:02:30 +04:00
/* update access masks */
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r7038: * upgrade version of nt*tdb files. Have to fix some issues in the printer security descriptors. Ensure that each printer sd has an oaner and group SID (BUILTIN\Administrators) and that we utilize more than the generic bits assigned in <= 3.0.14a. (This used to be commit c72182c1e20225a655376fd23915ac6053b94633)
2005-05-27 23:02:30 +04:00
for ( i=0; i<sec->dacl->num_aces; i++ ) {
r18745: Use the Samba4 data structures for security descriptors and security descriptor buffers. Make security access masks simply a uint32 rather than a structure with a uint32 in it. (This used to be commit b41c52b9db5fc4a553b20a7a5a051a4afced9366)
2006-09-21 02:23:12 +04:00
switch ( sec->dacl->aces[i].access_mask ) {
r7038: * upgrade version of nt*tdb files. Have to fix some issues in the printer security descriptors. Ensure that each printer sd has an oaner and group SID (BUILTIN\Administrators) and that we utilize more than the generic bits assigned in <= 3.0.14a. (This used to be commit c72182c1e20225a655376fd23915ac6053b94633)
2005-05-27 23:02:30 +04:00
case (GENERIC_READ_ACCESS | GENERIC_WRITE_ACCESS | GENERIC_EXECUTE_ACCESS):
r18745: Use the Samba4 data structures for security descriptors and security descriptor buffers. Make security access masks simply a uint32 rather than a structure with a uint32 in it. (This used to be commit b41c52b9db5fc4a553b20a7a5a051a4afced9366)
2006-09-21 02:23:12 +04:00
sec->dacl->aces[i].access_mask = PRINTER_ACE_PRINT;
r7038: * upgrade version of nt*tdb files. Have to fix some issues in the printer security descriptors. Ensure that each printer sd has an oaner and group SID (BUILTIN\Administrators) and that we utilize more than the generic bits assigned in <= 3.0.14a. (This used to be commit c72182c1e20225a655376fd23915ac6053b94633)
2005-05-27 23:02:30 +04:00
break;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r7038: * upgrade version of nt*tdb files. Have to fix some issues in the printer security descriptors. Ensure that each printer sd has an oaner and group SID (BUILTIN\Administrators) and that we utilize more than the generic bits assigned in <= 3.0.14a. (This used to be commit c72182c1e20225a655376fd23915ac6053b94633)
2005-05-27 23:02:30 +04:00
case GENERIC_ALL_ACCESS:
r18745: Use the Samba4 data structures for security descriptors and security descriptor buffers. Make security access masks simply a uint32 rather than a structure with a uint32 in it. (This used to be commit b41c52b9db5fc4a553b20a7a5a051a4afced9366)
2006-09-21 02:23:12 +04:00
sec->dacl->aces[i].access_mask = PRINTER_ACE_FULL_CONTROL;
r7038: * upgrade version of nt*tdb files. Have to fix some issues in the printer security descriptors. Ensure that each printer sd has an oaner and group SID (BUILTIN\Administrators) and that we utilize more than the generic bits assigned in <= 3.0.14a. (This used to be commit c72182c1e20225a655376fd23915ac6053b94633)
2005-05-27 23:02:30 +04:00
break;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r7038: * upgrade version of nt*tdb files. Have to fix some issues in the printer security descriptors. Ensure that each printer sd has an oaner and group SID (BUILTIN\Administrators) and that we utilize more than the generic bits assigned in <= 3.0.14a. (This used to be commit c72182c1e20225a655376fd23915ac6053b94633)
2005-05-27 23:02:30 +04:00
case READ_CONTROL_ACCESS:
r18745: Use the Samba4 data structures for security descriptors and security descriptor buffers. Make security access masks simply a uint32 rather than a structure with a uint32 in it. (This used to be commit b41c52b9db5fc4a553b20a7a5a051a4afced9366)
2006-09-21 02:23:12 +04:00
sec->dacl->aces[i].access_mask = PRINTER_ACE_MANAGE_DOCUMENTS;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r7038: * upgrade version of nt*tdb files. Have to fix some issues in the printer security descriptors. Ensure that each printer sd has an oaner and group SID (BUILTIN\Administrators) and that we utilize more than the generic bits assigned in <= 3.0.14a. (This used to be commit c72182c1e20225a655376fd23915ac6053b94633)
2005-05-27 23:02:30 +04:00
default: /* no change */
break;
}
}
s3-secdesc: remove "typedef struct security_descriptor SEC_DESC". Guenther
2010-05-18 12:29:34 +04:00
/* create a new struct security_descriptor with the appropriate owner and group SIDs */
r7038: * upgrade version of nt*tdb files. Have to fix some issues in the printer security descriptors. Ensure that each printer sd has an oaner and group SID (BUILTIN\Administrators) and that we utilize more than the generic bits assigned in <= 3.0.14a. (This used to be commit c72182c1e20225a655376fd23915ac6053b94633)
2005-05-27 23:02:30 +04:00
s3-secdesc: use SD_REVISION from security.idl. Guenther
2010-05-18 14:52:18 +04:00
new_sec = make_sec_desc( ctx, SD_REVISION, SEC_DESC_SELF_RELATIVE,
Some simplifications (This used to be commit b59b436997fba47afd02ffb6f1194dfaef229d44)
2008-03-17 23:00:16 +03:00
&global_sid_Builtin_Administrators,
&global_sid_Builtin_Administrators,
NULL, NULL, &size_new_sec );
r16365: Fix Klocwork #895, #898, #899, #915, #932, #938 and a few other problems Klocwork missed. Jeremy. (This used to be commit fe05769a1a85f924c67be7e5dcee4871a86948d7)
2006-06-20 01:36:19 +04:00
if (!new_sec) {
return 0;
}
r7038: * upgrade version of nt*tdb files. Have to fix some issues in the printer security descriptors. Ensure that each printer sd has an oaner and group SID (BUILTIN\Administrators) and that we utilize more than the generic bits assigned in <= 3.0.14a. (This used to be commit c72182c1e20225a655376fd23915ac6053b94633)
2005-05-27 23:02:30 +04:00
sd_new = make_sec_desc_buf( ctx, size_new_sec, new_sec );
r16365: Fix Klocwork #895, #898, #899, #915, #932, #938 and a few other problems Klocwork missed. Jeremy. (This used to be commit fe05769a1a85f924c67be7e5dcee4871a86948d7)
2006-06-20 01:36:19 +04:00
if (!sd_new) {
return 0;
}
r7038: * upgrade version of nt*tdb files. Have to fix some issues in the printer security descriptors. Ensure that each printer sd has an oaner and group SID (BUILTIN\Administrators) and that we utilize more than the generic bits assigned in <= 3.0.14a. (This used to be commit c72182c1e20225a655376fd23915ac6053b94633)
2005-05-27 23:02:30 +04:00
s3-lib: Create a sec_desc_merge and sec_desc_merge_buf function. Signed-off-by: Günther Deschner <gd@samba.org>
2010-04-26 19:38:56 +04:00
if ( !(sd_store = sec_desc_merge_buf( ctx, sd_new, sd_orig )) ) {
r7038: * upgrade version of nt*tdb files. Have to fix some issues in the printer security descriptors. Ensure that each printer sd has an oaner and group SID (BUILTIN\Administrators) and that we utilize more than the generic bits assigned in <= 3.0.14a. (This used to be commit c72182c1e20225a655376fd23915ac6053b94633)
2005-05-27 23:02:30 +04:00
DEBUG(0,("sec_desc_upg_fn: Failed to update sec_desc for %s\n", key.dptr ));
return 0;
}
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r7038: * upgrade version of nt*tdb files. Have to fix some issues in the printer security descriptors. Ensure that each printer sd has an oaner and group SID (BUILTIN\Administrators) and that we utilize more than the generic bits assigned in <= 3.0.14a. (This used to be commit c72182c1e20225a655376fd23915ac6053b94633)
2005-05-27 23:02:30 +04:00
/* store it back */
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
s3: Remove use of iconv_convenience.
2010-05-10 02:42:06 +04:00
sd_size = ndr_size_security_descriptor(sd_store->sd, 0)
s3-secdesc: remove "typedef struct sec_desc_buf SEC_DESC_BUF". Guenther
2010-05-18 04:56:17 +04:00
+ sizeof(struct sec_desc_buf);
r7038: * upgrade version of nt*tdb files. Have to fix some issues in the printer security descriptors. Ensure that each printer sd has an oaner and group SID (BUILTIN\Administrators) and that we utilize more than the generic bits assigned in <= 3.0.14a. (This used to be commit c72182c1e20225a655376fd23915ac6053b94633)
2005-05-27 23:02:30 +04:00
s3-printing: use marshall/unmarshall_sec_desc_buf in sec_desc_upg_fn(). Guenther
2009-03-18 14:46:40 +03:00
status = marshall_sec_desc_buf(ctx, sd_store, &data.dptr, &data.dsize);
if (!NT_STATUS_IS_OK(status)) {
r7038: * upgrade version of nt*tdb files. Have to fix some issues in the printer security descriptors. Ensure that each printer sd has an oaner and group SID (BUILTIN\Administrators) and that we utilize more than the generic bits assigned in <= 3.0.14a. (This used to be commit c72182c1e20225a655376fd23915ac6053b94633)
2005-05-27 23:02:30 +04:00
DEBUG(0,("sec_desc_upg_fn: Failed to parse new sec_desc for %s\n", key.dptr ));
return 0;
}
result = tdb_store( tdb_printers, key, data, TDB_REPLACE );
/* 0 to continue and non-zero to stop traversal */
return (result == -1);
}
/*******************************************************************
*******************************************************************/
RIP BOOL. Convert BOOL -> bool. I found a few interesting bugs in various places whilst doing this (places that assumed BOOL == int). I also need to fix the Samba4 pidl generation (next checkin). Jeremy. (This used to be commit f35a266b3cbb3e5fa6a86be60f34fe340a3ca71f)
2007-10-19 04:40:25 +04:00
static bool upgrade_to_version_4(void)
r7038: * upgrade version of nt*tdb files. Have to fix some issues in the printer security descriptors. Ensure that each printer sd has an oaner and group SID (BUILTIN\Administrators) and that we utilize more than the generic bits assigned in <= 3.0.14a. (This used to be commit c72182c1e20225a655376fd23915ac6053b94633)
2005-05-27 23:02:30 +04:00
{
TALLOC_CTX *ctx;
int result;
DEBUG(0,("upgrade_to_version_4: upgrading printer security descriptors\n"));
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
if ( !(ctx = talloc_init( "upgrade_to_version_4" )) )
r7038: * upgrade version of nt*tdb files. Have to fix some issues in the printer security descriptors. Ensure that each printer sd has an oaner and group SID (BUILTIN\Administrators) and that we utilize more than the generic bits assigned in <= 3.0.14a. (This used to be commit c72182c1e20225a655376fd23915ac6053b94633)
2005-05-27 23:02:30 +04:00
return False;
result = tdb_traverse( tdb_printers, sec_desc_upg_fn, ctx );
talloc_destroy( ctx );
return ( result != -1 );
}
r8501: * disable printer handle object cache (was mostly used for NT4 clients enumerating printer data on slow CPUs) * fix pinter and secdesc record upgrade to normalize the key (rev'd printer tdb version) * fixed problem that was normalizing the printername name field in general, this should fix the issues upgrading print servers from 3.0.14a to 3.0.20 (This used to be commit d07179de2f2a6eb1d13d0e25ac10de1a21475559)
2005-07-15 18:26:11 +04:00
/*******************************************************************
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Fix an issue with security descriptors. Printer sec_desc must
use more than the generic bits that were previously used
r8501: * disable printer handle object cache (was mostly used for NT4 clients enumerating printer data on slow CPUs) * fix pinter and secdesc record upgrade to normalize the key (rev'd printer tdb version) * fixed problem that was normalizing the printername name field in general, this should fix the issues upgrading print servers from 3.0.14a to 3.0.20 (This used to be commit d07179de2f2a6eb1d13d0e25ac10de1a21475559)
2005-07-15 18:26:11 +04:00
in <= 3.0.14a. They must also have a owner and group SID assigned.
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Otherwise, any printers than have been migrated to a Windows
r8501: * disable printer handle object cache (was mostly used for NT4 clients enumerating printer data on slow CPUs) * fix pinter and secdesc record upgrade to normalize the key (rev'd printer tdb version) * fixed problem that was normalizing the printername name field in general, this should fix the issues upgrading print servers from 3.0.14a to 3.0.20 (This used to be commit d07179de2f2a6eb1d13d0e25ac10de1a21475559)
2005-07-15 18:26:11 +04:00
host using printmig.exe will not be accessible.
*******************************************************************/
static int normalize_printers_fn( TDB_CONTEXT *the_tdb, TDB_DATA key,
TDB_DATA data, void *state )
{
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
TALLOC_CTX *ctx = talloc_tos();
r8501: * disable printer handle object cache (was mostly used for NT4 clients enumerating printer data on slow CPUs) * fix pinter and secdesc record upgrade to normalize the key (rev'd printer tdb version) * fixed problem that was normalizing the printername name field in general, this should fix the issues upgrading print servers from 3.0.14a to 3.0.20 (This used to be commit d07179de2f2a6eb1d13d0e25ac10de1a21475559)
2005-07-15 18:26:11 +04:00
TDB_DATA new_key;
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
r8501: * disable printer handle object cache (was mostly used for NT4 clients enumerating printer data on slow CPUs) * fix pinter and secdesc record upgrade to normalize the key (rev'd printer tdb version) * fixed problem that was normalizing the printername name field in general, this should fix the issues upgrading print servers from 3.0.14a to 3.0.20 (This used to be commit d07179de2f2a6eb1d13d0e25ac10de1a21475559)
2005-07-15 18:26:11 +04:00
if (!data.dptr || data.dsize == 0)
return 0;
/* upgrade printer records and security descriptors */
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
r22009: change TDB_DATA from char * to unsigned char * and fix all compiler warnings in the users metze (This used to be commit 3a28443079c141a6ce8182c65b56ca210e34f37f)
2007-03-29 13:35:51 +04:00
if ( strncmp((const char *) key.dptr, PRINTERS_PREFIX, strlen(PRINTERS_PREFIX) ) == 0 ) {
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
new_key = make_printer_tdbkey(ctx, (const char *)key.dptr+strlen(PRINTERS_PREFIX) );
r8501: * disable printer handle object cache (was mostly used for NT4 clients enumerating printer data on slow CPUs) * fix pinter and secdesc record upgrade to normalize the key (rev'd printer tdb version) * fixed problem that was normalizing the printername name field in general, this should fix the issues upgrading print servers from 3.0.14a to 3.0.20 (This used to be commit d07179de2f2a6eb1d13d0e25ac10de1a21475559)
2005-07-15 18:26:11 +04:00
}
r22009: change TDB_DATA from char * to unsigned char * and fix all compiler warnings in the users metze (This used to be commit 3a28443079c141a6ce8182c65b56ca210e34f37f)
2007-03-29 13:35:51 +04:00
else if ( strncmp((const char *) key.dptr, SECDESC_PREFIX, strlen(SECDESC_PREFIX) ) == 0 ) {
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
new_key = make_printers_secdesc_tdbkey(ctx, (const char *)key.dptr+strlen(SECDESC_PREFIX) );
r8501: * disable printer handle object cache (was mostly used for NT4 clients enumerating printer data on slow CPUs) * fix pinter and secdesc record upgrade to normalize the key (rev'd printer tdb version) * fixed problem that was normalizing the printername name field in general, this should fix the issues upgrading print servers from 3.0.14a to 3.0.20 (This used to be commit d07179de2f2a6eb1d13d0e25ac10de1a21475559)
2005-07-15 18:26:11 +04:00
}
else {
/* ignore this record */
return 0;
}
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
r8501: * disable printer handle object cache (was mostly used for NT4 clients enumerating printer data on slow CPUs) * fix pinter and secdesc record upgrade to normalize the key (rev'd printer tdb version) * fixed problem that was normalizing the printername name field in general, this should fix the issues upgrading print servers from 3.0.14a to 3.0.20 (This used to be commit d07179de2f2a6eb1d13d0e25ac10de1a21475559)
2005-07-15 18:26:11 +04:00
/* delete the original record and store under the normalized key */
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
r8501: * disable printer handle object cache (was mostly used for NT4 clients enumerating printer data on slow CPUs) * fix pinter and secdesc record upgrade to normalize the key (rev'd printer tdb version) * fixed problem that was normalizing the printername name field in general, this should fix the issues upgrading print servers from 3.0.14a to 3.0.20 (This used to be commit d07179de2f2a6eb1d13d0e25ac10de1a21475559)
2005-07-15 18:26:11 +04:00
if ( tdb_delete( the_tdb, key ) != 0 ) {
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
DEBUG(0,("normalize_printers_fn: tdb_delete for [%s] failed!\n",
r8501: * disable printer handle object cache (was mostly used for NT4 clients enumerating printer data on slow CPUs) * fix pinter and secdesc record upgrade to normalize the key (rev'd printer tdb version) * fixed problem that was normalizing the printername name field in general, this should fix the issues upgrading print servers from 3.0.14a to 3.0.20 (This used to be commit d07179de2f2a6eb1d13d0e25ac10de1a21475559)
2005-07-15 18:26:11 +04:00
key.dptr));
return 1;
}
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
r8501: * disable printer handle object cache (was mostly used for NT4 clients enumerating printer data on slow CPUs) * fix pinter and secdesc record upgrade to normalize the key (rev'd printer tdb version) * fixed problem that was normalizing the printername name field in general, this should fix the issues upgrading print servers from 3.0.14a to 3.0.20 (This used to be commit d07179de2f2a6eb1d13d0e25ac10de1a21475559)
2005-07-15 18:26:11 +04:00
if ( tdb_store( the_tdb, new_key, data, TDB_REPLACE) != 0 ) {
DEBUG(0,("normalize_printers_fn: failed to store new record for [%s]!\n",
key.dptr));
return 1;
}
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
r8501: * disable printer handle object cache (was mostly used for NT4 clients enumerating printer data on slow CPUs) * fix pinter and secdesc record upgrade to normalize the key (rev'd printer tdb version) * fixed problem that was normalizing the printername name field in general, this should fix the issues upgrading print servers from 3.0.14a to 3.0.20 (This used to be commit d07179de2f2a6eb1d13d0e25ac10de1a21475559)
2005-07-15 18:26:11 +04:00
return 0;
}
/*******************************************************************
*******************************************************************/
RIP BOOL. Convert BOOL -> bool. I found a few interesting bugs in various places whilst doing this (places that assumed BOOL == int). I also need to fix the Samba4 pidl generation (next checkin). Jeremy. (This used to be commit f35a266b3cbb3e5fa6a86be60f34fe340a3ca71f)
2007-10-19 04:40:25 +04:00
static bool upgrade_to_version_5(void)
r8501: * disable printer handle object cache (was mostly used for NT4 clients enumerating printer data on slow CPUs) * fix pinter and secdesc record upgrade to normalize the key (rev'd printer tdb version) * fixed problem that was normalizing the printername name field in general, this should fix the issues upgrading print servers from 3.0.14a to 3.0.20 (This used to be commit d07179de2f2a6eb1d13d0e25ac10de1a21475559)
2005-07-15 18:26:11 +04:00
{
TALLOC_CTX *ctx;
int result;
DEBUG(0,("upgrade_to_version_5: normalizing printer keys\n"));
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
if ( !(ctx = talloc_init( "upgrade_to_version_5" )) )
r8501: * disable printer handle object cache (was mostly used for NT4 clients enumerating printer data on slow CPUs) * fix pinter and secdesc record upgrade to normalize the key (rev'd printer tdb version) * fixed problem that was normalizing the printername name field in general, this should fix the issues upgrading print servers from 3.0.14a to 3.0.20 (This used to be commit d07179de2f2a6eb1d13d0e25ac10de1a21475559)
2005-07-15 18:26:11 +04:00
return False;
result = tdb_traverse( tdb_printers, normalize_printers_fn, NULL );
talloc_destroy( ctx );
return ( result != -1 );
}
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
/****************************************************************************
Fix slowdown because of enumerating all print queues on every smbd startup. Jeremy. (This used to be commit 6efd17ef78ebcfed1130312fa019d674e4663a00)
2002-11-01 02:41:00 +03:00
Open the NT printing tdbs. Done once before fork().
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
****************************************************************************/
When re-writing tdb version numbers as little endian int32, we must change the version number also. Jeremy. (This used to be commit 3dec9cf99a82bd15626eb99e7d937ff00183cc05)
2002-01-09 08:24:07 +03:00
RIP BOOL. Convert BOOL -> bool. I found a few interesting bugs in various places whilst doing this (places that assumed BOOL == int). I also need to fix the Samba4 pidl generation (next checkin). Jeremy. (This used to be commit f35a266b3cbb3e5fa6a86be60f34fe340a3ca71f)
2007-10-19 04:40:25 +04:00
bool nt_printing_init(struct messaging_context *msg_ctx)
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
{
Merge from HEAD - make Samba compile with -Wwrite-strings without additional warnings. (Adds a lot of const). Andrew Bartlett (This used to be commit 3a7458f9472432ef12c43008414925fd1ce8ea0c)
2003-01-03 11:28:12 +03:00
const char *vstring = "INFO/version";
r2569: Patch from Rob Foehl <rwf@loonybin.net>: - fix typo in libads/ldap_printer.c:39, ads_find_printer_on_server() (originally libads-typo.patch) - fix leak in printing/nt_printing.c, is_printer_published() (originally is_printer_published-leak.patch) - fix double print_backend_init() calls, now only called from main() - restructuring in printing/nt_printing.c - replaced (un)publish_it() with ads-specific functions - moved common code to nt_printer_publish() - improved error handling in several places - added check_published_printers() in printing/nt_printing.c, to verify that each published printer is actually in the directory at startup - changed calling semantics of mod_a_printer, dump_a_printer, and update_driver_init to be more consistent with the rest of the api and reduce some copying (This used to be commit 50a5a3dbd02acb0d09133b6e42cc37d091ea901d)
2004-09-23 23:24:02 +04:00
WERROR win_rc;
r8543: merge volker's nt_printing_init() fix from trunk (r8526) but make sure to write the new version to the ntdrivers.tdb. (This used to be commit 9e50d696c3e101174670c47ecbd6401bec2ab3d3)
2005-07-18 18:18:39 +04:00
int32 vers_id;
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
r7692: start versioning the registry.tdb file since it can be modified now (This used to be commit a091b37d59d1e0228a9c8d4bd2a31e9bbaafde99)
2005-06-17 19:53:01 +04:00
if ( tdb_drivers && tdb_printers && tdb_forms )
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
return True;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Fix slowdown because of enumerating all print queues on every smbd startup. Jeremy. (This used to be commit 6efd17ef78ebcfed1130312fa019d674e4663a00)
2002-11-01 02:41:00 +03:00
if (tdb_drivers)
tdb_close(tdb_drivers);
Patch 2 of 3 from Debian Samba packagers: The point is doing the following associations: - non discardable state data (all TDB files that may need to be backed up) go to statedir - shared data (codepage stuff) go to codepagedir The patch *does not change* the default location for these directories. So, there is no behaviour change when applying it. The main change is for samba developers who have to think when dealing with files that previously pertained to libdir whether they: - go in statedir - go in codepagedir - stay in libdir (This used to be commit d6cdbfd875bb2653e831d314726c3240beb0a96b)
2007-11-01 22:53:44 +03:00
tdb_drivers = tdb_open_log(state_path("ntdrivers.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
split the nt_drivers.tdb in 3 separate tdb files. Should speed-up lookups J.F. (This used to be commit c08e22713ea4ddbc4951dc8dcc40609eb0039ddb)
2001-07-09 22:19:04 +04:00
if (!tdb_drivers) {
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
DEBUG(0,("nt_printing_init: Failed to open nt drivers database %s (%s)\n",
Patch 2 of 3 from Debian Samba packagers: The point is doing the following associations: - non discardable state data (all TDB files that may need to be backed up) go to statedir - shared data (codepage stuff) go to codepagedir The patch *does not change* the default location for these directories. So, there is no behaviour change when applying it. The main change is for samba developers who have to think when dealing with files that previously pertained to libdir whether they: - go in statedir - go in codepagedir - stay in libdir (This used to be commit d6cdbfd875bb2653e831d314726c3240beb0a96b)
2007-11-01 22:53:44 +03:00
state_path("ntdrivers.tdb"), strerror(errno) ));
fixed return from nt_printing_init() (This used to be commit 7e13ba75444eb82b257a7a3578aa30ae2f52fe1a)
2000-05-27 11:27:21 +04:00
return False;
}
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Fix slowdown because of enumerating all print queues on every smbd startup. Jeremy. (This used to be commit 6efd17ef78ebcfed1130312fa019d674e4663a00)
2002-11-01 02:41:00 +03:00
if (tdb_printers)
tdb_close(tdb_printers);
Patch 2 of 3 from Debian Samba packagers: The point is doing the following associations: - non discardable state data (all TDB files that may need to be backed up) go to statedir - shared data (codepage stuff) go to codepagedir The patch *does not change* the default location for these directories. So, there is no behaviour change when applying it. The main change is for samba developers who have to think when dealing with files that previously pertained to libdir whether they: - go in statedir - go in codepagedir - stay in libdir (This used to be commit d6cdbfd875bb2653e831d314726c3240beb0a96b)
2007-11-01 22:53:44 +03:00
tdb_printers = tdb_open_log(state_path("ntprinters.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
split the nt_drivers.tdb in 3 separate tdb files. Should speed-up lookups J.F. (This used to be commit c08e22713ea4ddbc4951dc8dcc40609eb0039ddb)
2001-07-09 22:19:04 +04:00
if (!tdb_printers) {
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
DEBUG(0,("nt_printing_init: Failed to open nt printers database %s (%s)\n",
Patch 2 of 3 from Debian Samba packagers: The point is doing the following associations: - non discardable state data (all TDB files that may need to be backed up) go to statedir - shared data (codepage stuff) go to codepagedir The patch *does not change* the default location for these directories. So, there is no behaviour change when applying it. The main change is for samba developers who have to think when dealing with files that previously pertained to libdir whether they: - go in statedir - go in codepagedir - stay in libdir (This used to be commit d6cdbfd875bb2653e831d314726c3240beb0a96b)
2007-11-01 22:53:44 +03:00
state_path("ntprinters.tdb"), strerror(errno) ));
split the nt_drivers.tdb in 3 separate tdb files. Should speed-up lookups J.F. (This used to be commit c08e22713ea4ddbc4951dc8dcc40609eb0039ddb)
2001-07-09 22:19:04 +04:00
return False;
}
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Fix slowdown because of enumerating all print queues on every smbd startup. Jeremy. (This used to be commit 6efd17ef78ebcfed1130312fa019d674e4663a00)
2002-11-01 02:41:00 +03:00
if (tdb_forms)
tdb_close(tdb_forms);
Patch 2 of 3 from Debian Samba packagers: The point is doing the following associations: - non discardable state data (all TDB files that may need to be backed up) go to statedir - shared data (codepage stuff) go to codepagedir The patch *does not change* the default location for these directories. So, there is no behaviour change when applying it. The main change is for samba developers who have to think when dealing with files that previously pertained to libdir whether they: - go in statedir - go in codepagedir - stay in libdir (This used to be commit d6cdbfd875bb2653e831d314726c3240beb0a96b)
2007-11-01 22:53:44 +03:00
tdb_forms = tdb_open_log(state_path("ntforms.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
split the nt_drivers.tdb in 3 separate tdb files. Should speed-up lookups J.F. (This used to be commit c08e22713ea4ddbc4951dc8dcc40609eb0039ddb)
2001-07-09 22:19:04 +04:00
if (!tdb_forms) {
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
DEBUG(0,("nt_printing_init: Failed to open nt forms database %s (%s)\n",
Patch 2 of 3 from Debian Samba packagers: The point is doing the following associations: - non discardable state data (all TDB files that may need to be backed up) go to statedir - shared data (codepage stuff) go to codepagedir The patch *does not change* the default location for these directories. So, there is no behaviour change when applying it. The main change is for samba developers who have to think when dealing with files that previously pertained to libdir whether they: - go in statedir - go in codepagedir - stay in libdir (This used to be commit d6cdbfd875bb2653e831d314726c3240beb0a96b)
2007-11-01 22:53:44 +03:00
state_path("ntforms.tdb"), strerror(errno) ));
split the nt_drivers.tdb in 3 separate tdb files. Should speed-up lookups J.F. (This used to be commit c08e22713ea4ddbc4951dc8dcc40609eb0039ddb)
2001-07-09 22:19:04 +04:00
return False;
}
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
/* handle a Samba upgrade */
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r7038: * upgrade version of nt*tdb files. Have to fix some issues in the printer security descriptors. Ensure that each printer sd has an oaner and group SID (BUILTIN\Administrators) and that we utilize more than the generic bits assigned in <= 3.0.14a. (This used to be commit c72182c1e20225a655376fd23915ac6053b94633)
2005-05-27 23:02:30 +04:00
vers_id = tdb_fetch_int32(tdb_drivers, vstring);
r8543: merge volker's nt_printing_init() fix from trunk (r8526) but make sure to write the new version to the ntdrivers.tdb. (This used to be commit 9e50d696c3e101174670c47ecbd6401bec2ab3d3)
2005-07-18 18:18:39 +04:00
if (vers_id == -1) {
DEBUG(10, ("Fresh database\n"));
tdb_store_int32( tdb_drivers, vstring, NTDRIVERS_DATABASE_VERSION_5 );
vers_id = NTDRIVERS_DATABASE_VERSION_5;
}
r7038: * upgrade version of nt*tdb files. Have to fix some issues in the printer security descriptors. Ensure that each printer sd has an oaner and group SID (BUILTIN\Administrators) and that we utilize more than the generic bits assigned in <= 3.0.14a. (This used to be commit c72182c1e20225a655376fd23915ac6053b94633)
2005-05-27 23:02:30 +04:00
r8501: * disable printer handle object cache (was mostly used for NT4 clients enumerating printer data on slow CPUs) * fix pinter and secdesc record upgrade to normalize the key (rev'd printer tdb version) * fixed problem that was normalizing the printername name field in general, this should fix the issues upgrading print servers from 3.0.14a to 3.0.20 (This used to be commit d07179de2f2a6eb1d13d0e25ac10de1a21475559)
2005-07-15 18:26:11 +04:00
if ( vers_id != NTDRIVERS_DATABASE_VERSION_5 ) {
r7038: * upgrade version of nt*tdb files. Have to fix some issues in the printer security descriptors. Ensure that each printer sd has an oaner and group SID (BUILTIN\Administrators) and that we utilize more than the generic bits assigned in <= 3.0.14a. (This used to be commit c72182c1e20225a655376fd23915ac6053b94633)
2005-05-27 23:02:30 +04:00
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
if ((vers_id == NTDRIVERS_DATABASE_VERSION_1) || (IREV(vers_id) == NTDRIVERS_DATABASE_VERSION_1)) {
r8501: * disable printer handle object cache (was mostly used for NT4 clients enumerating printer data on slow CPUs) * fix pinter and secdesc record upgrade to normalize the key (rev'd printer tdb version) * fixed problem that was normalizing the printername name field in general, this should fix the issues upgrading print servers from 3.0.14a to 3.0.20 (This used to be commit d07179de2f2a6eb1d13d0e25ac10de1a21475559)
2005-07-15 18:26:11 +04:00
if (!upgrade_to_version_3())
return False;
tdb_store_int32(tdb_drivers, vstring, NTDRIVERS_DATABASE_VERSION_3);
vers_id = NTDRIVERS_DATABASE_VERSION_3;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
}
When re-writing tdb version numbers as little endian int32, we must change the version number also. Jeremy. (This used to be commit 3dec9cf99a82bd15626eb99e7d937ff00183cc05)
2002-01-09 08:24:07 +03:00
if ((vers_id == NTDRIVERS_DATABASE_VERSION_2) || (IREV(vers_id) == NTDRIVERS_DATABASE_VERSION_2)) {
Fixed all uses of tdb_fetch/store/_int to use explicit int32 little endian in tdb's. All except winbindd_idmap.... Hmmmmmm. Jeremy. (This used to be commit ec71f1732b6b27bd2d65b250a6f3720a235dc38d)
2002-01-09 07:13:30 +03:00
/* Written on a bigendian machine with old fetch_int code. Save as le. */
When re-writing tdb version numbers as little endian int32, we must change the version number also. Jeremy. (This used to be commit 3dec9cf99a82bd15626eb99e7d937ff00183cc05)
2002-01-09 08:24:07 +03:00
/* The only upgrade between V2 and V3 is to save the version in little-endian. */
r7038: * upgrade version of nt*tdb files. Have to fix some issues in the printer security descriptors. Ensure that each printer sd has an oaner and group SID (BUILTIN\Administrators) and that we utilize more than the generic bits assigned in <= 3.0.14a. (This used to be commit c72182c1e20225a655376fd23915ac6053b94633)
2005-05-27 23:02:30 +04:00
tdb_store_int32(tdb_drivers, vstring, NTDRIVERS_DATABASE_VERSION_3);
vers_id = NTDRIVERS_DATABASE_VERSION_3;
Fixed all uses of tdb_fetch/store/_int to use explicit int32 little endian in tdb's. All except winbindd_idmap.... Hmmmmmm. Jeremy. (This used to be commit ec71f1732b6b27bd2d65b250a6f3720a235dc38d)
2002-01-09 07:13:30 +03:00
}
r8501: * disable printer handle object cache (was mostly used for NT4 clients enumerating printer data on slow CPUs) * fix pinter and secdesc record upgrade to normalize the key (rev'd printer tdb version) * fixed problem that was normalizing the printername name field in general, this should fix the issues upgrading print servers from 3.0.14a to 3.0.20 (This used to be commit d07179de2f2a6eb1d13d0e25ac10de1a21475559)
2005-07-15 18:26:11 +04:00
if (vers_id == NTDRIVERS_DATABASE_VERSION_3 ) {
if ( !upgrade_to_version_4() )
return False;
tdb_store_int32(tdb_drivers, vstring, NTDRIVERS_DATABASE_VERSION_4);
vers_id = NTDRIVERS_DATABASE_VERSION_4;
Fixed all uses of tdb_fetch/store/_int to use explicit int32 little endian in tdb's. All except winbindd_idmap.... Hmmmmmm. Jeremy. (This used to be commit ec71f1732b6b27bd2d65b250a6f3720a235dc38d)
2002-01-09 07:13:30 +03:00
}
r7038: * upgrade version of nt*tdb files. Have to fix some issues in the printer security descriptors. Ensure that each printer sd has an oaner and group SID (BUILTIN\Administrators) and that we utilize more than the generic bits assigned in <= 3.0.14a. (This used to be commit c72182c1e20225a655376fd23915ac6053b94633)
2005-05-27 23:02:30 +04:00
r8501: * disable printer handle object cache (was mostly used for NT4 clients enumerating printer data on slow CPUs) * fix pinter and secdesc record upgrade to normalize the key (rev'd printer tdb version) * fixed problem that was normalizing the printername name field in general, this should fix the issues upgrading print servers from 3.0.14a to 3.0.20 (This used to be commit d07179de2f2a6eb1d13d0e25ac10de1a21475559)
2005-07-15 18:26:11 +04:00
if (vers_id == NTDRIVERS_DATABASE_VERSION_4 ) {
if ( !upgrade_to_version_5() )
return False;
tdb_store_int32(tdb_drivers, vstring, NTDRIVERS_DATABASE_VERSION_5);
vers_id = NTDRIVERS_DATABASE_VERSION_5;
}
r7038: * upgrade version of nt*tdb files. Have to fix some issues in the printer security descriptors. Ensure that each printer sd has an oaner and group SID (BUILTIN\Administrators) and that we utilize more than the generic bits assigned in <= 3.0.14a. (This used to be commit c72182c1e20225a655376fd23915ac6053b94633)
2005-05-27 23:02:30 +04:00
r8501: * disable printer handle object cache (was mostly used for NT4 clients enumerating printer data on slow CPUs) * fix pinter and secdesc record upgrade to normalize the key (rev'd printer tdb version) * fixed problem that was normalizing the printername name field in general, this should fix the issues upgrading print servers from 3.0.14a to 3.0.20 (This used to be commit d07179de2f2a6eb1d13d0e25ac10de1a21475559)
2005-07-15 18:26:11 +04:00
if ( vers_id != NTDRIVERS_DATABASE_VERSION_5 ) {
DEBUG(0,("nt_printing_init: Unknown printer database version [%d]\n", vers_id));
r7038: * upgrade version of nt*tdb files. Have to fix some issues in the printer security descriptors. Ensure that each printer sd has an oaner and group SID (BUILTIN\Administrators) and that we utilize more than the generic bits assigned in <= 3.0.14a. (This used to be commit c72182c1e20225a655376fd23915ac6053b94633)
2005-05-27 23:02:30 +04:00
return False;
r8501: * disable printer handle object cache (was mostly used for NT4 clients enumerating printer data on slow CPUs) * fix pinter and secdesc record upgrade to normalize the key (rev'd printer tdb version) * fixed problem that was normalizing the printername name field in general, this should fix the issues upgrading print servers from 3.0.14a to 3.0.20 (This used to be commit d07179de2f2a6eb1d13d0e25ac10de1a21475559)
2005-07-15 18:26:11 +04:00
}
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
}
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Bring printing in HEAD inline with 2.2.x and app-head. Jeremy. (This used to be commit 771ef92fc6e43725b7cc351079998a8acb74abef)
2002-02-09 07:10:24 +03:00
update_c_setprinter(True);
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
/*
* register callback to handle updating printers as new
* drivers are installed
*/
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
r22954: More messaging_register (This used to be commit 9b8df24107ffe3016031e5257c5680689f061886)
2007-05-17 00:56:39 +04:00
messaging_register(msg_ctx, NULL, MSG_PRINTER_DRVUPGRADE,
do_drv_upgrade_printer);
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
r1885: tighten the cache consistency with the ntprinters.tdb entry an the in memory cache associated with open printer handles; also make sure that register_messages_flags() doesn't overwrite the originally registers flags (This used to be commit 540daf71d8ad189af5dd6d45aa1ce2b3d67da752)
2004-08-18 17:55:58 +04:00
/* of course, none of the message callbacks matter if you don't
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
tell messages.c that you interested in receiving PRINT_GENERAL
s3: Fix a long-standing problem with recycled PIDs When a samba server process dies hard, it has no chance to clean up its entries in locking.tdb, brlock.tdb, connections.tdb and sessionid.tdb. For locking.tdb and brlock.tdb Samba is robust by checking every time we read an entry from the database if the corresponding process still exists. If it does not exist anymore, the entry is deleted. This is not 100% failsafe though: On systems with a limited PID space there is a non-zero chance that between the smbd's death and the fresh access, the PID is recycled by another long-running process. This renders all files that had been locked by the killed smbd potentially unusable until the new process also dies. This patch is supposed to fix the problem the following way: Every process ID in every database is augmented by a random 64-bit number that is stored in a serverid.tdb. Whenever we need to check if a process still exists we know its PID and the 64-bit number. We look up the PID in serverid.tdb and compare the 64-bit number. If it's the same, the process still is a valid smbd holding the lock. If it is different, a new smbd has taken over. I believe this is safe against an smbd that has died hard and the PID has been taken over by a non-samba process. This process would not have registered itself with a fresh 64-bit number in serverid.tdb, so the old one still exists in serverid.tdb. We protect against this case by the parent smbd taking care of deregistering PIDs from serverid.tdb and the fact that serverid.tdb is CLEAR_IF_FIRST. CLEAR_IF_FIRST does not work in a cluster, so the automatic cleanup does not work when all smbds are restarted. For this, "net serverid wipe" has to be run before smbd starts up. As a convenience, "net serverid wipedbs" also cleans up sessionid.tdb and connections.tdb. While there, this also cleans up overloading connections.tdb with all the process entries just for messaging_send_all(). Volker
2010-03-02 19:02:01 +03:00
msgs. This is done in serverid_register() */
r1885: tighten the cache consistency with the ntprinters.tdb entry an the in memory cache associated with open printer handles; also make sure that register_messages_flags() doesn't overwrite the originally registers flags (This used to be commit 540daf71d8ad189af5dd6d45aa1ce2b3d67da752)
2004-08-18 17:55:58 +04:00
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
r2955: fixing a segfault uncovered by the changes for BUG 1519 (This used to be commit 1664395257eb2425246e200ebde4384aa54484a4)
2004-10-13 23:40:22 +04:00
if ( lp_security() == SEC_ADS ) {
win_rc = check_published_printers();
if (!W_ERROR_IS_OK(win_rc))
Rename dos_errstr() to win_errstr() for consistency with Samba 4.
2008-11-01 19:19:26 +03:00
DEBUG(0, ("nt_printing_init: error checking published printers: %s\n", win_errstr(win_rc)));
r2955: fixing a segfault uncovered by the changes for BUG 1519 (This used to be commit 1664395257eb2425246e200ebde4384aa54484a4)
2004-10-13 23:40:22 +04:00
}
r2569: Patch from Rob Foehl <rwf@loonybin.net>: - fix typo in libads/ldap_printer.c:39, ads_find_printer_on_server() (originally libads-typo.patch) - fix leak in printing/nt_printing.c, is_printer_published() (originally is_printer_published-leak.patch) - fix double print_backend_init() calls, now only called from main() - restructuring in printing/nt_printing.c - replaced (un)publish_it() with ads-specific functions - moved common code to nt_printer_publish() - improved error handling in several places - added check_published_printers() in printing/nt_printing.c, to verify that each published printer is actually in the directory at startup - changed calling semantics of mod_a_printer, dump_a_printer, and update_driver_init to be more consistent with the rest of the api and reduce some copying (This used to be commit 50a5a3dbd02acb0d09133b6e42cc37d091ea901d)
2004-09-23 23:24:02 +04:00
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
return True;
}
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
r460: Fix for broken driver upload/delete path processing. Jeremy. (This used to be commit 78be46d13bc88a300ab627c59862559d5491ee46)
2004-05-03 20:38:37 +04:00
/*******************************************************************
Function to allow filename parsing "the old way".
********************************************************************/
s3: Prepare the first set of SMB_VFS_CREATE_FILE callers to take an smb_filename struct Some of the callers required minimal changes, while others (copy_internals) required significant changes. The task is simplified a little bit because we are able to do operations and checks on the base_name when a stream isn't used. This patch should cause no functional changes. Volker, Jeremy: Please check
2009-06-10 21:37:57 +04:00
static NTSTATUS driver_unix_convert(connection_struct *conn,
const char *old_name,
struct smb_filename **smb_fname)
r460: Fix for broken driver upload/delete path processing. Jeremy. (This used to be commit 78be46d13bc88a300ab627c59862559d5491ee46)
2004-05-03 20:38:37 +04:00
{
s3: Change unix_convert (and its callers) to use struct smb_filename This is the first of a series of patches that change path based operations to operate on a struct smb_filename instead of a char *. This same concept already exists in source4. My goals for this series of patches are to eventually: 1) Solve the stream vs. posix filename that contains a colon ambiguity that currently exists. 2) Make unix_convert the only function that parses the stream name. 3) Clean up the unix_convert API. 4) Change all path based vfs operation to take a struct smb_filename. 5) Make is_ntfs_stream_name() a constant operation that can simply check the state of struct smb_filename rather than re-parse the filename. 6) Eliminate the need for split_ntfs_stream_name() to exist. My strategy is to start from the inside at unix_convert() and work my way out through the vfs layer, call by call. This first patch does just that, by changing unix_convert and all of its callers to operate on struct smb_filename. Since this is such a large change, I plan on pushing the patches in phases, where each phase keeps full compatibility and passes make test. The API of unix_convert has been simplified from: NTSTATUS unix_convert(TALLOC_CTX *ctx, connection_struct *conn, const char *orig_path, bool allow_wcard_last_component, char **pp_conv_path, char **pp_saved_last_component, SMB_STRUCT_STAT *pst) to: NTSTATUS unix_convert(TALLOC_CTX *ctx, connection_struct *conn, const char *orig_path, struct smb_filename *smb_fname, uint32_t ucf_flags) Currently the smb_filename struct looks like: struct smb_filename { char *base_name; char *stream_name; char *original_lcomp; SMB_STRUCT_STAT st; }; One key point here is the decision to break up the base_name and stream_name. I have introduced a helper function called get_full_smb_filename() that takes an smb_filename struct and allocates the full_name. I changed the callers of unix_convert() to subsequently call get_full_smb_filename() for the time being, but I plan to eventually eliminate get_full_smb_filename().
2009-04-08 00:39:57 +04:00
NTSTATUS status;
More pstring removal. This one was tricky. I had to add one horror (pstring_clean_name()) which will have to remain until I've removed all pstrings from the client code. Jeremy. (This used to be commit 1ea3ac80146b83c2522b69e7747c823366a2b47d)
2007-11-16 01:19:52 +03:00
TALLOC_CTX *ctx = talloc_tos();
char *name = talloc_strdup(ctx, old_name);
if (!name) {
s3: Prepare the first set of SMB_VFS_CREATE_FILE callers to take an smb_filename struct Some of the callers required minimal changes, while others (copy_internals) required significant changes. The task is simplified a little bit because we are able to do operations and checks on the base_name when a stream isn't used. This patch should cause no functional changes. Volker, Jeremy: Please check
2009-06-10 21:37:57 +04:00
return NT_STATUS_NO_MEMORY;
More pstring removal. This one was tricky. I had to add one horror (pstring_clean_name()) which will have to remain until I've removed all pstrings from the client code. Jeremy. (This used to be commit 1ea3ac80146b83c2522b69e7747c823366a2b47d)
2007-11-16 01:19:52 +03:00
}
r460: Fix for broken driver upload/delete path processing. Jeremy. (This used to be commit 78be46d13bc88a300ab627c59862559d5491ee46)
2004-05-03 20:38:37 +04:00
unix_format(name);
More pstring removal. This one was tricky. I had to add one horror (pstring_clean_name()) which will have to remain until I've removed all pstrings from the client code. Jeremy. (This used to be commit 1ea3ac80146b83c2522b69e7747c823366a2b47d)
2007-11-16 01:19:52 +03:00
name = unix_clean_name(ctx, name);
if (!name) {
s3: Prepare the first set of SMB_VFS_CREATE_FILE callers to take an smb_filename struct Some of the callers required minimal changes, while others (copy_internals) required significant changes. The task is simplified a little bit because we are able to do operations and checks on the base_name when a stream isn't used. This patch should cause no functional changes. Volker, Jeremy: Please check
2009-06-10 21:37:57 +04:00
return NT_STATUS_NO_MEMORY;
r25009: Large patch discussed with Volker. Move unix_convert to a talloc-based interface. More development will come on top of this. Remove the "mangled map" parameter. Jeremy. (This used to be commit dee8beba7a92b8a3f68bbcc59fd0a827f68c7736)
2007-09-08 00:57:01 +04:00
}
More pstring removal. This one was tricky. I had to add one horror (pstring_clean_name()) which will have to remain until I've removed all pstrings from the client code. Jeremy. (This used to be commit 1ea3ac80146b83c2522b69e7747c823366a2b47d)
2007-11-16 01:19:52 +03:00
trim_string(name,"/","/");
s3: Change unix_convert (and its callers) to use struct smb_filename This is the first of a series of patches that change path based operations to operate on a struct smb_filename instead of a char *. This same concept already exists in source4. My goals for this series of patches are to eventually: 1) Solve the stream vs. posix filename that contains a colon ambiguity that currently exists. 2) Make unix_convert the only function that parses the stream name. 3) Clean up the unix_convert API. 4) Change all path based vfs operation to take a struct smb_filename. 5) Make is_ntfs_stream_name() a constant operation that can simply check the state of struct smb_filename rather than re-parse the filename. 6) Eliminate the need for split_ntfs_stream_name() to exist. My strategy is to start from the inside at unix_convert() and work my way out through the vfs layer, call by call. This first patch does just that, by changing unix_convert and all of its callers to operate on struct smb_filename. Since this is such a large change, I plan on pushing the patches in phases, where each phase keeps full compatibility and passes make test. The API of unix_convert has been simplified from: NTSTATUS unix_convert(TALLOC_CTX *ctx, connection_struct *conn, const char *orig_path, bool allow_wcard_last_component, char **pp_conv_path, char **pp_saved_last_component, SMB_STRUCT_STAT *pst) to: NTSTATUS unix_convert(TALLOC_CTX *ctx, connection_struct *conn, const char *orig_path, struct smb_filename *smb_fname, uint32_t ucf_flags) Currently the smb_filename struct looks like: struct smb_filename { char *base_name; char *stream_name; char *original_lcomp; SMB_STRUCT_STAT st; }; One key point here is the decision to break up the base_name and stream_name. I have introduced a helper function called get_full_smb_filename() that takes an smb_filename struct and allocates the full_name. I changed the callers of unix_convert() to subsequently call get_full_smb_filename() for the time being, but I plan to eventually eliminate get_full_smb_filename().
2009-04-08 00:39:57 +04:00
s3: Prepare the first set of SMB_VFS_CREATE_FILE callers to take an smb_filename struct Some of the callers required minimal changes, while others (copy_internals) required significant changes. The task is simplified a little bit because we are able to do operations and checks on the base_name when a stream isn't used. This patch should cause no functional changes. Volker, Jeremy: Please check
2009-06-10 21:37:57 +04:00
status = unix_convert(ctx, conn, name, smb_fname, 0);
s3: Change unix_convert (and its callers) to use struct smb_filename This is the first of a series of patches that change path based operations to operate on a struct smb_filename instead of a char *. This same concept already exists in source4. My goals for this series of patches are to eventually: 1) Solve the stream vs. posix filename that contains a colon ambiguity that currently exists. 2) Make unix_convert the only function that parses the stream name. 3) Clean up the unix_convert API. 4) Change all path based vfs operation to take a struct smb_filename. 5) Make is_ntfs_stream_name() a constant operation that can simply check the state of struct smb_filename rather than re-parse the filename. 6) Eliminate the need for split_ntfs_stream_name() to exist. My strategy is to start from the inside at unix_convert() and work my way out through the vfs layer, call by call. This first patch does just that, by changing unix_convert and all of its callers to operate on struct smb_filename. Since this is such a large change, I plan on pushing the patches in phases, where each phase keeps full compatibility and passes make test. The API of unix_convert has been simplified from: NTSTATUS unix_convert(TALLOC_CTX *ctx, connection_struct *conn, const char *orig_path, bool allow_wcard_last_component, char **pp_conv_path, char **pp_saved_last_component, SMB_STRUCT_STAT *pst) to: NTSTATUS unix_convert(TALLOC_CTX *ctx, connection_struct *conn, const char *orig_path, struct smb_filename *smb_fname, uint32_t ucf_flags) Currently the smb_filename struct looks like: struct smb_filename { char *base_name; char *stream_name; char *original_lcomp; SMB_STRUCT_STAT st; }; One key point here is the decision to break up the base_name and stream_name. I have introduced a helper function called get_full_smb_filename() that takes an smb_filename struct and allocates the full_name. I changed the callers of unix_convert() to subsequently call get_full_smb_filename() for the time being, but I plan to eventually eliminate get_full_smb_filename().
2009-04-08 00:39:57 +04:00
if (!NT_STATUS_IS_OK(status)) {
s3: Prepare the first set of SMB_VFS_CREATE_FILE callers to take an smb_filename struct Some of the callers required minimal changes, while others (copy_internals) required significant changes. The task is simplified a little bit because we are able to do operations and checks on the base_name when a stream isn't used. This patch should cause no functional changes. Volker, Jeremy: Please check
2009-06-10 21:37:57 +04:00
return NT_STATUS_NO_MEMORY;
s3: Change unix_convert (and its callers) to use struct smb_filename This is the first of a series of patches that change path based operations to operate on a struct smb_filename instead of a char *. This same concept already exists in source4. My goals for this series of patches are to eventually: 1) Solve the stream vs. posix filename that contains a colon ambiguity that currently exists. 2) Make unix_convert the only function that parses the stream name. 3) Clean up the unix_convert API. 4) Change all path based vfs operation to take a struct smb_filename. 5) Make is_ntfs_stream_name() a constant operation that can simply check the state of struct smb_filename rather than re-parse the filename. 6) Eliminate the need for split_ntfs_stream_name() to exist. My strategy is to start from the inside at unix_convert() and work my way out through the vfs layer, call by call. This first patch does just that, by changing unix_convert and all of its callers to operate on struct smb_filename. Since this is such a large change, I plan on pushing the patches in phases, where each phase keeps full compatibility and passes make test. The API of unix_convert has been simplified from: NTSTATUS unix_convert(TALLOC_CTX *ctx, connection_struct *conn, const char *orig_path, bool allow_wcard_last_component, char **pp_conv_path, char **pp_saved_last_component, SMB_STRUCT_STAT *pst) to: NTSTATUS unix_convert(TALLOC_CTX *ctx, connection_struct *conn, const char *orig_path, struct smb_filename *smb_fname, uint32_t ucf_flags) Currently the smb_filename struct looks like: struct smb_filename { char *base_name; char *stream_name; char *original_lcomp; SMB_STRUCT_STAT st; }; One key point here is the decision to break up the base_name and stream_name. I have introduced a helper function called get_full_smb_filename() that takes an smb_filename struct and allocates the full_name. I changed the callers of unix_convert() to subsequently call get_full_smb_filename() for the time being, but I plan to eventually eliminate get_full_smb_filename().
2009-04-08 00:39:57 +04:00
}
s3: Prepare the first set of SMB_VFS_CREATE_FILE callers to take an smb_filename struct Some of the callers required minimal changes, while others (copy_internals) required significant changes. The task is simplified a little bit because we are able to do operations and checks on the base_name when a stream isn't used. This patch should cause no functional changes. Volker, Jeremy: Please check
2009-06-10 21:37:57 +04:00
return NT_STATUS_OK;
r460: Fix for broken driver upload/delete path processing. Jeremy. (This used to be commit 78be46d13bc88a300ab627c59862559d5491ee46)
2004-05-03 20:38:37 +04:00
}
Bring printing in HEAD inline with 2.2.x and app-head. Jeremy. (This used to be commit 771ef92fc6e43725b7cc351079998a8acb74abef)
2002-02-09 07:10:24 +03:00
/*******************************************************************
tdb traversal function for counting printers.
********************************************************************/
static int traverse_counting_printers(TDB_CONTEXT *t, TDB_DATA key,
TDB_DATA data, void *context)
{
int *printer_count = (int*)context;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Bring printing in HEAD inline with 2.2.x and app-head. Jeremy. (This used to be commit 771ef92fc6e43725b7cc351079998a8acb74abef)
2002-02-09 07:10:24 +03:00
if (memcmp(PRINTERS_PREFIX, key.dptr, sizeof(PRINTERS_PREFIX)-1) == 0) {
(*printer_count)++;
DEBUG(10,("traverse_counting_printers: printer = [%s] printer_count = %d\n", key.dptr, *printer_count));
}
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Bring printing in HEAD inline with 2.2.x and app-head. Jeremy. (This used to be commit 771ef92fc6e43725b7cc351079998a8acb74abef)
2002-02-09 07:10:24 +03:00
return 0;
}
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Bring printing in HEAD inline with 2.2.x and app-head. Jeremy. (This used to be commit 771ef92fc6e43725b7cc351079998a8acb74abef)
2002-02-09 07:10:24 +03:00
/*******************************************************************
Update the spooler global c_setprinter. This variable is initialized
when the parent smbd starts with the number of existing printers. It
is monotonically increased by the current number of printers *after*
each add or delete printer RPC. Only Microsoft knows why... JRR020119
********************************************************************/
RIP BOOL. Convert BOOL -> bool. I found a few interesting bugs in various places whilst doing this (places that assumed BOOL == int). I also need to fix the Samba4 pidl generation (next checkin). Jeremy. (This used to be commit f35a266b3cbb3e5fa6a86be60f34fe340a3ca71f)
2007-10-19 04:40:25 +04:00
uint32 update_c_setprinter(bool initialize)
Bring printing in HEAD inline with 2.2.x and app-head. Jeremy. (This used to be commit 771ef92fc6e43725b7cc351079998a8acb74abef)
2002-02-09 07:10:24 +03:00
{
int32 c_setprinter;
int32 printer_count = 0;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r15101: Little step towards getting Samba4 tdb into 3: tdb_lock_bystring does not have the timeout argument in Samba4. Add a new routine tdb_lock_bystring_with_timeout. Volker (This used to be commit b9c6e3f55602fa505859a4b2cd137b74105d685f)
2006-04-17 15:49:06 +04:00
tdb_lock_bystring(tdb_printers, GLOBAL_C_SETPRINTER);
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Bring printing in HEAD inline with 2.2.x and app-head. Jeremy. (This used to be commit 771ef92fc6e43725b7cc351079998a8acb74abef)
2002-02-09 07:10:24 +03:00
/* Traverse the tdb, counting the printers */
tdb_traverse(tdb_printers, traverse_counting_printers, (void *)&printer_count);
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Bring printing in HEAD inline with 2.2.x and app-head. Jeremy. (This used to be commit 771ef92fc6e43725b7cc351079998a8acb74abef)
2002-02-09 07:10:24 +03:00
/* If initializing, set c_setprinter to current printers count
* otherwise, bump it by the current printer count
*/
if (!initialize)
c_setprinter = tdb_fetch_int32(tdb_printers, GLOBAL_C_SETPRINTER) + printer_count;
else
c_setprinter = printer_count;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Bring printing in HEAD inline with 2.2.x and app-head. Jeremy. (This used to be commit 771ef92fc6e43725b7cc351079998a8acb74abef)
2002-02-09 07:10:24 +03:00
DEBUG(10,("update_c_setprinter: c_setprinter = %u\n", (unsigned int)c_setprinter));
tdb_store_int32(tdb_printers, GLOBAL_C_SETPRINTER, c_setprinter);
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Bring printing in HEAD inline with 2.2.x and app-head. Jeremy. (This used to be commit 771ef92fc6e43725b7cc351079998a8acb74abef)
2002-02-09 07:10:24 +03:00
tdb_unlock_bystring(tdb_printers, GLOBAL_C_SETPRINTER);
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Bring printing in HEAD inline with 2.2.x and app-head. Jeremy. (This used to be commit 771ef92fc6e43725b7cc351079998a8acb74abef)
2002-02-09 07:10:24 +03:00
return (uint32)c_setprinter;
}
/*******************************************************************
Get the spooler global c_setprinter, accounting for initialization.
********************************************************************/
uint32 get_c_setprinter(void)
{
int32 c_setprinter = tdb_fetch_int32(tdb_printers, GLOBAL_C_SETPRINTER);
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Bring printing in HEAD inline with 2.2.x and app-head. Jeremy. (This used to be commit 771ef92fc6e43725b7cc351079998a8acb74abef)
2002-02-09 07:10:24 +03:00
if (c_setprinter == (int32)-1)
c_setprinter = update_c_setprinter(True);
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Bring printing in HEAD inline with 2.2.x and app-head. Jeremy. (This used to be commit 771ef92fc6e43725b7cc351079998a8acb74abef)
2002-02-09 07:10:24 +03:00
DEBUG(10,("get_c_setprinter: c_setprinter = %d\n", c_setprinter));
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Bring printing in HEAD inline with 2.2.x and app-head. Jeremy. (This used to be commit 771ef92fc6e43725b7cc351079998a8acb74abef)
2002-02-09 07:10:24 +03:00
return (uint32)c_setprinter;
}
Sync up with new NT forms code. Jeremy. (This used to be commit 63ce316d870be0cf61ae669c955479ec175fdaef)
2001-04-04 02:41:31 +04:00
/****************************************************************************
Bring printing in HEAD inline with 2.2.x and app-head. Jeremy. (This used to be commit 771ef92fc6e43725b7cc351079998a8acb74abef)
2002-02-09 07:10:24 +03:00
Get builtin form struct list.
Sync up with new NT forms code. Jeremy. (This used to be commit 63ce316d870be0cf61ae669c955479ec175fdaef)
2001-04-04 02:41:31 +04:00
****************************************************************************/
Bring printing in HEAD inline with 2.2.x and app-head. Jeremy. (This used to be commit 771ef92fc6e43725b7cc351079998a8acb74abef)
2002-02-09 07:10:24 +03:00
Sync up with new NT forms code. Jeremy. (This used to be commit 63ce316d870be0cf61ae669c955479ec175fdaef)
2001-04-04 02:41:31 +04:00
int get_builtin_ntforms(nt_forms_struct **list)
{
*list = (nt_forms_struct *)memdup(&default_forms[0], sizeof(default_forms));
r16582: Fix Klocwork #1997 and all generic class of problems where we don't correctly check the return from memdup. Jeremy. (This used to be commit ce14daf51c7ee2f9c68c77f7f4674e6f0e35c9ca)
2006-06-28 04:50:14 +04:00
if (!*list) {
return 0;
}
s3-printing: use ARRAY_SIZE() macro in forms functions. Guenther
2009-04-18 02:58:12 +04:00
return ARRAY_SIZE(default_forms);
Sync up with new NT forms code. Jeremy. (This used to be commit 63ce316d870be0cf61ae669c955479ec175fdaef)
2001-04-04 02:41:31 +04:00
}
/****************************************************************************
get a builtin form struct
****************************************************************************/
s3-spoolss: rework some form functions and add form_by_string functions. Guenther
2008-11-16 00:17:23 +03:00
bool get_a_builtin_ntform_by_string(const char *form_name, nt_forms_struct *form)
Sync up with new NT forms code. Jeremy. (This used to be commit 63ce316d870be0cf61ae669c955479ec175fdaef)
2001-04-04 02:41:31 +04:00
{
s3-printing: use ARRAY_SIZE() macro in forms functions. Guenther
2009-04-18 02:58:12 +04:00
int i;
Sync up with new NT forms code. Jeremy. (This used to be commit 63ce316d870be0cf61ae669c955479ec175fdaef)
2001-04-04 02:41:31 +04:00
DEBUGADD(6,("Looking for builtin form %s \n", form_name));
s3-printing: use ARRAY_SIZE() macro in forms functions. Guenther
2009-04-18 02:58:12 +04:00
for (i=0; i<ARRAY_SIZE(default_forms); i++) {
Sync up with new NT forms code. Jeremy. (This used to be commit 63ce316d870be0cf61ae669c955479ec175fdaef)
2001-04-04 02:41:31 +04:00
if (strequal(form_name,default_forms[i].name)) {
DEBUGADD(6,("Found builtin form %s \n", form_name));
memcpy(form,&default_forms[i],sizeof(*form));
s3-printing: use ARRAY_SIZE() macro in forms functions. Guenther
2009-04-18 02:58:12 +04:00
return true;
Sync up with new NT forms code. Jeremy. (This used to be commit 63ce316d870be0cf61ae669c955479ec175fdaef)
2001-04-04 02:41:31 +04:00
}
}
s3-printing: use ARRAY_SIZE() macro in forms functions. Guenther
2009-04-18 02:58:12 +04:00
return false;
Sync up with new NT forms code. Jeremy. (This used to be commit 63ce316d870be0cf61ae669c955479ec175fdaef)
2001-04-04 02:41:31 +04:00
}
Roll back to using malloc/realloc on some of spoolss in head. I'm having problems with talloc_realloc in the 2.2 branch and I want a stable reference. The only problem is this breaks the clean auto-generated code in *one* call in srv_spoolss.c (the rfnpcnex call). Jeremy. (This used to be commit 57a9340cbafa40f3a41e6c676c6f2477855fd799)
2001-03-03 08:27:26 +03:00
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
/****************************************************************************
r13915: Fixed a very interesting class of realloc() bugs found by Coverity. realloc can return NULL in one of two cases - (1) the realloc failed, (2) realloc succeeded but the new size requested was zero, in which case this is identical to a free() call. The error paths dealing with these two cases should be different, but mostly weren't. Secondly the standard idiom for dealing with realloc when you know the new size is non-zero is the following : tmp = realloc(p, size); if (!tmp) { SAFE_FREE(p); return error; } else { p = tmp; } However, there were *many* *many* places in Samba where we were using the old (broken) idiom of : p = realloc(p, size) if (!p) { return error; } which will leak the memory pointed to by p on realloc fail. This commit (hopefully) fixes all these cases by moving to a standard idiom of : p = SMB_REALLOC(p, size) if (!p) { return error; } Where if the realloc returns null due to the realloc failing or size == 0 we *guarentee* that the storage pointed to by p has been freed. This allows me to remove a lot of code that was dealing with the standard (more verbose) method that required a tmp pointer. This is almost always what you want. When a realloc fails you never usually want the old memory, you want to free it and get into your error processing asap. For the 11 remaining cases where we really do need to keep the old pointer I have invented the new macro SMB_REALLOC_KEEP_OLD_ON_ERROR, which can be used as follows : tmp = SMB_REALLOC_KEEP_OLD_ON_ERROR(p, size); if (!tmp) { SAFE_FREE(p); return error; } else { p = tmp; } SMB_REALLOC_KEEP_OLD_ON_ERROR guarentees never to free the pointer p, even on size == 0 or realloc fail. All this is done by a hidden extra argument to Realloc(), BOOL free_old_on_error which is set appropriately by the SMB_REALLOC and SMB_REALLOC_KEEP_OLD_ON_ERROR macros (and their array counterparts). It remains to be seen what this will do to our Coverity bug count :-). Jeremy. (This used to be commit 1d710d06a214f3f1740e80e0bffd6aab44aac2b0)
2006-03-07 09:31:04 +03:00
get a form struct list.
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
****************************************************************************/
r13915: Fixed a very interesting class of realloc() bugs found by Coverity. realloc can return NULL in one of two cases - (1) the realloc failed, (2) realloc succeeded but the new size requested was zero, in which case this is identical to a free() call. The error paths dealing with these two cases should be different, but mostly weren't. Secondly the standard idiom for dealing with realloc when you know the new size is non-zero is the following : tmp = realloc(p, size); if (!tmp) { SAFE_FREE(p); return error; } else { p = tmp; } However, there were *many* *many* places in Samba where we were using the old (broken) idiom of : p = realloc(p, size) if (!p) { return error; } which will leak the memory pointed to by p on realloc fail. This commit (hopefully) fixes all these cases by moving to a standard idiom of : p = SMB_REALLOC(p, size) if (!p) { return error; } Where if the realloc returns null due to the realloc failing or size == 0 we *guarentee* that the storage pointed to by p has been freed. This allows me to remove a lot of code that was dealing with the standard (more verbose) method that required a tmp pointer. This is almost always what you want. When a realloc fails you never usually want the old memory, you want to free it and get into your error processing asap. For the 11 remaining cases where we really do need to keep the old pointer I have invented the new macro SMB_REALLOC_KEEP_OLD_ON_ERROR, which can be used as follows : tmp = SMB_REALLOC_KEEP_OLD_ON_ERROR(p, size); if (!tmp) { SAFE_FREE(p); return error; } else { p = tmp; } SMB_REALLOC_KEEP_OLD_ON_ERROR guarentees never to free the pointer p, even on size == 0 or realloc fail. All this is done by a hidden extra argument to Realloc(), BOOL free_old_on_error which is set appropriately by the SMB_REALLOC and SMB_REALLOC_KEEP_OLD_ON_ERROR macros (and their array counterparts). It remains to be seen what this will do to our Coverity bug count :-). Jeremy. (This used to be commit 1d710d06a214f3f1740e80e0bffd6aab44aac2b0)
2006-03-07 09:31:04 +03:00
Roll back to using malloc/realloc on some of spoolss in head. I'm having problems with talloc_realloc in the 2.2 branch and I want a stable reference. The only problem is this breaks the clean auto-generated code in *one* call in srv_spoolss.c (the rfnpcnex call). Jeremy. (This used to be commit 57a9340cbafa40f3a41e6c676c6f2477855fd799)
2001-03-03 08:27:26 +03:00
int get_ntforms(nt_forms_struct **list)
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
{
fixed call of firstkey/nextkey to traverse driver database (This used to be commit 11010f946af4d60d88bed450692e43c6a7860ab7)
2000-05-27 07:37:05 +04:00
TDB_DATA kbuf, newkey, dbuf;
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
nt_forms_struct form;
int ret;
Fix from John Reilly for forms ordering problems. Jeremy. (This used to be commit 837839eb3d0fae7fef5d61593862a2c1b00d6a07)
2000-09-29 01:33:08 +04:00
int i;
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
int n = 0;
r14489: Guard against coverity reversion. #181 is a false positive but make the intent clearer. Jeremy. (This used to be commit 2703df7a8f26a315ae6ab53de8f7814fa66a1c54)
2006-03-17 00:05:15 +03:00
*list = NULL;
split the nt_drivers.tdb in 3 separate tdb files. Should speed-up lookups J.F. (This used to be commit c08e22713ea4ddbc4951dc8dcc40609eb0039ddb)
2001-07-09 22:19:04 +04:00
for (kbuf = tdb_firstkey(tdb_forms);
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
kbuf.dptr;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
newkey = tdb_nextkey(tdb_forms, kbuf), free(kbuf.dptr), kbuf=newkey)
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
{
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
if (strncmp((const char *)kbuf.dptr, FORMS_PREFIX, strlen(FORMS_PREFIX)) != 0)
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
continue;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
split the nt_drivers.tdb in 3 separate tdb files. Should speed-up lookups J.F. (This used to be commit c08e22713ea4ddbc4951dc8dcc40609eb0039ddb)
2001-07-09 22:19:04 +04:00
dbuf = tdb_fetch(tdb_forms, kbuf);
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
if (!dbuf.dptr)
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
continue;
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
r22009: change TDB_DATA from char * to unsigned char * and fix all compiler warnings in the users metze (This used to be commit 3a28443079c141a6ce8182c65b56ca210e34f37f)
2007-03-29 13:35:51 +04:00
fstrcpy(form.name, (const char *)kbuf.dptr+strlen(FORMS_PREFIX));
Fix from John Reilly for forms ordering problems. Jeremy. (This used to be commit 837839eb3d0fae7fef5d61593862a2c1b00d6a07)
2000-09-29 01:33:08 +04:00
ret = tdb_unpack(dbuf.dptr, dbuf.dsize, "dddddddd",
&i, &form.flag, &form.width, &form.length, &form.left,
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
&form.top, &form.right, &form.bottom);
move to SAFE_FREE() (This used to be commit 09bf4425492fd96672ddd7a31d88854adcf7f0fe)
2001-09-17 13:25:57 +04:00
SAFE_FREE(dbuf.dptr);
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
if (ret != dbuf.dsize)
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
continue;
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
r13915: Fixed a very interesting class of realloc() bugs found by Coverity. realloc can return NULL in one of two cases - (1) the realloc failed, (2) realloc succeeded but the new size requested was zero, in which case this is identical to a free() call. The error paths dealing with these two cases should be different, but mostly weren't. Secondly the standard idiom for dealing with realloc when you know the new size is non-zero is the following : tmp = realloc(p, size); if (!tmp) { SAFE_FREE(p); return error; } else { p = tmp; } However, there were *many* *many* places in Samba where we were using the old (broken) idiom of : p = realloc(p, size) if (!p) { return error; } which will leak the memory pointed to by p on realloc fail. This commit (hopefully) fixes all these cases by moving to a standard idiom of : p = SMB_REALLOC(p, size) if (!p) { return error; } Where if the realloc returns null due to the realloc failing or size == 0 we *guarentee* that the storage pointed to by p has been freed. This allows me to remove a lot of code that was dealing with the standard (more verbose) method that required a tmp pointer. This is almost always what you want. When a realloc fails you never usually want the old memory, you want to free it and get into your error processing asap. For the 11 remaining cases where we really do need to keep the old pointer I have invented the new macro SMB_REALLOC_KEEP_OLD_ON_ERROR, which can be used as follows : tmp = SMB_REALLOC_KEEP_OLD_ON_ERROR(p, size); if (!tmp) { SAFE_FREE(p); return error; } else { p = tmp; } SMB_REALLOC_KEEP_OLD_ON_ERROR guarentees never to free the pointer p, even on size == 0 or realloc fail. All this is done by a hidden extra argument to Realloc(), BOOL free_old_on_error which is set appropriately by the SMB_REALLOC and SMB_REALLOC_KEEP_OLD_ON_ERROR macros (and their array counterparts). It remains to be seen what this will do to our Coverity bug count :-). Jeremy. (This used to be commit 1d710d06a214f3f1740e80e0bffd6aab44aac2b0)
2006-03-07 09:31:04 +03:00
*list = SMB_REALLOC_ARRAY(*list, nt_forms_struct, n+1);
if (!*list) {
Sync up with new NT forms code. Jeremy. (This used to be commit 63ce316d870be0cf61ae669c955479ec175fdaef)
2001-04-04 02:41:31 +04:00
DEBUG(0,("get_ntforms: Realloc fail.\n"));
return 0;
Fix from John Reilly for forms ordering problems. Jeremy. (This used to be commit 837839eb3d0fae7fef5d61593862a2c1b00d6a07)
2000-09-29 01:33:08 +04:00
}
Sync up with new NT forms code. Jeremy. (This used to be commit 63ce316d870be0cf61ae669c955479ec175fdaef)
2001-04-04 02:41:31 +04:00
(*list)[n] = form;
n++;
fixed!! yipee! the damn "device settings cannot be displayed" error is gone. We needed to supply a default set of forms. I've added A4 and Letter by default. (This used to be commit 36f1189be1609490b6a825a2608b9cf5dc682656)
2000-06-06 05:47:11 +04:00
}
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
fixed!! yipee! the damn "device settings cannot be displayed" error is gone. We needed to supply a default set of forms. I've added A4 and Letter by default. (This used to be commit 36f1189be1609490b6a825a2608b9cf5dc682656)
2000-06-06 05:47:11 +04:00
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
return n;
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
}
/****************************************************************************
write a form struct list
****************************************************************************/
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
int write_ntforms(nt_forms_struct **list, int number)
{
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
TALLOC_CTX *ctx = talloc_tos();
char *buf = NULL;
char *key = NULL;
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
int len;
r21989: make use of tdb_*_bystring() and string_term_tdb_data() to avoid creating the TDB_DATA struct from strings "by hand" metze (This used to be commit 1897da9efcfe58ff3c190450731f33bef3ac2ebd)
2007-03-27 15:22:07 +04:00
TDB_DATA dbuf;
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
int i;
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
for (i=0;i<number;i++) {
Fix from John Reilly for forms ordering problems. Jeremy. (This used to be commit 837839eb3d0fae7fef5d61593862a2c1b00d6a07)
2000-09-29 01:33:08 +04:00
/* save index, so list is rebuilt in correct order */
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
len = tdb_pack(NULL, 0, "dddddddd",
Fix from John Reilly for forms ordering problems. Jeremy. (This used to be commit 837839eb3d0fae7fef5d61593862a2c1b00d6a07)
2000-09-29 01:33:08 +04:00
i, (*list)[i].flag, (*list)[i].width, (*list)[i].length,
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
(*list)[i].left, (*list)[i].top, (*list)[i].right,
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
(*list)[i].bottom);
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
if (!len) {
continue;
}
buf = TALLOC_ARRAY(ctx, char, len);
if (!buf) {
return 0;
}
len = tdb_pack((uint8 *)buf, len, "dddddddd",
i, (*list)[i].flag, (*list)[i].width, (*list)[i].length,
(*list)[i].left, (*list)[i].top, (*list)[i].right,
(*list)[i].bottom);
key = talloc_asprintf(ctx, "%s%s", FORMS_PREFIX, (*list)[i].name);
if (!key) {
return 0;
}
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
dbuf.dsize = len;
r22009: change TDB_DATA from char * to unsigned char * and fix all compiler warnings in the users metze (This used to be commit 3a28443079c141a6ce8182c65b56ca210e34f37f)
2007-03-29 13:35:51 +04:00
dbuf.dptr = (uint8 *)buf;
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
if (tdb_store_bystring(tdb_forms, key, dbuf, TDB_REPLACE) != 0) {
TALLOC_FREE(key);
TALLOC_FREE(buf);
break;
}
TALLOC_FREE(key);
TALLOC_FREE(buf);
Roll back to using malloc/realloc on some of spoolss in head. I'm having problems with talloc_realloc in the 2.2 branch and I want a stable reference. The only problem is this breaks the clean auto-generated code in *one* call in srv_spoolss.c (the rfnpcnex call). Jeremy. (This used to be commit 57a9340cbafa40f3a41e6c676c6f2477855fd799)
2001-03-03 08:27:26 +03:00
}
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
Roll back to using malloc/realloc on some of spoolss in head. I'm having problems with talloc_realloc in the 2.2 branch and I want a stable reference. The only problem is this breaks the clean auto-generated code in *one* call in srv_spoolss.c (the rfnpcnex call). Jeremy. (This used to be commit 57a9340cbafa40f3a41e6c676c6f2477855fd799)
2001-03-03 08:27:26 +03:00
return i;
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
}
/****************************************************************************
add a form struct at the end of the list
****************************************************************************/
s3-spoolss: use pidl for spoolss_AddForm. Guenther
2009-02-08 02:04:27 +03:00
bool add_a_form(nt_forms_struct **list, struct spoolss_AddFormInfo1 *form, int *count)
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
{
int n=0;
RIP BOOL. Convert BOOL -> bool. I found a few interesting bugs in various places whilst doing this (places that assumed BOOL == int). I also need to fix the Samba4 pidl generation (next checkin). Jeremy. (This used to be commit f35a266b3cbb3e5fa6a86be60f34fe340a3ca71f)
2007-10-19 04:40:25 +04:00
bool update;
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
/*
* NT tries to add forms even when
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
* they are already in the base
* only update the values if already present
*/
update=False;
s3-spoolss: use pidl for spoolss_AddForm. Guenther
2009-02-08 02:04:27 +03:00
Fix for incorrect break using wrong offset when updating a form. Jeremy. (This used to be commit 365c76e39d2397a12ac6785a51c4d1529527a356)
2000-11-17 03:31:29 +03:00
for (n=0; n<*count; n++) {
s3-spoolss: use pidl for spoolss_AddForm. Guenther
2009-02-08 02:04:27 +03:00
if ( strequal((*list)[n].name, form->form_name) ) {
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
update=True;
Fix for incorrect break using wrong offset when updating a form. Jeremy. (This used to be commit 365c76e39d2397a12ac6785a51c4d1529527a356)
2000-11-17 03:31:29 +03:00
break;
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
}
}
Fix for incorrect break using wrong offset when updating a form. Jeremy. (This used to be commit 365c76e39d2397a12ac6785a51c4d1529527a356)
2000-11-17 03:31:29 +03:00
if (update==False) {
r13915: Fixed a very interesting class of realloc() bugs found by Coverity. realloc can return NULL in one of two cases - (1) the realloc failed, (2) realloc succeeded but the new size requested was zero, in which case this is identical to a free() call. The error paths dealing with these two cases should be different, but mostly weren't. Secondly the standard idiom for dealing with realloc when you know the new size is non-zero is the following : tmp = realloc(p, size); if (!tmp) { SAFE_FREE(p); return error; } else { p = tmp; } However, there were *many* *many* places in Samba where we were using the old (broken) idiom of : p = realloc(p, size) if (!p) { return error; } which will leak the memory pointed to by p on realloc fail. This commit (hopefully) fixes all these cases by moving to a standard idiom of : p = SMB_REALLOC(p, size) if (!p) { return error; } Where if the realloc returns null due to the realloc failing or size == 0 we *guarentee* that the storage pointed to by p has been freed. This allows me to remove a lot of code that was dealing with the standard (more verbose) method that required a tmp pointer. This is almost always what you want. When a realloc fails you never usually want the old memory, you want to free it and get into your error processing asap. For the 11 remaining cases where we really do need to keep the old pointer I have invented the new macro SMB_REALLOC_KEEP_OLD_ON_ERROR, which can be used as follows : tmp = SMB_REALLOC_KEEP_OLD_ON_ERROR(p, size); if (!tmp) { SAFE_FREE(p); return error; } else { p = tmp; } SMB_REALLOC_KEEP_OLD_ON_ERROR guarentees never to free the pointer p, even on size == 0 or realloc fail. All this is done by a hidden extra argument to Realloc(), BOOL free_old_on_error which is set appropriately by the SMB_REALLOC and SMB_REALLOC_KEEP_OLD_ON_ERROR macros (and their array counterparts). It remains to be seen what this will do to our Coverity bug count :-). Jeremy. (This used to be commit 1d710d06a214f3f1740e80e0bffd6aab44aac2b0)
2006-03-07 09:31:04 +03:00
if((*list=SMB_REALLOC_ARRAY(*list, nt_forms_struct, n+1)) == NULL) {
this is a big global fix for the ptr = Realloc(ptr, size) bug. many possible mem leaks, and segfaults fixed. someone should port this fix to 2.2 also. (This used to be commit fa8e55b8b465114ce209344965c1ca0333b84db9)
2001-08-12 21:30:01 +04:00
DEBUG(0,("add_a_form: failed to enlarge forms list!\n"));
Modified interfaces and added checks around *all* *alloc calls so that errors are returned on memory allocation failure. Jeremy. (This used to be commit 9a118cd4a2b03146b341eeffb62144a2d29b574c)
2000-04-07 02:48:53 +04:00
return False;
this is a big global fix for the ptr = Realloc(ptr, size) bug. many possible mem leaks, and segfaults fixed. someone should port this fix to 2.2 also. (This used to be commit fa8e55b8b465114ce209344965c1ca0333b84db9)
2001-08-12 21:30:01 +04:00
}
s3-spoolss: use pidl for spoolss_AddForm. Guenther
2009-02-08 02:04:27 +03:00
fstrcpy((*list)[n].name, form->form_name);
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
(*count)++;
}
s3-spoolss: use pidl for spoolss_AddForm. Guenther
2009-02-08 02:04:27 +03:00
(*list)[n].flag = form->flags;
(*list)[n].width = form->size.width;
(*list)[n].length = form->size.height;
(*list)[n].left = form->area.left;
(*list)[n].top = form->area.top;
(*list)[n].right = form->area.right;
(*list)[n].bottom = form->area.bottom;
Modified interfaces and added checks around *all* *alloc calls so that errors are returned on memory allocation failure. Jeremy. (This used to be commit 9a118cd4a2b03146b341eeffb62144a2d29b574c)
2000-04-07 02:48:53 +04:00
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
DEBUG(6,("add_a_form: Successfully %s form [%s]\n",
s3-spoolss: use pidl for spoolss_AddForm. Guenther
2009-02-08 02:04:27 +03:00
update ? "updated" : "added", form->form_name));
r4089: fix logic error in add_a_form() that only compared N characters instead of the entire form name (This used to be commit e3decbc441686486903a4863daa862ed1672e405)
2004-12-07 22:00:45 +03:00
Modified interfaces and added checks around *all* *alloc calls so that errors are returned on memory allocation failure. Jeremy. (This used to be commit 9a118cd4a2b03146b341eeffb62144a2d29b574c)
2000-04-07 02:48:53 +04:00
return True;
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
}
Implemented DELETEFORM tested using Gerald's Win32 test code :-). Jeremy. (This used to be commit 596c21a2af0309ce43a5e52a343a671036d05ebf)
2000-08-31 23:04:51 +04:00
/****************************************************************************
Progress on CR 601 cache the printer_info_2 with the open printer handle. cache is invalidated on a mod_a_printer() call **on that smbd**. Yes, this means that the window for admins to step on each other from different clients just got larger, but since handles a generally short lived this is probably ok. (This used to be commit 31272d3b6bb9ec62fd666301c7adfa0c1720a99b)
2003-02-25 23:53:53 +03:00
Delete a named form struct.
Implemented DELETEFORM tested using Gerald's Win32 test code :-). Jeremy. (This used to be commit 596c21a2af0309ce43a5e52a343a671036d05ebf)
2000-08-31 23:04:51 +04:00
****************************************************************************/
Progress on CR 601 cache the printer_info_2 with the open printer handle. cache is invalidated on a mod_a_printer() call **on that smbd**. Yes, this means that the window for admins to step on each other from different clients just got larger, but since handles a generally short lived this is probably ok. (This used to be commit 31272d3b6bb9ec62fd666301c7adfa0c1720a99b)
2003-02-25 23:53:53 +03:00
s3-spoolss: restore delete_a_form(). Guenther
2009-02-08 21:24:39 +03:00
bool delete_a_form(nt_forms_struct **list, const char *del_name, int *count, WERROR *ret)
Implemented DELETEFORM tested using Gerald's Win32 test code :-). Jeremy. (This used to be commit 596c21a2af0309ce43a5e52a343a671036d05ebf)
2000-08-31 23:04:51 +04:00
{
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
char *key = NULL;
Implemented DELETEFORM tested using Gerald's Win32 test code :-). Jeremy. (This used to be commit 596c21a2af0309ce43a5e52a343a671036d05ebf)
2000-08-31 23:04:51 +04:00
int n=0;
the next stage in the NTSTATUS/WERROR change. smbd and nmbd now compile, but the client code still needs some work (This used to be commit dcd6e735f709a9231860ceb9682db40ff26c9a66)
2001-09-04 11:13:01 +04:00
*ret = WERR_OK;
Implemented DELETEFORM tested using Gerald's Win32 test code :-). Jeremy. (This used to be commit 596c21a2af0309ce43a5e52a343a671036d05ebf)
2000-08-31 23:04:51 +04:00
for (n=0; n<*count; n++) {
s3-spoolss: rework some form functions and add form_by_string functions. Guenther
2008-11-16 00:17:23 +03:00
if (!strncmp((*list)[n].name, del_name, strlen(del_name))) {
DEBUG(103, ("delete_a_form, [%s] in list\n", del_name));
Implemented DELETEFORM tested using Gerald's Win32 test code :-). Jeremy. (This used to be commit 596c21a2af0309ce43a5e52a343a671036d05ebf)
2000-08-31 23:04:51 +04:00
break;
}
}
if (n == *count) {
s3-spoolss: rework some form functions and add form_by_string functions. Guenther
2008-11-16 00:17:23 +03:00
DEBUG(10,("delete_a_form, [%s] not found\n", del_name));
s3-spoolss: Fix an issue in _spoolss_DeleteForm. Found by torture test. Guenther
2010-04-08 01:36:48 +04:00
*ret = WERR_INVALID_FORM_NAME;
Implemented DELETEFORM tested using Gerald's Win32 test code :-). Jeremy. (This used to be commit 596c21a2af0309ce43a5e52a343a671036d05ebf)
2000-08-31 23:04:51 +04:00
return False;
}
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
if (asprintf(&key, "%s%s", FORMS_PREFIX, (*list)[n].name) < 0) {
*ret = WERR_NOMEM;
return false;
}
r21989: make use of tdb_*_bystring() and string_term_tdb_data() to avoid creating the TDB_DATA struct from strings "by hand" metze (This used to be commit 1897da9efcfe58ff3c190450731f33bef3ac2ebd)
2007-03-27 15:22:07 +04:00
if (tdb_delete_bystring(tdb_forms, key) != 0) {
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
SAFE_FREE(key);
the next stage in the NTSTATUS/WERROR change. smbd and nmbd now compile, but the client code still needs some work (This used to be commit dcd6e735f709a9231860ceb9682db40ff26c9a66)
2001-09-04 11:13:01 +04:00
*ret = WERR_NOMEM;
Implemented DELETEFORM tested using Gerald's Win32 test code :-). Jeremy. (This used to be commit 596c21a2af0309ce43a5e52a343a671036d05ebf)
2000-08-31 23:04:51 +04:00
return False;
}
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
SAFE_FREE(key);
return true;
Implemented DELETEFORM tested using Gerald's Win32 test code :-). Jeremy. (This used to be commit 596c21a2af0309ce43a5e52a343a671036d05ebf)
2000-08-31 23:04:51 +04:00
}
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
/****************************************************************************
Progress on CR 601 cache the printer_info_2 with the open printer handle. cache is invalidated on a mod_a_printer() call **on that smbd**. Yes, this means that the window for admins to step on each other from different clients just got larger, but since handles a generally short lived this is probably ok. (This used to be commit 31272d3b6bb9ec62fd666301c7adfa0c1720a99b)
2003-02-25 23:53:53 +03:00
Update a form struct.
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
****************************************************************************/
Progress on CR 601 cache the printer_info_2 with the open printer handle. cache is invalidated on a mod_a_printer() call **on that smbd**. Yes, this means that the window for admins to step on each other from different clients just got larger, but since handles a generally short lived this is probably ok. (This used to be commit 31272d3b6bb9ec62fd666301c7adfa0c1720a99b)
2003-02-25 23:53:53 +03:00
s3-spoolss: use pidl for _spoolss_SetForm. Guenther
2009-02-08 21:19:57 +03:00
void update_a_form(nt_forms_struct **list, struct spoolss_AddFormInfo1 *form, int count)
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
{
int n=0;
s3-spoolss: use pidl for _spoolss_SetForm. Guenther
2009-02-08 21:19:57 +03:00
DEBUG(106, ("[%s]\n", form->form_name));
Progress on CR 601 cache the printer_info_2 with the open printer handle. cache is invalidated on a mod_a_printer() call **on that smbd**. Yes, this means that the window for admins to step on each other from different clients just got larger, but since handles a generally short lived this is probably ok. (This used to be commit 31272d3b6bb9ec62fd666301c7adfa0c1720a99b)
2003-02-25 23:53:53 +03:00
for (n=0; n<count; n++) {
fix the reply of rpc_alter_context OpenPrinterEx is now decoding correctly the query most of the EnumXXX use the new_buffer struct. check the (un)marshalling return code. conclusion: still a long way to go. all the client code has to be rewritten, and I still wonder how to implement correctly the notify stuff. (This used to be commit 3d6d3863751787b08d40268c83221add1487a5c9)
2000-02-15 21:07:45 +03:00
DEBUGADD(106, ("n [%d]:[%s]\n", n, (*list)[n].name));
s3-spoolss: use pidl for _spoolss_SetForm. Guenther
2009-02-08 21:19:57 +03:00
if (!strncmp((*list)[n].name, form->form_name, strlen(form->form_name)))
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
break;
}
if (n==count) return;
s3-spoolss: use pidl for _spoolss_SetForm. Guenther
2009-02-08 21:19:57 +03:00
(*list)[n].flag = form->flags;
(*list)[n].width = form->size.width;
(*list)[n].length = form->size.height;
(*list)[n].left = form->area.left;
(*list)[n].top = form->area.top;
(*list)[n].right = form->area.right;
(*list)[n].bottom = form->area.bottom;
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
}
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
/****************************************************************************
Progress on CR 601 cache the printer_info_2 with the open printer handle. cache is invalidated on a mod_a_printer() call **on that smbd**. Yes, this means that the window for admins to step on each other from different clients just got larger, but since handles a generally short lived this is probably ok. (This used to be commit 31272d3b6bb9ec62fd666301c7adfa0c1720a99b)
2003-02-25 23:53:53 +03:00
Get the nt drivers list.
Traverse the database and look-up the matching names.
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
****************************************************************************/
Merge from HEAD - make Samba compile with -Wwrite-strings without additional warnings. (Adds a lot of const). Andrew Bartlett (This used to be commit 3a7458f9472432ef12c43008414925fd1ce8ea0c)
2003-01-03 11:28:12 +03:00
int get_ntdrivers(fstring **list, const char *architecture, uint32 version)
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
{
int total=0;
Merge the 'safe' parts of my StrnCpy patch - many of the users really wanted a pstrcpy/fstrcpy or at most a safe_strcpy(). These have the advantage of being compiler-verifiable. Get these out of the way, along with a rewrite of 'get_short_archi' in the spoolss client and server. (This pushes around const string pointers, rather than copied strings). Andrew Bartlett (This used to be commit 32fb801ddc035e8971e9911ed4b6e51892e9d1cc)
2003-04-23 17:27:35 +04:00
const char *short_archi;
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
char *key = NULL;
fixed call of firstkey/nextkey to traverse driver database (This used to be commit 11010f946af4d60d88bed450692e43c6a7860ab7)
2000-05-27 07:37:05 +04:00
TDB_DATA kbuf, newkey;
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
Merge the 'safe' parts of my StrnCpy patch - many of the users really wanted a pstrcpy/fstrcpy or at most a safe_strcpy(). These have the advantage of being compiler-verifiable. Get these out of the way, along with a rewrite of 'get_short_archi' in the spoolss client and server. (This pushes around const string pointers, rather than copied strings). Andrew Bartlett (This used to be commit 32fb801ddc035e8971e9911ed4b6e51892e9d1cc)
2003-04-23 17:27:35 +04:00
short_archi = get_short_archi(architecture);
r16365: Fix Klocwork #895, #898, #899, #915, #932, #938 and a few other problems Klocwork missed. Jeremy. (This used to be commit fe05769a1a85f924c67be7e5dcee4871a86948d7)
2006-06-20 01:36:19 +04:00
if (!short_archi) {
return 0;
}
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
if (asprintf(&key, "%s%s/%d/", DRIVERS_PREFIX,
short_archi, version) < 0) {
return 0;
}
Modified interfaces and added checks around *all* *alloc calls so that errors are returned on memory allocation failure. Jeremy. (This used to be commit 9a118cd4a2b03146b341eeffb62144a2d29b574c)
2000-04-07 02:48:53 +04:00
split the nt_drivers.tdb in 3 separate tdb files. Should speed-up lookups J.F. (This used to be commit c08e22713ea4ddbc4951dc8dcc40609eb0039ddb)
2001-07-09 22:19:04 +04:00
for (kbuf = tdb_firstkey(tdb_drivers);
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
kbuf.dptr;
Remove silly safe_free() function which is a wrapper around SAFE_FREE(). Since it's a function it just sets the local pointer to NULL and basically is an equivalent to free(). It also claims it's being used for callbacks but isn't used that way anywhere.
2008-10-19 15:06:14 +04:00
newkey = tdb_nextkey(tdb_drivers, kbuf), free(kbuf.dptr), kbuf=newkey) {
Progress on CR 601 cache the printer_info_2 with the open printer handle. cache is invalidated on a mod_a_printer() call **on that smbd**. Yes, this means that the window for admins to step on each other from different clients just got larger, but since handles a generally short lived this is probably ok. (This used to be commit 31272d3b6bb9ec62fd666301c7adfa0c1720a99b)
2003-02-25 23:53:53 +03:00
r22009: change TDB_DATA from char * to unsigned char * and fix all compiler warnings in the users metze (This used to be commit 3a28443079c141a6ce8182c65b56ca210e34f37f)
2007-03-29 13:35:51 +04:00
if (strncmp((const char *)kbuf.dptr, key, strlen(key)) != 0)
Progress on CR 601 cache the printer_info_2 with the open printer handle. cache is invalidated on a mod_a_printer() call **on that smbd**. Yes, this means that the window for admins to step on each other from different clients just got larger, but since handles a generally short lived this is probably ok. (This used to be commit 31272d3b6bb9ec62fd666301c7adfa0c1720a99b)
2003-02-25 23:53:53 +03:00
continue;
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
r13915: Fixed a very interesting class of realloc() bugs found by Coverity. realloc can return NULL in one of two cases - (1) the realloc failed, (2) realloc succeeded but the new size requested was zero, in which case this is identical to a free() call. The error paths dealing with these two cases should be different, but mostly weren't. Secondly the standard idiom for dealing with realloc when you know the new size is non-zero is the following : tmp = realloc(p, size); if (!tmp) { SAFE_FREE(p); return error; } else { p = tmp; } However, there were *many* *many* places in Samba where we were using the old (broken) idiom of : p = realloc(p, size) if (!p) { return error; } which will leak the memory pointed to by p on realloc fail. This commit (hopefully) fixes all these cases by moving to a standard idiom of : p = SMB_REALLOC(p, size) if (!p) { return error; } Where if the realloc returns null due to the realloc failing or size == 0 we *guarentee* that the storage pointed to by p has been freed. This allows me to remove a lot of code that was dealing with the standard (more verbose) method that required a tmp pointer. This is almost always what you want. When a realloc fails you never usually want the old memory, you want to free it and get into your error processing asap. For the 11 remaining cases where we really do need to keep the old pointer I have invented the new macro SMB_REALLOC_KEEP_OLD_ON_ERROR, which can be used as follows : tmp = SMB_REALLOC_KEEP_OLD_ON_ERROR(p, size); if (!tmp) { SAFE_FREE(p); return error; } else { p = tmp; } SMB_REALLOC_KEEP_OLD_ON_ERROR guarentees never to free the pointer p, even on size == 0 or realloc fail. All this is done by a hidden extra argument to Realloc(), BOOL free_old_on_error which is set appropriately by the SMB_REALLOC and SMB_REALLOC_KEEP_OLD_ON_ERROR macros (and their array counterparts). It remains to be seen what this will do to our Coverity bug count :-). Jeremy. (This used to be commit 1d710d06a214f3f1740e80e0bffd6aab44aac2b0)
2006-03-07 09:31:04 +03:00
if((*list = SMB_REALLOC_ARRAY(*list, fstring, total+1)) == NULL) {
this is a big global fix for the ptr = Realloc(ptr, size) bug. many possible mem leaks, and segfaults fixed. someone should port this fix to 2.2 also. (This used to be commit fa8e55b8b465114ce209344965c1ca0333b84db9)
2001-08-12 21:30:01 +04:00
DEBUG(0,("get_ntdrivers: failed to enlarge list!\n"));
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
SAFE_FREE(key);
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
return -1;
this is a big global fix for the ptr = Realloc(ptr, size) bug. many possible mem leaks, and segfaults fixed. someone should port this fix to 2.2 also. (This used to be commit fa8e55b8b465114ce209344965c1ca0333b84db9)
2001-08-12 21:30:01 +04:00
}
Modified interfaces and added checks around *all* *alloc calls so that errors are returned on memory allocation failure. Jeremy. (This used to be commit 9a118cd4a2b03146b341eeffb62144a2d29b574c)
2000-04-07 02:48:53 +04:00
r22009: change TDB_DATA from char * to unsigned char * and fix all compiler warnings in the users metze (This used to be commit 3a28443079c141a6ce8182c65b56ca210e34f37f)
2007-03-29 13:35:51 +04:00
fstrcpy((*list)[total], (const char *)kbuf.dptr+strlen(key));
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
total++;
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
}
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
SAFE_FREE(key);
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
return(total);
}
/****************************************************************************
r16365: Fix Klocwork #895, #898, #899, #915, #932, #938 and a few other problems Klocwork missed. Jeremy. (This used to be commit fe05769a1a85f924c67be7e5dcee4871a86948d7)
2006-06-20 01:36:19 +04:00
Function to do the mapping between the long architecture name and
the short one.
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
****************************************************************************/
r16365: Fix Klocwork #895, #898, #899, #915, #932, #938 and a few other problems Klocwork missed. Jeremy. (This used to be commit fe05769a1a85f924c67be7e5dcee4871a86948d7)
2006-06-20 01:36:19 +04:00
Merge the 'safe' parts of my StrnCpy patch - many of the users really wanted a pstrcpy/fstrcpy or at most a safe_strcpy(). These have the advantage of being compiler-verifiable. Get these out of the way, along with a rewrite of 'get_short_archi' in the spoolss client and server. (This pushes around const string pointers, rather than copied strings). Andrew Bartlett (This used to be commit 32fb801ddc035e8971e9911ed4b6e51892e9d1cc)
2003-04-23 17:27:35 +04:00
const char *get_short_archi(const char *long_archi)
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
{
Merge the 'safe' parts of my StrnCpy patch - many of the users really wanted a pstrcpy/fstrcpy or at most a safe_strcpy(). These have the advantage of being compiler-verifiable. Get these out of the way, along with a rewrite of 'get_short_archi' in the spoolss client and server. (This pushes around const string pointers, rather than copied strings). Andrew Bartlett (This used to be commit 32fb801ddc035e8971e9911ed4b6e51892e9d1cc)
2003-04-23 17:27:35 +04:00
int i=-1;
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
Merge the 'safe' parts of my StrnCpy patch - many of the users really wanted a pstrcpy/fstrcpy or at most a safe_strcpy(). These have the advantage of being compiler-verifiable. Get these out of the way, along with a rewrite of 'get_short_archi' in the spoolss client and server. (This pushes around const string pointers, rather than copied strings). Andrew Bartlett (This used to be commit 32fb801ddc035e8971e9911ed4b6e51892e9d1cc)
2003-04-23 17:27:35 +04:00
DEBUG(107,("Getting architecture dependant directory\n"));
do {
i++;
} while ( (archi_table[i].long_archi!=NULL ) &&
StrCaseCmp(long_archi, archi_table[i].long_archi) );
Check the long_archi name for NULL. Jeremy. (This used to be commit e504d1170da0d89da78063f0a00fc7b9294d911f)
2002-10-31 21:42:38 +03:00
Merge the 'safe' parts of my StrnCpy patch - many of the users really wanted a pstrcpy/fstrcpy or at most a safe_strcpy(). These have the advantage of being compiler-verifiable. Get these out of the way, along with a rewrite of 'get_short_archi' in the spoolss client and server. (This pushes around const string pointers, rather than copied strings). Andrew Bartlett (This used to be commit 32fb801ddc035e8971e9911ed4b6e51892e9d1cc)
2003-04-23 17:27:35 +04:00
if (archi_table[i].long_archi==NULL) {
DEBUGADD(10,("Unknown architecture [%s] !\n", long_archi));
return NULL;
}
Check the long_archi name for NULL. Jeremy. (This used to be commit e504d1170da0d89da78063f0a00fc7b9294d911f)
2002-10-31 21:42:38 +03:00
Merge the 'safe' parts of my StrnCpy patch - many of the users really wanted a pstrcpy/fstrcpy or at most a safe_strcpy(). These have the advantage of being compiler-verifiable. Get these out of the way, along with a rewrite of 'get_short_archi' in the spoolss client and server. (This pushes around const string pointers, rather than copied strings). Andrew Bartlett (This used to be commit 32fb801ddc035e8971e9911ed4b6e51892e9d1cc)
2003-04-23 17:27:35 +04:00
/* this might be client code - but shouldn't this be an fstrcpy etc? */
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
Merge the 'safe' parts of my StrnCpy patch - many of the users really wanted a pstrcpy/fstrcpy or at most a safe_strcpy(). These have the advantage of being compiler-verifiable. Get these out of the way, along with a rewrite of 'get_short_archi' in the spoolss client and server. (This pushes around const string pointers, rather than copied strings). Andrew Bartlett (This used to be commit 32fb801ddc035e8971e9911ed4b6e51892e9d1cc)
2003-04-23 17:27:35 +04:00
DEBUGADD(108,("index: [%d]\n", i));
DEBUGADD(108,("long architecture: [%s]\n", archi_table[i].long_archi));
DEBUGADD(108,("short architecture: [%s]\n", archi_table[i].short_archi));
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
Merge the 'safe' parts of my StrnCpy patch - many of the users really wanted a pstrcpy/fstrcpy or at most a safe_strcpy(). These have the advantage of being compiler-verifiable. Get these out of the way, along with a rewrite of 'get_short_archi' in the spoolss client and server. (This pushes around const string pointers, rather than copied strings). Andrew Bartlett (This used to be commit 32fb801ddc035e8971e9911ed4b6e51892e9d1cc)
2003-04-23 17:27:35 +04:00
return archi_table[i].short_archi;
A rather big change set ! (listed in no particular order) - changed the default forms flag to 2 - all short architecture name are uppercased - get_short_archi() is now case unsensitive - the drivers TDB is indexed by archi/version/name - implemented code to move drivers from the upload area to the download area. Someone else need to look at that code. - don't return anymore a default driver if it doesn't exist in the TDB. Instead return an error. - cleaned prs_unistr. - #ifdef out jeremy's new SD parsing in printer_info_2 - removed the unused MANGLE_CODE - #ifdef out the security checking in update_printer() as it doesn't work for me. Zap your ntdrivers.tdb, it won't work anymore. J.F. (This used to be commit ac0a145acc0953a6f362497abbf4dfe70aa522a6)
2000-07-25 17:15:16 +04:00
}
/****************************************************************************
Caught one problem where a BOOL fn was returning 3 different values :-). Roll on defined types :-). Jeremy. (This used to be commit ccf07e2184a93345a51455dd3e9201dee7be70e7)
2002-01-08 04:22:23 +03:00
Version information in Microsoft files is held in a VS_VERSION_INFO structure.
There are two case to be covered here: PE (Portable Executable) and NE (New
Executable) files. Both files support the same INFO structure, but PE files
store the signature in unicode, and NE files store it as !unicode.
returns -1 on error, 1 on version info found, and 0 on no version info found.
A rather big change set ! (listed in no particular order) - changed the default forms flag to 2 - all short architecture name are uppercased - get_short_archi() is now case unsensitive - the drivers TDB is indexed by archi/version/name - implemented code to move drivers from the upload area to the download area. Someone else need to look at that code. - don't return anymore a default driver if it doesn't exist in the TDB. Instead return an error. - cleaned prs_unistr. - #ifdef out jeremy's new SD parsing in printer_info_2 - removed the unused MANGLE_CODE - #ifdef out the security checking in update_printer() as it doesn't work for me. Zap your ntdrivers.tdb, it won't work anymore. J.F. (This used to be commit ac0a145acc0953a6f362497abbf4dfe70aa522a6)
2000-07-25 17:15:16 +04:00
****************************************************************************/
Caught one problem where a BOOL fn was returning 3 different values :-). Roll on defined types :-). Jeremy. (This used to be commit ccf07e2184a93345a51455dd3e9201dee7be70e7)
2002-01-08 04:22:23 +03:00
static int get_file_version(files_struct *fsp, char *fname,uint32 *major, uint32 *minor)
A rather big change set ! (listed in no particular order) - changed the default forms flag to 2 - all short architecture name are uppercased - get_short_archi() is now case unsensitive - the drivers TDB is indexed by archi/version/name - implemented code to move drivers from the upload area to the download area. Someone else need to look at that code. - don't return anymore a default driver if it doesn't exist in the TDB. Instead return an error. - cleaned prs_unistr. - #ifdef out jeremy's new SD parsing in printer_info_2 - removed the unused MANGLE_CODE - #ifdef out the security checking in update_printer() as it doesn't work for me. Zap your ntdrivers.tdb, it won't work anymore. J.F. (This used to be commit ac0a145acc0953a6f362497abbf4dfe70aa522a6)
2000-07-25 17:15:16 +04:00
{
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
int i;
Fixes to check for wraps which could cause coredumps. Jeremy. (This used to be commit ad06edd1bb58cc5e2c38a364b1af96a933b770af)
2003-10-30 00:28:00 +03:00
char *buf = NULL;
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
ssize_t byte_count;
passdb/secrets.c passdb/smbpassfile.c smbd/server.c : Actually *use* the code written to transition from an old DOMAIN.MACHINE.MAC file to secrets.tdb. printing/nt_printing.c: Fix case insensitive name lookups for driver files. John - this should fix the Win9x/WinME problem correctly. Jeremy. (This used to be commit 8f3332a9acf413ac5d12053ca5c52733a4e946cc)
2000-11-28 02:59:42 +03:00
r21875: BUG 3275: Patch from Andy Polyakov <appro@fy.chalmers.se> Relax check for i386 header checks in the PE header of printer driver files. Thus allowing uploading of x64 print drivers from 64bit Windows clients. (This used to be commit 328807ec7b1ce6489d5443a93d1599f93af93933)
2007-03-19 20:45:13 +03:00
if ((buf=(char *)SMB_MALLOC(DOS_HEADER_SIZE)) == NULL) {
DEBUG(0,("get_file_version: PE file [%s] DOS Header malloc failed bytes = %d\n",
fname, DOS_HEADER_SIZE));
John Reilly @ HP (who is a wonderful human being and *definately* needs CVS commit access :-) has written a simple routine that peeks inside the MS PE printer driver file format and can tell if a driver is W2K or NT4.x. So we can now correctly return the driver version number. Hurrah ! JF - this is the code you always wanted ..... :-) :-). Jeremy. (This used to be commit fd17374e6d888813f4ed7142480cf93b8a16bfef)
2000-10-25 21:56:38 +04:00
goto error_exit;
}
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
if ((byte_count = vfs_read_data(fsp, buf, DOS_HEADER_SIZE)) < DOS_HEADER_SIZE) {
Fix more 64-bit printf warnings. (This used to be commit 23443e3aa079710221557e18158d0ddb8ff48a36)
2003-11-03 17:34:25 +03:00
DEBUG(3,("get_file_version: File [%s] DOS header too short, bytes read = %lu\n",
fname, (unsigned long)byte_count));
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
goto no_version_info;
John Reilly @ HP (who is a wonderful human being and *definately* needs CVS commit access :-) has written a simple routine that peeks inside the MS PE printer driver file format and can tell if a driver is W2K or NT4.x. So we can now correctly return the driver version number. Hurrah ! JF - this is the code you always wanted ..... :-) :-). Jeremy. (This used to be commit fd17374e6d888813f4ed7142480cf93b8a16bfef)
2000-10-25 21:56:38 +04:00
}
/* Is this really a DOS header? */
if (SVAL(buf,DOS_HEADER_MAGIC_OFFSET) != DOS_HEADER_MAGIC) {
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
DEBUG(6,("get_file_version: File [%s] bad DOS magic = 0x%x\n",
fname, SVAL(buf,DOS_HEADER_MAGIC_OFFSET)));
goto no_version_info;
John Reilly @ HP (who is a wonderful human being and *definately* needs CVS commit access :-) has written a simple routine that peeks inside the MS PE printer driver file format and can tell if a driver is W2K or NT4.x. So we can now correctly return the driver version number. Hurrah ! JF - this is the code you always wanted ..... :-) :-). Jeremy. (This used to be commit fd17374e6d888813f4ed7142480cf93b8a16bfef)
2000-10-25 21:56:38 +04:00
}
/* Skip OEM header (if any) and the DOS stub to start of Windows header */
Remove redundant parameter fd from SMB_VFS_LSEEK(). Michael (This used to be commit df929796f2698698d2875227bda8500589cca2df)
2008-01-07 12:15:08 +03:00
if (SMB_VFS_LSEEK(fsp, SVAL(buf,DOS_HEADER_LFANEW_OFFSET), SEEK_SET) == (SMB_OFF_T)-1) {
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
DEBUG(3,("get_file_version: File [%s] too short, errno = %d\n",
fname, errno));
/* Assume this isn't an error... the file just looks sort of like a PE/NE file */
goto no_version_info;
John Reilly @ HP (who is a wonderful human being and *definately* needs CVS commit access :-) has written a simple routine that peeks inside the MS PE printer driver file format and can tell if a driver is W2K or NT4.x. So we can now correctly return the driver version number. Hurrah ! JF - this is the code you always wanted ..... :-) :-). Jeremy. (This used to be commit fd17374e6d888813f4ed7142480cf93b8a16bfef)
2000-10-25 21:56:38 +04:00
}
r21875: BUG 3275: Patch from Andy Polyakov <appro@fy.chalmers.se> Relax check for i386 header checks in the PE header of printer driver files. Thus allowing uploading of x64 print drivers from 64bit Windows clients. (This used to be commit 328807ec7b1ce6489d5443a93d1599f93af93933)
2007-03-19 20:45:13 +03:00
/* Note: DOS_HEADER_SIZE and NE_HEADER_SIZE are incidentally same */
if ((byte_count = vfs_read_data(fsp, buf, NE_HEADER_SIZE)) < NE_HEADER_SIZE) {
Fix more 64-bit printf warnings. (This used to be commit 23443e3aa079710221557e18158d0ddb8ff48a36)
2003-11-03 17:34:25 +03:00
DEBUG(3,("get_file_version: File [%s] Windows header too short, bytes read = %lu\n",
fname, (unsigned long)byte_count));
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
/* Assume this isn't an error... the file just looks sort of like a PE/NE file */
goto no_version_info;
John Reilly @ HP (who is a wonderful human being and *definately* needs CVS commit access :-) has written a simple routine that peeks inside the MS PE printer driver file format and can tell if a driver is W2K or NT4.x. So we can now correctly return the driver version number. Hurrah ! JF - this is the code you always wanted ..... :-) :-). Jeremy. (This used to be commit fd17374e6d888813f4ed7142480cf93b8a16bfef)
2000-10-25 21:56:38 +04:00
}
/* The header may be a PE (Portable Executable) or an NE (New Executable) */
if (IVAL(buf,PE_HEADER_SIGNATURE_OFFSET) == PE_HEADER_SIGNATURE) {
Fixes to check for wraps which could cause coredumps. Jeremy. (This used to be commit ad06edd1bb58cc5e2c38a364b1af96a933b770af)
2003-10-30 00:28:00 +03:00
unsigned int num_sections;
unsigned int section_table_bytes;
r21875: BUG 3275: Patch from Andy Polyakov <appro@fy.chalmers.se> Relax check for i386 header checks in the PE header of printer driver files. Thus allowing uploading of x64 print drivers from 64bit Windows clients. (This used to be commit 328807ec7b1ce6489d5443a93d1599f93af93933)
2007-03-19 20:45:13 +03:00
/* Just skip over optional header to get to section table */
Remove redundant parameter fd from SMB_VFS_LSEEK(). Michael (This used to be commit df929796f2698698d2875227bda8500589cca2df)
2008-01-07 12:15:08 +03:00
if (SMB_VFS_LSEEK(fsp,
r21875: BUG 3275: Patch from Andy Polyakov <appro@fy.chalmers.se> Relax check for i386 header checks in the PE header of printer driver files. Thus allowing uploading of x64 print drivers from 64bit Windows clients. (This used to be commit 328807ec7b1ce6489d5443a93d1599f93af93933)
2007-03-19 20:45:13 +03:00
SVAL(buf,PE_HEADER_OPTIONAL_HEADER_SIZE)-(NE_HEADER_SIZE-PE_HEADER_SIZE),
SEEK_CUR) == (SMB_OFF_T)-1) {
DEBUG(3,("get_file_version: File [%s] Windows optional header too short, errno = %d\n",
fname, errno));
John Reilly @ HP (who is a wonderful human being and *definately* needs CVS commit access :-) has written a simple routine that peeks inside the MS PE printer driver file format and can tell if a driver is W2K or NT4.x. So we can now correctly return the driver version number. Hurrah ! JF - this is the code you always wanted ..... :-) :-). Jeremy. (This used to be commit fd17374e6d888813f4ed7142480cf93b8a16bfef)
2000-10-25 21:56:38 +04:00
goto error_exit;
}
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
/* get the section table */
num_sections = SVAL(buf,PE_HEADER_NUMBER_OF_SECTIONS);
section_table_bytes = num_sections * PE_HEADER_SECT_HEADER_SIZE;
Fixes to check for wraps which could cause coredumps. Jeremy. (This used to be commit ad06edd1bb58cc5e2c38a364b1af96a933b770af)
2003-10-30 00:28:00 +03:00
if (section_table_bytes == 0)
goto error_exit;
move to SAFE_FREE() (This used to be commit 09bf4425492fd96672ddd7a31d88854adcf7f0fe)
2001-09-17 13:25:57 +04:00
SAFE_FREE(buf);
r17590: Some C++ Warnings (This used to be commit b7ec240880af0072ef20b2c0d688ef3cc386d484)
2006-08-17 18:28:03 +04:00
if ((buf=(char *)SMB_MALLOC(section_table_bytes)) == NULL) {
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
DEBUG(0,("get_file_version: PE file [%s] section table malloc failed bytes = %d\n",
fname, section_table_bytes));
John Reilly @ HP (who is a wonderful human being and *definately* needs CVS commit access :-) has written a simple routine that peeks inside the MS PE printer driver file format and can tell if a driver is W2K or NT4.x. So we can now correctly return the driver version number. Hurrah ! JF - this is the code you always wanted ..... :-) :-). Jeremy. (This used to be commit fd17374e6d888813f4ed7142480cf93b8a16bfef)
2000-10-25 21:56:38 +04:00
goto error_exit;
}
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
if ((byte_count = vfs_read_data(fsp, buf, section_table_bytes)) < section_table_bytes) {
Fix more 64-bit printf warnings. (This used to be commit 23443e3aa079710221557e18158d0ddb8ff48a36)
2003-11-03 17:34:25 +03:00
DEBUG(3,("get_file_version: PE file [%s] Section header too short, bytes read = %lu\n",
fname, (unsigned long)byte_count));
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
goto error_exit;
}
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
/* Iterate the section table looking for the resource section ".rsrc" */
for (i = 0; i < num_sections; i++) {
int sec_offset = i * PE_HEADER_SECT_HEADER_SIZE;
John Reilly @ HP (who is a wonderful human being and *definately* needs CVS commit access :-) has written a simple routine that peeks inside the MS PE printer driver file format and can tell if a driver is W2K or NT4.x. So we can now correctly return the driver version number. Hurrah ! JF - this is the code you always wanted ..... :-) :-). Jeremy. (This used to be commit fd17374e6d888813f4ed7142480cf93b8a16bfef)
2000-10-25 21:56:38 +04:00
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
if (strcmp(".rsrc", &buf[sec_offset+PE_HEADER_SECT_NAME_OFFSET]) == 0) {
Fixes to check for wraps which could cause coredumps. Jeremy. (This used to be commit ad06edd1bb58cc5e2c38a364b1af96a933b770af)
2003-10-30 00:28:00 +03:00
unsigned int section_pos = IVAL(buf,sec_offset+PE_HEADER_SECT_PTR_DATA_OFFSET);
unsigned int section_bytes = IVAL(buf,sec_offset+PE_HEADER_SECT_SIZE_DATA_OFFSET);
if (section_bytes == 0)
goto error_exit;
A rather big change set ! (listed in no particular order) - changed the default forms flag to 2 - all short architecture name are uppercased - get_short_archi() is now case unsensitive - the drivers TDB is indexed by archi/version/name - implemented code to move drivers from the upload area to the download area. Someone else need to look at that code. - don't return anymore a default driver if it doesn't exist in the TDB. Instead return an error. - cleaned prs_unistr. - #ifdef out jeremy's new SD parsing in printer_info_2 - removed the unused MANGLE_CODE - #ifdef out the security checking in update_printer() as it doesn't work for me. Zap your ntdrivers.tdb, it won't work anymore. J.F. (This used to be commit ac0a145acc0953a6f362497abbf4dfe70aa522a6)
2000-07-25 17:15:16 +04:00
move to SAFE_FREE() (This used to be commit 09bf4425492fd96672ddd7a31d88854adcf7f0fe)
2001-09-17 13:25:57 +04:00
SAFE_FREE(buf);
r17590: Some C++ Warnings (This used to be commit b7ec240880af0072ef20b2c0d688ef3cc386d484)
2006-08-17 18:28:03 +04:00
if ((buf=(char *)SMB_MALLOC(section_bytes)) == NULL) {
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
DEBUG(0,("get_file_version: PE file [%s] version malloc failed bytes = %d\n",
fname, section_bytes));
goto error_exit;
}
A rather big change set ! (listed in no particular order) - changed the default forms flag to 2 - all short architecture name are uppercased - get_short_archi() is now case unsensitive - the drivers TDB is indexed by archi/version/name - implemented code to move drivers from the upload area to the download area. Someone else need to look at that code. - don't return anymore a default driver if it doesn't exist in the TDB. Instead return an error. - cleaned prs_unistr. - #ifdef out jeremy's new SD parsing in printer_info_2 - removed the unused MANGLE_CODE - #ifdef out the security checking in update_printer() as it doesn't work for me. Zap your ntdrivers.tdb, it won't work anymore. J.F. (This used to be commit ac0a145acc0953a6f362497abbf4dfe70aa522a6)
2000-07-25 17:15:16 +04:00
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
/* Seek to the start of the .rsrc section info */
Remove redundant parameter fd from SMB_VFS_LSEEK(). Michael (This used to be commit df929796f2698698d2875227bda8500589cca2df)
2008-01-07 12:15:08 +03:00
if (SMB_VFS_LSEEK(fsp, section_pos, SEEK_SET) == (SMB_OFF_T)-1) {
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
DEBUG(3,("get_file_version: PE file [%s] too short for section info, errno = %d\n",
fname, errno));
goto error_exit;
}
A rather big change set ! (listed in no particular order) - changed the default forms flag to 2 - all short architecture name are uppercased - get_short_archi() is now case unsensitive - the drivers TDB is indexed by archi/version/name - implemented code to move drivers from the upload area to the download area. Someone else need to look at that code. - don't return anymore a default driver if it doesn't exist in the TDB. Instead return an error. - cleaned prs_unistr. - #ifdef out jeremy's new SD parsing in printer_info_2 - removed the unused MANGLE_CODE - #ifdef out the security checking in update_printer() as it doesn't work for me. Zap your ntdrivers.tdb, it won't work anymore. J.F. (This used to be commit ac0a145acc0953a6f362497abbf4dfe70aa522a6)
2000-07-25 17:15:16 +04:00
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
if ((byte_count = vfs_read_data(fsp, buf, section_bytes)) < section_bytes) {
Fix more 64-bit printf warnings. (This used to be commit 23443e3aa079710221557e18158d0ddb8ff48a36)
2003-11-03 17:34:25 +03:00
DEBUG(3,("get_file_version: PE file [%s] .rsrc section too short, bytes read = %lu\n",
fname, (unsigned long)byte_count));
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
goto error_exit;
}
A rather big change set ! (listed in no particular order) - changed the default forms flag to 2 - all short architecture name are uppercased - get_short_archi() is now case unsensitive - the drivers TDB is indexed by archi/version/name - implemented code to move drivers from the upload area to the download area. Someone else need to look at that code. - don't return anymore a default driver if it doesn't exist in the TDB. Instead return an error. - cleaned prs_unistr. - #ifdef out jeremy's new SD parsing in printer_info_2 - removed the unused MANGLE_CODE - #ifdef out the security checking in update_printer() as it doesn't work for me. Zap your ntdrivers.tdb, it won't work anymore. J.F. (This used to be commit ac0a145acc0953a6f362497abbf4dfe70aa522a6)
2000-07-25 17:15:16 +04:00
Fixes to check for wraps which could cause coredumps. Jeremy. (This used to be commit ad06edd1bb58cc5e2c38a364b1af96a933b770af)
2003-10-30 00:28:00 +03:00
if (section_bytes < VS_VERSION_INFO_UNICODE_SIZE)
goto error_exit;
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
for (i=0; i<section_bytes-VS_VERSION_INFO_UNICODE_SIZE; i++) {
/* Scan for 1st 3 unicoded bytes followed by word aligned magic value */
if (buf[i] == 'V' && buf[i+1] == '\0' && buf[i+2] == 'S') {
/* Align to next long address */
int pos = (i + sizeof(VS_SIGNATURE)*2 + 3) & 0xfffffffc;
A rather big change set ! (listed in no particular order) - changed the default forms flag to 2 - all short architecture name are uppercased - get_short_archi() is now case unsensitive - the drivers TDB is indexed by archi/version/name - implemented code to move drivers from the upload area to the download area. Someone else need to look at that code. - don't return anymore a default driver if it doesn't exist in the TDB. Instead return an error. - cleaned prs_unistr. - #ifdef out jeremy's new SD parsing in printer_info_2 - removed the unused MANGLE_CODE - #ifdef out the security checking in update_printer() as it doesn't work for me. Zap your ntdrivers.tdb, it won't work anymore. J.F. (This used to be commit ac0a145acc0953a6f362497abbf4dfe70aa522a6)
2000-07-25 17:15:16 +04:00
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
if (IVAL(buf,pos) == VS_MAGIC_VALUE) {
*major = IVAL(buf,pos+VS_MAJOR_OFFSET);
*minor = IVAL(buf,pos+VS_MINOR_OFFSET);
More pstring removal. This one was tricky. I had to add one horror (pstring_clean_name()) which will have to remain until I've removed all pstrings from the client code. Jeremy. (This used to be commit 1ea3ac80146b83c2522b69e7747c823366a2b47d)
2007-11-16 01:19:52 +03:00
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
DEBUG(6,("get_file_version: PE file [%s] Version = %08x:%08x (%d.%d.%d.%d)\n",
fname, *major, *minor,
(*major>>16)&0xffff, *major&0xffff,
(*minor>>16)&0xffff, *minor&0xffff));
move to SAFE_FREE() (This used to be commit 09bf4425492fd96672ddd7a31d88854adcf7f0fe)
2001-09-17 13:25:57 +04:00
SAFE_FREE(buf);
Caught one problem where a BOOL fn was returning 3 different values :-). Roll on defined types :-). Jeremy. (This used to be commit ccf07e2184a93345a51455dd3e9201dee7be70e7)
2002-01-08 04:22:23 +03:00
return 1;
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
}
}
}
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
}
}
/* Version info not found, fall back to origin date/time */
DEBUG(10,("get_file_version: PE file [%s] has no version info\n", fname));
move to SAFE_FREE() (This used to be commit 09bf4425492fd96672ddd7a31d88854adcf7f0fe)
2001-09-17 13:25:57 +04:00
SAFE_FREE(buf);
Caught one problem where a BOOL fn was returning 3 different values :-). Roll on defined types :-). Jeremy. (This used to be commit ccf07e2184a93345a51455dd3e9201dee7be70e7)
2002-01-08 04:22:23 +03:00
return 0;
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
} else if (SVAL(buf,NE_HEADER_SIGNATURE_OFFSET) == NE_HEADER_SIGNATURE) {
if (CVAL(buf,NE_HEADER_TARGET_OS_OFFSET) != NE_HEADER_TARGOS_WIN ) {
DEBUG(3,("get_file_version: NE file [%s] wrong target OS = 0x%x\n",
fname, CVAL(buf,NE_HEADER_TARGET_OS_OFFSET)));
/* At this point, we assume the file is in error. It still could be somthing
* else besides a NE file, but it unlikely at this point. */
goto error_exit;
}
/* Allocate a bit more space to speed up things */
move to SAFE_FREE() (This used to be commit 09bf4425492fd96672ddd7a31d88854adcf7f0fe)
2001-09-17 13:25:57 +04:00
SAFE_FREE(buf);
r17590: Some C++ Warnings (This used to be commit b7ec240880af0072ef20b2c0d688ef3cc386d484)
2006-08-17 18:28:03 +04:00
if ((buf=(char *)SMB_MALLOC(VS_NE_BUF_SIZE)) == NULL) {
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
DEBUG(0,("get_file_version: NE file [%s] malloc failed bytes = %d\n",
fname, PE_HEADER_SIZE));
goto error_exit;
}
/* This is a HACK! I got tired of trying to sort through the messy
* 'NE' file format. If anyone wants to clean this up please have at
* it, but this works. 'NE' files will eventually fade away. JRR */
while((byte_count = vfs_read_data(fsp, buf, VS_NE_BUF_SIZE)) > 0) {
/* Cover case that should not occur in a well formed 'NE' .dll file */
if (byte_count-VS_VERSION_INFO_SIZE <= 0) break;
for(i=0; i<byte_count; i++) {
/* Fast skip past data that can't possibly match */
if (buf[i] != 'V') continue;
/* Potential match data crosses buf boundry, move it to beginning
* of buf, and fill the buf with as much as it will hold. */
if (i>byte_count-VS_VERSION_INFO_SIZE) {
int bc;
memcpy(buf, &buf[i], byte_count-i);
if ((bc = vfs_read_data(fsp, &buf[byte_count-i], VS_NE_BUF_SIZE-
(byte_count-i))) < 0) {
DEBUG(0,("get_file_version: NE file [%s] Read error, errno=%d\n",
fname, errno));
goto error_exit;
}
byte_count = bc + (byte_count - i);
if (byte_count<VS_VERSION_INFO_SIZE) break;
i = 0;
}
/* Check that the full signature string and the magic number that
* follows exist (not a perfect solution, but the chances that this
* occurs in code is, well, remote. Yes I know I'm comparing the 'V'
* twice, as it is simpler to read the code. */
if (strcmp(&buf[i], VS_SIGNATURE) == 0) {
/* Compute skip alignment to next long address */
Remove redundant parameter fd from SMB_VFS_LSEEK(). Michael (This used to be commit df929796f2698698d2875227bda8500589cca2df)
2008-01-07 12:15:08 +03:00
int skip = -(SMB_VFS_LSEEK(fsp, 0, SEEK_CUR) - (byte_count - i) +
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
sizeof(VS_SIGNATURE)) & 3;
if (IVAL(buf,i+sizeof(VS_SIGNATURE)+skip) != 0xfeef04bd) continue;
*major = IVAL(buf,i+sizeof(VS_SIGNATURE)+skip+VS_MAJOR_OFFSET);
*minor = IVAL(buf,i+sizeof(VS_SIGNATURE)+skip+VS_MINOR_OFFSET);
DEBUG(6,("get_file_version: NE file [%s] Version = %08x:%08x (%d.%d.%d.%d)\n",
fname, *major, *minor,
(*major>>16)&0xffff, *major&0xffff,
(*minor>>16)&0xffff, *minor&0xffff));
move to SAFE_FREE() (This used to be commit 09bf4425492fd96672ddd7a31d88854adcf7f0fe)
2001-09-17 13:25:57 +04:00
SAFE_FREE(buf);
Caught one problem where a BOOL fn was returning 3 different values :-). Roll on defined types :-). Jeremy. (This used to be commit ccf07e2184a93345a51455dd3e9201dee7be70e7)
2002-01-08 04:22:23 +03:00
return 1;
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
}
}
}
/* Version info not found, fall back to origin date/time */
DEBUG(0,("get_file_version: NE file [%s] Version info not found\n", fname));
move to SAFE_FREE() (This used to be commit 09bf4425492fd96672ddd7a31d88854adcf7f0fe)
2001-09-17 13:25:57 +04:00
SAFE_FREE(buf);
Caught one problem where a BOOL fn was returning 3 different values :-). Roll on defined types :-). Jeremy. (This used to be commit ccf07e2184a93345a51455dd3e9201dee7be70e7)
2002-01-08 04:22:23 +03:00
return 0;
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
} else
/* Assume this isn't an error... the file just looks sort of like a PE/NE file */
DEBUG(3,("get_file_version: File [%s] unknown file format, signature = 0x%x\n",
fname, IVAL(buf,PE_HEADER_SIGNATURE_OFFSET)));
no_version_info:
move to SAFE_FREE() (This used to be commit 09bf4425492fd96672ddd7a31d88854adcf7f0fe)
2001-09-17 13:25:57 +04:00
SAFE_FREE(buf);
Caught one problem where a BOOL fn was returning 3 different values :-). Roll on defined types :-). Jeremy. (This used to be commit ccf07e2184a93345a51455dd3e9201dee7be70e7)
2002-01-08 04:22:23 +03:00
return 0;
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
error_exit:
move to SAFE_FREE() (This used to be commit 09bf4425492fd96672ddd7a31d88854adcf7f0fe)
2001-09-17 13:25:57 +04:00
SAFE_FREE(buf);
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
return -1;
}
/****************************************************************************
Drivers for Microsoft systems contain multiple files. Often, multiple drivers
share one or more files. During the MS installation process files are checked
to insure that only a newer version of a shared file is installed over an
older version. There are several possibilities for this comparison. If there
is no previous version, the new one is newer (obviously). If either file is
missing the version info structure, compare the creation date (on Unix use
the modification date). Otherwise chose the numerically larger version number.
****************************************************************************/
Progress on CR 601 cache the printer_info_2 with the open printer handle. cache is invalidated on a mod_a_printer() call **on that smbd**. Yes, this means that the window for admins to step on each other from different clients just got larger, but since handles a generally short lived this is probably ok. (This used to be commit 31272d3b6bb9ec62fd666301c7adfa0c1720a99b)
2003-02-25 23:53:53 +03:00
static int file_version_is_newer(connection_struct *conn, fstring new_file, fstring old_file)
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
{
More pstring removal. This one was tricky. I had to add one horror (pstring_clean_name()) which will have to remain until I've removed all pstrings from the client code. Jeremy. (This used to be commit 1ea3ac80146b83c2522b69e7747c823366a2b47d)
2007-11-16 01:19:52 +03:00
bool use_version = true;
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
uint32 new_major;
uint32 new_minor;
time_t new_create_time;
uint32 old_major;
uint32 old_minor;
time_t old_create_time;
s3: Prepare the first set of SMB_VFS_CREATE_FILE callers to take an smb_filename struct Some of the callers required minimal changes, while others (copy_internals) required significant changes. The task is simplified a little bit because we are able to do operations and checks on the base_name when a stream isn't used. This patch should cause no functional changes. Volker, Jeremy: Please check
2009-06-10 21:37:57 +04:00
struct smb_filename *smb_fname = NULL;
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
files_struct *fsp = NULL;
SMB_STRUCT_STAT st;
passdb/secrets.c passdb/smbpassfile.c smbd/server.c : Actually *use* the code written to transition from an old DOMAIN.MACHINE.MAC file to secrets.tdb. printing/nt_printing.c: Fix case insensitive name lookups for driver files. John - this should fix the Win9x/WinME problem correctly. Jeremy. (This used to be commit 8f3332a9acf413ac5d12053ca5c52733a4e946cc)
2000-11-28 02:59:42 +03:00
r16945: Sync trunk -> 3.0 for 3.0.24 code. Still need to do the upper layer directories but this is what everyone is waiting for.... Jeremy. (This used to be commit 9dafb7f48ca3e7af956b0a7d1720c2546fc4cfb8)
2006-07-11 22:01:26 +04:00
NTSTATUS status;
s3: Prepare the first set of SMB_VFS_CREATE_FILE callers to take an smb_filename struct Some of the callers required minimal changes, while others (copy_internals) required significant changes. The task is simplified a little bit because we are able to do operations and checks on the base_name when a stream isn't used. This patch should cause no functional changes. Volker, Jeremy: Please check
2009-06-10 21:37:57 +04:00
int ret;
r16945: Sync trunk -> 3.0 for 3.0.24 code. Still need to do the upper layer directories but this is what everyone is waiting for.... Jeremy. (This used to be commit 9dafb7f48ca3e7af956b0a7d1720c2546fc4cfb8)
2006-07-11 22:01:26 +04:00
r7200: Don't use memset, use SET_STAT_INVALID (has the same effect). Jeremy. (This used to be commit 0b6f87d5e14da461bd2b1c3a4e6f47a69d2cd1c4)
2005-06-03 03:18:52 +04:00
SET_STAT_INVALID(st);
Uninitialized memory read fixes. open_file_shared takes a DOS pathname, not a UNIX one. Jeremy. (This used to be commit b2b59b93ff1c5bdc43b099e2db1ee86fe8514152)
2000-11-15 05:39:11 +03:00
new_create_time = (time_t)0;
old_create_time = (time_t)0;
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
/* Get file version info (if available) for previous file (if it exists) */
s3: Prepare the first set of SMB_VFS_CREATE_FILE callers to take an smb_filename struct Some of the callers required minimal changes, while others (copy_internals) required significant changes. The task is simplified a little bit because we are able to do operations and checks on the base_name when a stream isn't used. This patch should cause no functional changes. Volker, Jeremy: Please check
2009-06-10 21:37:57 +04:00
status = driver_unix_convert(conn, old_file, &smb_fname);
if (!NT_STATUS_IS_OK(status)) {
goto error_exit;
}
s3: Modify direct callers of open_file_ntcreate and open_directory to call SMB_VFS_CREATE_FILE
2008-11-21 05:55:24 +03:00
status = SMB_VFS_CREATE_FILE(
conn, /* conn */
NULL, /* req */
0, /* root_dir_fid */
s3: Plumb smb_filename through SMB_VFS_CREATE_FILE
2009-06-12 23:54:11 +04:00
smb_fname, /* fname */
s3: Modify direct callers of open_file_ntcreate and open_directory to call SMB_VFS_CREATE_FILE
2008-11-21 05:55:24 +03:00
FILE_GENERIC_READ, /* access_mask */
FILE_SHARE_READ | FILE_SHARE_WRITE, /* share_access */
FILE_OPEN, /* create_disposition*/
0, /* create_options */
FILE_ATTRIBUTE_NORMAL, /* file_attributes */
INTERNAL_OPEN_ONLY, /* oplock_request */
0, /* allocation_size */
Fix for bug #7189 - Open txt files with notepad on samba shares creates problem. Ensure we don't use any of the create_options for Samba private use. Add a new parameter to the VFS_CREATE call (private_flags) which is only used internally. Renumber NTCREATEX_OPTIONS_PRIVATE_DENY_DOS and NTCREATEX_OPTIONS_PRIVATE_DENY_FCB to match the S4 code). Rev. the VFS interface to version 28. Jeremy.
2010-03-06 02:10:30 +03:00
0, /* private_flags */
s3: Modify direct callers of open_file_ntcreate and open_directory to call SMB_VFS_CREATE_FILE
2008-11-21 05:55:24 +03:00
NULL, /* sd */
NULL, /* ea_list */
&fsp, /* result */
s3: Plumb smb_filename through SMB_VFS_CREATE_FILE
2009-06-12 23:54:11 +04:00
NULL); /* pinfo */
r8219: Merge the new open code from HEAD to 3.0. Haven't yet run the torture tests on this as it's very late NY time (just wanted to get this work into the tree). I'll test this over the weekend.... Jerry - in looking at the difference between the two trees there seem to be some printing/ntprinting.c and registry changes we might want to examine to try keep in sync. Jeremy. (This used to be commit c7fe18761e2c753afbffd3a78abff46472a9b8eb)
2005-07-08 08:51:27 +04:00
r16945: Sync trunk -> 3.0 for 3.0.24 code. Still need to do the upper layer directories but this is what everyone is waiting for.... Jeremy. (This used to be commit 9dafb7f48ca3e7af956b0a7d1720c2546fc4cfb8)
2006-07-11 22:01:26 +04:00
if (!NT_STATUS_IS_OK(status)) {
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
/* Old file not found, so by definition new file is in fact newer */
s3: Plumb smb_filename through SMB_VFS_CREATE_FILE
2009-06-12 23:54:11 +04:00
DEBUG(10,("file_version_is_newer: Can't open old file [%s], "
"errno = %d\n", smb_fname_str_dbg(smb_fname),
errno));
s3: Prepare the first set of SMB_VFS_CREATE_FILE callers to take an smb_filename struct Some of the callers required minimal changes, while others (copy_internals) required significant changes. The task is simplified a little bit because we are able to do operations and checks on the base_name when a stream isn't used. This patch should cause no functional changes. Volker, Jeremy: Please check
2009-06-10 21:37:57 +04:00
ret = 1;
goto done;
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
} else {
s3: Prepare the first set of SMB_VFS_CREATE_FILE callers to take an smb_filename struct Some of the callers required minimal changes, while others (copy_internals) required significant changes. The task is simplified a little bit because we are able to do operations and checks on the base_name when a stream isn't used. This patch should cause no functional changes. Volker, Jeremy: Please check
2009-06-10 21:37:57 +04:00
ret = get_file_version(fsp, old_file, &old_major, &old_minor);
r8219: Merge the new open code from HEAD to 3.0. Haven't yet run the torture tests on this as it's very late NY time (just wanted to get this work into the tree). I'll test this over the weekend.... Jerry - in looking at the difference between the two trees there seem to be some printing/ntprinting.c and registry changes we might want to examine to try keep in sync. Jeremy. (This used to be commit c7fe18761e2c753afbffd3a78abff46472a9b8eb)
2005-07-08 08:51:27 +04:00
if (ret == -1) {
goto error_exit;
}
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
if (!ret) {
DEBUG(6,("file_version_is_newer: Version info not found [%s], use mod time\n",
old_file));
More pstring removal. This one was tricky. I had to add one horror (pstring_clean_name()) which will have to remain until I've removed all pstrings from the client code. Jeremy. (This used to be commit 1ea3ac80146b83c2522b69e7747c823366a2b47d)
2007-11-16 01:19:52 +03:00
use_version = false;
Remove redundant parameter fd from SMB_VFS_FSTAT(). Michael (This used to be commit 0b86c420be94d295f6917a220b5d699f65b46711)
2008-01-07 15:21:26 +03:00
if (SMB_VFS_FSTAT(fsp, &st) == -1) {
More pstring removal. This one was tricky. I had to add one horror (pstring_clean_name()) which will have to remain until I've removed all pstrings from the client code. Jeremy. (This used to be commit 1ea3ac80146b83c2522b69e7747c823366a2b47d)
2007-11-16 01:19:52 +03:00
goto error_exit;
}
Introduce "struct stat_ex" as a replacement for SMB_STRUCT_STAT This patch introduces struct stat_ex { dev_t st_ex_dev; ino_t st_ex_ino; mode_t st_ex_mode; nlink_t st_ex_nlink; uid_t st_ex_uid; gid_t st_ex_gid; dev_t st_ex_rdev; off_t st_ex_size; struct timespec st_ex_atime; struct timespec st_ex_mtime; struct timespec st_ex_ctime; struct timespec st_ex_btime; /* birthtime */ blksize_t st_ex_blksize; blkcnt_t st_ex_blocks; }; typedef struct stat_ex SMB_STRUCT_STAT; It is really large because due to the friendly libc headers playing macro tricks with fields like st_ino, so I renamed them to st_ex_xxx. Why this change? To support birthtime, we already have quite a few #ifdef's at places where it does not really belong. With a stat struct that we control, we can consolidate the nanosecond timestamps and the birthtime deep in the VFS stat calls. At this moment it is triggered by a request to support the birthtime field for GPFS. GPFS does not extend the system level struct stat, but instead has a separate call that gets us the additional information beyond posix. Without being able to do that within the VFS stat calls, that support would have to be scattered around the main smbd code. It will very likely break all the onefs modules, but I think the changes will be reasonably easy to do.
2009-05-14 17:34:42 +04:00
old_create_time = convert_timespec_to_time_t(st.st_ex_mtime);
Fix some NetBSD warnings. Jeremy.
2009-02-25 20:59:53 +03:00
DEBUGADD(6,("file_version_is_newer: mod time = %ld sec\n",
(long)old_create_time));
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
}
}
Pass struct smb_request to file_free on the way to get rid of chain_fsp
2008-10-09 18:27:49 +04:00
close_file(NULL, fsp, NORMAL_CLOSE);
Avoid freeing fsp twice when opening new_file fails. (Debian #431696) If opening new_file fails, fsp would still be set to the files_struct of old_file.
2008-09-29 21:09:53 +04:00
fsp = NULL;
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
/* Get file version info (if available) for new file */
s3: Prepare the first set of SMB_VFS_CREATE_FILE callers to take an smb_filename struct Some of the callers required minimal changes, while others (copy_internals) required significant changes. The task is simplified a little bit because we are able to do operations and checks on the base_name when a stream isn't used. This patch should cause no functional changes. Volker, Jeremy: Please check
2009-06-10 21:37:57 +04:00
status = driver_unix_convert(conn, new_file, &smb_fname);
if (!NT_STATUS_IS_OK(status)) {
goto error_exit;
}
s3: Modify direct callers of open_file_ntcreate and open_directory to call SMB_VFS_CREATE_FILE
2008-11-21 05:55:24 +03:00
status = SMB_VFS_CREATE_FILE(
conn, /* conn */
NULL, /* req */
0, /* root_dir_fid */
s3: Plumb smb_filename through SMB_VFS_CREATE_FILE
2009-06-12 23:54:11 +04:00
smb_fname, /* fname */
s3: Modify direct callers of open_file_ntcreate and open_directory to call SMB_VFS_CREATE_FILE
2008-11-21 05:55:24 +03:00
FILE_GENERIC_READ, /* access_mask */
FILE_SHARE_READ | FILE_SHARE_WRITE, /* share_access */
FILE_OPEN, /* create_disposition*/
0, /* create_options */
FILE_ATTRIBUTE_NORMAL, /* file_attributes */
INTERNAL_OPEN_ONLY, /* oplock_request */
0, /* allocation_size */
Fix for bug #7189 - Open txt files with notepad on samba shares creates problem. Ensure we don't use any of the create_options for Samba private use. Add a new parameter to the VFS_CREATE call (private_flags) which is only used internally. Renumber NTCREATEX_OPTIONS_PRIVATE_DENY_DOS and NTCREATEX_OPTIONS_PRIVATE_DENY_FCB to match the S4 code). Rev. the VFS interface to version 28. Jeremy.
2010-03-06 02:10:30 +03:00
0, /* private_flags */
s3: Modify direct callers of open_file_ntcreate and open_directory to call SMB_VFS_CREATE_FILE
2008-11-21 05:55:24 +03:00
NULL, /* sd */
NULL, /* ea_list */
&fsp, /* result */
s3: Plumb smb_filename through SMB_VFS_CREATE_FILE
2009-06-12 23:54:11 +04:00
NULL); /* pinfo */
r8219: Merge the new open code from HEAD to 3.0. Haven't yet run the torture tests on this as it's very late NY time (just wanted to get this work into the tree). I'll test this over the weekend.... Jerry - in looking at the difference between the two trees there seem to be some printing/ntprinting.c and registry changes we might want to examine to try keep in sync. Jeremy. (This used to be commit c7fe18761e2c753afbffd3a78abff46472a9b8eb)
2005-07-08 08:51:27 +04:00
r16945: Sync trunk -> 3.0 for 3.0.24 code. Still need to do the upper layer directories but this is what everyone is waiting for.... Jeremy. (This used to be commit 9dafb7f48ca3e7af956b0a7d1720c2546fc4cfb8)
2006-07-11 22:01:26 +04:00
if (!NT_STATUS_IS_OK(status)) {
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
/* New file not found, this shouldn't occur if the caller did its job */
s3: Plumb smb_filename through SMB_VFS_CREATE_FILE
2009-06-12 23:54:11 +04:00
DEBUG(3,("file_version_is_newer: Can't open new file [%s], "
"errno = %d\n", smb_fname_str_dbg(smb_fname), errno));
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
goto error_exit;
} else {
s3: Prepare the first set of SMB_VFS_CREATE_FILE callers to take an smb_filename struct Some of the callers required minimal changes, while others (copy_internals) required significant changes. The task is simplified a little bit because we are able to do operations and checks on the base_name when a stream isn't used. This patch should cause no functional changes. Volker, Jeremy: Please check
2009-06-10 21:37:57 +04:00
ret = get_file_version(fsp, new_file, &new_major, &new_minor);
r8219: Merge the new open code from HEAD to 3.0. Haven't yet run the torture tests on this as it's very late NY time (just wanted to get this work into the tree). I'll test this over the weekend.... Jerry - in looking at the difference between the two trees there seem to be some printing/ntprinting.c and registry changes we might want to examine to try keep in sync. Jeremy. (This used to be commit c7fe18761e2c753afbffd3a78abff46472a9b8eb)
2005-07-08 08:51:27 +04:00
if (ret == -1) {
goto error_exit;
}
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
if (!ret) {
DEBUG(6,("file_version_is_newer: Version info not found [%s], use mod time\n",
new_file));
More pstring removal. This one was tricky. I had to add one horror (pstring_clean_name()) which will have to remain until I've removed all pstrings from the client code. Jeremy. (This used to be commit 1ea3ac80146b83c2522b69e7747c823366a2b47d)
2007-11-16 01:19:52 +03:00
use_version = false;
Remove redundant parameter fd from SMB_VFS_FSTAT(). Michael (This used to be commit 0b86c420be94d295f6917a220b5d699f65b46711)
2008-01-07 15:21:26 +03:00
if (SMB_VFS_FSTAT(fsp, &st) == -1) {
More pstring removal. This one was tricky. I had to add one horror (pstring_clean_name()) which will have to remain until I've removed all pstrings from the client code. Jeremy. (This used to be commit 1ea3ac80146b83c2522b69e7747c823366a2b47d)
2007-11-16 01:19:52 +03:00
goto error_exit;
}
Introduce "struct stat_ex" as a replacement for SMB_STRUCT_STAT This patch introduces struct stat_ex { dev_t st_ex_dev; ino_t st_ex_ino; mode_t st_ex_mode; nlink_t st_ex_nlink; uid_t st_ex_uid; gid_t st_ex_gid; dev_t st_ex_rdev; off_t st_ex_size; struct timespec st_ex_atime; struct timespec st_ex_mtime; struct timespec st_ex_ctime; struct timespec st_ex_btime; /* birthtime */ blksize_t st_ex_blksize; blkcnt_t st_ex_blocks; }; typedef struct stat_ex SMB_STRUCT_STAT; It is really large because due to the friendly libc headers playing macro tricks with fields like st_ino, so I renamed them to st_ex_xxx. Why this change? To support birthtime, we already have quite a few #ifdef's at places where it does not really belong. With a stat struct that we control, we can consolidate the nanosecond timestamps and the birthtime deep in the VFS stat calls. At this moment it is triggered by a request to support the birthtime field for GPFS. GPFS does not extend the system level struct stat, but instead has a separate call that gets us the additional information beyond posix. Without being able to do that within the VFS stat calls, that support would have to be scattered around the main smbd code. It will very likely break all the onefs modules, but I think the changes will be reasonably easy to do.
2009-05-14 17:34:42 +04:00
new_create_time = convert_timespec_to_time_t(st.st_ex_mtime);
Fix some NetBSD warnings. Jeremy.
2009-02-25 20:59:53 +03:00
DEBUGADD(6,("file_version_is_newer: mod time = %ld sec\n",
(long)new_create_time));
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
}
}
Pass struct smb_request to file_free on the way to get rid of chain_fsp
2008-10-09 18:27:49 +04:00
close_file(NULL, fsp, NORMAL_CLOSE);
Ensure we null out fsp after a close in all paths. Jeremy.
2008-09-29 21:57:22 +04:00
fsp = NULL;
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
if (use_version && (new_major != old_major || new_minor != old_minor)) {
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
/* Compare versions and choose the larger version number */
if (new_major > old_major ||
(new_major == old_major && new_minor > old_minor)) {
More pstring removal. This one was tricky. I had to add one horror (pstring_clean_name()) which will have to remain until I've removed all pstrings from the client code. Jeremy. (This used to be commit 1ea3ac80146b83c2522b69e7747c823366a2b47d)
2007-11-16 01:19:52 +03:00
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
DEBUG(6,("file_version_is_newer: Replacing [%s] with [%s]\n", old_file, new_file));
s3: Prepare the first set of SMB_VFS_CREATE_FILE callers to take an smb_filename struct Some of the callers required minimal changes, while others (copy_internals) required significant changes. The task is simplified a little bit because we are able to do operations and checks on the base_name when a stream isn't used. This patch should cause no functional changes. Volker, Jeremy: Please check
2009-06-10 21:37:57 +04:00
ret = 1;
goto done;
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
}
else {
DEBUG(6,("file_version_is_newer: Leaving [%s] unchanged\n", old_file));
s3: Prepare the first set of SMB_VFS_CREATE_FILE callers to take an smb_filename struct Some of the callers required minimal changes, while others (copy_internals) required significant changes. The task is simplified a little bit because we are able to do operations and checks on the base_name when a stream isn't used. This patch should cause no functional changes. Volker, Jeremy: Please check
2009-06-10 21:37:57 +04:00
ret = 0;
goto done;
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
}
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
} else {
/* Compare modification time/dates and choose the newest time/date */
if (new_create_time > old_create_time) {
DEBUG(6,("file_version_is_newer: Replacing [%s] with [%s]\n", old_file, new_file));
s3: Prepare the first set of SMB_VFS_CREATE_FILE callers to take an smb_filename struct Some of the callers required minimal changes, while others (copy_internals) required significant changes. The task is simplified a little bit because we are able to do operations and checks on the base_name when a stream isn't used. This patch should cause no functional changes. Volker, Jeremy: Please check
2009-06-10 21:37:57 +04:00
ret = 1;
goto done;
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
}
else {
DEBUG(6,("file_version_is_newer: Leaving [%s] unchanged\n", old_file));
s3: Prepare the first set of SMB_VFS_CREATE_FILE callers to take an smb_filename struct Some of the callers required minimal changes, while others (copy_internals) required significant changes. The task is simplified a little bit because we are able to do operations and checks on the base_name when a stream isn't used. This patch should cause no functional changes. Volker, Jeremy: Please check
2009-06-10 21:37:57 +04:00
ret = 0;
goto done;
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
}
}
s3: Prepare the first set of SMB_VFS_CREATE_FILE callers to take an smb_filename struct Some of the callers required minimal changes, while others (copy_internals) required significant changes. The task is simplified a little bit because we are able to do operations and checks on the base_name when a stream isn't used. This patch should cause no functional changes. Volker, Jeremy: Please check
2009-06-10 21:37:57 +04:00
error_exit:
if(fsp)
close_file(NULL, fsp, NORMAL_CLOSE);
ret = -1;
done:
TALLOC_FREE(smb_fname);
return ret;
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
}
/****************************************************************************
Determine the correct cVersion associated with an architecture and driver
****************************************************************************/
Convert get_correct_cversion to use create_conn_struct Jerry, please check!
2008-11-24 01:01:24 +03:00
static uint32 get_correct_cversion(struct pipes_struct *p,
const char *architecture,
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
const char *driverpath_in,
Convert get_correct_cversion to use create_conn_struct Jerry, please check!
2008-11-24 01:01:24 +03:00
WERROR *perr)
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
{
int cversion;
Looks like it missed these. make_connection now no longer takes a 'username' argument. (This used to be commit 0e1322227b0a91226b4b85c8e0ff838ebfd9e962)
2001-09-16 03:32:19 +04:00
NTSTATUS nt_status;
s3: Prepare the first set of SMB_VFS_CREATE_FILE callers to take an smb_filename struct Some of the callers required minimal changes, while others (copy_internals) required significant changes. The task is simplified a little bit because we are able to do operations and checks on the base_name when a stream isn't used. This patch should cause no functional changes. Volker, Jeremy: Please check
2009-06-10 21:37:57 +04:00
struct smb_filename *smb_fname = NULL;
char *driverpath = NULL;
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
files_struct *fsp = NULL;
Convert get_correct_cversion to use create_conn_struct Jerry, please check!
2008-11-24 01:01:24 +03:00
connection_struct *conn = NULL;
r16945: Sync trunk -> 3.0 for 3.0.24 code. Still need to do the upper layer directories but this is what everyone is waiting for.... Jeremy. (This used to be commit 9dafb7f48ca3e7af956b0a7d1720c2546fc4cfb8)
2006-07-11 22:01:26 +04:00
NTSTATUS status;
Convert get_correct_cversion to use create_conn_struct Jerry, please check!
2008-11-24 01:01:24 +03:00
char *oldcwd;
fstring printdollar;
int printdollar_snum;
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
Removed extra lp_adduser() call. Fixed up error returns in get_correct_cversion(). Jeremy. (This used to be commit 7ce2d1fe37d2be26c407f3dc9427851d00ca216a)
2001-12-29 23:29:43 +03:00
*perr = WERR_INVALID_PARAM;
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
/* If architecture is Windows 95/98/ME, the version is always 0. */
r10554: * BUG 3057: assume x64 drivers are v3 drivers * BUG 3087: allow smbspool to establisha geust connection using a username with no password (This used to be commit 39369c8041e0633e88c30e0c62530c2393ef80f6)
2005-09-27 23:18:20 +04:00
if (strcmp(architecture, SPL_ARCH_WIN40) == 0) {
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
DEBUG(10,("get_correct_cversion: Driver is Win9x, cversion = 0\n"));
Removed extra lp_adduser() call. Fixed up error returns in get_correct_cversion(). Jeremy. (This used to be commit 7ce2d1fe37d2be26c407f3dc9427851d00ca216a)
2001-12-29 23:29:43 +03:00
*perr = WERR_OK;
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
return 0;
}
r10554: * BUG 3057: assume x64 drivers are v3 drivers * BUG 3087: allow smbspool to establisha geust connection using a username with no password (This used to be commit 39369c8041e0633e88c30e0c62530c2393ef80f6)
2005-09-27 23:18:20 +04:00
/* If architecture is Windows x64, the version is always 3. */
if (strcmp(architecture, SPL_ARCH_X64) == 0) {
DEBUG(10,("get_correct_cversion: Driver is x64, cversion = 3\n"));
*perr = WERR_OK;
return 3;
}
Convert get_correct_cversion to use create_conn_struct Jerry, please check!
2008-11-24 01:01:24 +03:00
fstrcpy(printdollar, "print$");
Bring printing in HEAD inline with 2.2.x and app-head. Jeremy. (This used to be commit 771ef92fc6e43725b7cc351079998a8acb74abef)
2002-02-09 07:10:24 +03:00
Convert get_correct_cversion to use create_conn_struct Jerry, please check!
2008-11-24 01:01:24 +03:00
printdollar_snum = find_service(printdollar);
if (printdollar_snum == -1) {
*perr = WERR_NO_SUCH_SHARE;
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
return -1;
}
Convert get_correct_cversion to use create_conn_struct Jerry, please check!
2008-11-24 01:01:24 +03:00
nt_status = create_conn_struct(talloc_tos(), &conn, printdollar_snum,
lp_pathname(printdollar_snum),
p->server_info, &oldcwd);
if (!NT_STATUS_IS_OK(nt_status)) {
DEBUG(0,("get_correct_cversion: create_conn_struct "
"returned %s\n", nt_errstr(nt_status)));
*perr = ntstatus_to_werror(nt_status);
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
return -1;
}
/* Open the driver file (Portable Executable format) and determine the
* deriver the cversion. */
More pstring removal. This one was tricky. I had to add one horror (pstring_clean_name()) which will have to remain until I've removed all pstrings from the client code. Jeremy. (This used to be commit 1ea3ac80146b83c2522b69e7747c823366a2b47d)
2007-11-16 01:19:52 +03:00
driverpath = talloc_asprintf(talloc_tos(),
"%s/%s",
architecture,
driverpath_in);
if (!driverpath) {
*perr = WERR_NOMEM;
goto error_exit;
}
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
s3: Prepare the first set of SMB_VFS_CREATE_FILE callers to take an smb_filename struct Some of the callers required minimal changes, while others (copy_internals) required significant changes. The task is simplified a little bit because we are able to do operations and checks on the base_name when a stream isn't used. This patch should cause no functional changes. Volker, Jeremy: Please check
2009-06-10 21:37:57 +04:00
nt_status = driver_unix_convert(conn, driverpath, &smb_fname);
if (!NT_STATUS_IS_OK(nt_status)) {
*perr = ntstatus_to_werror(nt_status);
More pstring removal. This one was tricky. I had to add one horror (pstring_clean_name()) which will have to remain until I've removed all pstrings from the client code. Jeremy. (This used to be commit 1ea3ac80146b83c2522b69e7747c823366a2b47d)
2007-11-16 01:19:52 +03:00
goto error_exit;
}
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
s3: Prepare the first set of SMB_VFS_CREATE_FILE callers to take an smb_filename struct Some of the callers required minimal changes, while others (copy_internals) required significant changes. The task is simplified a little bit because we are able to do operations and checks on the base_name when a stream isn't used. This patch should cause no functional changes. Volker, Jeremy: Please check
2009-06-10 21:37:57 +04:00
nt_status = vfs_file_exist(conn, smb_fname);
if (!NT_STATUS_IS_OK(nt_status)) {
r7620: when adding a new printer driver, we should copy the files (not move) to the W32X86/{2,3}/ directory. Printmig.exe copies the driver files for all drivers to print$/W32X86 and the calls AddPrinterDriver() for each driver. If we move the file, then adding a driver which shares a file with a previous driver will fail. I can now restore drivers in bulk to a Samba 3 server. (This used to be commit 46cd95c9b48a00a51139d3654352d4399b774a9b)
2005-06-15 23:28:14 +04:00
*perr = WERR_BADFILE;
goto error_exit;
}
s3: Modify direct callers of open_file_ntcreate and open_directory to call SMB_VFS_CREATE_FILE
2008-11-21 05:55:24 +03:00
status = SMB_VFS_CREATE_FILE(
conn, /* conn */
NULL, /* req */
0, /* root_dir_fid */
s3: Plumb smb_filename through SMB_VFS_CREATE_FILE
2009-06-12 23:54:11 +04:00
smb_fname, /* fname */
s3: Modify direct callers of open_file_ntcreate and open_directory to call SMB_VFS_CREATE_FILE
2008-11-21 05:55:24 +03:00
FILE_GENERIC_READ, /* access_mask */
FILE_SHARE_READ | FILE_SHARE_WRITE, /* share_access */
FILE_OPEN, /* create_disposition*/
0, /* create_options */
FILE_ATTRIBUTE_NORMAL, /* file_attributes */
INTERNAL_OPEN_ONLY, /* oplock_request */
Fix for bug #7189 - Open txt files with notepad on samba shares creates problem. Ensure we don't use any of the create_options for Samba private use. Add a new parameter to the VFS_CREATE call (private_flags) which is only used internally. Renumber NTCREATEX_OPTIONS_PRIVATE_DENY_DOS and NTCREATEX_OPTIONS_PRIVATE_DENY_FCB to match the S4 code). Rev. the VFS interface to version 28. Jeremy.
2010-03-06 02:10:30 +03:00
0, /* private_flags */
s3: Modify direct callers of open_file_ntcreate and open_directory to call SMB_VFS_CREATE_FILE
2008-11-21 05:55:24 +03:00
0, /* allocation_size */
NULL, /* sd */
NULL, /* ea_list */
&fsp, /* result */
s3: Plumb smb_filename through SMB_VFS_CREATE_FILE
2009-06-12 23:54:11 +04:00
NULL); /* pinfo */
r7620: when adding a new printer driver, we should copy the files (not move) to the W32X86/{2,3}/ directory. Printmig.exe copies the driver files for all drivers to print$/W32X86 and the calls AddPrinterDriver() for each driver. If we move the file, then adding a driver which shares a file with a previous driver will fail. I can now restore drivers in bulk to a Samba 3 server. (This used to be commit 46cd95c9b48a00a51139d3654352d4399b774a9b)
2005-06-15 23:28:14 +04:00
r16945: Sync trunk -> 3.0 for 3.0.24 code. Still need to do the upper layer directories but this is what everyone is waiting for.... Jeremy. (This used to be commit 9dafb7f48ca3e7af956b0a7d1720c2546fc4cfb8)
2006-07-11 22:01:26 +04:00
if (!NT_STATUS_IS_OK(status)) {
s3: Plumb smb_filename through SMB_VFS_CREATE_FILE
2009-06-12 23:54:11 +04:00
DEBUG(3,("get_correct_cversion: Can't open file [%s], errno = "
"%d\n", smb_fname_str_dbg(smb_fname), errno));
the next stage in the NTSTATUS/WERROR change. smbd and nmbd now compile, but the client code still needs some work (This used to be commit dcd6e735f709a9231860ceb9682db40ff26c9a66)
2001-09-04 11:13:01 +04:00
*perr = WERR_ACCESS_DENIED;
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
goto error_exit;
r8219: Merge the new open code from HEAD to 3.0. Haven't yet run the torture tests on this as it's very late NY time (just wanted to get this work into the tree). I'll test this over the weekend.... Jerry - in looking at the difference between the two trees there seem to be some printing/ntprinting.c and registry changes we might want to examine to try keep in sync. Jeremy. (This used to be commit c7fe18761e2c753afbffd3a78abff46472a9b8eb)
2005-07-08 08:51:27 +04:00
} else {
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
uint32 major;
uint32 minor;
s3: Plumb smb_filename through SMB_VFS_CREATE_FILE
2009-06-12 23:54:11 +04:00
int ret;
ret = get_file_version(fsp, smb_fname->base_name, &major, &minor);
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
if (ret == -1) goto error_exit;
if (!ret) {
s3: Plumb smb_filename through SMB_VFS_CREATE_FILE
2009-06-12 23:54:11 +04:00
DEBUG(6,("get_correct_cversion: Version info not "
"found [%s]\n",
smb_fname_str_dbg(smb_fname)));
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
goto error_exit;
}
/*
* This is a Microsoft'ism. See references in MSDN to VER_FILEVERSION
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
* for more details. Version in this case is not just the version of the
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
* file, but the version in the sense of kernal mode (2) vs. user mode
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
* (3) drivers. Other bits of the version fields are the version info.
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
* JRR 010716
*/
cversion = major & 0x0000ffff;
switch (cversion) {
case 2: /* WinNT drivers */
case 3: /* Win2K drivers */
break;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
default:
s3: Plumb smb_filename through SMB_VFS_CREATE_FILE
2009-06-12 23:54:11 +04:00
DEBUG(6,("get_correct_cversion: cversion "
"invalid [%s] cversion = %d\n",
smb_fname_str_dbg(smb_fname),
cversion));
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
goto error_exit;
}
s3: Plumb smb_filename through SMB_VFS_CREATE_FILE
2009-06-12 23:54:11 +04:00
DEBUG(10,("get_correct_cversion: Version info found [%s] major"
" = 0x%x minor = 0x%x\n",
smb_fname_str_dbg(smb_fname), major, minor));
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
}
r7620: when adding a new printer driver, we should copy the files (not move) to the W32X86/{2,3}/ directory. Printmig.exe copies the driver files for all drivers to print$/W32X86 and the calls AddPrinterDriver() for each driver. If we move the file, then adding a driver which shares a file with a previous driver will fail. I can now restore drivers in bulk to a Samba 3 server. (This used to be commit 46cd95c9b48a00a51139d3654352d4399b774a9b)
2005-06-15 23:28:14 +04:00
DEBUG(10,("get_correct_cversion: Driver file [%s] cversion = %d\n",
s3: Plumb smb_filename through SMB_VFS_CREATE_FILE
2009-06-12 23:54:11 +04:00
smb_fname_str_dbg(smb_fname), cversion));
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
Convert get_correct_cversion to use create_conn_struct Jerry, please check!
2008-11-24 01:01:24 +03:00
goto done;
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
Convert get_correct_cversion to use create_conn_struct Jerry, please check!
2008-11-24 01:01:24 +03:00
error_exit:
cversion = -1;
done:
s3: Prepare the first set of SMB_VFS_CREATE_FILE callers to take an smb_filename struct Some of the callers required minimal changes, while others (copy_internals) required significant changes. The task is simplified a little bit because we are able to do operations and checks on the base_name when a stream isn't used. This patch should cause no functional changes. Volker, Jeremy: Please check
2009-06-10 21:37:57 +04:00
TALLOC_FREE(smb_fname);
Convert get_correct_cversion to use create_conn_struct Jerry, please check!
2008-11-24 01:01:24 +03:00
if (fsp != NULL) {
Pass struct smb_request to file_free on the way to get rid of chain_fsp
2008-10-09 18:27:49 +04:00
close_file(NULL, fsp, NORMAL_CLOSE);
Convert get_correct_cversion to use create_conn_struct Jerry, please check!
2008-11-24 01:01:24 +03:00
}
if (conn != NULL) {
vfs_ChDir(conn, oldcwd);
s3:smbd: conn_free_internal() can be static now metze
2009-08-07 13:48:03 +04:00
conn_free(conn);
Convert get_correct_cversion to use create_conn_struct Jerry, please check!
2008-11-24 01:01:24 +03:00
}
if (cversion != -1) {
*perr = WERR_OK;
}
return cversion;
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
}
/****************************************************************************
****************************************************************************/
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
#define strip_driver_path(_mem_ctx, _element) do { \
s3-spoolss: fix some crash bugs and missing error codes in AddDriver paths. Found by torture test. Guenther
2010-04-23 04:34:43 +04:00
if (_element && ((_p = strrchr((_element), '\\')) != NULL)) { \
Fix warnings with talloc_asprintf. Jeremy.
2009-11-26 01:47:36 +03:00
(_element) = talloc_asprintf((_mem_ctx), "%s", _p+1); \
W_ERROR_HAVE_NO_MEMORY((_element)); \
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
} \
} while (0);
s3-printing: remove duplicate code while cleaning up driver structs. Guenther
2009-11-23 14:57:46 +03:00
static WERROR clean_up_driver_struct_level(TALLOC_CTX *mem_ctx,
struct pipes_struct *rpc_pipe,
const char *architecture,
const char **driver_path,
const char **data_file,
const char **config_file,
const char **help_file,
struct spoolss_StringArray *dependent_files,
uint32_t *version)
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
{
s3-printing: remove duplicate code while cleaning up driver structs. Guenther
2009-11-23 14:57:46 +03:00
const char *short_architecture;
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
int i;
the next stage in the NTSTATUS/WERROR change. smbd and nmbd now compile, but the client code still needs some work (This used to be commit dcd6e735f709a9231860ceb9682db40ff26c9a66)
2001-09-04 11:13:01 +04:00
WERROR err;
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
char *_p;
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
s3-spoolss: fix some crash bugs and missing error codes in AddDriver paths. Found by torture test. Guenther
2010-04-23 04:34:43 +04:00
if (!*driver_path || !*data_file || !*config_file) {
return WERR_INVALID_PARAM;
}
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
/* clean up the driver name.
* we can get .\driver.dll
* or worse c:\windows\system\driver.dll !
*/
/* using an intermediate string to not have overlaping memcpy()'s */
s3-printing: remove duplicate code while cleaning up driver structs. Guenther
2009-11-23 14:57:46 +03:00
strip_driver_path(mem_ctx, *driver_path);
strip_driver_path(mem_ctx, *data_file);
strip_driver_path(mem_ctx, *config_file);
s3-spoolss: fix some crash bugs and missing error codes in AddDriver paths. Found by torture test. Guenther
2010-04-23 04:34:43 +04:00
if (help_file) {
strip_driver_path(mem_ctx, *help_file);
}
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
s3-printing: remove duplicate code while cleaning up driver structs. Guenther
2009-11-23 14:57:46 +03:00
if (dependent_files && dependent_files->string) {
for (i=0; dependent_files->string[i]; i++) {
strip_driver_path(mem_ctx, dependent_files->string[i]);
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
}
}
s3-printing: remove duplicate code while cleaning up driver structs. Guenther
2009-11-23 14:57:46 +03:00
short_architecture = get_short_archi(architecture);
if (!short_architecture) {
r16365: Fix Klocwork #895, #898, #899, #915, #932, #938 and a few other problems Klocwork missed. Jeremy. (This used to be commit fe05769a1a85f924c67be7e5dcee4871a86948d7)
2006-06-20 01:36:19 +04:00
return WERR_UNKNOWN_PRINTER_DRIVER;
}
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
/* jfm:7/16/2000 the client always sends the cversion=0.
* The server should check which version the driver is by reading
* the PE header of driver->driverpath.
*
* For Windows 95/98 the version is 0 (so the value sent is correct)
* For Windows NT (the architecture doesn't matter)
* NT 3.1: cversion=0
* NT 3.5/3.51: cversion=1
* NT 4: cversion=2
* NT2K: cversion=3
*/
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
s3-printing: remove duplicate code while cleaning up driver structs. Guenther
2009-11-23 14:57:46 +03:00
*version = get_correct_cversion(rpc_pipe, short_architecture,
*driver_path, &err);
if (*version == -1) {
r16365: Fix Klocwork #895, #898, #899, #915, #932, #938 and a few other problems Klocwork missed. Jeremy. (This used to be commit fe05769a1a85f924c67be7e5dcee4871a86948d7)
2006-06-20 01:36:19 +04:00
return err;
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
}
the next stage in the NTSTATUS/WERROR change. smbd and nmbd now compile, but the client code still needs some work (This used to be commit dcd6e735f709a9231860ceb9682db40ff26c9a66)
2001-09-04 11:13:01 +04:00
return WERR_OK;
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
}
/****************************************************************************
****************************************************************************/
s3-printing: remove duplicate code while cleaning up driver structs. Guenther
2009-11-23 14:57:46 +03:00
Convert get_correct_cversion to use create_conn_struct Jerry, please check!
2008-11-24 01:01:24 +03:00
WERROR clean_up_driver_struct(struct pipes_struct *rpc_pipe,
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
struct spoolss_AddDriverInfoCtr *r)
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
{
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
switch (r->level) {
case 3:
s3-printing: remove duplicate code while cleaning up driver structs. Guenther
2009-11-23 14:57:46 +03:00
return clean_up_driver_struct_level(r, rpc_pipe,
r->info.info3->architecture,
&r->info.info3->driver_path,
&r->info.info3->data_file,
&r->info.info3->config_file,
&r->info.info3->help_file,
r->info.info3->dependent_files,
&r->info.info3->version);
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
case 6:
s3-printing: remove duplicate code while cleaning up driver structs. Guenther
2009-11-23 14:57:46 +03:00
return clean_up_driver_struct_level(r, rpc_pipe,
r->info.info6->architecture,
&r->info.info6->driver_path,
&r->info.info6->data_file,
&r->info.info6->config_file,
&r->info.info6->help_file,
r->info.info6->dependent_files,
&r->info.info6->version);
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
default:
return WERR_NOT_SUPPORTED;
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
}
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
}
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
/****************************************************************************
This function sucks and should be replaced. JRA.
****************************************************************************/
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
static void convert_level_6_to_level3(struct spoolss_AddDriverInfo3 *dst,
const struct spoolss_AddDriverInfo6 *src)
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
{
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
dst->version = src->version;
dst->driver_name = src->driver_name;
dst->architecture = src->architecture;
dst->driver_path = src->driver_path;
dst->data_file = src->data_file;
dst->config_file = src->config_file;
dst->help_file = src->help_file;
dst->monitor_name = src->monitor_name;
dst->default_datatype = src->default_datatype;
dst->_ndr_size_dependent_files = src->_ndr_size_dependent_files;
dst->dependent_files = src->dependent_files;
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
}
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
/****************************************************************************
This function sucks and should be replaced. JRA.
****************************************************************************/
static void convert_level_8_to_level3(TALLOC_CTX *mem_ctx,
struct spoolss_AddDriverInfo3 *dst,
const struct spoolss_DriverInfo8 *src)
{
dst->version = src->version;
dst->driver_name = src->driver_name;
dst->architecture = src->architecture;
dst->driver_path = src->driver_path;
dst->data_file = src->data_file;
dst->config_file = src->config_file;
dst->help_file = src->help_file;
dst->monitor_name = src->monitor_name;
dst->default_datatype = src->default_datatype;
if (src->dependent_files) {
dst->dependent_files = talloc_zero(mem_ctx, struct spoolss_StringArray);
if (!dst->dependent_files) return;
dst->dependent_files->string = src->dependent_files;
} else {
dst->dependent_files = NULL;
}
}
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
/****************************************************************************
****************************************************************************/
s3-printing: add move_driver_file_to_download_area(). Guenther
2009-04-30 03:07:31 +04:00
static WERROR move_driver_file_to_download_area(TALLOC_CTX *mem_ctx,
connection_struct *conn,
const char *driver_file,
s3-printing: rework move_driver_file_to_download_area() a bit for clarity. Guenther
2009-04-30 18:49:50 +04:00
const char *short_architecture,
uint32_t driver_version,
s3-printing: add move_driver_file_to_download_area(). Guenther
2009-04-30 03:07:31 +04:00
uint32_t version)
{
s3: Prepare the first set of SMB_VFS_CREATE_FILE callers to take an smb_filename struct Some of the callers required minimal changes, while others (copy_internals) required significant changes. The task is simplified a little bit because we are able to do operations and checks on the base_name when a stream isn't used. This patch should cause no functional changes. Volker, Jeremy: Please check
2009-06-10 21:37:57 +04:00
struct smb_filename *smb_fname_old = NULL;
struct smb_filename *smb_fname_new = NULL;
s3-printing: add move_driver_file_to_download_area(). Guenther
2009-04-30 03:07:31 +04:00
char *old_name = NULL;
char *new_name = NULL;
NTSTATUS status;
s3: Prepare the first set of SMB_VFS_CREATE_FILE callers to take an smb_filename struct Some of the callers required minimal changes, while others (copy_internals) required significant changes. The task is simplified a little bit because we are able to do operations and checks on the base_name when a stream isn't used. This patch should cause no functional changes. Volker, Jeremy: Please check
2009-06-10 21:37:57 +04:00
WERROR ret;
s3-printing: add move_driver_file_to_download_area(). Guenther
2009-04-30 03:07:31 +04:00
old_name = talloc_asprintf(mem_ctx, "%s/%s",
s3-printing: rework move_driver_file_to_download_area() a bit for clarity. Guenther
2009-04-30 18:49:50 +04:00
short_architecture, driver_file);
s3-printing: add move_driver_file_to_download_area(). Guenther
2009-04-30 03:07:31 +04:00
W_ERROR_HAVE_NO_MEMORY(old_name);
s3-printing: rework move_driver_file_to_download_area() a bit for clarity. Guenther
2009-04-30 18:49:50 +04:00
new_name = talloc_asprintf(mem_ctx, "%s/%d/%s",
short_architecture, driver_version, driver_file);
Do a correct TALLOC_FREE in an error case
2009-06-15 09:45:47 +04:00
if (new_name == NULL) {
TALLOC_FREE(old_name);
return WERR_NOMEM;
}
s3-printing: rework move_driver_file_to_download_area() a bit for clarity. Guenther
2009-04-30 18:49:50 +04:00
if (version != -1 && (version = file_version_is_newer(conn, old_name, new_name)) > 0) {
s3: Prepare the first set of SMB_VFS_CREATE_FILE callers to take an smb_filename struct Some of the callers required minimal changes, while others (copy_internals) required significant changes. The task is simplified a little bit because we are able to do operations and checks on the base_name when a stream isn't used. This patch should cause no functional changes. Volker, Jeremy: Please check
2009-06-10 21:37:57 +04:00
status = driver_unix_convert(conn, old_name, &smb_fname_old);
if (!NT_STATUS_IS_OK(status)) {
ret = WERR_NOMEM;
goto out;
}
/* Setup a synthetic smb_filename struct */
smb_fname_new = TALLOC_ZERO_P(mem_ctx, struct smb_filename);
if (!smb_fname_new) {
ret = WERR_NOMEM;
goto out;
}
smb_fname_new->base_name = new_name;
s3-printing: add move_driver_file_to_download_area(). Guenther
2009-04-30 03:07:31 +04:00
s3: Prepare the first set of SMB_VFS_CREATE_FILE callers to take an smb_filename struct Some of the callers required minimal changes, while others (copy_internals) required significant changes. The task is simplified a little bit because we are able to do operations and checks on the base_name when a stream isn't used. This patch should cause no functional changes. Volker, Jeremy: Please check
2009-06-10 21:37:57 +04:00
DEBUG(10,("move_driver_file_to_download_area: copying '%s' to "
"'%s'\n", smb_fname_old->base_name,
smb_fname_new->base_name));
s3-printing: add move_driver_file_to_download_area(). Guenther
2009-04-30 03:07:31 +04:00
s3: Prepare the first set of SMB_VFS_CREATE_FILE callers to take an smb_filename struct Some of the callers required minimal changes, while others (copy_internals) required significant changes. The task is simplified a little bit because we are able to do operations and checks on the base_name when a stream isn't used. This patch should cause no functional changes. Volker, Jeremy: Please check
2009-06-10 21:37:57 +04:00
status = copy_file(mem_ctx, conn, smb_fname_old, smb_fname_new,
s3-printing: add move_driver_file_to_download_area(). Guenther
2009-04-30 03:07:31 +04:00
OPENX_FILE_EXISTS_TRUNCATE |
OPENX_FILE_CREATE_IF_NOT_EXIST,
0, false);
s3-printing: rework move_driver_file_to_download_area() a bit for clarity. Guenther
2009-04-30 18:49:50 +04:00
s3-printing: add move_driver_file_to_download_area(). Guenther
2009-04-30 03:07:31 +04:00
if (!NT_STATUS_IS_OK(status)) {
s3: Prepare the first set of SMB_VFS_CREATE_FILE callers to take an smb_filename struct Some of the callers required minimal changes, while others (copy_internals) required significant changes. The task is simplified a little bit because we are able to do operations and checks on the base_name when a stream isn't used. This patch should cause no functional changes. Volker, Jeremy: Please check
2009-06-10 21:37:57 +04:00
DEBUG(0,("move_driver_file_to_download_area: Unable "
"to rename [%s] to [%s]: %s\n",
smb_fname_old->base_name, new_name,
nt_errstr(status)));
ret = WERR_ACCESS_DENIED;
goto out;
s3-printing: add move_driver_file_to_download_area(). Guenther
2009-04-30 03:07:31 +04:00
}
}
s3: Prepare the first set of SMB_VFS_CREATE_FILE callers to take an smb_filename struct Some of the callers required minimal changes, while others (copy_internals) required significant changes. The task is simplified a little bit because we are able to do operations and checks on the base_name when a stream isn't used. This patch should cause no functional changes. Volker, Jeremy: Please check
2009-06-10 21:37:57 +04:00
ret = WERR_OK;
out:
TALLOC_FREE(smb_fname_old);
TALLOC_FREE(smb_fname_new);
return ret;
s3-printing: add move_driver_file_to_download_area(). Guenther
2009-04-30 03:07:31 +04:00
}
Convert move_driver_to_download_area to use create_conn_struct This removes a use of struct current_user and the vuid The become_user() here is unnecessary, within the spoolss handling code we have switched to the authenticated pipe user anyway. Jerry, please check!
2008-11-24 00:46:08 +03:00
WERROR move_driver_to_download_area(struct pipes_struct *p,
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
struct spoolss_AddDriverInfoCtr *r,
WERROR *perr)
A rather big change set ! (listed in no particular order) - changed the default forms flag to 2 - all short architecture name are uppercased - get_short_archi() is now case unsensitive - the drivers TDB is indexed by archi/version/name - implemented code to move drivers from the upload area to the download area. Someone else need to look at that code. - don't return anymore a default driver if it doesn't exist in the TDB. Instead return an error. - cleaned prs_unistr. - #ifdef out jeremy's new SD parsing in printer_info_2 - removed the unused MANGLE_CODE - #ifdef out the security checking in update_printer() as it doesn't work for me. Zap your ntdrivers.tdb, it won't work anymore. J.F. (This used to be commit ac0a145acc0953a6f362497abbf4dfe70aa522a6)
2000-07-25 17:15:16 +04:00
{
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
struct spoolss_AddDriverInfo3 *driver;
struct spoolss_AddDriverInfo3 converted_driver;
s3-printing: rework move_driver_file_to_download_area() a bit for clarity. Guenther
2009-04-30 18:49:50 +04:00
const char *short_architecture;
s3: Prepare the first set of SMB_VFS_CREATE_FILE callers to take an smb_filename struct Some of the callers required minimal changes, while others (copy_internals) required significant changes. The task is simplified a little bit because we are able to do operations and checks on the base_name when a stream isn't used. This patch should cause no functional changes. Volker, Jeremy: Please check
2009-06-10 21:37:57 +04:00
struct smb_filename *smb_dname = NULL;
More pstring removal. This one was tricky. I had to add one horror (pstring_clean_name()) which will have to remain until I've removed all pstrings from the client code. Jeremy. (This used to be commit 1ea3ac80146b83c2522b69e7747c823366a2b47d)
2007-11-16 01:19:52 +03:00
char *new_dir = NULL;
Convert move_driver_to_download_area to use create_conn_struct This removes a use of struct current_user and the vuid The become_user() here is unnecessary, within the spoolss handling code we have switched to the authenticated pipe user anyway. Jerry, please check!
2008-11-24 00:46:08 +03:00
connection_struct *conn = NULL;
Looks like it missed these. make_connection now no longer takes a 'username' argument. (This used to be commit 0e1322227b0a91226b4b85c8e0ff838ebfd9e962)
2001-09-16 03:32:19 +04:00
NTSTATUS nt_status;
A rather big change set ! (listed in no particular order) - changed the default forms flag to 2 - all short architecture name are uppercased - get_short_archi() is now case unsensitive - the drivers TDB is indexed by archi/version/name - implemented code to move drivers from the upload area to the download area. Someone else need to look at that code. - don't return anymore a default driver if it doesn't exist in the TDB. Instead return an error. - cleaned prs_unistr. - #ifdef out jeremy's new SD parsing in printer_info_2 - removed the unused MANGLE_CODE - #ifdef out the security checking in update_printer() as it doesn't work for me. Zap your ntdrivers.tdb, it won't work anymore. J.F. (This used to be commit ac0a145acc0953a6f362497abbf4dfe70aa522a6)
2000-07-25 17:15:16 +04:00
int i;
r25117: The mega-patch Jerry was waiting for. Remove all pstrings from the main server code paths. We should now be able to cope with paths up to PATH_MAX length now. Final job will be to add the TALLOC_CTX * parameter to unix_convert to make it explicit (for Volker). Jeremy. (This used to be commit 7f0db75fb0f24873577dcb758a2ecee74fdc4297)
2007-09-13 01:48:20 +04:00
TALLOC_CTX *ctx = talloc_tos();
More pstring removal. This one was tricky. I had to add one horror (pstring_clean_name()) which will have to remain until I've removed all pstrings from the client code. Jeremy. (This used to be commit 1ea3ac80146b83c2522b69e7747c823366a2b47d)
2007-11-16 01:19:52 +03:00
int ver = 0;
Convert move_driver_to_download_area to use create_conn_struct This removes a use of struct current_user and the vuid The become_user() here is unnecessary, within the spoolss handling code we have switched to the authenticated pipe user anyway. Jerry, please check!
2008-11-24 00:46:08 +03:00
char *oldcwd;
fstring printdollar;
int printdollar_snum;
A rather big change set ! (listed in no particular order) - changed the default forms flag to 2 - all short architecture name are uppercased - get_short_archi() is now case unsensitive - the drivers TDB is indexed by archi/version/name - implemented code to move drivers from the upload area to the download area. Someone else need to look at that code. - don't return anymore a default driver if it doesn't exist in the TDB. Instead return an error. - cleaned prs_unistr. - #ifdef out jeremy's new SD parsing in printer_info_2 - removed the unused MANGLE_CODE - #ifdef out the security checking in update_printer() as it doesn't work for me. Zap your ntdrivers.tdb, it won't work anymore. J.F. (This used to be commit ac0a145acc0953a6f362497abbf4dfe70aa522a6)
2000-07-25 17:15:16 +04:00
the next stage in the NTSTATUS/WERROR change. smbd and nmbd now compile, but the client code still needs some work (This used to be commit dcd6e735f709a9231860ceb9682db40ff26c9a66)
2001-09-04 11:13:01 +04:00
*perr = WERR_OK;
Fixed error returns for moving printer driver files around so generic "Access denied" isn't always returned. More fixes found using Gerald's wonderful Win32 test progs :-). Jeremy. (This used to be commit 67b9d40e3df19523714430cb4457717575f2a61e)
2000-08-31 01:09:21 +04:00
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
switch (r->level) {
s3-printing: rework move_driver_file_to_download_area() a bit for clarity. Guenther
2009-04-30 18:49:50 +04:00
case 3:
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
driver = r->info.info3;
s3-printing: rework move_driver_file_to_download_area() a bit for clarity. Guenther
2009-04-30 18:49:50 +04:00
break;
case 6:
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
convert_level_6_to_level3(&converted_driver, r->info.info6);
Temporary fix to convert from level6 (Win2k) to level 3 (NT4) for driver download files. Jeremy. (This used to be commit 1c9ac94c941aac5f6d309a094e4f741d523dbfb0)
2000-09-07 03:20:35 +04:00
driver = &converted_driver;
s3-printing: rework move_driver_file_to_download_area() a bit for clarity. Guenther
2009-04-30 18:49:50 +04:00
break;
default:
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
DEBUG(0,("move_driver_to_download_area: Unknown info level (%u)\n", (unsigned int)r->level));
r7614: convert move_driver_to_download_area() to return WERROR in order to provide better error messages to clients when a AddPrinterDriver[Ex]() call fails (This used to be commit c98e17446afffc4b12f1a31f6e5cce517fc0a95b)
2005-06-15 21:03:34 +04:00
return WERR_UNKNOWN_LEVEL;
Temporary fix to convert from level6 (Win2k) to level 3 (NT4) for driver download files. Jeremy. (This used to be commit 1c9ac94c941aac5f6d309a094e4f741d523dbfb0)
2000-09-07 03:20:35 +04:00
}
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
short_architecture = get_short_archi(driver->architecture);
s3-printing: rework move_driver_file_to_download_area() a bit for clarity. Guenther
2009-04-30 18:49:50 +04:00
if (!short_architecture) {
r16365: Fix Klocwork #895, #898, #899, #915, #932, #938 and a few other problems Klocwork missed. Jeremy. (This used to be commit fe05769a1a85f924c67be7e5dcee4871a86948d7)
2006-06-20 01:36:19 +04:00
return WERR_UNKNOWN_PRINTER_DRIVER;
}
A rather big change set ! (listed in no particular order) - changed the default forms flag to 2 - all short architecture name are uppercased - get_short_archi() is now case unsensitive - the drivers TDB is indexed by archi/version/name - implemented code to move drivers from the upload area to the download area. Someone else need to look at that code. - don't return anymore a default driver if it doesn't exist in the TDB. Instead return an error. - cleaned prs_unistr. - #ifdef out jeremy's new SD parsing in printer_info_2 - removed the unused MANGLE_CODE - #ifdef out the security checking in update_printer() as it doesn't work for me. Zap your ntdrivers.tdb, it won't work anymore. J.F. (This used to be commit ac0a145acc0953a6f362497abbf4dfe70aa522a6)
2000-07-25 17:15:16 +04:00
Convert move_driver_to_download_area to use create_conn_struct This removes a use of struct current_user and the vuid The become_user() here is unnecessary, within the spoolss handling code we have switched to the authenticated pipe user anyway. Jerry, please check!
2008-11-24 00:46:08 +03:00
fstrcpy(printdollar, "print$");
A rather big change set ! (listed in no particular order) - changed the default forms flag to 2 - all short architecture name are uppercased - get_short_archi() is now case unsensitive - the drivers TDB is indexed by archi/version/name - implemented code to move drivers from the upload area to the download area. Someone else need to look at that code. - don't return anymore a default driver if it doesn't exist in the TDB. Instead return an error. - cleaned prs_unistr. - #ifdef out jeremy's new SD parsing in printer_info_2 - removed the unused MANGLE_CODE - #ifdef out the security checking in update_printer() as it doesn't work for me. Zap your ntdrivers.tdb, it won't work anymore. J.F. (This used to be commit ac0a145acc0953a6f362497abbf4dfe70aa522a6)
2000-07-25 17:15:16 +04:00
Convert move_driver_to_download_area to use create_conn_struct This removes a use of struct current_user and the vuid The become_user() here is unnecessary, within the spoolss handling code we have switched to the authenticated pipe user anyway. Jerry, please check!
2008-11-24 00:46:08 +03:00
printdollar_snum = find_service(printdollar);
if (printdollar_snum == -1) {
*perr = WERR_NO_SUCH_SHARE;
r7614: convert move_driver_to_download_area() to return WERROR in order to provide better error messages to clients when a AddPrinterDriver[Ex]() call fails (This used to be commit c98e17446afffc4b12f1a31f6e5cce517fc0a95b)
2005-06-15 21:03:34 +04:00
return WERR_NO_SUCH_SHARE;
Fixed up error checking and move printer file code. Fixed a memory leak. Jeremy. (This used to be commit 5130dd0f8b80aed5fb3c0df290b627057cc9b825)
2000-07-26 02:35:57 +04:00
}
Convert move_driver_to_download_area to use create_conn_struct This removes a use of struct current_user and the vuid The become_user() here is unnecessary, within the spoolss handling code we have switched to the authenticated pipe user anyway. Jerry, please check!
2008-11-24 00:46:08 +03:00
nt_status = create_conn_struct(talloc_tos(), &conn, printdollar_snum,
lp_pathname(printdollar_snum),
p->server_info, &oldcwd);
if (!NT_STATUS_IS_OK(nt_status)) {
DEBUG(0,("move_driver_to_download_area: create_conn_struct "
"returned %s\n", nt_errstr(nt_status)));
*perr = ntstatus_to_werror(nt_status);
return *perr;
Added some error checking and returns to the new 'move' code. Jeremy. (This used to be commit 0bd88d304cd773e0bbf3e6f7fedcb3b544d41cbe)
2000-07-25 21:09:29 +04:00
}
More pstring removal. This one was tricky. I had to add one horror (pstring_clean_name()) which will have to remain until I've removed all pstrings from the client code. Jeremy. (This used to be commit 1ea3ac80146b83c2522b69e7747c823366a2b47d)
2007-11-16 01:19:52 +03:00
new_dir = talloc_asprintf(ctx,
"%s/%d",
s3-printing: rework move_driver_file_to_download_area() a bit for clarity. Guenther
2009-04-30 18:49:50 +04:00
short_architecture,
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
driver->version);
More pstring removal. This one was tricky. I had to add one horror (pstring_clean_name()) which will have to remain until I've removed all pstrings from the client code. Jeremy. (This used to be commit 1ea3ac80146b83c2522b69e7747c823366a2b47d)
2007-11-16 01:19:52 +03:00
if (!new_dir) {
*perr = WERR_NOMEM;
goto err_exit;
}
s3: Prepare the first set of SMB_VFS_CREATE_FILE callers to take an smb_filename struct Some of the callers required minimal changes, while others (copy_internals) required significant changes. The task is simplified a little bit because we are able to do operations and checks on the base_name when a stream isn't used. This patch should cause no functional changes. Volker, Jeremy: Please check
2009-06-10 21:37:57 +04:00
nt_status = driver_unix_convert(conn, new_dir, &smb_dname);
if (!NT_STATUS_IS_OK(nt_status)) {
More pstring removal. This one was tricky. I had to add one horror (pstring_clean_name()) which will have to remain until I've removed all pstrings from the client code. Jeremy. (This used to be commit 1ea3ac80146b83c2522b69e7747c823366a2b47d)
2007-11-16 01:19:52 +03:00
*perr = WERR_NOMEM;
goto err_exit;
}
s3: Prepare the first set of SMB_VFS_CREATE_FILE callers to take an smb_filename struct Some of the callers required minimal changes, while others (copy_internals) required significant changes. The task is simplified a little bit because we are able to do operations and checks on the base_name when a stream isn't used. This patch should cause no functional changes. Volker, Jeremy: Please check
2009-06-10 21:37:57 +04:00
DEBUG(5,("Creating first directory: %s\n", smb_dname->base_name));
s3-printing: rework move_driver_file_to_download_area() a bit for clarity. Guenther
2009-04-30 18:49:50 +04:00
s3: Prepare the first set of SMB_VFS_CREATE_FILE callers to take an smb_filename struct Some of the callers required minimal changes, while others (copy_internals) required significant changes. The task is simplified a little bit because we are able to do operations and checks on the base_name when a stream isn't used. This patch should cause no functional changes. Volker, Jeremy: Please check
2009-06-10 21:37:57 +04:00
create_directory(conn, NULL, smb_dname);
A rather big change set ! (listed in no particular order) - changed the default forms flag to 2 - all short architecture name are uppercased - get_short_archi() is now case unsensitive - the drivers TDB is indexed by archi/version/name - implemented code to move drivers from the upload area to the download area. Someone else need to look at that code. - don't return anymore a default driver if it doesn't exist in the TDB. Instead return an error. - cleaned prs_unistr. - #ifdef out jeremy's new SD parsing in printer_info_2 - removed the unused MANGLE_CODE - #ifdef out the security checking in update_printer() as it doesn't work for me. Zap your ntdrivers.tdb, it won't work anymore. J.F. (This used to be commit ac0a145acc0953a6f362497abbf4dfe70aa522a6)
2000-07-25 17:15:16 +04:00
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
/* For each driver file, archi\filexxx.yyy, if there is a duplicate file
* listed for this driver which has already been moved, skip it (note:
* drivers may list the same file name several times. Then check if the
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
* file already exists in archi\version\, if so, check that the version
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
* info (or time stamps if version info is unavailable) is newer (or the
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
* date is later). If it is, move it to archi\version\filexxx.yyy.
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
* Otherwise, delete the file.
Added John Reilly's enumports/addprinter/delprinter scripting code plus the fix for the Win9x printer drivers. Changed command names to add "command" string on the end for some consistancy with the other scripting commands. Added '%P' option to tdbpack/unpack to store long comment string. Made port name be "Samba Printer Port" if no enum port script given. Fixed prs_uint32_pre code to cope with null args. Jeremy. (This used to be commit 902ada63799cf27924c72e24e7593a8c9fb5eba9)
2000-08-01 00:41:51 +04:00
*
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
* If a file is not moved to archi\version\ because of an error, all the
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
* rest of the 'unmoved' driver files are removed from archi\. If one or
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
* more of the driver's files was already moved to archi\version\, it
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
* potentially leaves the driver in a partially updated state. Version
* trauma will most likely occur if an client attempts to use any printer
* bound to the driver. Perhaps a rewrite to make sure the moves can be
* done is appropriate... later JRR
A rather big change set ! (listed in no particular order) - changed the default forms flag to 2 - all short architecture name are uppercased - get_short_archi() is now case unsensitive - the drivers TDB is indexed by archi/version/name - implemented code to move drivers from the upload area to the download area. Someone else need to look at that code. - don't return anymore a default driver if it doesn't exist in the TDB. Instead return an error. - cleaned prs_unistr. - #ifdef out jeremy's new SD parsing in printer_info_2 - removed the unused MANGLE_CODE - #ifdef out the security checking in update_printer() as it doesn't work for me. Zap your ntdrivers.tdb, it won't work anymore. J.F. (This used to be commit ac0a145acc0953a6f362497abbf4dfe70aa522a6)
2000-07-25 17:15:16 +04:00
*/
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
DEBUG(5,("Moving files now !\n"));
John Reilly @ HP (who is a wonderful human being and *definately* needs CVS commit access :-) has written a simple routine that peeks inside the MS PE printer driver file format and can tell if a driver is W2K or NT4.x. So we can now correctly return the driver version number. Hurrah ! JF - this is the code you always wanted ..... :-) :-). Jeremy. (This used to be commit fd17374e6d888813f4ed7142480cf93b8a16bfef)
2000-10-25 21:56:38 +04:00
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
if (driver->driver_path && strlen(driver->driver_path)) {
More pstring removal. This one was tricky. I had to add one horror (pstring_clean_name()) which will have to remain until I've removed all pstrings from the client code. Jeremy. (This used to be commit 1ea3ac80146b83c2522b69e7747c823366a2b47d)
2007-11-16 01:19:52 +03:00
s3-printing: use move_driver_file_to_download_area() to avoid code duplication. Guenther
2009-04-30 03:25:23 +04:00
*perr = move_driver_file_to_download_area(ctx,
conn,
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
driver->driver_path,
s3-printing: rework move_driver_file_to_download_area() a bit for clarity. Guenther
2009-04-30 18:49:50 +04:00
short_architecture,
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
driver->version,
s3-printing: use move_driver_file_to_download_area() to avoid code duplication. Guenther
2009-04-30 03:25:23 +04:00
ver);
if (!W_ERROR_IS_OK(*perr)) {
if (W_ERROR_EQUAL(*perr, WERR_ACCESS_DENIED)) {
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
ver = -1;
}
s3-printing: use move_driver_file_to_download_area() to avoid code duplication. Guenther
2009-04-30 03:25:23 +04:00
goto err_exit;
More pstring removal. This one was tricky. I had to add one horror (pstring_clean_name()) which will have to remain until I've removed all pstrings from the client code. Jeremy. (This used to be commit 1ea3ac80146b83c2522b69e7747c823366a2b47d)
2007-11-16 01:19:52 +03:00
}
John Reilly @ HP (who is a wonderful human being and *definately* needs CVS commit access :-) has written a simple routine that peeks inside the MS PE printer driver file format and can tell if a driver is W2K or NT4.x. So we can now correctly return the driver version number. Hurrah ! JF - this is the code you always wanted ..... :-) :-). Jeremy. (This used to be commit fd17374e6d888813f4ed7142480cf93b8a16bfef)
2000-10-25 21:56:38 +04:00
}
A rather big change set ! (listed in no particular order) - changed the default forms flag to 2 - all short architecture name are uppercased - get_short_archi() is now case unsensitive - the drivers TDB is indexed by archi/version/name - implemented code to move drivers from the upload area to the download area. Someone else need to look at that code. - don't return anymore a default driver if it doesn't exist in the TDB. Instead return an error. - cleaned prs_unistr. - #ifdef out jeremy's new SD parsing in printer_info_2 - removed the unused MANGLE_CODE - #ifdef out the security checking in update_printer() as it doesn't work for me. Zap your ntdrivers.tdb, it won't work anymore. J.F. (This used to be commit ac0a145acc0953a6f362497abbf4dfe70aa522a6)
2000-07-25 17:15:16 +04:00
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
if (driver->data_file && strlen(driver->data_file)) {
if (!strequal(driver->data_file, driver->driver_path)) {
s3-printing: use move_driver_file_to_download_area() to avoid code duplication. Guenther
2009-04-30 03:25:23 +04:00
*perr = move_driver_file_to_download_area(ctx,
conn,
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
driver->data_file,
s3-printing: rework move_driver_file_to_download_area() a bit for clarity. Guenther
2009-04-30 18:49:50 +04:00
short_architecture,
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
driver->version,
s3-printing: use move_driver_file_to_download_area() to avoid code duplication. Guenther
2009-04-30 03:25:23 +04:00
ver);
if (!W_ERROR_IS_OK(*perr)) {
if (W_ERROR_EQUAL(*perr, WERR_ACCESS_DENIED)) {
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
ver = -1;
}
s3-printing: use move_driver_file_to_download_area() to avoid code duplication. Guenther
2009-04-30 03:25:23 +04:00
goto err_exit;
r460: Fix for broken driver upload/delete path processing. Jeremy. (This used to be commit 78be46d13bc88a300ab627c59862559d5491ee46)
2004-05-03 20:38:37 +04:00
}
Fixed memory leak with NT tokens. Added debug messages to se_access_check(). Added FULL_ACCESS acl to default acl on printers. Jeremy. (This used to be commit 7507f6f408cf8b0f8d7e2b3da54ce5fb5ef5343b)
2000-08-09 22:40:48 +04:00
}
Added John Reilly's enumports/addprinter/delprinter scripting code plus the fix for the Win9x printer drivers. Changed command names to add "command" string on the end for some consistancy with the other scripting commands. Added '%P' option to tdbpack/unpack to store long comment string. Made port name be "Samba Printer Port" if no enum port script given. Fixed prs_uint32_pre code to cope with null args. Jeremy. (This used to be commit 902ada63799cf27924c72e24e7593a8c9fb5eba9)
2000-08-01 00:41:51 +04:00
}
A rather big change set ! (listed in no particular order) - changed the default forms flag to 2 - all short architecture name are uppercased - get_short_archi() is now case unsensitive - the drivers TDB is indexed by archi/version/name - implemented code to move drivers from the upload area to the download area. Someone else need to look at that code. - don't return anymore a default driver if it doesn't exist in the TDB. Instead return an error. - cleaned prs_unistr. - #ifdef out jeremy's new SD parsing in printer_info_2 - removed the unused MANGLE_CODE - #ifdef out the security checking in update_printer() as it doesn't work for me. Zap your ntdrivers.tdb, it won't work anymore. J.F. (This used to be commit ac0a145acc0953a6f362497abbf4dfe70aa522a6)
2000-07-25 17:15:16 +04:00
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
if (driver->config_file && strlen(driver->config_file)) {
if (!strequal(driver->config_file, driver->driver_path) &&
!strequal(driver->config_file, driver->data_file)) {
s3-printing: use move_driver_file_to_download_area() to avoid code duplication. Guenther
2009-04-30 03:25:23 +04:00
*perr = move_driver_file_to_download_area(ctx,
conn,
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
driver->config_file,
s3-printing: rework move_driver_file_to_download_area() a bit for clarity. Guenther
2009-04-30 18:49:50 +04:00
short_architecture,
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
driver->version,
s3-printing: use move_driver_file_to_download_area() to avoid code duplication. Guenther
2009-04-30 03:25:23 +04:00
ver);
if (!W_ERROR_IS_OK(*perr)) {
if (W_ERROR_EQUAL(*perr, WERR_ACCESS_DENIED)) {
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
ver = -1;
}
s3-printing: use move_driver_file_to_download_area() to avoid code duplication. Guenther
2009-04-30 03:25:23 +04:00
goto err_exit;
r460: Fix for broken driver upload/delete path processing. Jeremy. (This used to be commit 78be46d13bc88a300ab627c59862559d5491ee46)
2004-05-03 20:38:37 +04:00
}
Fixed memory leak with NT tokens. Added debug messages to se_access_check(). Added FULL_ACCESS acl to default acl on printers. Jeremy. (This used to be commit 7507f6f408cf8b0f8d7e2b3da54ce5fb5ef5343b)
2000-08-09 22:40:48 +04:00
}
Added John Reilly's enumports/addprinter/delprinter scripting code plus the fix for the Win9x printer drivers. Changed command names to add "command" string on the end for some consistancy with the other scripting commands. Added '%P' option to tdbpack/unpack to store long comment string. Made port name be "Samba Printer Port" if no enum port script given. Fixed prs_uint32_pre code to cope with null args. Jeremy. (This used to be commit 902ada63799cf27924c72e24e7593a8c9fb5eba9)
2000-08-01 00:41:51 +04:00
}
A rather big change set ! (listed in no particular order) - changed the default forms flag to 2 - all short architecture name are uppercased - get_short_archi() is now case unsensitive - the drivers TDB is indexed by archi/version/name - implemented code to move drivers from the upload area to the download area. Someone else need to look at that code. - don't return anymore a default driver if it doesn't exist in the TDB. Instead return an error. - cleaned prs_unistr. - #ifdef out jeremy's new SD parsing in printer_info_2 - removed the unused MANGLE_CODE - #ifdef out the security checking in update_printer() as it doesn't work for me. Zap your ntdrivers.tdb, it won't work anymore. J.F. (This used to be commit ac0a145acc0953a6f362497abbf4dfe70aa522a6)
2000-07-25 17:15:16 +04:00
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
if (driver->help_file && strlen(driver->help_file)) {
if (!strequal(driver->help_file, driver->driver_path) &&
!strequal(driver->help_file, driver->data_file) &&
!strequal(driver->help_file, driver->config_file)) {
s3-printing: use move_driver_file_to_download_area() to avoid code duplication. Guenther
2009-04-30 03:25:23 +04:00
*perr = move_driver_file_to_download_area(ctx,
conn,
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
driver->help_file,
s3-printing: rework move_driver_file_to_download_area() a bit for clarity. Guenther
2009-04-30 18:49:50 +04:00
short_architecture,
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
driver->version,
s3-printing: use move_driver_file_to_download_area() to avoid code duplication. Guenther
2009-04-30 03:25:23 +04:00
ver);
if (!W_ERROR_IS_OK(*perr)) {
if (W_ERROR_EQUAL(*perr, WERR_ACCESS_DENIED)) {
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
ver = -1;
}
s3-printing: use move_driver_file_to_download_area() to avoid code duplication. Guenther
2009-04-30 03:25:23 +04:00
goto err_exit;
r460: Fix for broken driver upload/delete path processing. Jeremy. (This used to be commit 78be46d13bc88a300ab627c59862559d5491ee46)
2004-05-03 20:38:37 +04:00
}
Fixed memory leak with NT tokens. Added debug messages to se_access_check(). Added FULL_ACCESS acl to default acl on printers. Jeremy. (This used to be commit 7507f6f408cf8b0f8d7e2b3da54ce5fb5ef5343b)
2000-08-09 22:40:48 +04:00
}
Added John Reilly's enumports/addprinter/delprinter scripting code plus the fix for the Win9x printer drivers. Changed command names to add "command" string on the end for some consistancy with the other scripting commands. Added '%P' option to tdbpack/unpack to store long comment string. Made port name be "Samba Printer Port" if no enum port script given. Fixed prs_uint32_pre code to cope with null args. Jeremy. (This used to be commit 902ada63799cf27924c72e24e7593a8c9fb5eba9)
2000-08-01 00:41:51 +04:00
}
A rather big change set ! (listed in no particular order) - changed the default forms flag to 2 - all short architecture name are uppercased - get_short_archi() is now case unsensitive - the drivers TDB is indexed by archi/version/name - implemented code to move drivers from the upload area to the download area. Someone else need to look at that code. - don't return anymore a default driver if it doesn't exist in the TDB. Instead return an error. - cleaned prs_unistr. - #ifdef out jeremy's new SD parsing in printer_info_2 - removed the unused MANGLE_CODE - #ifdef out the security checking in update_printer() as it doesn't work for me. Zap your ntdrivers.tdb, it won't work anymore. J.F. (This used to be commit ac0a145acc0953a6f362497abbf4dfe70aa522a6)
2000-07-25 17:15:16 +04:00
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
if (driver->dependent_files && driver->dependent_files->string) {
for (i=0; driver->dependent_files->string[i]; i++) {
if (!strequal(driver->dependent_files->string[i], driver->driver_path) &&
!strequal(driver->dependent_files->string[i], driver->data_file) &&
!strequal(driver->dependent_files->string[i], driver->config_file) &&
!strequal(driver->dependent_files->string[i], driver->help_file)) {
Patch from John Reilly <jreilly@hp.com> for not processing duplicate files when moving printer driver to download area. (This used to be commit 6e0c9079c385a4f0e61d9f1b1e0351bc4dbc3151)
2000-08-22 10:28:33 +04:00
int j;
for (j=0; j < i; j++) {
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
if (strequal(driver->dependent_files->string[i], driver->dependent_files->string[j])) {
Patch from John Reilly <jreilly@hp.com> for not processing duplicate files when moving printer driver to download area. (This used to be commit 6e0c9079c385a4f0e61d9f1b1e0351bc4dbc3151)
2000-08-22 10:28:33 +04:00
goto NextDriver;
}
}
s3-printing: use move_driver_file_to_download_area() to avoid code duplication. Guenther
2009-04-30 03:25:23 +04:00
*perr = move_driver_file_to_download_area(ctx,
conn,
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
driver->dependent_files->string[i],
s3-printing: rework move_driver_file_to_download_area() a bit for clarity. Guenther
2009-04-30 18:49:50 +04:00
short_architecture,
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
driver->version,
s3-printing: use move_driver_file_to_download_area() to avoid code duplication. Guenther
2009-04-30 03:25:23 +04:00
ver);
if (!W_ERROR_IS_OK(*perr)) {
if (W_ERROR_EQUAL(*perr, WERR_ACCESS_DENIED)) {
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
ver = -1;
}
s3-printing: use move_driver_file_to_download_area() to avoid code duplication. Guenther
2009-04-30 03:25:23 +04:00
goto err_exit;
r460: Fix for broken driver upload/delete path processing. Jeremy. (This used to be commit 78be46d13bc88a300ab627c59862559d5491ee46)
2004-05-03 20:38:37 +04:00
}
Added John Reilly's enumports/addprinter/delprinter scripting code plus the fix for the Win9x printer drivers. Changed command names to add "command" string on the end for some consistancy with the other scripting commands. Added '%P' option to tdbpack/unpack to store long comment string. Made port name be "Samba Printer Port" if no enum port script given. Fixed prs_uint32_pre code to cope with null args. Jeremy. (This used to be commit 902ada63799cf27924c72e24e7593a8c9fb5eba9)
2000-08-01 00:41:51 +04:00
}
fix for IRIX 6.2 compiler error (This used to be commit eecee22bf1ab6e22e5e989b51d522fcf587aa48c)
2000-09-27 03:28:04 +04:00
NextDriver: ;
A rather big change set ! (listed in no particular order) - changed the default forms flag to 2 - all short architecture name are uppercased - get_short_archi() is now case unsensitive - the drivers TDB is indexed by archi/version/name - implemented code to move drivers from the upload area to the download area. Someone else need to look at that code. - don't return anymore a default driver if it doesn't exist in the TDB. Instead return an error. - cleaned prs_unistr. - #ifdef out jeremy's new SD parsing in printer_info_2 - removed the unused MANGLE_CODE - #ifdef out the security checking in update_printer() as it doesn't work for me. Zap your ntdrivers.tdb, it won't work anymore. J.F. (This used to be commit ac0a145acc0953a6f362497abbf4dfe70aa522a6)
2000-07-25 17:15:16 +04:00
}
}
More pstring removal. This one was tricky. I had to add one horror (pstring_clean_name()) which will have to remain until I've removed all pstrings from the client code. Jeremy. (This used to be commit 1ea3ac80146b83c2522b69e7747c823366a2b47d)
2007-11-16 01:19:52 +03:00
err_exit:
s3: Prepare the first set of SMB_VFS_CREATE_FILE callers to take an smb_filename struct Some of the callers required minimal changes, while others (copy_internals) required significant changes. The task is simplified a little bit because we are able to do operations and checks on the base_name when a stream isn't used. This patch should cause no functional changes. Volker, Jeremy: Please check
2009-06-10 21:37:57 +04:00
TALLOC_FREE(smb_dname);
More pstring removal. This one was tricky. I had to add one horror (pstring_clean_name()) which will have to remain until I've removed all pstrings from the client code. Jeremy. (This used to be commit 1ea3ac80146b83c2522b69e7747c823366a2b47d)
2007-11-16 01:19:52 +03:00
Convert move_driver_to_download_area to use create_conn_struct This removes a use of struct current_user and the vuid The become_user() here is unnecessary, within the spoolss handling code we have switched to the authenticated pipe user anyway. Jerry, please check!
2008-11-24 00:46:08 +03:00
if (conn != NULL) {
vfs_ChDir(conn, oldcwd);
s3:smbd: conn_free_internal() can be static now metze
2009-08-07 13:48:03 +04:00
conn_free(conn);
Convert move_driver_to_download_area to use create_conn_struct This removes a use of struct current_user and the vuid The become_user() here is unnecessary, within the spoolss handling code we have switched to the authenticated pipe user anyway. Jerry, please check!
2008-11-24 00:46:08 +03:00
}
Added some error checking and returns to the new 'move' code. Jeremy. (This used to be commit 0bd88d304cd773e0bbf3e6f7fedcb3b544d41cbe)
2000-07-25 21:09:29 +04:00
More pstring removal. This one was tricky. I had to add one horror (pstring_clean_name()) which will have to remain until I've removed all pstrings from the client code. Jeremy. (This used to be commit 1ea3ac80146b83c2522b69e7747c823366a2b47d)
2007-11-16 01:19:52 +03:00
if (W_ERROR_EQUAL(*perr, WERR_OK)) {
return WERR_OK;
}
if (ver == -1) {
return WERR_UNKNOWN_PRINTER_DRIVER;
}
return (*perr);
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
}
/****************************************************************************
****************************************************************************/
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
static uint32 add_a_printer_driver_3(struct spoolss_AddDriverInfo3 *driver)
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
{
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
TALLOC_CTX *ctx = talloc_tos();
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
int len, buflen;
Merge the 'safe' parts of my StrnCpy patch - many of the users really wanted a pstrcpy/fstrcpy or at most a safe_strcpy(). These have the advantage of being compiler-verifiable. Get these out of the way, along with a rewrite of 'get_short_archi' in the spoolss client and server. (This pushes around const string pointers, rather than copied strings). Andrew Bartlett (This used to be commit 32fb801ddc035e8971e9911ed4b6e51892e9d1cc)
2003-04-23 17:27:35 +04:00
const char *architecture;
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
char *directory = NULL;
char *key = NULL;
r22009: change TDB_DATA from char * to unsigned char * and fix all compiler warnings in the users metze (This used to be commit 3a28443079c141a6ce8182c65b56ca210e34f37f)
2007-03-29 13:35:51 +04:00
uint8 *buf;
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
int i, ret;
r21989: make use of tdb_*_bystring() and string_term_tdb_data() to avoid creating the TDB_DATA struct from strings "by hand" metze (This used to be commit 1897da9efcfe58ff3c190450731f33bef3ac2ebd)
2007-03-27 15:22:07 +04:00
TDB_DATA dbuf;
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
architecture = get_short_archi(driver->architecture);
r16365: Fix Klocwork #895, #898, #899, #915, #932, #938 and a few other problems Klocwork missed. Jeremy. (This used to be commit fe05769a1a85f924c67be7e5dcee4871a86948d7)
2006-06-20 01:36:19 +04:00
if (!architecture) {
return (uint32)-1;
}
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
Added John Reilly's enumports/addprinter/delprinter scripting code plus the fix for the Win9x printer drivers. Changed command names to add "command" string on the end for some consistancy with the other scripting commands. Added '%P' option to tdbpack/unpack to store long comment string. Made port name be "Samba Printer Port" if no enum port script given. Fixed prs_uint32_pre code to cope with null args. Jeremy. (This used to be commit 902ada63799cf27924c72e24e7593a8c9fb5eba9)
2000-08-01 00:41:51 +04:00
/* The names are relative. We store them in the form: \print$\arch\version\driver.xxx
A rather big change set ! (listed in no particular order) - changed the default forms flag to 2 - all short architecture name are uppercased - get_short_archi() is now case unsensitive - the drivers TDB is indexed by archi/version/name - implemented code to move drivers from the upload area to the download area. Someone else need to look at that code. - don't return anymore a default driver if it doesn't exist in the TDB. Instead return an error. - cleaned prs_unistr. - #ifdef out jeremy's new SD parsing in printer_info_2 - removed the unused MANGLE_CODE - #ifdef out the security checking in update_printer() as it doesn't work for me. Zap your ntdrivers.tdb, it won't work anymore. J.F. (This used to be commit ac0a145acc0953a6f362497abbf4dfe70aa522a6)
2000-07-25 17:15:16 +04:00
* \\server is added in the rpc server layer.
* It does make sense to NOT store the server's name in the printer TDB.
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
*/
A rather big change set ! (listed in no particular order) - changed the default forms flag to 2 - all short architecture name are uppercased - get_short_archi() is now case unsensitive - the drivers TDB is indexed by archi/version/name - implemented code to move drivers from the upload area to the download area. Someone else need to look at that code. - don't return anymore a default driver if it doesn't exist in the TDB. Instead return an error. - cleaned prs_unistr. - #ifdef out jeremy's new SD parsing in printer_info_2 - removed the unused MANGLE_CODE - #ifdef out the security checking in update_printer() as it doesn't work for me. Zap your ntdrivers.tdb, it won't work anymore. J.F. (This used to be commit ac0a145acc0953a6f362497abbf4dfe70aa522a6)
2000-07-25 17:15:16 +04:00
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
directory = talloc_asprintf(ctx, "\\print$\\%s\\%d\\",
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
architecture, driver->version);
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
if (!directory) {
return (uint32)-1;
}
A rather big change set ! (listed in no particular order) - changed the default forms flag to 2 - all short architecture name are uppercased - get_short_archi() is now case unsensitive - the drivers TDB is indexed by archi/version/name - implemented code to move drivers from the upload area to the download area. Someone else need to look at that code. - don't return anymore a default driver if it doesn't exist in the TDB. Instead return an error. - cleaned prs_unistr. - #ifdef out jeremy's new SD parsing in printer_info_2 - removed the unused MANGLE_CODE - #ifdef out the security checking in update_printer() as it doesn't work for me. Zap your ntdrivers.tdb, it won't work anymore. J.F. (This used to be commit ac0a145acc0953a6f362497abbf4dfe70aa522a6)
2000-07-25 17:15:16 +04:00
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
#define gen_full_driver_unc_path(ctx, directory, file) \
do { \
if (file && strlen(file)) { \
file = talloc_asprintf(ctx, "%s%s", directory, file); \
} else { \
file = talloc_strdup(ctx, ""); \
} \
if (!file) { \
return (uint32_t)-1; \
} \
} while (0);
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
/* .inf files do not always list a file for each of the four standard files.
Bring printing in HEAD inline with 2.2.x and app-head. Jeremy. (This used to be commit 771ef92fc6e43725b7cc351079998a8acb74abef)
2002-02-09 07:10:24 +03:00
* Don't prepend a path to a null filename, or client claims:
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
* "The server on which the printer resides does not have a suitable
* <printer driver name> printer driver installed. Click OK if you
Bring printing in HEAD inline with 2.2.x and app-head. Jeremy. (This used to be commit 771ef92fc6e43725b7cc351079998a8acb74abef)
2002-02-09 07:10:24 +03:00
* wish to install the driver on your local machine."
*/
A rather big change set ! (listed in no particular order) - changed the default forms flag to 2 - all short architecture name are uppercased - get_short_archi() is now case unsensitive - the drivers TDB is indexed by archi/version/name - implemented code to move drivers from the upload area to the download area. Someone else need to look at that code. - don't return anymore a default driver if it doesn't exist in the TDB. Instead return an error. - cleaned prs_unistr. - #ifdef out jeremy's new SD parsing in printer_info_2 - removed the unused MANGLE_CODE - #ifdef out the security checking in update_printer() as it doesn't work for me. Zap your ntdrivers.tdb, it won't work anymore. J.F. (This used to be commit ac0a145acc0953a6f362497abbf4dfe70aa522a6)
2000-07-25 17:15:16 +04:00
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
gen_full_driver_unc_path(ctx, directory, driver->driver_path);
gen_full_driver_unc_path(ctx, directory, driver->data_file);
gen_full_driver_unc_path(ctx, directory, driver->config_file);
gen_full_driver_unc_path(ctx, directory, driver->help_file);
A rather big change set ! (listed in no particular order) - changed the default forms flag to 2 - all short architecture name are uppercased - get_short_archi() is now case unsensitive - the drivers TDB is indexed by archi/version/name - implemented code to move drivers from the upload area to the download area. Someone else need to look at that code. - don't return anymore a default driver if it doesn't exist in the TDB. Instead return an error. - cleaned prs_unistr. - #ifdef out jeremy's new SD parsing in printer_info_2 - removed the unused MANGLE_CODE - #ifdef out the security checking in update_printer() as it doesn't work for me. Zap your ntdrivers.tdb, it won't work anymore. J.F. (This used to be commit ac0a145acc0953a6f362497abbf4dfe70aa522a6)
2000-07-25 17:15:16 +04:00
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
if (driver->dependent_files && driver->dependent_files->string) {
for (i=0; driver->dependent_files->string[i]; i++) {
gen_full_driver_unc_path(ctx, directory,
driver->dependent_files->string[i]);
A rather big change set ! (listed in no particular order) - changed the default forms flag to 2 - all short architecture name are uppercased - get_short_archi() is now case unsensitive - the drivers TDB is indexed by archi/version/name - implemented code to move drivers from the upload area to the download area. Someone else need to look at that code. - don't return anymore a default driver if it doesn't exist in the TDB. Instead return an error. - cleaned prs_unistr. - #ifdef out jeremy's new SD parsing in printer_info_2 - removed the unused MANGLE_CODE - #ifdef out the security checking in update_printer() as it doesn't work for me. Zap your ntdrivers.tdb, it won't work anymore. J.F. (This used to be commit ac0a145acc0953a6f362497abbf4dfe70aa522a6)
2000-07-25 17:15:16 +04:00
}
}
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
key = talloc_asprintf(ctx, "%s%s/%d/%s", DRIVERS_PREFIX,
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
architecture, driver->version, driver->driver_name);
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
if (!key) {
return (uint32)-1;
}
A rather big change set ! (listed in no particular order) - changed the default forms flag to 2 - all short architecture name are uppercased - get_short_archi() is now case unsensitive - the drivers TDB is indexed by archi/version/name - implemented code to move drivers from the upload area to the download area. Someone else need to look at that code. - don't return anymore a default driver if it doesn't exist in the TDB. Instead return an error. - cleaned prs_unistr. - #ifdef out jeremy's new SD parsing in printer_info_2 - removed the unused MANGLE_CODE - #ifdef out the security checking in update_printer() as it doesn't work for me. Zap your ntdrivers.tdb, it won't work anymore. J.F. (This used to be commit ac0a145acc0953a6f362497abbf4dfe70aa522a6)
2000-07-25 17:15:16 +04:00
Move towards getting W2k p&p to upload NT4.x drivers. Still doesn't work - not sure why (JF - a glance at this would be appreciated). Removed code that JF objected to with enumprinterdata. Added translations to/from level 6 - but Win2k still not happy... hmmm... Jeremy. (This used to be commit e5d98ba9e97eb16337ff6c49f799e130844ae72e)
2000-09-15 04:15:10 +04:00
DEBUG(5,("add_a_printer_driver_3: Adding driver with key %s\n", key ));
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
buf = NULL;
len = buflen = 0;
again:
len = 0;
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
len += tdb_pack(buf+len, buflen-len, "dffffffff",
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
driver->version,
driver->driver_name,
driver->architecture,
driver->driver_path,
driver->data_file,
driver->config_file,
driver->help_file,
driver->monitor_name ? driver->monitor_name : "",
driver->default_datatype ? driver->default_datatype : "");
if (driver->dependent_files && driver->dependent_files->string) {
for (i=0; driver->dependent_files->string[i]; i++) {
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
len += tdb_pack(buf+len, buflen-len, "f",
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
driver->dependent_files->string[i]);
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
}
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
}
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
if (len != buflen) {
r22009: change TDB_DATA from char * to unsigned char * and fix all compiler warnings in the users metze (This used to be commit 3a28443079c141a6ce8182c65b56ca210e34f37f)
2007-03-29 13:35:51 +04:00
buf = (uint8 *)SMB_REALLOC(buf, len);
r13915: Fixed a very interesting class of realloc() bugs found by Coverity. realloc can return NULL in one of two cases - (1) the realloc failed, (2) realloc succeeded but the new size requested was zero, in which case this is identical to a free() call. The error paths dealing with these two cases should be different, but mostly weren't. Secondly the standard idiom for dealing with realloc when you know the new size is non-zero is the following : tmp = realloc(p, size); if (!tmp) { SAFE_FREE(p); return error; } else { p = tmp; } However, there were *many* *many* places in Samba where we were using the old (broken) idiom of : p = realloc(p, size) if (!p) { return error; } which will leak the memory pointed to by p on realloc fail. This commit (hopefully) fixes all these cases by moving to a standard idiom of : p = SMB_REALLOC(p, size) if (!p) { return error; } Where if the realloc returns null due to the realloc failing or size == 0 we *guarentee* that the storage pointed to by p has been freed. This allows me to remove a lot of code that was dealing with the standard (more verbose) method that required a tmp pointer. This is almost always what you want. When a realloc fails you never usually want the old memory, you want to free it and get into your error processing asap. For the 11 remaining cases where we really do need to keep the old pointer I have invented the new macro SMB_REALLOC_KEEP_OLD_ON_ERROR, which can be used as follows : tmp = SMB_REALLOC_KEEP_OLD_ON_ERROR(p, size); if (!tmp) { SAFE_FREE(p); return error; } else { p = tmp; } SMB_REALLOC_KEEP_OLD_ON_ERROR guarentees never to free the pointer p, even on size == 0 or realloc fail. All this is done by a hidden extra argument to Realloc(), BOOL free_old_on_error which is set appropriately by the SMB_REALLOC and SMB_REALLOC_KEEP_OLD_ON_ERROR macros (and their array counterparts). It remains to be seen what this will do to our Coverity bug count :-). Jeremy. (This used to be commit 1d710d06a214f3f1740e80e0bffd6aab44aac2b0)
2006-03-07 09:31:04 +03:00
if (!buf) {
this is a big global fix for the ptr = Realloc(ptr, size) bug. many possible mem leaks, and segfaults fixed. someone should port this fix to 2.2 also. (This used to be commit fa8e55b8b465114ce209344965c1ca0333b84db9)
2001-08-12 21:30:01 +04:00
DEBUG(0,("add_a_printer_driver_3: failed to enlarge buffer\n!"));
ret = -1;
goto done;
}
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
buflen = len;
goto again;
}
dbuf.dptr = buf;
dbuf.dsize = len;
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
r21989: make use of tdb_*_bystring() and string_term_tdb_data() to avoid creating the TDB_DATA struct from strings "by hand" metze (This used to be commit 1897da9efcfe58ff3c190450731f33bef3ac2ebd)
2007-03-27 15:22:07 +04:00
ret = tdb_store_bystring(tdb_drivers, key, dbuf, TDB_REPLACE);
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
this is a big global fix for the ptr = Realloc(ptr, size) bug. many possible mem leaks, and segfaults fixed. someone should port this fix to 2.2 also. (This used to be commit fa8e55b8b465114ce209344965c1ca0333b84db9)
2001-08-12 21:30:01 +04:00
done:
Move towards getting W2k p&p to upload NT4.x drivers. Still doesn't work - not sure why (JF - a glance at this would be appreciated). Removed code that JF objected to with enumprinterdata. Added translations to/from level 6 - but Win2k still not happy... hmmm... Jeremy. (This used to be commit e5d98ba9e97eb16337ff6c49f799e130844ae72e)
2000-09-15 04:15:10 +04:00
if (ret)
DEBUG(0,("add_a_printer_driver_3: Adding driver with key %s failed.\n", key ));
move to SAFE_FREE() (This used to be commit 09bf4425492fd96672ddd7a31d88854adcf7f0fe)
2001-09-17 13:25:57 +04:00
SAFE_FREE(buf);
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
return ret;
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
}
added spool_io_printer_driver_info_level_6() thsi function and the associated header structure were autogenerated using a little awk based code geerator I wroe ths evening. I'll commit that next ... (This used to be commit 974813f0d4afb6c14ed27c48ab24b19932557f9f)
2000-05-12 18:28:46 +04:00
/****************************************************************************
****************************************************************************/
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
static uint32_t add_a_printer_driver_8(struct spoolss_DriverInfo8 *driver)
added spool_io_printer_driver_info_level_6() thsi function and the associated header structure were autogenerated using a little awk based code geerator I wroe ths evening. I'll commit that next ... (This used to be commit 974813f0d4afb6c14ed27c48ab24b19932557f9f)
2000-05-12 18:28:46 +04:00
{
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
TALLOC_CTX *mem_ctx = talloc_new(talloc_tos());
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
struct spoolss_AddDriverInfo3 info3;
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
uint32_t ret;
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
convert_level_8_to_level3(mem_ctx, &info3, driver);
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
ret = add_a_printer_driver_3(&info3);
talloc_free(mem_ctx);
added spool_io_printer_driver_info_level_6() thsi function and the associated header structure were autogenerated using a little awk based code geerator I wroe ths evening. I'll commit that next ... (This used to be commit 974813f0d4afb6c14ed27c48ab24b19932557f9f)
2000-05-12 18:28:46 +04:00
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
return ret;
}
added spool_io_printer_driver_info_level_6() thsi function and the associated header structure were autogenerated using a little awk based code geerator I wroe ths evening. I'll commit that next ... (This used to be commit 974813f0d4afb6c14ed27c48ab24b19932557f9f)
2000-05-12 18:28:46 +04:00
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
/****************************************************************************
****************************************************************************/
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
s3-printing: use spoolss types and structs while getting and deleting drivers. Guenther
2009-11-17 14:54:02 +03:00
static WERROR get_a_printer_driver_3_default(TALLOC_CTX *mem_ctx,
struct spoolss_DriverInfo3 *info,
const char *driver, const char *arch)
{
info->driver_name = talloc_strdup(mem_ctx, driver);
if (!info->driver_name) {
the next stage in the NTSTATUS/WERROR change. smbd and nmbd now compile, but the client code still needs some work (This used to be commit dcd6e735f709a9231860ceb9682db40ff26c9a66)
2001-09-04 11:13:01 +04:00
return WERR_NOMEM;
s3-printing: use spoolss types and structs while getting and deleting drivers. Guenther
2009-11-17 14:54:02 +03:00
}
param/loadparm.c: Looks like someone ran indent on this ! passdb/smbpass.c: Insure uninitialized memory reference fix. printing/nt_printing.c: rpc_server/srv_spoolss_nt.c: Insure memory leak fixes. smbd/unix_acls.c: Shadow ref fix. Jeremy. (This used to be commit d175d3ebefc053e9badd91ca5f2d8bd03eb6705d)
2000-06-02 01:00:37 +04:00
s3-printing: use spoolss types and structs while getting and deleting drivers. Guenther
2009-11-17 14:54:02 +03:00
info->default_datatype = talloc_strdup(mem_ctx, "RAW");
if (!info->default_datatype) {
return WERR_NOMEM;
}
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
s3-printing: use spoolss types and structs while getting and deleting drivers. Guenther
2009-11-17 14:54:02 +03:00
info->driver_path = talloc_strdup(mem_ctx, "");
info->data_file = talloc_strdup(mem_ctx, "");
info->config_file = talloc_strdup(mem_ctx, "");
info->help_file = talloc_strdup(mem_ctx, "");
if (!info->driver_path || !info->data_file || !info->config_file || !info->help_file) {
r16582: Fix Klocwork #1997 and all generic class of problems where we don't correctly check the return from memdup. Jeremy. (This used to be commit ce14daf51c7ee2f9c68c77f7f4674e6f0e35c9ca)
2006-06-28 04:50:14 +04:00
return WERR_NOMEM;
}
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
the next stage in the NTSTATUS/WERROR change. smbd and nmbd now compile, but the client code still needs some work (This used to be commit dcd6e735f709a9231860ceb9682db40ff26c9a66)
2001-09-04 11:13:01 +04:00
return WERR_OK;
added spool_io_printer_driver_info_level_6() thsi function and the associated header structure were autogenerated using a little awk based code geerator I wroe ths evening. I'll commit that next ... (This used to be commit 974813f0d4afb6c14ed27c48ab24b19932557f9f)
2000-05-12 18:28:46 +04:00
}
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
/****************************************************************************
****************************************************************************/
s3-printing: use spoolss types and structs while getting and deleting drivers. Guenther
2009-11-17 14:54:02 +03:00
static WERROR get_a_printer_driver_3(TALLOC_CTX *mem_ctx,
struct spoolss_DriverInfo3 *driver,
s3-spoolss: apply some const in spoolss server. Guenther
2009-03-20 17:14:09 +03:00
const char *drivername, const char *arch,
uint32_t version)
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
{
r21989: make use of tdb_*_bystring() and string_term_tdb_data() to avoid creating the TDB_DATA struct from strings "by hand" metze (This used to be commit 1897da9efcfe58ff3c190450731f33bef3ac2ebd)
2007-03-27 15:22:07 +04:00
TDB_DATA dbuf;
Merge the 'safe' parts of my StrnCpy patch - many of the users really wanted a pstrcpy/fstrcpy or at most a safe_strcpy(). These have the advantage of being compiler-verifiable. Get these out of the way, along with a rewrite of 'get_short_archi' in the spoolss client and server. (This pushes around const string pointers, rather than copied strings). Andrew Bartlett (This used to be commit 32fb801ddc035e8971e9911ed4b6e51892e9d1cc)
2003-04-23 17:27:35 +04:00
const char *architecture;
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
int len = 0;
int i;
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
char *key = NULL;
s3-printing: use spoolss types and structs while getting and deleting drivers. Guenther
2009-11-17 14:54:02 +03:00
fstring name, driverpath, environment, datafile, configfile, helpfile, monitorname, defaultdatatype;
JF - you might want to look at this patch. Went through and fixed up all failure possibilities. If something (malloc, file open etc.) fails, then this code goes through and cleans up all allocated resources on exit. This is the equivalent of a C++ destuctor for the allocated structures. We need code to be written like this to pass purify tests. Jeremy. (This used to be commit b260ef7cb1fb2b1e4661cc54eab403eb01fbfc35)
2000-04-05 23:48:06 +04:00
Merge the 'safe' parts of my StrnCpy patch - many of the users really wanted a pstrcpy/fstrcpy or at most a safe_strcpy(). These have the advantage of being compiler-verifiable. Get these out of the way, along with a rewrite of 'get_short_archi' in the spoolss client and server. (This pushes around const string pointers, rather than copied strings). Andrew Bartlett (This used to be commit 32fb801ddc035e8971e9911ed4b6e51892e9d1cc)
2003-04-23 17:27:35 +04:00
architecture = get_short_archi(arch);
r16365: Fix Klocwork #895, #898, #899, #915, #932, #938 and a few other problems Klocwork missed. Jeremy. (This used to be commit fe05769a1a85f924c67be7e5dcee4871a86948d7)
2006-06-20 01:36:19 +04:00
if ( !architecture ) {
r5683: BUG 2363: allow 'in use' driver to be removed as long as one 'Windows NT x86' driver remains' (This used to be commit 743ddbc7f204977431b8eaa48c3838b3cc9bdb11)
2005-03-08 01:06:25 +03:00
return WERR_UNKNOWN_PRINTER_DRIVER;
r16365: Fix Klocwork #895, #898, #899, #915, #932, #938 and a few other problems Klocwork missed. Jeremy. (This used to be commit fe05769a1a85f924c67be7e5dcee4871a86948d7)
2006-06-20 01:36:19 +04:00
}
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
fix bug 294; win9x driver lookups should always use version 0 (This used to be commit 8cc1a49c13b24e8fe501caa0d7d695d34a58d08d)
2003-08-15 00:51:41 +04:00
/* Windows 4.0 (i.e. win9x) should always use a version of 0 */
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
stupid...stupid...stupid....fix bug 294 by looking at the right arch string (This used to be commit 584df6b8d691b30d6ead485cfc8dce7bb30cd8bb)
2003-08-16 05:40:38 +04:00
if ( strcmp( architecture, SPL_ARCH_WIN40 ) == 0 )
fix bug 294; win9x driver lookups should always use version 0 (This used to be commit 8cc1a49c13b24e8fe501caa0d7d695d34a58d08d)
2003-08-15 00:51:41 +04:00
version = 0;
A rather big change set ! (listed in no particular order) - changed the default forms flag to 2 - all short architecture name are uppercased - get_short_archi() is now case unsensitive - the drivers TDB is indexed by archi/version/name - implemented code to move drivers from the upload area to the download area. Someone else need to look at that code. - don't return anymore a default driver if it doesn't exist in the TDB. Instead return an error. - cleaned prs_unistr. - #ifdef out jeremy's new SD parsing in printer_info_2 - removed the unused MANGLE_CODE - #ifdef out the security checking in update_printer() as it doesn't work for me. Zap your ntdrivers.tdb, it won't work anymore. J.F. (This used to be commit ac0a145acc0953a6f362497abbf4dfe70aa522a6)
2000-07-25 17:15:16 +04:00
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
DEBUG(8,("get_a_printer_driver_3: [%s%s/%d/%s]\n", DRIVERS_PREFIX, architecture, version, drivername));
A rather big change set ! (listed in no particular order) - changed the default forms flag to 2 - all short architecture name are uppercased - get_short_archi() is now case unsensitive - the drivers TDB is indexed by archi/version/name - implemented code to move drivers from the upload area to the download area. Someone else need to look at that code. - don't return anymore a default driver if it doesn't exist in the TDB. Instead return an error. - cleaned prs_unistr. - #ifdef out jeremy's new SD parsing in printer_info_2 - removed the unused MANGLE_CODE - #ifdef out the security checking in update_printer() as it doesn't work for me. Zap your ntdrivers.tdb, it won't work anymore. J.F. (This used to be commit ac0a145acc0953a6f362497abbf4dfe70aa522a6)
2000-07-25 17:15:16 +04:00
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
if (asprintf(&key, "%s%s/%d/%s", DRIVERS_PREFIX,
architecture, version, drivername) < 0) {
return WERR_NOMEM;
}
r21989: make use of tdb_*_bystring() and string_term_tdb_data() to avoid creating the TDB_DATA struct from strings "by hand" metze (This used to be commit 1897da9efcfe58ff3c190450731f33bef3ac2ebd)
2007-03-27 15:22:07 +04:00
dbuf = tdb_fetch_bystring(tdb_drivers, key);
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
if (!dbuf.dptr) {
SAFE_FREE(key);
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
return WERR_UNKNOWN_PRINTER_DRIVER;
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
}
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
len += tdb_unpack(dbuf.dptr, dbuf.dsize, "dffffffff",
s3-printing: use spoolss types and structs while getting and deleting drivers. Guenther
2009-11-17 14:54:02 +03:00
&driver->version,
name,
environment,
driverpath,
datafile,
configfile,
helpfile,
monitorname,
defaultdatatype);
driver->driver_name = talloc_strdup(mem_ctx, name);
driver->architecture = talloc_strdup(mem_ctx, environment);
driver->driver_path = talloc_strdup(mem_ctx, driverpath);
driver->data_file = talloc_strdup(mem_ctx, datafile);
driver->config_file = talloc_strdup(mem_ctx, configfile);
driver->help_file = talloc_strdup(mem_ctx, helpfile);
driver->monitor_name = talloc_strdup(mem_ctx, monitorname);
driver->default_datatype = talloc_strdup(mem_ctx, defaultdatatype);
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
i=0;
s3-printing: use spoolss types and structs while getting and deleting drivers. Guenther
2009-11-17 14:54:02 +03:00
Lots of fixes for error paths where tdb_fetch() data need freeing. Found via a post from Arcady Chernyak <Arcady.Chernyak@efi.com>. Jeremy. (This used to be commit 5d5762d1787db4392d2dff16024097c638b2d494)
2002-11-23 05:52:36 +03:00
while (len < dbuf.dsize) {
s3-printing: use spoolss types and structs while getting and deleting drivers. Guenther
2009-11-17 14:54:02 +03:00
fstring file;
driver->dependent_files = talloc_realloc(mem_ctx, driver->dependent_files, const char *, i+2);
if (!driver->dependent_files ) {
this is a big global fix for the ptr = Realloc(ptr, size) bug. many possible mem leaks, and segfaults fixed. someone should port this fix to 2.2 also. (This used to be commit fa8e55b8b465114ce209344965c1ca0333b84db9)
2001-08-12 21:30:01 +04:00
DEBUG(0,("get_a_printer_driver_3: failed to enlarge buffer!\n"));
param/loadparm.c: Looks like someone ran indent on this ! passdb/smbpass.c: Insure uninitialized memory reference fix. printing/nt_printing.c: rpc_server/srv_spoolss_nt.c: Insure memory leak fixes. smbd/unix_acls.c: Shadow ref fix. Jeremy. (This used to be commit d175d3ebefc053e9badd91ca5f2d8bd03eb6705d)
2000-06-02 01:00:37 +04:00
break;
this is a big global fix for the ptr = Realloc(ptr, size) bug. many possible mem leaks, and segfaults fixed. someone should port this fix to 2.2 also. (This used to be commit fa8e55b8b465114ce209344965c1ca0333b84db9)
2001-08-12 21:30:01 +04:00
}
param/loadparm.c: Looks like someone ran indent on this ! passdb/smbpass.c: Insure uninitialized memory reference fix. printing/nt_printing.c: rpc_server/srv_spoolss_nt.c: Insure memory leak fixes. smbd/unix_acls.c: Shadow ref fix. Jeremy. (This used to be commit d175d3ebefc053e9badd91ca5f2d8bd03eb6705d)
2000-06-02 01:00:37 +04:00
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
len += tdb_unpack(dbuf.dptr+len, dbuf.dsize-len, "f",
s3-printing: use spoolss types and structs while getting and deleting drivers. Guenther
2009-11-17 14:54:02 +03:00
&file);
driver->dependent_files[i] = talloc_strdup(mem_ctx, file);
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
i++;
JF - you might want to look at this patch. Went through and fixed up all failure possibilities. If something (malloc, file open etc.) fails, then this code goes through and cleans up all allocated resources on exit. This is the equivalent of a C++ destuctor for the allocated structures. We need code to be written like this to pass purify tests. Jeremy. (This used to be commit b260ef7cb1fb2b1e4661cc54eab403eb01fbfc35)
2000-04-05 23:48:06 +04:00
}
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
s3-printing: use spoolss types and structs while getting and deleting drivers. Guenther
2009-11-17 14:54:02 +03:00
if (driver->dependent_files)
driver->dependent_files[i] = NULL;
JF - you might want to look at this patch. Went through and fixed up all failure possibilities. If something (malloc, file open etc.) fails, then this code goes through and cleans up all allocated resources on exit. This is the equivalent of a C++ destuctor for the allocated structures. We need code to be written like this to pass purify tests. Jeremy. (This used to be commit b260ef7cb1fb2b1e4661cc54eab403eb01fbfc35)
2000-04-05 23:48:06 +04:00
move to SAFE_FREE() (This used to be commit 09bf4425492fd96672ddd7a31d88854adcf7f0fe)
2001-09-17 13:25:57 +04:00
SAFE_FREE(dbuf.dptr);
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
SAFE_FREE(key);
fixed a couple of bugs in the driver return code (This used to be commit 8695cb0023597fd118241a431eeeddc559484465)
2000-05-29 02:50:30 +04:00
Lots of fixes for error paths where tdb_fetch() data need freeing. Found via a post from Arcady Chernyak <Arcady.Chernyak@efi.com>. Jeremy. (This used to be commit 5d5762d1787db4392d2dff16024097c638b2d494)
2002-11-23 05:52:36 +03:00
if (len != dbuf.dsize) {
s3-printing: use spoolss types and structs while getting and deleting drivers. Guenther
2009-11-17 14:54:02 +03:00
return get_a_printer_driver_3_default(mem_ctx, driver, drivername, arch);
r16582: Fix Klocwork #1997 and all generic class of problems where we don't correctly check the return from memdup. Jeremy. (This used to be commit ce14daf51c7ee2f9c68c77f7f4674e6f0e35c9ca)
2006-06-28 04:50:14 +04:00
}
fixed a couple of bugs in the driver return code (This used to be commit 8695cb0023597fd118241a431eeeddc559484465)
2000-05-29 02:50:30 +04:00
the next step in our error code handling change - added WERROR for win32 error codes - added a configure test for immediate structures still lots to do, so its not enabled by default, but the main structure is there (This used to be commit 24f9ab683dec52587ee56717e821b49c0fa3d70f)
2001-09-03 12:50:59 +04:00
return WERR_OK;
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
}
/****************************************************************************
****************************************************************************/
r22009: change TDB_DATA from char * to unsigned char * and fix all compiler warnings in the users metze (This used to be commit 3a28443079c141a6ce8182c65b56ca210e34f37f)
2007-03-29 13:35:51 +04:00
int pack_devicemode(NT_DEVICEMODE *nt_devmode, uint8 *buf, int buflen)
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
{
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
int len = 0;
len += tdb_pack(buf+len, buflen-len, "p", nt_devmode);
Progress on CR 601 cache the printer_info_2 with the open printer handle. cache is invalidated on a mod_a_printer() call **on that smbd**. Yes, this means that the window for admins to step on each other from different clients just got larger, but since handles a generally short lived this is probably ok. (This used to be commit 31272d3b6bb9ec62fd666301c7adfa0c1720a99b)
2003-02-25 23:53:53 +03:00
if (!nt_devmode)
return len;
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
Changing drivers using the properties page works - but only if getting/setting security descriptors is disabled (as it is in this code). If get/set sd's is enabled spooler.exe crashes on NT. I'll investigate and fix that issue next. Jeremy. (This used to be commit 8c9ed874363e6a710bc0fe521bb8c4f7ee219587)
2000-06-27 02:08:20 +04:00
len += tdb_pack(buf+len, buflen-len, "ffwwwwwwwwwwwwwwwwwwddddddddddddddp",
nt_devmode->devicename,
fixed the pack/unpack of the devicemode we were being bitten by uint16/uint32 mixups (This used to be commit 1d37f76953534f7bf9d8890dda30c7e00cbb024c)
2000-06-04 06:29:00 +04:00
nt_devmode->formname,
nt_devmode->specversion,
nt_devmode->driverversion,
nt_devmode->size,
nt_devmode->driverextra,
nt_devmode->orientation,
nt_devmode->papersize,
nt_devmode->paperlength,
nt_devmode->paperwidth,
nt_devmode->scale,
nt_devmode->copies,
nt_devmode->defaultsource,
nt_devmode->printquality,
nt_devmode->color,
nt_devmode->duplex,
nt_devmode->yresolution,
nt_devmode->ttoption,
nt_devmode->collate,
nt_devmode->logpixels,
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
fixed the pack/unpack of the devicemode we were being bitten by uint16/uint32 mixups (This used to be commit 1d37f76953534f7bf9d8890dda30c7e00cbb024c)
2000-06-04 06:29:00 +04:00
nt_devmode->fields,
nt_devmode->bitsperpel,
nt_devmode->pelswidth,
nt_devmode->pelsheight,
nt_devmode->displayflags,
nt_devmode->displayfrequency,
nt_devmode->icmmethod,
nt_devmode->icmintent,
nt_devmode->mediatype,
nt_devmode->dithertype,
nt_devmode->reserved1,
nt_devmode->reserved2,
nt_devmode->panningwidth,
nt_devmode->panningheight,
r7882: Looks like a large patch - but what it actually does is make Samba safe for using our headers and linking with C++ modules. Stops us from using C++ reserved keywords in our code. Jeremy (This used to be commit 9506b8e145982b1160a2f0aee5c9b7a54980940a)
2005-06-25 00:25:18 +04:00
nt_devmode->nt_dev_private);
fixed the pack/unpack of the devicemode we were being bitten by uint16/uint32 mixups (This used to be commit 1d37f76953534f7bf9d8890dda30c7e00cbb024c)
2000-06-04 06:29:00 +04:00
r7882: Looks like a large patch - but what it actually does is make Samba safe for using our headers and linking with C++ modules. Stops us from using C++ reserved keywords in our code. Jeremy (This used to be commit 9506b8e145982b1160a2f0aee5c9b7a54980940a)
2005-06-25 00:25:18 +04:00
if (nt_devmode->nt_dev_private) {
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
len += tdb_pack(buf+len, buflen-len, "B",
nt_devmode->driverextra,
r7882: Looks like a large patch - but what it actually does is make Samba safe for using our headers and linking with C++ modules. Stops us from using C++ reserved keywords in our code. Jeremy (This used to be commit 9506b8e145982b1160a2f0aee5c9b7a54980940a)
2005-06-25 00:25:18 +04:00
nt_devmode->nt_dev_private);
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
}
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
fixed the pack/unpack of the devicemode we were being bitten by uint16/uint32 mixups (This used to be commit 1d37f76953534f7bf9d8890dda30c7e00cbb024c)
2000-06-04 06:29:00 +04:00
DEBUG(8,("Packed devicemode [%s]\n", nt_devmode->formname));
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
return len;
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
}
/****************************************************************************
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
Pack all values in all printer keys
***************************************************************************/
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
r22009: change TDB_DATA from char * to unsigned char * and fix all compiler warnings in the users metze (This used to be commit 3a28443079c141a6ce8182c65b56ca210e34f37f)
2007-03-29 13:35:51 +04:00
static int pack_values(NT_PRINTER_DATA *data, uint8 *buf, int buflen)
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
{
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
int len = 0;
int i, j;
s3:registry: replace typedef REGISTRY_VALUE by struct regval_blob Michael
2009-03-24 00:27:59 +03:00
struct regval_blob *val;
s3:registry: replace typedef REGVAL_CTR by struct regval_ctr. This paves the way for hiding the typedef and the implementation from the surface. Michael
2009-03-23 20:14:17 +03:00
struct regval_ctr *val_ctr;
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
char *path = NULL;
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
int num_values;
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
if ( !data )
return 0;
/* loop over all keys */
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
for ( i=0; i<data->num_keys; i++ ) {
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
val_ctr = data->keys[i].values;
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
num_values = regval_ctr_numvals( val_ctr );
r8066: * had to modify the printer data storage slightly in ntprinters.tdb when packing values. It is a compatible change though and will not require a tdb version upgrade * Can successfully create new printer subkeys via winreg that are immediately available via spoolss calls. Still cannot delete keys yet though. That comes next. (This used to be commit 00bce2b3bb78a44842a258b1737076281297d247)
2005-07-02 05:23:21 +04:00
/* pack the keyname followed by a empty value */
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
len += tdb_pack(buf+len, buflen-len, "pPdB",
r8066: * had to modify the printer data storage slightly in ntprinters.tdb when packing values. It is a compatible change though and will not require a tdb version upgrade * Can successfully create new printer subkeys via winreg that are immediately available via spoolss calls. Still cannot delete keys yet though. That comes next. (This used to be commit 00bce2b3bb78a44842a258b1737076281297d247)
2005-07-02 05:23:21 +04:00
&data->keys[i].name,
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
data->keys[i].name,
r8066: * had to modify the printer data storage slightly in ntprinters.tdb when packing values. It is a compatible change though and will not require a tdb version upgrade * Can successfully create new printer subkeys via winreg that are immediately available via spoolss calls. Still cannot delete keys yet though. That comes next. (This used to be commit 00bce2b3bb78a44842a258b1737076281297d247)
2005-07-02 05:23:21 +04:00
REG_NONE,
0,
NULL);
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
r8066: * had to modify the printer data storage slightly in ntprinters.tdb when packing values. It is a compatible change though and will not require a tdb version upgrade * Can successfully create new printer subkeys via winreg that are immediately available via spoolss calls. Still cannot delete keys yet though. That comes next. (This used to be commit 00bce2b3bb78a44842a258b1737076281297d247)
2005-07-02 05:23:21 +04:00
/* now loop over all values */
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
Progress on CR 601 cache the printer_info_2 with the open printer handle. cache is invalidated on a mod_a_printer() call **on that smbd**. Yes, this means that the window for admins to step on each other from different clients just got larger, but since handles a generally short lived this is probably ok. (This used to be commit 31272d3b6bb9ec62fd666301c7adfa0c1720a99b)
2003-02-25 23:53:53 +03:00
for ( j=0; j<num_values; j++ ) {
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
/* pathname should be stored as <key>\<value> */
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
val = regval_ctr_specific_value( val_ctr, j );
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
if (asprintf(&path, "%s\\%s",
data->keys[i].name,
regval_name(val)) < 0) {
return -1;
}
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
len += tdb_pack(buf+len, buflen-len, "pPdB",
val,
path,
regval_type(val),
regval_size(val),
regval_data_p(val) );
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
DEBUG(8,("specific: [%s], len: %d\n", regval_name(val), regval_size(val)));
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
SAFE_FREE(path);
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
}
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
}
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
/* terminator */
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
len += tdb_pack(buf+len, buflen-len, "p", NULL);
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
return len;
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
}
added support for deleting printers into the spoolss system (This used to be commit e72a5718537b84409fc20ff21951b1d1ab24d97f)
2000-05-02 19:31:55 +04:00
/****************************************************************************
Bring printing in HEAD inline with 2.2.x and app-head. Jeremy. (This used to be commit 771ef92fc6e43725b7cc351079998a8acb74abef)
2002-02-09 07:10:24 +03:00
Delete a printer - this just deletes the printer info file, any open
handles are not affected.
added support for deleting printers into the spoolss system (This used to be commit e72a5718537b84409fc20ff21951b1d1ab24d97f)
2000-05-02 19:31:55 +04:00
****************************************************************************/
Bring printing in HEAD inline with 2.2.x and app-head. Jeremy. (This used to be commit 771ef92fc6e43725b7cc351079998a8acb74abef)
2002-02-09 07:10:24 +03:00
r4539: patch from Rob -- adding real printcap name cache function to speed up printcap reloads (This used to be commit 1cad5250932b963c2eb9b775221b13db386d601b)
2005-01-05 19:20:35 +03:00
uint32 del_a_printer(const char *sharename)
added support for deleting printers into the spoolss system (This used to be commit e72a5718537b84409fc20ff21951b1d1ab24d97f)
2000-05-02 19:31:55 +04:00
{
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
TDB_DATA kbuf;
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
char *printdb_path = NULL;
TALLOC_CTX *ctx = talloc_tos();
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
kbuf = make_printer_tdbkey(ctx, sharename);
r4539: patch from Rob -- adding real printcap name cache function to speed up printcap reloads (This used to be commit 1cad5250932b963c2eb9b775221b13db386d601b)
2005-01-05 19:20:35 +03:00
tdb_delete(tdb_printers, kbuf);
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
kbuf= make_printers_secdesc_tdbkey(ctx, sharename);
split the nt_drivers.tdb in 3 separate tdb files. Should speed-up lookups J.F. (This used to be commit c08e22713ea4ddbc4951dc8dcc40609eb0039ddb)
2001-07-09 22:19:04 +04:00
tdb_delete(tdb_printers, kbuf);
r4539: patch from Rob -- adding real printcap name cache function to speed up printcap reloads (This used to be commit 1cad5250932b963c2eb9b775221b13db386d601b)
2005-01-05 19:20:35 +03:00
close_all_print_db();
s3-printing: eliminate another non sec_initial_uid using security check. Guenther
2009-06-23 22:27:05 +04:00
if (geteuid() == sec_initial_uid()) {
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
if (asprintf(&printdb_path, "%s%s.tdb",
s3: put printing/ under cache_dir, not lock_dir Michael
2009-01-16 02:48:29 +03:00
cache_path("printing/"),
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
sharename) < 0) {
return (uint32)-1;
}
r4539: patch from Rob -- adding real printcap name cache function to speed up printcap reloads (This used to be commit 1cad5250932b963c2eb9b775221b13db386d601b)
2005-01-05 19:20:35 +03:00
unlink(printdb_path);
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
SAFE_FREE(printdb_path);
r4539: patch from Rob -- adding real printcap name cache function to speed up printcap reloads (This used to be commit 1cad5250932b963c2eb9b775221b13db386d601b)
2005-01-05 19:20:35 +03:00
}
added support for deleting printers into the spoolss system (This used to be commit e72a5718537b84409fc20ff21951b1d1ab24d97f)
2000-05-02 19:31:55 +04:00
return 0;
}
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
/****************************************************************************
****************************************************************************/
the next stage in the NTSTATUS/WERROR change. smbd and nmbd now compile, but the client code still needs some work (This used to be commit dcd6e735f709a9231860ceb9682db40ff26c9a66)
2001-09-04 11:13:01 +04:00
static WERROR update_a_printer_2(NT_PRINTER_INFO_LEVEL_2 *info)
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
{
r22009: change TDB_DATA from char * to unsigned char * and fix all compiler warnings in the users metze (This used to be commit 3a28443079c141a6ce8182c65b56ca210e34f37f)
2007-03-29 13:35:51 +04:00
uint8 *buf;
the next stage in the NTSTATUS/WERROR change. smbd and nmbd now compile, but the client code still needs some work (This used to be commit dcd6e735f709a9231860ceb9682db40ff26c9a66)
2001-09-04 11:13:01 +04:00
int buflen, len;
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
int retlen;
the next stage in the NTSTATUS/WERROR change. smbd and nmbd now compile, but the client code still needs some work (This used to be commit dcd6e735f709a9231860ceb9682db40ff26c9a66)
2001-09-04 11:13:01 +04:00
WERROR ret;
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
TDB_DATA kbuf, dbuf;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
/*
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
* in addprinter: no servername and the printer is the name
* in setprinter: servername is \\server
* and printer is \\server\\printer
*
* Samba manages only local printers.
r783: fix bug in reading printer data from disk; all ow valuenames with embedded '\'s (This used to be commit fdc1633c348b072a6dde45a3d9b3b8a19744613d)
2004-05-19 21:17:33 +04:00
* we currently don't support things like i
* path=\\other_server\printer
*
* We only store the printername, not \\server\printername
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
*/
Fixed open handle code in printers - 3 functions were always being done in order - moved them into open_printer_hnd(). Added saving of comment field. Jeremy. (This used to be commit a0ee774fe92e5d0bc84d1d6729e8c538c67e8aba)
2000-07-22 04:48:29 +04:00
r783: fix bug in reading printer data from disk; all ow valuenames with embedded '\'s (This used to be commit fdc1633c348b072a6dde45a3d9b3b8a19744613d)
2004-05-19 21:17:33 +04:00
if ( info->servername[0] != '\0' ) {
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
trim_string(info->printername, info->servername, NULL);
More tuning from cachegrind. Change most trim_string() calls to trim_char(0, as that's what they do. Fix string_replace() to fast-path ascii. Jeremy. (This used to be commit f35e9a8b909d3c74be47083ccc4a4e91a14938db)
2003-09-05 23:59:55 +04:00
trim_char(info->printername, '\\', '\0');
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
info->servername[0]='\0';
}
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
/*
* JFM: one day I'll forget.
* below that's info->portname because that's the SAMBA sharename
* and I made NT 'thinks' it's the portname
* the info->sharename is the thing you can name when you add a printer
* that's the short-name when you create shared printer for 95/98
* So I've made a limitation in SAMBA: you can only have 1 printer model
* behind a SAMBA share.
*/
buf = NULL;
buflen = 0;
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
again:
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
len = 0;
Added John Reilly's enumports/addprinter/delprinter scripting code plus the fix for the Win9x printer drivers. Changed command names to add "command" string on the end for some consistancy with the other scripting commands. Added '%P' option to tdbpack/unpack to store long comment string. Made port name be "Samba Printer Port" if no enum port script given. Fixed prs_uint32_pre code to cope with null args. Jeremy. (This used to be commit 902ada63799cf27924c72e24e7593a8c9fb5eba9)
2000-08-01 00:41:51 +04:00
len += tdb_pack(buf+len, buflen-len, "dddddddddddfffffPfffff",
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
info->attributes,
info->priority,
info->default_priority,
info->starttime,
info->untiltime,
info->status,
info->cjobs,
info->averageppm,
info->changeid,
info->c_setprinter,
info->setuptime,
info->servername,
info->printername,
info->sharename,
info->portname,
info->drivername,
Fixed open handle code in printers - 3 functions were always being done in order - moved them into open_printer_hnd(). Added saving of comment field. Jeremy. (This used to be commit a0ee774fe92e5d0bc84d1d6729e8c538c67e8aba)
2000-07-22 04:48:29 +04:00
info->comment,
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
info->location,
info->sepfile,
info->printprocessor,
info->datatype,
info->parameters);
Changes from APPLIANCE_HEAD: source/include/proto.h - make proto source/printing/nt_printing.c source/rpc_server/srv_spoolss_nt.c - Fix for the overwriting of printerdata entries when WinNT and Win2k are modifying printer parameters on PCL printers. Turns out that Win2k creates a printer with a NULL devmode entry and then expects to set it on *OPEN* (yes this is insane). So we cannot return a "default" devmode for a printer - and we must allow an open to set it. source/tdb/tdb.c - Show freelist in an easier format. Show total free. - When storing a new record, allocate memory for the key + data before the tdb_allocate() as if the malloc fails a (sparse) hole is left in the tdb. source/tdb/tdbtool.c - Show freelist in an easier format. Show total free. source/tdb/Makefile - cleaned up Makefile dependancies source/smbd/lanman.c - Fix for Win9x corrupting it's own parameter string. source/printing/printfsp.c source/printing/printing.c source/rpc_server/srv_spoolss_nt.c source/smbd/close.c - Added normal close parameter into print_fsp_end() which treats an abnormal close as error condition and deletes the spool file. (This used to be commit 025f7a092ad258ff774e3f5e53737f8210cc8af6)
2001-01-30 00:34:08 +03:00
len += pack_devicemode(info->devmode, buf+len, buflen-len);
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
retlen = pack_values( info->data, buf+len, buflen-len );
if (retlen == -1) {
ret = WERR_NOMEM;
goto done;
}
len += retlen;
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
if (buflen != len) {
r22009: change TDB_DATA from char * to unsigned char * and fix all compiler warnings in the users metze (This used to be commit 3a28443079c141a6ce8182c65b56ca210e34f37f)
2007-03-29 13:35:51 +04:00
buf = (uint8 *)SMB_REALLOC(buf, len);
r13915: Fixed a very interesting class of realloc() bugs found by Coverity. realloc can return NULL in one of two cases - (1) the realloc failed, (2) realloc succeeded but the new size requested was zero, in which case this is identical to a free() call. The error paths dealing with these two cases should be different, but mostly weren't. Secondly the standard idiom for dealing with realloc when you know the new size is non-zero is the following : tmp = realloc(p, size); if (!tmp) { SAFE_FREE(p); return error; } else { p = tmp; } However, there were *many* *many* places in Samba where we were using the old (broken) idiom of : p = realloc(p, size) if (!p) { return error; } which will leak the memory pointed to by p on realloc fail. This commit (hopefully) fixes all these cases by moving to a standard idiom of : p = SMB_REALLOC(p, size) if (!p) { return error; } Where if the realloc returns null due to the realloc failing or size == 0 we *guarentee* that the storage pointed to by p has been freed. This allows me to remove a lot of code that was dealing with the standard (more verbose) method that required a tmp pointer. This is almost always what you want. When a realloc fails you never usually want the old memory, you want to free it and get into your error processing asap. For the 11 remaining cases where we really do need to keep the old pointer I have invented the new macro SMB_REALLOC_KEEP_OLD_ON_ERROR, which can be used as follows : tmp = SMB_REALLOC_KEEP_OLD_ON_ERROR(p, size); if (!tmp) { SAFE_FREE(p); return error; } else { p = tmp; } SMB_REALLOC_KEEP_OLD_ON_ERROR guarentees never to free the pointer p, even on size == 0 or realloc fail. All this is done by a hidden extra argument to Realloc(), BOOL free_old_on_error which is set appropriately by the SMB_REALLOC and SMB_REALLOC_KEEP_OLD_ON_ERROR macros (and their array counterparts). It remains to be seen what this will do to our Coverity bug count :-). Jeremy. (This used to be commit 1d710d06a214f3f1740e80e0bffd6aab44aac2b0)
2006-03-07 09:31:04 +03:00
if (!buf) {
this is a big global fix for the ptr = Realloc(ptr, size) bug. many possible mem leaks, and segfaults fixed. someone should port this fix to 2.2 also. (This used to be commit fa8e55b8b465114ce209344965c1ca0333b84db9)
2001-08-12 21:30:01 +04:00
DEBUG(0,("update_a_printer_2: failed to enlarge buffer!\n"));
the next stage in the NTSTATUS/WERROR change. smbd and nmbd now compile, but the client code still needs some work (This used to be commit dcd6e735f709a9231860ceb9682db40ff26c9a66)
2001-09-04 11:13:01 +04:00
ret = WERR_NOMEM;
this is a big global fix for the ptr = Realloc(ptr, size) bug. many possible mem leaks, and segfaults fixed. someone should port this fix to 2.2 also. (This used to be commit fa8e55b8b465114ce209344965c1ca0333b84db9)
2001-08-12 21:30:01 +04:00
goto done;
}
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
buflen = len;
goto again;
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
}
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
kbuf = make_printer_tdbkey(talloc_tos(), info->sharename );
r8025: *how* can this code have been around so long and nver normalized the string used for printer and sec_desc key lookups ????? normalized sharename to lower case before storing/fetching from tdb. Need to look at drivers and forms tdb as well (perhaps). (This used to be commit 4aec5dce5c2d0b5c686123a624b58097be9d911a)
2005-06-30 23:33:47 +04:00
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
dbuf.dptr = buf;
dbuf.dsize = len;
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
the next stage in the NTSTATUS/WERROR change. smbd and nmbd now compile, but the client code still needs some work (This used to be commit dcd6e735f709a9231860ceb9682db40ff26c9a66)
2001-09-04 11:13:01 +04:00
ret = (tdb_store(tdb_printers, kbuf, dbuf, TDB_REPLACE) == 0? WERR_OK : WERR_NOMEM);
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
this is a big global fix for the ptr = Realloc(ptr, size) bug. many possible mem leaks, and segfaults fixed. someone should port this fix to 2.2 also. (This used to be commit fa8e55b8b465114ce209344965c1ca0333b84db9)
2001-08-12 21:30:01 +04:00
done:
the next stage in the NTSTATUS/WERROR change. smbd and nmbd now compile, but the client code still needs some work (This used to be commit dcd6e735f709a9231860ceb9682db40ff26c9a66)
2001-09-04 11:13:01 +04:00
if (!W_ERROR_IS_OK(ret))
- The printers are indexed by the sharename in both get_a_printer() and add_a_printer() now. - correctly unpack the private part of a devmode and remove a memleak - correctly retrieve the pair(value,data) for getprinterdata - handle null devicemode in printer_info_2 I still have some bugs but I'm not crashing anymore NT4SP6 d/c build :-) J.F. (This used to be commit 493f7d11acf753ba24c88e6cbb73d86a8595a66a)
2000-07-12 18:10:40 +04:00
DEBUG(8, ("error updating printer to tdb on disk\n"));
move to SAFE_FREE() (This used to be commit 09bf4425492fd96672ddd7a31d88854adcf7f0fe)
2001-09-17 13:25:57 +04:00
SAFE_FREE(buf);
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
DEBUG(8,("packed printer [%s] with driver [%s] portname=[%s] len=%d\n",
A rather big change set ! (listed in no particular order) - changed the default forms flag to 2 - all short architecture name are uppercased - get_short_archi() is now case unsensitive - the drivers TDB is indexed by archi/version/name - implemented code to move drivers from the upload area to the download area. Someone else need to look at that code. - don't return anymore a default driver if it doesn't exist in the TDB. Instead return an error. - cleaned prs_unistr. - #ifdef out jeremy's new SD parsing in printer_info_2 - removed the unused MANGLE_CODE - #ifdef out the security checking in update_printer() as it doesn't work for me. Zap your ntdrivers.tdb, it won't work anymore. J.F. (This used to be commit ac0a145acc0953a6f362497abbf4dfe70aa522a6)
2000-07-25 17:15:16 +04:00
info->sharename, info->drivername, info->portname, len));
fixed the pack/unpack of the devicemode we were being bitten by uint16/uint32 mixups (This used to be commit 1d37f76953534f7bf9d8890dda30c7e00cbb024c)
2000-06-04 06:29:00 +04:00
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
return ret;
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
}
s3-spoolss: Added a function to create a default spoolss_DeviceMode. Signed-off-by: Günther Deschner <gd@samba.org>
2010-05-05 19:44:22 +04:00
/****************************************************************************
Create and allocate a default devicemode.
****************************************************************************/
WERROR spoolss_create_default_devmode(TALLOC_CTX *mem_ctx,
const char *devicename,
struct spoolss_DeviceMode **devmode)
{
struct spoolss_DeviceMode *dm;
char *dname;
dm = talloc_zero(mem_ctx, struct spoolss_DeviceMode);
if (dm == NULL) {
return WERR_NOMEM;
}
dname = talloc_asprintf(dm, "%s", devicename);
if (dname == NULL) {
return WERR_NOMEM;
}
if (strlen(dname) > MAXDEVICENAME) {
dname[MAXDEVICENAME] = '\0';
}
dm->devicename = dname;
dm->formname = talloc_strdup(dm, "Letter");
if (dm->formname == NULL) {
return WERR_NOMEM;
}
dm->specversion = DMSPEC_NT4_AND_ABOVE;
dm->driverversion = 0x0400;
dm->size = 0x00DC;
dm->__driverextra_length = 0;
dm->fields = DEVMODE_FORMNAME |
DEVMODE_TTOPTION |
DEVMODE_PRINTQUALITY |
DEVMODE_DEFAULTSOURCE |
DEVMODE_COPIES |
DEVMODE_SCALE |
DEVMODE_PAPERSIZE |
DEVMODE_ORIENTATION;
dm->orientation = DMORIENT_PORTRAIT;
dm->papersize = DMPAPER_LETTER;
dm->paperlength = 0;
dm->paperwidth = 0;
dm->scale = 0x64;
dm->copies = 1;
dm->defaultsource = DMBIN_FORMSOURCE;
dm->printquality = DMRES_HIGH; /* 0x0258 */
dm->color = DMRES_MONOCHROME;
dm->duplex = DMDUP_SIMPLEX;
dm->yresolution = 0;
dm->ttoption = DMTT_SUBDEV;
dm->collate = DMCOLLATE_FALSE;
dm->icmmethod = 0;
dm->icmintent = 0;
dm->mediatype = 0;
dm->dithertype = 0;
dm->logpixels = 0;
dm->bitsperpel = 0;
dm->pelswidth = 0;
dm->pelsheight = 0;
dm->displayflags = 0;
dm->displayfrequency = 0;
dm->reserved1 = 0;
dm->reserved2 = 0;
dm->panningwidth = 0;
dm->panningheight = 0;
dm->driverextra_data.data = NULL;
dm->driverextra_data.length = 0;
*devmode = dm;
return WERR_OK;
}
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
s3-spoolss: Added a generic spoolss_create_default_secdesc function. Signed-off-by: Günther Deschner <gd@samba.org>
2010-05-04 14:07:10 +04:00
WERROR spoolss_create_default_secdesc(TALLOC_CTX *mem_ctx,
struct spoolss_security_descriptor **secdesc)
{
s3-secdesc: remove "typedef struct security_ace SEC_ACE". Guenther
2010-05-18 05:25:38 +04:00
struct security_ace ace[5]; /* max number of ace entries */
s3-spoolss: Added a generic spoolss_create_default_secdesc function. Signed-off-by: Günther Deschner <gd@samba.org>
2010-05-04 14:07:10 +04:00
int i = 0;
uint32_t sa;
s3-secdesc: remove "typedef struct security_acl SEC_ACL". Guenther
2010-05-18 05:30:40 +04:00
struct security_acl *psa = NULL;
s3-secdesc: remove "typedef struct security_descriptor SEC_DESC". Guenther
2010-05-18 12:29:34 +04:00
struct security_descriptor *psd = NULL;
s3-spoolss: Added a generic spoolss_create_default_secdesc function. Signed-off-by: Günther Deschner <gd@samba.org>
2010-05-04 14:07:10 +04:00
DOM_SID adm_sid;
size_t sd_size;
/* Create an ACE where Everyone is allowed to print */
sa = PRINTER_ACE_PRINT;
init_sec_ace(&ace[i++], &global_sid_World, SEC_ACE_TYPE_ACCESS_ALLOWED,
sa, SEC_ACE_FLAG_CONTAINER_INHERIT);
/* Add the domain admins group if we are a DC */
if ( IS_DC ) {
DOM_SID domadmins_sid;
sid_compose(&domadmins_sid, get_global_sam_sid(),
s3-rpc_misc: clean out include/rpc_misc.h. Well known rids don't really belong into an rpc header, just use the ones defined in security.idl. Guenther
2010-05-18 00:04:24 +04:00
DOMAIN_RID_ADMINS);
s3-spoolss: Added a generic spoolss_create_default_secdesc function. Signed-off-by: Günther Deschner <gd@samba.org>
2010-05-04 14:07:10 +04:00
sa = PRINTER_ACE_FULL_CONTROL;
init_sec_ace(&ace[i++], &domadmins_sid,
SEC_ACE_TYPE_ACCESS_ALLOWED, sa,
SEC_ACE_FLAG_OBJECT_INHERIT | SEC_ACE_FLAG_INHERIT_ONLY);
init_sec_ace(&ace[i++], &domadmins_sid, SEC_ACE_TYPE_ACCESS_ALLOWED,
sa, SEC_ACE_FLAG_CONTAINER_INHERIT);
}
else if (secrets_fetch_domain_sid(lp_workgroup(), &adm_sid)) {
s3-rpc_misc: clean out include/rpc_misc.h. Well known rids don't really belong into an rpc header, just use the ones defined in security.idl. Guenther
2010-05-18 00:04:24 +04:00
sid_append_rid(&adm_sid, DOMAIN_RID_ADMINISTRATOR);
s3-spoolss: Added a generic spoolss_create_default_secdesc function. Signed-off-by: Günther Deschner <gd@samba.org>
2010-05-04 14:07:10 +04:00
sa = PRINTER_ACE_FULL_CONTROL;
init_sec_ace(&ace[i++], &adm_sid,
SEC_ACE_TYPE_ACCESS_ALLOWED, sa,
SEC_ACE_FLAG_OBJECT_INHERIT | SEC_ACE_FLAG_INHERIT_ONLY);
init_sec_ace(&ace[i++], &adm_sid, SEC_ACE_TYPE_ACCESS_ALLOWED,
sa, SEC_ACE_FLAG_CONTAINER_INHERIT);
}
/* add BUILTIN\Administrators as FULL CONTROL */
sa = PRINTER_ACE_FULL_CONTROL;
init_sec_ace(&ace[i++], &global_sid_Builtin_Administrators,
SEC_ACE_TYPE_ACCESS_ALLOWED, sa,
SEC_ACE_FLAG_OBJECT_INHERIT | SEC_ACE_FLAG_INHERIT_ONLY);
init_sec_ace(&ace[i++], &global_sid_Builtin_Administrators,
SEC_ACE_TYPE_ACCESS_ALLOWED,
sa, SEC_ACE_FLAG_CONTAINER_INHERIT);
/* Make the security descriptor owned by the BUILTIN\Administrators */
/* The ACL revision number in rpc_secdesc.h differs from the one
created by NT when setting ACE entries in printer
descriptors. NT4 complains about the property being edited by a
NT5 machine. */
if ((psa = make_sec_acl(mem_ctx, NT4_ACL_REVISION, i, ace)) != NULL) {
psd = make_sec_desc(mem_ctx,
s3-secdesc: use SD_REVISION from security.idl. Guenther
2010-05-18 14:52:18 +04:00
SD_REVISION,
s3-spoolss: Added a generic spoolss_create_default_secdesc function. Signed-off-by: Günther Deschner <gd@samba.org>
2010-05-04 14:07:10 +04:00
SEC_DESC_SELF_RELATIVE,
&global_sid_Builtin_Administrators,
&global_sid_Builtin_Administrators,
NULL,
psa,
&sd_size);
}
if (psd == NULL) {
DEBUG(0,("construct_default_printer_sd: Failed to make SEC_DESC.\n"));
return WERR_NOMEM;
}
DEBUG(4,("construct_default_printer_sdb: size = %u.\n",
(unsigned int)sd_size));
*secdesc = psd;
return WERR_OK;
}
Getting back to a compilable state (not there yet but close). Added patches for random -> sys_random. Added set_effective_xxx patches for AFS code. Memory allocation changes in spoolss code. Jeremy. (This used to be commit c2099cfb033c2cdb6035f4f7f50ce21b98e1584d)
2000-06-01 21:01:34 +04:00
/****************************************************************************
Malloc and return an NT devicemode.
****************************************************************************/
Changing drivers using the properties page works - but only if getting/setting security descriptors is disabled (as it is in this code). If get/set sd's is enabled spooler.exe crashes on NT. I'll investigate and fix that issue next. Jeremy. (This used to be commit 8c9ed874363e6a710bc0fe521bb8c4f7ee219587)
2000-06-27 02:08:20 +04:00
NT_DEVICEMODE *construct_nt_devicemode(const fstring default_devicename)
Getting back to a compilable state (not there yet but close). Added patches for random -> sys_random. Added set_effective_xxx patches for AFS code. Memory allocation changes in spoolss code. Jeremy. (This used to be commit c2099cfb033c2cdb6035f4f7f50ce21b98e1584d)
2000-06-01 21:01:34 +04:00
{
Array size fixup for construct_nt_devicemode() from HEAD. (This used to be commit 5d1e8cca03b3908e2266e39f4b50ef16ef4ef2b2)
2003-04-14 07:50:38 +04:00
char adevice[MAXDEVICENAME];
r4088: Get medieval on our ass about malloc.... :-). Take control of all our allocation functions so we can funnel through some well known functions. Should help greatly with malloc checking. HEAD patch to follow. Jeremy. (This used to be commit 620f2e608f70ba92f032720c031283d295c5c06a)
2004-12-07 21:25:53 +03:00
NT_DEVICEMODE *nt_devmode = SMB_MALLOC_P(NT_DEVICEMODE);
Getting back to a compilable state (not there yet but close). Added patches for random -> sys_random. Added set_effective_xxx patches for AFS code. Memory allocation changes in spoolss code. Jeremy. (This used to be commit c2099cfb033c2cdb6035f4f7f50ce21b98e1584d)
2000-06-01 21:01:34 +04:00
if (nt_devmode == NULL) {
DEBUG(0,("construct_nt_devicemode: malloc fail.\n"));
return NULL;
}
ZERO_STRUCTP(nt_devmode);
r3710: fix another safe_strcpy() warning SPAM with the printer drivcename (This used to be commit 5eac16464dfe58ec2c725888993f313fdb609f9b)
2004-11-13 01:15:55 +03:00
slprintf(adevice, sizeof(adevice), "%s", default_devicename);
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
fstrcpy(nt_devmode->devicename, adevice);
fixed!! yipee! the damn "device settings cannot be displayed" error is gone. We needed to supply a default set of forms. I've added A4 and Letter by default. (This used to be commit 36f1189be1609490b6a825a2608b9cf5dc682656)
2000-06-06 05:47:11 +04:00
fstrcpy(nt_devmode->formname, "Letter");
Getting back to a compilable state (not there yet but close). Added patches for random -> sys_random. Added set_effective_xxx patches for AFS code. Memory allocation changes in spoolss code. Jeremy. (This used to be commit c2099cfb033c2cdb6035f4f7f50ce21b98e1584d)
2000-06-01 21:01:34 +04:00
s3-spoolss: remove device mode defines from nt_printing.h. Guenther
2009-08-10 13:25:52 +04:00
nt_devmode->specversion = DMSPEC_NT4_AND_ABOVE;
Getting back to a compilable state (not there yet but close). Added patches for random -> sys_random. Added set_effective_xxx patches for AFS code. Memory allocation changes in spoolss code. Jeremy. (This used to be commit c2099cfb033c2cdb6035f4f7f50ce21b98e1584d)
2000-06-01 21:01:34 +04:00
nt_devmode->driverversion = 0x0400;
nt_devmode->size = 0x00DC;
nt_devmode->driverextra = 0x0000;
s3-spoolss: remove device mode defines from nt_printing.h. Guenther
2009-08-10 13:25:52 +04:00
nt_devmode->fields = DEVMODE_FORMNAME |
DEVMODE_TTOPTION |
DEVMODE_PRINTQUALITY |
DEVMODE_DEFAULTSOURCE |
DEVMODE_COPIES |
DEVMODE_SCALE |
DEVMODE_PAPERSIZE |
DEVMODE_ORIENTATION;
nt_devmode->orientation = DMORIENT_PORTRAIT;
nt_devmode->papersize = DMPAPER_LETTER;
Getting back to a compilable state (not there yet but close). Added patches for random -> sys_random. Added set_effective_xxx patches for AFS code. Memory allocation changes in spoolss code. Jeremy. (This used to be commit c2099cfb033c2cdb6035f4f7f50ce21b98e1584d)
2000-06-01 21:01:34 +04:00
nt_devmode->paperlength = 0;
nt_devmode->paperwidth = 0;
nt_devmode->scale = 0x64;
Writing decimal constants as "02" has been shown to cause cancer in rats. (This used to be commit 142d3dad0ab6870acb0d46d1f189d5e2e1f71b17)
2001-12-03 05:30:27 +03:00
nt_devmode->copies = 1;
s3-spoolss: remove device mode defines from nt_printing.h. Guenther
2009-08-10 13:25:52 +04:00
nt_devmode->defaultsource = DMBIN_FORMSOURCE;
nt_devmode->printquality = DMRES_HIGH; /* 0x0258 */
nt_devmode->color = DMRES_MONOCHROME;
nt_devmode->duplex = DMDUP_SIMPLEX;
Getting back to a compilable state (not there yet but close). Added patches for random -> sys_random. Added set_effective_xxx patches for AFS code. Memory allocation changes in spoolss code. Jeremy. (This used to be commit c2099cfb033c2cdb6035f4f7f50ce21b98e1584d)
2000-06-01 21:01:34 +04:00
nt_devmode->yresolution = 0;
s3-spoolss: remove device mode defines from nt_printing.h. Guenther
2009-08-10 13:25:52 +04:00
nt_devmode->ttoption = DMTT_SUBDEV;
nt_devmode->collate = DMCOLLATE_FALSE;
Getting back to a compilable state (not there yet but close). Added patches for random -> sys_random. Added set_effective_xxx patches for AFS code. Memory allocation changes in spoolss code. Jeremy. (This used to be commit c2099cfb033c2cdb6035f4f7f50ce21b98e1584d)
2000-06-01 21:01:34 +04:00
nt_devmode->icmmethod = 0;
nt_devmode->icmintent = 0;
nt_devmode->mediatype = 0;
nt_devmode->dithertype = 0;
r196: merging struct uuid from trunk (This used to be commit 911a28361b9d8dd50597627f245ebfb57c6294fb)
2004-04-13 18:39:48 +04:00
/* non utilisés par un driver d'imprimante */
Getting back to a compilable state (not there yet but close). Added patches for random -> sys_random. Added set_effective_xxx patches for AFS code. Memory allocation changes in spoolss code. Jeremy. (This used to be commit c2099cfb033c2cdb6035f4f7f50ce21b98e1584d)
2000-06-01 21:01:34 +04:00
nt_devmode->logpixels = 0;
nt_devmode->bitsperpel = 0;
nt_devmode->pelswidth = 0;
nt_devmode->pelsheight = 0;
nt_devmode->displayflags = 0;
nt_devmode->displayfrequency = 0;
nt_devmode->reserved1 = 0;
nt_devmode->reserved2 = 0;
nt_devmode->panningwidth = 0;
nt_devmode->panningheight = 0;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r7882: Looks like a large patch - but what it actually does is make Samba safe for using our headers and linking with C++ modules. Stops us from using C++ reserved keywords in our code. Jeremy (This used to be commit 9506b8e145982b1160a2f0aee5c9b7a54980940a)
2005-06-25 00:25:18 +04:00
nt_devmode->nt_dev_private = NULL;
Getting back to a compilable state (not there yet but close). Added patches for random -> sys_random. Added set_effective_xxx patches for AFS code. Memory allocation changes in spoolss code. Jeremy. (This used to be commit c2099cfb033c2cdb6035f4f7f50ce21b98e1584d)
2000-06-01 21:01:34 +04:00
return nt_devmode;
}
JF - you might want to look at this patch. Went through and fixed up all failure possibilities. If something (malloc, file open etc.) fails, then this code goes through and cleans up all allocated resources on exit. This is the equivalent of a C++ destuctor for the allocated structures. We need code to be written like this to pass purify tests. Jeremy. (This used to be commit b260ef7cb1fb2b1e4661cc54eab403eb01fbfc35)
2000-04-05 23:48:06 +04:00
/****************************************************************************
Clean up and deallocate a (maybe partially) allocated NT_DEVICEMODE.
****************************************************************************/
Getting back to a compilable state (not there yet but close). Added patches for random -> sys_random. Added set_effective_xxx patches for AFS code. Memory allocation changes in spoolss code. Jeremy. (This used to be commit c2099cfb033c2cdb6035f4f7f50ce21b98e1584d)
2000-06-01 21:01:34 +04:00
void free_nt_devicemode(NT_DEVICEMODE **devmode_ptr)
JF - you might want to look at this patch. Went through and fixed up all failure possibilities. If something (malloc, file open etc.) fails, then this code goes through and cleans up all allocated resources on exit. This is the equivalent of a C++ destuctor for the allocated structures. We need code to be written like this to pass purify tests. Jeremy. (This used to be commit b260ef7cb1fb2b1e4661cc54eab403eb01fbfc35)
2000-04-05 23:48:06 +04:00
{
NT_DEVICEMODE *nt_devmode = *devmode_ptr;
if(nt_devmode == NULL)
return;
Modified interfaces and added checks around *all* *alloc calls so that errors are returned on memory allocation failure. Jeremy. (This used to be commit 9a118cd4a2b03146b341eeffb62144a2d29b574c)
2000-04-07 02:48:53 +04:00
DEBUG(106,("free_nt_devicemode: deleting DEVMODE\n"));
r7882: Looks like a large patch - but what it actually does is make Samba safe for using our headers and linking with C++ modules. Stops us from using C++ reserved keywords in our code. Jeremy (This used to be commit 9506b8e145982b1160a2f0aee5c9b7a54980940a)
2005-06-25 00:25:18 +04:00
SAFE_FREE(nt_devmode->nt_dev_private);
move to SAFE_FREE() (This used to be commit 09bf4425492fd96672ddd7a31d88854adcf7f0fe)
2001-09-17 13:25:57 +04:00
SAFE_FREE(*devmode_ptr);
JF - you might want to look at this patch. Went through and fixed up all failure possibilities. If something (malloc, file open etc.) fails, then this code goes through and cleans up all allocated resources on exit. This is the equivalent of a C++ destuctor for the allocated structures. We need code to be written like this to pass purify tests. Jeremy. (This used to be commit b260ef7cb1fb2b1e4661cc54eab403eb01fbfc35)
2000-04-05 23:48:06 +04:00
}
/****************************************************************************
Clean up and deallocate a (maybe partially) allocated NT_PRINTER_INFO_LEVEL_2.
****************************************************************************/
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
JF - you might want to look at this patch. Went through and fixed up all failure possibilities. If something (malloc, file open etc.) fails, then this code goes through and cleans up all allocated resources on exit. This is the equivalent of a C++ destuctor for the allocated structures. We need code to be written like this to pass purify tests. Jeremy. (This used to be commit b260ef7cb1fb2b1e4661cc54eab403eb01fbfc35)
2000-04-05 23:48:06 +04:00
static void free_nt_printer_info_level_2(NT_PRINTER_INFO_LEVEL_2 **info_ptr)
{
NT_PRINTER_INFO_LEVEL_2 *info = *info_ptr;
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
if ( !info )
JF - you might want to look at this patch. Went through and fixed up all failure possibilities. If something (malloc, file open etc.) fails, then this code goes through and cleans up all allocated resources on exit. This is the equivalent of a C++ destuctor for the allocated structures. We need code to be written like this to pass purify tests. Jeremy. (This used to be commit b260ef7cb1fb2b1e4661cc54eab403eb01fbfc35)
2000-04-05 23:48:06 +04:00
return;
free_nt_devicemode(&info->devmode);
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
TALLOC_FREE( *info_ptr );
JF - you might want to look at this patch. Went through and fixed up all failure possibilities. If something (malloc, file open etc.) fails, then this code goes through and cleans up all allocated resources on exit. This is the equivalent of a C++ destuctor for the allocated structures. We need code to be written like this to pass purify tests. Jeremy. (This used to be commit b260ef7cb1fb2b1e4661cc54eab403eb01fbfc35)
2000-04-05 23:48:06 +04:00
}
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
/****************************************************************************
****************************************************************************/
r22009: change TDB_DATA from char * to unsigned char * and fix all compiler warnings in the users metze (This used to be commit 3a28443079c141a6ce8182c65b56ca210e34f37f)
2007-03-29 13:35:51 +04:00
int unpack_devicemode(NT_DEVICEMODE **nt_devmode, const uint8 *buf, int buflen)
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
{
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
int len = 0;
fix the devmode.orientation being set to 0. that bug was *subtle* :-( J.F. (This used to be commit 0e9e048b6d65b57bdcc7440ddaa9d2cc1eac71dc)
2000-07-27 11:59:39 +04:00
int extra_len = 0;
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
NT_DEVICEMODE devmode;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
ZERO_STRUCT(devmode);
getting and setting security descriptors on printers now works this needed some fixes in tdb_unpack(). Tim, you'll need to update (This used to be commit 9422719ab4c35e4ce3199b62dd632433bf391283)
2000-05-27 13:53:11 +04:00
len += tdb_unpack(buf+len, buflen-len, "p", nt_devmode);
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
if (!*nt_devmode) return len;
Changing drivers using the properties page works - but only if getting/setting security descriptors is disabled (as it is in this code). If get/set sd's is enabled spooler.exe crashes on NT. I'll investigate and fix that issue next. Jeremy. (This used to be commit 8c9ed874363e6a710bc0fe521bb8c4f7ee219587)
2000-06-27 02:08:20 +04:00
len += tdb_unpack(buf+len, buflen-len, "ffwwwwwwwwwwwwwwwwwwddddddddddddddp",
devmode.devicename,
fixed the pack/unpack of the devicemode we were being bitten by uint16/uint32 mixups (This used to be commit 1d37f76953534f7bf9d8890dda30c7e00cbb024c)
2000-06-04 06:29:00 +04:00
devmode.formname,
&devmode.specversion,
&devmode.driverversion,
&devmode.size,
&devmode.driverextra,
&devmode.orientation,
&devmode.papersize,
&devmode.paperlength,
&devmode.paperwidth,
&devmode.scale,
&devmode.copies,
&devmode.defaultsource,
&devmode.printquality,
&devmode.color,
&devmode.duplex,
&devmode.yresolution,
&devmode.ttoption,
&devmode.collate,
&devmode.logpixels,
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
fixed the pack/unpack of the devicemode we were being bitten by uint16/uint32 mixups (This used to be commit 1d37f76953534f7bf9d8890dda30c7e00cbb024c)
2000-06-04 06:29:00 +04:00
&devmode.fields,
&devmode.bitsperpel,
&devmode.pelswidth,
&devmode.pelsheight,
&devmode.displayflags,
&devmode.displayfrequency,
&devmode.icmmethod,
&devmode.icmintent,
&devmode.mediatype,
&devmode.dithertype,
&devmode.reserved1,
&devmode.reserved2,
&devmode.panningwidth,
&devmode.panningheight,
r7882: Looks like a large patch - but what it actually does is make Samba safe for using our headers and linking with C++ modules. Stops us from using C++ reserved keywords in our code. Jeremy (This used to be commit 9506b8e145982b1160a2f0aee5c9b7a54980940a)
2005-06-25 00:25:18 +04:00
&devmode.nt_dev_private);
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r7882: Looks like a large patch - but what it actually does is make Samba safe for using our headers and linking with C++ modules. Stops us from using C++ reserved keywords in our code. Jeremy (This used to be commit 9506b8e145982b1160a2f0aee5c9b7a54980940a)
2005-06-25 00:25:18 +04:00
if (devmode.nt_dev_private) {
fix the devmode.orientation being set to 0. that bug was *subtle* :-( J.F. (This used to be commit 0e9e048b6d65b57bdcc7440ddaa9d2cc1eac71dc)
2000-07-27 11:59:39 +04:00
/* the len in tdb_unpack is an int value and
Changes from APPLIANCE_HEAD: source/include/proto.h - make proto source/printing/nt_printing.c source/rpc_server/srv_spoolss_nt.c - Fix for the overwriting of printerdata entries when WinNT and Win2k are modifying printer parameters on PCL printers. Turns out that Win2k creates a printer with a NULL devmode entry and then expects to set it on *OPEN* (yes this is insane). So we cannot return a "default" devmode for a printer - and we must allow an open to set it. source/tdb/tdb.c - Show freelist in an easier format. Show total free. - When storing a new record, allocate memory for the key + data before the tdb_allocate() as if the malloc fails a (sparse) hole is left in the tdb. source/tdb/tdbtool.c - Show freelist in an easier format. Show total free. source/tdb/Makefile - cleaned up Makefile dependancies source/smbd/lanman.c - Fix for Win9x corrupting it's own parameter string. source/printing/printfsp.c source/printing/printing.c source/rpc_server/srv_spoolss_nt.c source/smbd/close.c - Added normal close parameter into print_fsp_end() which treats an abnormal close as error condition and deletes the spool file. (This used to be commit 025f7a092ad258ff774e3f5e53737f8210cc8af6)
2001-01-30 00:34:08 +03:00
* devmode.driverextra is only a short
fix the devmode.orientation being set to 0. that bug was *subtle* :-( J.F. (This used to be commit 0e9e048b6d65b57bdcc7440ddaa9d2cc1eac71dc)
2000-07-27 11:59:39 +04:00
*/
r7882: Looks like a large patch - but what it actually does is make Samba safe for using our headers and linking with C++ modules. Stops us from using C++ reserved keywords in our code. Jeremy (This used to be commit 9506b8e145982b1160a2f0aee5c9b7a54980940a)
2005-06-25 00:25:18 +04:00
len += tdb_unpack(buf+len, buflen-len, "B", &extra_len, &devmode.nt_dev_private);
fix the devmode.orientation being set to 0. that bug was *subtle* :-( J.F. (This used to be commit 0e9e048b6d65b57bdcc7440ddaa9d2cc1eac71dc)
2000-07-27 11:59:39 +04:00
devmode.driverextra=(uint16)extra_len;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
merge from appliance head (This used to be commit 393c5f14e0858dcb3d6cb26eb5643b520c2c9686)
2000-12-22 02:38:47 +03:00
/* check to catch an invalid TDB entry so we don't segfault */
if (devmode.driverextra == 0) {
r7882: Looks like a large patch - but what it actually does is make Samba safe for using our headers and linking with C++ modules. Stops us from using C++ reserved keywords in our code. Jeremy (This used to be commit 9506b8e145982b1160a2f0aee5c9b7a54980940a)
2005-06-25 00:25:18 +04:00
devmode.nt_dev_private = NULL;
merge from appliance head (This used to be commit 393c5f14e0858dcb3d6cb26eb5643b520c2c9686)
2000-12-22 02:38:47 +03:00
}
fix the devmode.orientation being set to 0. that bug was *subtle* :-( J.F. (This used to be commit 0e9e048b6d65b57bdcc7440ddaa9d2cc1eac71dc)
2000-07-27 11:59:39 +04:00
}
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
*nt_devmode = (NT_DEVICEMODE *)memdup(&devmode, sizeof(devmode));
r16582: Fix Klocwork #1997 and all generic class of problems where we don't correctly check the return from memdup. Jeremy. (This used to be commit ce14daf51c7ee2f9c68c77f7f4674e6f0e35c9ca)
2006-06-28 04:50:14 +04:00
if (!*nt_devmode) {
SAFE_FREE(devmode.nt_dev_private);
return -1;
}
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
- The printers are indexed by the sharename in both get_a_printer() and add_a_printer() now. - correctly unpack the private part of a devmode and remove a memleak - correctly retrieve the pair(value,data) for getprinterdata - handle null devicemode in printer_info_2 I still have some bugs but I'm not crashing anymore NT4SP6 d/c build :-) J.F. (This used to be commit 493f7d11acf753ba24c88e6cbb73d86a8595a66a)
2000-07-12 18:10:40 +04:00
DEBUG(8,("Unpacked devicemode [%s](%s)\n", devmode.devicename, devmode.formname));
r7882: Looks like a large patch - but what it actually does is make Samba safe for using our headers and linking with C++ modules. Stops us from using C++ reserved keywords in our code. Jeremy (This used to be commit 9506b8e145982b1160a2f0aee5c9b7a54980940a)
2005-06-25 00:25:18 +04:00
if (devmode.nt_dev_private)
- The printers are indexed by the sharename in both get_a_printer() and add_a_printer() now. - correctly unpack the private part of a devmode and remove a memleak - correctly retrieve the pair(value,data) for getprinterdata - handle null devicemode in printer_info_2 I still have some bugs but I'm not crashing anymore NT4SP6 d/c build :-) J.F. (This used to be commit 493f7d11acf753ba24c88e6cbb73d86a8595a66a)
2000-07-12 18:10:40 +04:00
DEBUG(8,("with a private section of %d bytes\n", devmode.driverextra));
fixed the pack/unpack of the devicemode we were being bitten by uint16/uint32 mixups (This used to be commit 1d37f76953534f7bf9d8890dda30c7e00cbb024c)
2000-06-04 06:29:00 +04:00
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
return len;
}
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
/****************************************************************************
Progress on CR 601 cache the printer_info_2 with the open printer handle. cache is invalidated on a mod_a_printer() call **on that smbd**. Yes, this means that the window for admins to step on each other from different clients just got larger, but since handles a generally short lived this is probably ok. (This used to be commit 31272d3b6bb9ec62fd666301c7adfa0c1720a99b)
2003-02-25 23:53:53 +03:00
Allocate and initialize a new slot.
***************************************************************************/
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r8066: * had to modify the printer data storage slightly in ntprinters.tdb when packing values. It is a compatible change though and will not require a tdb version upgrade * Can successfully create new printer subkeys via winreg that are immediately available via spoolss calls. Still cannot delete keys yet though. That comes next. (This used to be commit 00bce2b3bb78a44842a258b1737076281297d247)
2005-07-02 05:23:21 +04:00
int add_new_printer_key( NT_PRINTER_DATA *data, const char *name )
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
{
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
NT_PRINTER_KEY *d;
int key_index;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
if ( !name || !data )
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
return -1;
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
/* allocate another slot in the NT_PRINTER_KEY array */
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
if ( !(d = TALLOC_REALLOC_ARRAY( data, data->keys, NT_PRINTER_KEY, data->num_keys+1)) ) {
r8066: * had to modify the printer data storage slightly in ntprinters.tdb when packing values. It is a compatible change though and will not require a tdb version upgrade * Can successfully create new printer subkeys via winreg that are immediately available via spoolss calls. Still cannot delete keys yet though. That comes next. (This used to be commit 00bce2b3bb78a44842a258b1737076281297d247)
2005-07-02 05:23:21 +04:00
DEBUG(0,("add_new_printer_key: Realloc() failed!\n"));
return -1;
}
data->keys = d;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
key_index = data->num_keys;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
/* initialze new key */
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
data->keys[key_index].name = talloc_strdup( data, name );
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
s3:registry: replace typedef REGVAL_CTR by struct regval_ctr. This paves the way for hiding the typedef and the implementation from the surface. Michael
2009-03-23 20:14:17 +03:00
if ( !(data->keys[key_index].values = TALLOC_ZERO_P( data, struct regval_ctr )) )
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
return -1;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
data->num_keys++;
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
DEBUG(10,("add_new_printer_key: Inserted new data key [%s]\n", name ));
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
return key_index;
}
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
r8089: successfully delete printer subkeys via the registry....now for values (This used to be commit d3427960b0676c506c639b582a2544dc58990c9e)
2005-07-03 06:05:01 +04:00
/****************************************************************************
search for a registry key name in the existing printer data
***************************************************************************/
int delete_printer_key( NT_PRINTER_DATA *data, const char *name )
{
int i;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r8089: successfully delete printer subkeys via the registry....now for values (This used to be commit d3427960b0676c506c639b582a2544dc58990c9e)
2005-07-03 06:05:01 +04:00
for ( i=0; i<data->num_keys; i++ ) {
if ( strequal( data->keys[i].name, name ) ) {
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r8089: successfully delete printer subkeys via the registry....now for values (This used to be commit d3427960b0676c506c639b582a2544dc58990c9e)
2005-07-03 06:05:01 +04:00
/* cleanup memory */
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
TALLOC_FREE( data->keys[i].name );
TALLOC_FREE( data->keys[i].values );
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r8089: successfully delete printer subkeys via the registry....now for values (This used to be commit d3427960b0676c506c639b582a2544dc58990c9e)
2005-07-03 06:05:01 +04:00
/* if not the end of the array, move remaining elements down one slot */
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r8089: successfully delete printer subkeys via the registry....now for values (This used to be commit d3427960b0676c506c639b582a2544dc58990c9e)
2005-07-03 06:05:01 +04:00
data->num_keys--;
if ( data->num_keys && (i < data->num_keys) )
memmove( &data->keys[i], &data->keys[i+1], sizeof(NT_PRINTER_KEY)*(data->num_keys-i) );
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r8089: successfully delete printer subkeys via the registry....now for values (This used to be commit d3427960b0676c506c639b582a2544dc58990c9e)
2005-07-03 06:05:01 +04:00
break;
}
}
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r8089: successfully delete printer subkeys via the registry....now for values (This used to be commit d3427960b0676c506c639b582a2544dc58990c9e)
2005-07-03 06:05:01 +04:00
return data->num_keys;
}
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
/****************************************************************************
search for a registry key name in the existing printer data
***************************************************************************/
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Merge from HEAD - make Samba compile with -Wwrite-strings without additional warnings. (Adds a lot of const). Andrew Bartlett (This used to be commit 3a7458f9472432ef12c43008414925fd1ce8ea0c)
2003-01-03 11:28:12 +03:00
int lookup_printerkey( NT_PRINTER_DATA *data, const char *name )
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
{
int key_index = -1;
int i;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
if ( !data || !name )
return -1;
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
DEBUG(12,("lookup_printerkey: Looking for [%s]\n", name));
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
/* loop over all existing keys */
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Progress on CR 601 cache the printer_info_2 with the open printer handle. cache is invalidated on a mod_a_printer() call **on that smbd**. Yes, this means that the window for admins to step on each other from different clients just got larger, but since handles a generally short lived this is probably ok. (This used to be commit 31272d3b6bb9ec62fd666301c7adfa0c1720a99b)
2003-02-25 23:53:53 +03:00
for ( i=0; i<data->num_keys; i++ ) {
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
if ( strequal(data->keys[i].name, name) ) {
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
DEBUG(12,("lookup_printerkey: Found [%s]!\n", name));
key_index = i;
break;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
}
}
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
return key_index;
}
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
/****************************************************************************
***************************************************************************/
r8066: * had to modify the printer data storage slightly in ntprinters.tdb when packing values. It is a compatible change though and will not require a tdb version upgrade * Can successfully create new printer subkeys via winreg that are immediately available via spoolss calls. Still cannot delete keys yet though. That comes next. (This used to be commit 00bce2b3bb78a44842a258b1737076281297d247)
2005-07-02 05:23:21 +04:00
int get_printer_subkeys( NT_PRINTER_DATA *data, const char* key, fstring **subkeys )
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
{
int i, j;
int key_len;
int num_subkeys = 0;
char *p;
r13915: Fixed a very interesting class of realloc() bugs found by Coverity. realloc can return NULL in one of two cases - (1) the realloc failed, (2) realloc succeeded but the new size requested was zero, in which case this is identical to a free() call. The error paths dealing with these two cases should be different, but mostly weren't. Secondly the standard idiom for dealing with realloc when you know the new size is non-zero is the following : tmp = realloc(p, size); if (!tmp) { SAFE_FREE(p); return error; } else { p = tmp; } However, there were *many* *many* places in Samba where we were using the old (broken) idiom of : p = realloc(p, size) if (!p) { return error; } which will leak the memory pointed to by p on realloc fail. This commit (hopefully) fixes all these cases by moving to a standard idiom of : p = SMB_REALLOC(p, size) if (!p) { return error; } Where if the realloc returns null due to the realloc failing or size == 0 we *guarentee* that the storage pointed to by p has been freed. This allows me to remove a lot of code that was dealing with the standard (more verbose) method that required a tmp pointer. This is almost always what you want. When a realloc fails you never usually want the old memory, you want to free it and get into your error processing asap. For the 11 remaining cases where we really do need to keep the old pointer I have invented the new macro SMB_REALLOC_KEEP_OLD_ON_ERROR, which can be used as follows : tmp = SMB_REALLOC_KEEP_OLD_ON_ERROR(p, size); if (!tmp) { SAFE_FREE(p); return error; } else { p = tmp; } SMB_REALLOC_KEEP_OLD_ON_ERROR guarentees never to free the pointer p, even on size == 0 or realloc fail. All this is done by a hidden extra argument to Realloc(), BOOL free_old_on_error which is set appropriately by the SMB_REALLOC and SMB_REALLOC_KEEP_OLD_ON_ERROR macros (and their array counterparts). It remains to be seen what this will do to our Coverity bug count :-). Jeremy. (This used to be commit 1d710d06a214f3f1740e80e0bffd6aab44aac2b0)
2006-03-07 09:31:04 +03:00
fstring *subkeys_ptr = NULL;
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
fstring subkeyname;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r16424: Fix possible null deref and a memory leak found by examining Klockwork #1519. get_printer_subkeys() could return zero without initializing it's return pointer arg. Fixed this. Added free of subkey pointer return in registry/reg_printing.c (interesting that neithe Coverity or Klocwork found this one). Jeremy. (This used to be commit 4fbeae1a3ac3499e5d9f566655cbafccd9d691cb)
2006-06-20 23:06:57 +04:00
*subkeys = NULL;
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
if ( !data )
return 0;
r8066: * had to modify the printer data storage slightly in ntprinters.tdb when packing values. It is a compatible change though and will not require a tdb version upgrade * Can successfully create new printer subkeys via winreg that are immediately available via spoolss calls. Still cannot delete keys yet though. That comes next. (This used to be commit 00bce2b3bb78a44842a258b1737076281297d247)
2005-07-02 05:23:21 +04:00
if ( !key )
return -1;
/* special case of asking for the top level printer data registry key names */
if ( strlen(key) == 0 ) {
for ( i=0; i<data->num_keys; i++ ) {
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r8066: * had to modify the printer data storage slightly in ntprinters.tdb when packing values. It is a compatible change though and will not require a tdb version upgrade * Can successfully create new printer subkeys via winreg that are immediately available via spoolss calls. Still cannot delete keys yet though. That comes next. (This used to be commit 00bce2b3bb78a44842a258b1737076281297d247)
2005-07-02 05:23:21 +04:00
/* found a match, so allocate space and copy the name */
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r13915: Fixed a very interesting class of realloc() bugs found by Coverity. realloc can return NULL in one of two cases - (1) the realloc failed, (2) realloc succeeded but the new size requested was zero, in which case this is identical to a free() call. The error paths dealing with these two cases should be different, but mostly weren't. Secondly the standard idiom for dealing with realloc when you know the new size is non-zero is the following : tmp = realloc(p, size); if (!tmp) { SAFE_FREE(p); return error; } else { p = tmp; } However, there were *many* *many* places in Samba where we were using the old (broken) idiom of : p = realloc(p, size) if (!p) { return error; } which will leak the memory pointed to by p on realloc fail. This commit (hopefully) fixes all these cases by moving to a standard idiom of : p = SMB_REALLOC(p, size) if (!p) { return error; } Where if the realloc returns null due to the realloc failing or size == 0 we *guarentee* that the storage pointed to by p has been freed. This allows me to remove a lot of code that was dealing with the standard (more verbose) method that required a tmp pointer. This is almost always what you want. When a realloc fails you never usually want the old memory, you want to free it and get into your error processing asap. For the 11 remaining cases where we really do need to keep the old pointer I have invented the new macro SMB_REALLOC_KEEP_OLD_ON_ERROR, which can be used as follows : tmp = SMB_REALLOC_KEEP_OLD_ON_ERROR(p, size); if (!tmp) { SAFE_FREE(p); return error; } else { p = tmp; } SMB_REALLOC_KEEP_OLD_ON_ERROR guarentees never to free the pointer p, even on size == 0 or realloc fail. All this is done by a hidden extra argument to Realloc(), BOOL free_old_on_error which is set appropriately by the SMB_REALLOC and SMB_REALLOC_KEEP_OLD_ON_ERROR macros (and their array counterparts). It remains to be seen what this will do to our Coverity bug count :-). Jeremy. (This used to be commit 1d710d06a214f3f1740e80e0bffd6aab44aac2b0)
2006-03-07 09:31:04 +03:00
if ( !(subkeys_ptr = SMB_REALLOC_ARRAY( subkeys_ptr, fstring, num_subkeys+2)) ) {
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
DEBUG(0,("get_printer_subkeys: Realloc failed for [%d] entries!\n",
r8066: * had to modify the printer data storage slightly in ntprinters.tdb when packing values. It is a compatible change though and will not require a tdb version upgrade * Can successfully create new printer subkeys via winreg that are immediately available via spoolss calls. Still cannot delete keys yet though. That comes next. (This used to be commit 00bce2b3bb78a44842a258b1737076281297d247)
2005-07-02 05:23:21 +04:00
num_subkeys+1));
return -1;
}
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r8066: * had to modify the printer data storage slightly in ntprinters.tdb when packing values. It is a compatible change though and will not require a tdb version upgrade * Can successfully create new printer subkeys via winreg that are immediately available via spoolss calls. Still cannot delete keys yet though. That comes next. (This used to be commit 00bce2b3bb78a44842a258b1737076281297d247)
2005-07-02 05:23:21 +04:00
fstrcpy( subkeys_ptr[num_subkeys], data->keys[i].name );
num_subkeys++;
}
goto done;
}
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r8066: * had to modify the printer data storage slightly in ntprinters.tdb when packing values. It is a compatible change though and will not require a tdb version upgrade * Can successfully create new printer subkeys via winreg that are immediately available via spoolss calls. Still cannot delete keys yet though. That comes next. (This used to be commit 00bce2b3bb78a44842a258b1737076281297d247)
2005-07-02 05:23:21 +04:00
/* asking for the subkeys of some key */
/* subkey paths are stored in the key name using '\' as the delimiter */
Progress on CR 601 cache the printer_info_2 with the open printer handle. cache is invalidated on a mod_a_printer() call **on that smbd**. Yes, this means that the window for admins to step on each other from different clients just got larger, but since handles a generally short lived this is probably ok. (This used to be commit 31272d3b6bb9ec62fd666301c7adfa0c1720a99b)
2003-02-25 23:53:53 +03:00
for ( i=0; i<data->num_keys; i++ ) {
if ( StrnCaseCmp(data->keys[i].name, key, strlen(key)) == 0 ) {
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r8066: * had to modify the printer data storage slightly in ntprinters.tdb when packing values. It is a compatible change though and will not require a tdb version upgrade * Can successfully create new printer subkeys via winreg that are immediately available via spoolss calls. Still cannot delete keys yet though. That comes next. (This used to be commit 00bce2b3bb78a44842a258b1737076281297d247)
2005-07-02 05:23:21 +04:00
/* if we found the exact key, then break */
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
key_len = strlen( key );
if ( strlen(data->keys[i].name) == key_len )
r8066: * had to modify the printer data storage slightly in ntprinters.tdb when packing values. It is a compatible change though and will not require a tdb version upgrade * Can successfully create new printer subkeys via winreg that are immediately available via spoolss calls. Still cannot delete keys yet though. That comes next. (This used to be commit 00bce2b3bb78a44842a258b1737076281297d247)
2005-07-02 05:23:21 +04:00
break;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
/* get subkey path */
p = data->keys[i].name + key_len;
if ( *p == '\\' )
p++;
fstrcpy( subkeyname, p );
if ( (p = strchr( subkeyname, '\\' )) )
*p = '\0';
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
/* don't add a key more than once */
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
for ( j=0; j<num_subkeys; j++ ) {
if ( strequal( subkeys_ptr[j], subkeyname ) )
break;
}
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
if ( j != num_subkeys )
continue;
/* found a match, so allocate space and copy the name */
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r13915: Fixed a very interesting class of realloc() bugs found by Coverity. realloc can return NULL in one of two cases - (1) the realloc failed, (2) realloc succeeded but the new size requested was zero, in which case this is identical to a free() call. The error paths dealing with these two cases should be different, but mostly weren't. Secondly the standard idiom for dealing with realloc when you know the new size is non-zero is the following : tmp = realloc(p, size); if (!tmp) { SAFE_FREE(p); return error; } else { p = tmp; } However, there were *many* *many* places in Samba where we were using the old (broken) idiom of : p = realloc(p, size) if (!p) { return error; } which will leak the memory pointed to by p on realloc fail. This commit (hopefully) fixes all these cases by moving to a standard idiom of : p = SMB_REALLOC(p, size) if (!p) { return error; } Where if the realloc returns null due to the realloc failing or size == 0 we *guarentee* that the storage pointed to by p has been freed. This allows me to remove a lot of code that was dealing with the standard (more verbose) method that required a tmp pointer. This is almost always what you want. When a realloc fails you never usually want the old memory, you want to free it and get into your error processing asap. For the 11 remaining cases where we really do need to keep the old pointer I have invented the new macro SMB_REALLOC_KEEP_OLD_ON_ERROR, which can be used as follows : tmp = SMB_REALLOC_KEEP_OLD_ON_ERROR(p, size); if (!tmp) { SAFE_FREE(p); return error; } else { p = tmp; } SMB_REALLOC_KEEP_OLD_ON_ERROR guarentees never to free the pointer p, even on size == 0 or realloc fail. All this is done by a hidden extra argument to Realloc(), BOOL free_old_on_error which is set appropriately by the SMB_REALLOC and SMB_REALLOC_KEEP_OLD_ON_ERROR macros (and their array counterparts). It remains to be seen what this will do to our Coverity bug count :-). Jeremy. (This used to be commit 1d710d06a214f3f1740e80e0bffd6aab44aac2b0)
2006-03-07 09:31:04 +03:00
if ( !(subkeys_ptr = SMB_REALLOC_ARRAY( subkeys_ptr, fstring, num_subkeys+2)) ) {
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
DEBUG(0,("get_printer_subkeys: Realloc failed for [%d] entries!\n",
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
num_subkeys+1));
return 0;
}
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
fstrcpy( subkeys_ptr[num_subkeys], subkeyname );
num_subkeys++;
}
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
}
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r8066: * had to modify the printer data storage slightly in ntprinters.tdb when packing values. It is a compatible change though and will not require a tdb version upgrade * Can successfully create new printer subkeys via winreg that are immediately available via spoolss calls. Still cannot delete keys yet though. That comes next. (This used to be commit 00bce2b3bb78a44842a258b1737076281297d247)
2005-07-02 05:23:21 +04:00
/* return error if the key was not found */
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r14273: Fix coverity bug #202. Memory leak on error path. Jeremy. (This used to be commit d2be8163f2cf69681150ed7de720a37ffaa8e937)
2006-03-13 03:37:57 +03:00
if ( i == data->num_keys ) {
SAFE_FREE(subkeys_ptr);
r8066: * had to modify the printer data storage slightly in ntprinters.tdb when packing values. It is a compatible change though and will not require a tdb version upgrade * Can successfully create new printer subkeys via winreg that are immediately available via spoolss calls. Still cannot delete keys yet though. That comes next. (This used to be commit 00bce2b3bb78a44842a258b1737076281297d247)
2005-07-02 05:23:21 +04:00
return -1;
r14273: Fix coverity bug #202. Memory leak on error path. Jeremy. (This used to be commit d2be8163f2cf69681150ed7de720a37ffaa8e937)
2006-03-13 03:37:57 +03:00
}
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r8066: * had to modify the printer data storage slightly in ntprinters.tdb when packing values. It is a compatible change though and will not require a tdb version upgrade * Can successfully create new printer subkeys via winreg that are immediately available via spoolss calls. Still cannot delete keys yet though. That comes next. (This used to be commit 00bce2b3bb78a44842a258b1737076281297d247)
2005-07-02 05:23:21 +04:00
done:
/* tag off the end */
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Keeping branches in sync.... Jeremy. (This used to be commit eb937761c4047bd98990ca33e56b668465e2c228)
2002-11-07 10:13:29 +03:00
if (num_subkeys)
Progress on CR 601 cache the printer_info_2 with the open printer handle. cache is invalidated on a mod_a_printer() call **on that smbd**. Yes, this means that the window for admins to step on each other from different clients just got larger, but since handles a generally short lived this is probably ok. (This used to be commit 31272d3b6bb9ec62fd666301c7adfa0c1720a99b)
2003-02-25 23:53:53 +03:00
fstrcpy(subkeys_ptr[num_subkeys], "" );
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
*subkeys = subkeys_ptr;
return num_subkeys;
}
Automatic printer publishing when using APW or choosing 'list in the directory' in printer settings. Currently very little is published, and you cannot unpublish because of a bug in win2k clients. (This used to be commit ca6360e8db30fc9be3fe3718c8b49c92dba5ecac)
2002-12-04 20:40:50 +03:00
ifdef out some functions that are not used when HAVE_ADS is not defined (This used to be commit 2d192e0431c7b754cf9db2306acb01fbe4068a14)
2003-06-25 23:49:27 +04:00
#ifdef HAVE_ADS
s3:registry: replace typedef REGVAL_CTR by struct regval_ctr. This paves the way for hiding the typedef and the implementation from the surface. Michael
2009-03-23 20:14:17 +03:00
static void map_sz_into_ctr(struct regval_ctr *ctr, const char *val_name,
More printer data to publish (This used to be commit 6e2f0c4e304a09313f933a3c9c2a7b3a0219006d)
2002-12-05 22:13:40 +03:00
const char *sz)
{
regval_ctr_delvalue(ctr, val_name);
s3-registry: use regval_ctr_addvalue_sz(). Greatly simplifies and cleanes up the code. Guenther
2009-09-24 17:01:32 +04:00
regval_ctr_addvalue_sz(ctr, val_name, sz);
More printer data to publish (This used to be commit 6e2f0c4e304a09313f933a3c9c2a7b3a0219006d)
2002-12-05 22:13:40 +03:00
}
s3:registry: replace typedef REGVAL_CTR by struct regval_ctr. This paves the way for hiding the typedef and the implementation from the surface. Michael
2009-03-23 20:14:17 +03:00
static void map_dword_into_ctr(struct regval_ctr *ctr, const char *val_name,
More printer data to publish (This used to be commit 6e2f0c4e304a09313f933a3c9c2a7b3a0219006d)
2002-12-05 22:13:40 +03:00
uint32 dword)
{
regval_ctr_delvalue(ctr, val_name);
regval_ctr_addvalue(ctr, val_name, REG_DWORD,
(char *) &dword, sizeof(dword));
}
s3:registry: replace typedef REGVAL_CTR by struct regval_ctr. This paves the way for hiding the typedef and the implementation from the surface. Michael
2009-03-23 20:14:17 +03:00
static void map_bool_into_ctr(struct regval_ctr *ctr, const char *val_name,
RIP BOOL. Convert BOOL -> bool. I found a few interesting bugs in various places whilst doing this (places that assumed BOOL == int). I also need to fix the Samba4 pidl generation (next checkin). Jeremy. (This used to be commit f35a266b3cbb3e5fa6a86be60f34fe340a3ca71f)
2007-10-19 04:40:25 +04:00
bool b)
More printer data to publish (This used to be commit 6e2f0c4e304a09313f933a3c9c2a7b3a0219006d)
2002-12-05 22:13:40 +03:00
{
Squash another compiler warning. (This used to be commit 8b208834354db39797e45fd041c408c7ab6eb314)
2003-05-27 11:29:13 +04:00
uint8 bin_bool = (b ? 1 : 0);
More printer data to publish (This used to be commit 6e2f0c4e304a09313f933a3c9c2a7b3a0219006d)
2002-12-05 22:13:40 +03:00
regval_ctr_delvalue(ctr, val_name);
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
regval_ctr_addvalue(ctr, val_name, REG_BINARY,
More printer data to publish (This used to be commit 6e2f0c4e304a09313f933a3c9c2a7b3a0219006d)
2002-12-05 22:13:40 +03:00
(char *) &bin_bool, sizeof(bin_bool));
}
s3:registry: replace typedef REGVAL_CTR by struct regval_ctr. This paves the way for hiding the typedef and the implementation from the surface. Michael
2009-03-23 20:14:17 +03:00
static void map_single_multi_sz_into_ctr(struct regval_ctr *ctr, const char *val_name,
More printer data to publish (This used to be commit 6e2f0c4e304a09313f933a3c9c2a7b3a0219006d)
2002-12-05 22:13:40 +03:00
const char *multi_sz)
{
s3-printing: use regval_ctr_addvalue_multi_sz. Guenther
2009-09-30 17:22:02 +04:00
const char *a[2];
More printer data to publish (This used to be commit 6e2f0c4e304a09313f933a3c9c2a7b3a0219006d)
2002-12-05 22:13:40 +03:00
s3-printing: use regval_ctr_addvalue_multi_sz. Guenther
2009-09-30 17:22:02 +04:00
a[0] = multi_sz;
a[1] = NULL;
More printer data to publish (This used to be commit 6e2f0c4e304a09313f933a3c9c2a7b3a0219006d)
2002-12-05 22:13:40 +03:00
regval_ctr_delvalue(ctr, val_name);
s3-printing: use regval_ctr_addvalue_multi_sz. Guenther
2009-09-30 17:22:02 +04:00
regval_ctr_addvalue_multi_sz(ctr, val_name, a);
More printer data to publish (This used to be commit 6e2f0c4e304a09313f933a3c9c2a7b3a0219006d)
2002-12-05 22:13:40 +03:00
}
Automatic printer publishing when using APW or choosing 'list in the directory' in printer settings. Currently very little is published, and you cannot unpublish because of a bug in win2k clients. (This used to be commit ca6360e8db30fc9be3fe3718c8b49c92dba5ecac)
2002-12-04 20:40:50 +03:00
/****************************************************************************
* Map the NT_PRINTER_INFO_LEVEL_2 data into DsSpooler keys for publishing.
*
* @param info2 NT_PRINTER_INFO_LEVEL_2 describing printer - gets modified
RIP BOOL. Convert BOOL -> bool. I found a few interesting bugs in various places whilst doing this (places that assumed BOOL == int). I also need to fix the Samba4 pidl generation (next checkin). Jeremy. (This used to be commit f35a266b3cbb3e5fa6a86be60f34fe340a3ca71f)
2007-10-19 04:40:25 +04:00
* @return bool indicating success or failure
Automatic printer publishing when using APW or choosing 'list in the directory' in printer settings. Currently very little is published, and you cannot unpublish because of a bug in win2k clients. (This used to be commit ca6360e8db30fc9be3fe3718c8b49c92dba5ecac)
2002-12-04 20:40:50 +03:00
***************************************************************************/
RIP BOOL. Convert BOOL -> bool. I found a few interesting bugs in various places whilst doing this (places that assumed BOOL == int). I also need to fix the Samba4 pidl generation (next checkin). Jeremy. (This used to be commit f35a266b3cbb3e5fa6a86be60f34fe340a3ca71f)
2007-10-19 04:40:25 +04:00
static bool map_nt_printer_info2_to_dsspooler(NT_PRINTER_INFO_LEVEL_2 *info2)
Automatic printer publishing when using APW or choosing 'list in the directory' in printer settings. Currently very little is published, and you cannot unpublish because of a bug in win2k clients. (This used to be commit ca6360e8db30fc9be3fe3718c8b49c92dba5ecac)
2002-12-04 20:40:50 +03:00
{
s3:registry: replace typedef REGVAL_CTR by struct regval_ctr. This paves the way for hiding the typedef and the implementation from the surface. Michael
2009-03-23 20:14:17 +03:00
struct regval_ctr *ctr = NULL;
Automatic printer publishing when using APW or choosing 'list in the directory' in printer settings. Currently very little is published, and you cannot unpublish because of a bug in win2k clients. (This used to be commit ca6360e8db30fc9be3fe3718c8b49c92dba5ecac)
2002-12-04 20:40:50 +03:00
fstring longname;
Remove more fstring/pstring bad useage. Go talloc ! Jeremy. (This used to be commit 2a0173743d2cf615d52278f3dd87cc804abe2d16)
2007-11-09 04:25:45 +03:00
const char *dnssuffix;
Merge from HEAD - make Samba compile with -Wwrite-strings without additional warnings. (Adds a lot of const). Andrew Bartlett (This used to be commit 3a7458f9472432ef12c43008414925fd1ce8ea0c)
2003-01-03 11:28:12 +03:00
char *allocated_string = NULL;
const char *ascii_str;
Automatic printer publishing when using APW or choosing 'list in the directory' in printer settings. Currently very little is published, and you cannot unpublish because of a bug in win2k clients. (This used to be commit ca6360e8db30fc9be3fe3718c8b49c92dba5ecac)
2002-12-04 20:40:50 +03:00
int i;
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
if ((i = lookup_printerkey(info2->data, SPOOL_DSSPOOLER_KEY)) < 0)
i = add_new_printer_key(info2->data, SPOOL_DSSPOOLER_KEY);
ctr = info2->data->keys[i].values;
Automatic printer publishing when using APW or choosing 'list in the directory' in printer settings. Currently very little is published, and you cannot unpublish because of a bug in win2k clients. (This used to be commit ca6360e8db30fc9be3fe3718c8b49c92dba5ecac)
2002-12-04 20:40:50 +03:00
More printer data to publish (This used to be commit 6e2f0c4e304a09313f933a3c9c2a7b3a0219006d)
2002-12-05 22:13:40 +03:00
map_sz_into_ctr(ctr, SPOOL_REG_PRINTERNAME, info2->sharename);
map_sz_into_ctr(ctr, SPOOL_REG_SHORTSERVERNAME, global_myname());
Automatic printer publishing when using APW or choosing 'list in the directory' in printer settings. Currently very little is published, and you cannot unpublish because of a bug in win2k clients. (This used to be commit ca6360e8db30fc9be3fe3718c8b49c92dba5ecac)
2002-12-04 20:40:50 +03:00
Remove more fstring/pstring bad useage. Go talloc ! Jeremy. (This used to be commit 2a0173743d2cf615d52278f3dd87cc804abe2d16)
2007-11-09 04:25:45 +03:00
/* we make the assumption that the netbios name is the same
as the DNS name sinc ethe former will be what we used to
r5029: after talking to Rob, ensure that we set the NETIOSNAME.domainname as the longname in the published printer information since this is what we will have used when we joined the domain. More testing on this tomorrow. (This used to be commit d64fd1116d5fe29807be29c73809317f88fdb033)
2005-01-27 05:56:18 +03:00
join the domain */
Remove more fstring/pstring bad useage. Go talloc ! Jeremy. (This used to be commit 2a0173743d2cf615d52278f3dd87cc804abe2d16)
2007-11-09 04:25:45 +03:00
dnssuffix = get_mydnsdomname(talloc_tos());
Fix case where we have no dns domain name. Return a talloc of "". Jeremy. (This used to be commit ab8934844a8ae08657769ce1787c32f14a7eb745)
2007-11-09 04:58:55 +03:00
if (dnssuffix && *dnssuffix) {
r5029: after talking to Rob, ensure that we set the NETIOSNAME.domainname as the longname in the published printer information since this is what we will have used when we joined the domain. More testing on this tomorrow. (This used to be commit d64fd1116d5fe29807be29c73809317f88fdb033)
2005-01-27 05:56:18 +03:00
fstr_sprintf( longname, "%s.%s", global_myname(), dnssuffix );
Remove more fstring/pstring bad useage. Go talloc ! Jeremy. (This used to be commit 2a0173743d2cf615d52278f3dd87cc804abe2d16)
2007-11-09 04:25:45 +03:00
} else {
r5029: after talking to Rob, ensure that we set the NETIOSNAME.domainname as the longname in the published printer information since this is what we will have used when we joined the domain. More testing on this tomorrow. (This used to be commit d64fd1116d5fe29807be29c73809317f88fdb033)
2005-01-27 05:56:18 +03:00
fstrcpy( longname, global_myname() );
Remove more fstring/pstring bad useage. Go talloc ! Jeremy. (This used to be commit 2a0173743d2cf615d52278f3dd87cc804abe2d16)
2007-11-09 04:25:45 +03:00
}
More printer data to publish (This used to be commit 6e2f0c4e304a09313f933a3c9c2a7b3a0219006d)
2002-12-05 22:13:40 +03:00
map_sz_into_ctr(ctr, SPOOL_REG_SERVERNAME, longname);
Fix more asprintf warnings and some error path errors. Jeremy.
2008-12-23 23:11:12 +03:00
if (asprintf(&allocated_string, "\\\\%s\\%s", longname, info2->sharename) == -1) {
return false;
}
Merge from HEAD - make Samba compile with -Wwrite-strings without additional warnings. (Adds a lot of const). Andrew Bartlett (This used to be commit 3a7458f9472432ef12c43008414925fd1ce8ea0c)
2003-01-03 11:28:12 +03:00
map_sz_into_ctr(ctr, SPOOL_REG_UNCNAME, allocated_string);
SAFE_FREE(allocated_string);
More printer data to publish (This used to be commit 6e2f0c4e304a09313f933a3c9c2a7b3a0219006d)
2002-12-05 22:13:40 +03:00
map_dword_into_ctr(ctr, SPOOL_REG_VERSIONNUMBER, 4);
map_sz_into_ctr(ctr, SPOOL_REG_DRIVERNAME, info2->drivername);
map_sz_into_ctr(ctr, SPOOL_REG_LOCATION, info2->location);
map_sz_into_ctr(ctr, SPOOL_REG_DESCRIPTION, info2->comment);
map_single_multi_sz_into_ctr(ctr, SPOOL_REG_PORTNAME, info2->portname);
map_sz_into_ctr(ctr, SPOOL_REG_PRINTSEPARATORFILE, info2->sepfile);
map_dword_into_ctr(ctr, SPOOL_REG_PRINTSTARTTIME, info2->starttime);
map_dword_into_ctr(ctr, SPOOL_REG_PRINTENDTIME, info2->untiltime);
map_dword_into_ctr(ctr, SPOOL_REG_PRIORITY, info2->priority);
map_bool_into_ctr(ctr, SPOOL_REG_PRINTKEEPPRINTEDJOBS,
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
(info2->attributes &
More printer publishing code. - Add published attribute to info2, needed for win clients to work properly - Return proper info on getprinter 7 This means you can now look at the sharing tab of a printer and get correct info about whether it is published or not, and change it. (This used to be commit d57bddc9b22e809c79294c7eacbd5d0f115fe990)
2002-12-13 22:01:27 +03:00
PRINTER_ATTRIBUTE_KEEPPRINTEDJOBS));
More printer data to publish (This used to be commit 6e2f0c4e304a09313f933a3c9c2a7b3a0219006d)
2002-12-05 22:13:40 +03:00
switch (info2->attributes & 0x3) {
case 0:
ascii_str = SPOOL_REGVAL_PRINTWHILESPOOLING;
break;
case 1:
ascii_str = SPOOL_REGVAL_PRINTAFTERSPOOLED;
break;
case 2:
ascii_str = SPOOL_REGVAL_PRINTDIRECT;
break;
default:
ascii_str = "unknown";
}
map_sz_into_ctr(ctr, SPOOL_REG_PRINTSPOOLING, ascii_str);
Automatic printer publishing when using APW or choosing 'list in the directory' in printer settings. Currently very little is published, and you cannot unpublish because of a bug in win2k clients. (This used to be commit ca6360e8db30fc9be3fe3718c8b49c92dba5ecac)
2002-12-04 20:40:50 +03:00
return True;
}
r21258: Fix for connecting printers from Vista by storing the printer GUID as a REG_SZ as Vista seems to whine about unknown REG_BINARY values. Thanks to Martin Zielinski <mz@seh.de> for his excellent analysis on this. (This used to be commit fa5490b71b5cd41b63b028aa8a316e1197263083)
2007-02-09 05:12:12 +03:00
/*****************************************************************
****************************************************************/
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
static void store_printer_guid(NT_PRINTER_INFO_LEVEL_2 *info2,
r18654: Rename "struct uuid" => "struct GUID" for consistency. (This used to be commit 5de76767e857e9d159ea46e2ded612ccd6d6bf19)
2006-09-19 04:12:11 +04:00
struct GUID guid)
Store printer guid in the dsspooler registry key so we don't have to query the directory server every time someone asks (This used to be commit dd81003bddc17522041e1cd2f0484e1760493e4a)
2002-12-14 00:56:34 +03:00
{
int i;
s3:registry: replace typedef REGVAL_CTR by struct regval_ctr. This paves the way for hiding the typedef and the implementation from the surface. Michael
2009-03-23 20:14:17 +03:00
struct regval_ctr *ctr=NULL;
Store printer guid in the dsspooler registry key so we don't have to query the directory server every time someone asks (This used to be commit dd81003bddc17522041e1cd2f0484e1760493e4a)
2002-12-14 00:56:34 +03:00
/* find the DsSpooler key */
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
if ((i = lookup_printerkey(info2->data, SPOOL_DSSPOOLER_KEY)) < 0)
i = add_new_printer_key(info2->data, SPOOL_DSSPOOLER_KEY);
ctr = info2->data->keys[i].values;
Store printer guid in the dsspooler registry key so we don't have to query the directory server every time someone asks (This used to be commit dd81003bddc17522041e1cd2f0484e1760493e4a)
2002-12-14 00:56:34 +03:00
regval_ctr_delvalue(ctr, "objectGUID");
r21258: Fix for connecting printers from Vista by storing the printer GUID as a REG_SZ as Vista seems to whine about unknown REG_BINARY values. Thanks to Martin Zielinski <mz@seh.de> for his excellent analysis on this. (This used to be commit fa5490b71b5cd41b63b028aa8a316e1197263083)
2007-02-09 05:12:12 +03:00
/* We used to store this as a REG_BINARY but that causes
Vista to whine */
s3-registry: use regval_ctr_addvalue_sz(). Greatly simplifies and cleanes up the code. Guenther
2009-09-24 17:01:32 +04:00
regval_ctr_addvalue_sz(ctr, "objectGUID",
GUID_string(talloc_tos(), &guid));
Store printer guid in the dsspooler registry key so we don't have to query the directory server every time someone asks (This used to be commit dd81003bddc17522041e1cd2f0484e1760493e4a)
2002-12-14 00:56:34 +03:00
}
r2569: Patch from Rob Foehl <rwf@loonybin.net>: - fix typo in libads/ldap_printer.c:39, ads_find_printer_on_server() (originally libads-typo.patch) - fix leak in printing/nt_printing.c, is_printer_published() (originally is_printer_published-leak.patch) - fix double print_backend_init() calls, now only called from main() - restructuring in printing/nt_printing.c - replaced (un)publish_it() with ads-specific functions - moved common code to nt_printer_publish() - improved error handling in several places - added check_published_printers() in printing/nt_printing.c, to verify that each published printer is actually in the directory at startup - changed calling semantics of mod_a_printer, dump_a_printer, and update_driver_init to be more consistent with the rest of the api and reduce some copying (This used to be commit 50a5a3dbd02acb0d09133b6e42cc37d091ea901d)
2004-09-23 23:24:02 +04:00
static WERROR nt_printer_publish_ads(ADS_STRUCT *ads,
NT_PRINTER_INFO_LEVEL *printer)
Store printer guid in the dsspooler registry key so we don't have to query the directory server every time someone asks (This used to be commit dd81003bddc17522041e1cd2f0484e1760493e4a)
2002-12-14 00:56:34 +03:00
{
ADS_STATUS ads_rc;
r18019: Fix a C++ warnings: Don't use void * in libads/ for LDAPMessage anymore. Compiled it on systems with and without LDAP, I hope it does not break the build farm too badly. If it does, I'll fix it tomorrow. Volker (This used to be commit b2ff9680ebe0979fbeef7f2dabc2e3f27c959d11)
2006-09-04 01:07:16 +04:00
LDAPMessage *res;
r21606: Implement escaping function for ldap RDN values Fix escaping of DN components and filters around the code Add some notes to commandline help messages about how to pass DNs revert jra's "concistency" commit to nsswitch/winbindd_ads.c, as it was incorrect. The 2 functions use DNs in different ways. - lookup_usergroups_member() uses the DN in a search filter, and must use the filter escaping function to escape it Escaping filters that include escaped DNs ("\," becomes "\5c,") is the correct way to do it (tested against W2k3). - lookup_usergroups_memberof() instead uses the DN ultimately as a base dn. Both functions do NOT need any DN escaping function as DNs can't be reliably escaped when in a string form, intead each single RDN value must be escaped separately. DNs coming from other ldap calls (like ads_get_dn()), do not need escaping as they come already escaped on the wire and passed as is by the ldap libraries DN filtering has been tested. For example now it is possible to do something like: 'net ads add user joe#5' as now the '#' character is correctly escaped when building the DN, previously such a call failed with Invalid DN Syntax. Simo. (This used to be commit 5b4838f62ab1a92bfe02626ef40d7f94c2598322)
2007-03-01 03:49:28 +03:00
char *prt_dn = NULL, *srv_dn, *srv_cn_0, *srv_cn_escaped, *sharename_escaped;
Fix a nasty mess, and also bug #296. passdb/pdb_ldap.c was not converting to/from utf8 for some calls. The libads code gets this right. Wonder why the passdb code doesn't use it ? Jeremy. (This used to be commit 910d21d3164c2c64773031fddaad35ea88e72a04)
2003-09-11 02:33:06 +04:00
char *srv_dn_utf8, **srv_cn_utf8;
r2569: Patch from Rob Foehl <rwf@loonybin.net>: - fix typo in libads/ldap_printer.c:39, ads_find_printer_on_server() (originally libads-typo.patch) - fix leak in printing/nt_printing.c, is_printer_published() (originally is_printer_published-leak.patch) - fix double print_backend_init() calls, now only called from main() - restructuring in printing/nt_printing.c - replaced (un)publish_it() with ads-specific functions - moved common code to nt_printer_publish() - improved error handling in several places - added check_published_printers() in printing/nt_printing.c, to verify that each published printer is actually in the directory at startup - changed calling semantics of mod_a_printer, dump_a_printer, and update_driver_init to be more consistent with the rest of the api and reduce some copying (This used to be commit 50a5a3dbd02acb0d09133b6e42cc37d091ea901d)
2004-09-23 23:24:02 +04:00
TALLOC_CTX *ctx;
ADS_MODLIST mods;
Store printer guid in the dsspooler registry key so we don't have to query the directory server every time someone asks (This used to be commit dd81003bddc17522041e1cd2f0484e1760493e4a)
2002-12-14 00:56:34 +03:00
const char *attrs[] = {"objectGUID", NULL};
r18654: Rename "struct uuid" => "struct GUID" for consistency. (This used to be commit 5de76767e857e9d159ea46e2ded612ccd6d6bf19)
2006-09-19 04:12:11 +04:00
struct GUID guid;
Store printer guid in the dsspooler registry key so we don't have to query the directory server every time someone asks (This used to be commit dd81003bddc17522041e1cd2f0484e1760493e4a)
2002-12-14 00:56:34 +03:00
WERROR win_rc = WERR_OK;
Cleanup size_t return values in callers of convert_string_allocate This patch is the second iteration of an inside-out conversion to cleanup functions in charcnv.c returning size_t == -1 to indicate failure. (This used to be commit 6b189dabc562d86dcaa685419d0cb6ea276f100d)
2008-04-30 01:36:24 +04:00
size_t converted_size;
s3:printing Convert nt_printer_publish_ads() to use talloc better In particular, this removes one more user of pull_utf8_allocate() Andrew Bartlett Signed-off-by: Günther Deschner <gd@samba.org>
2009-03-18 08:31:51 +03:00
/* build the ads mods */
ctx = talloc_init("nt_printer_publish_ads");
if (ctx == NULL) {
return WERR_NOMEM;
}
Store printer guid in the dsspooler registry key so we don't have to query the directory server every time someone asks (This used to be commit dd81003bddc17522041e1cd2f0484e1760493e4a)
2002-12-14 00:56:34 +03:00
r2569: Patch from Rob Foehl <rwf@loonybin.net>: - fix typo in libads/ldap_printer.c:39, ads_find_printer_on_server() (originally libads-typo.patch) - fix leak in printing/nt_printing.c, is_printer_published() (originally is_printer_published-leak.patch) - fix double print_backend_init() calls, now only called from main() - restructuring in printing/nt_printing.c - replaced (un)publish_it() with ads-specific functions - moved common code to nt_printer_publish() - improved error handling in several places - added check_published_printers() in printing/nt_printing.c, to verify that each published printer is actually in the directory at startup - changed calling semantics of mod_a_printer, dump_a_printer, and update_driver_init to be more consistent with the rest of the api and reduce some copying (This used to be commit 50a5a3dbd02acb0d09133b6e42cc37d091ea901d)
2004-09-23 23:24:02 +04:00
DEBUG(5, ("publishing printer %s\n", printer->info_2->printername));
Store printer guid in the dsspooler registry key so we don't have to query the directory server every time someone asks (This used to be commit dd81003bddc17522041e1cd2f0484e1760493e4a)
2002-12-14 00:56:34 +03:00
/* figure out where to publish */
ads_find_machine_acct(ads, &res, global_myname());
Fix a nasty mess, and also bug #296. passdb/pdb_ldap.c was not converting to/from utf8 for some calls. The libads code gets this right. Wonder why the passdb code doesn't use it ? Jeremy. (This used to be commit 910d21d3164c2c64773031fddaad35ea88e72a04)
2003-09-11 02:33:06 +04:00
/* We use ldap_get_dn here as we need the answer
* in utf8 to call ldap_explode_dn(). JRA. */
r23888: move elements belonging to the current ldap connection to a substructure. metze (This used to be commit 00909194a6c1ed193dfdb296f50f58a53450583c)
2007-07-16 15:08:00 +04:00
srv_dn_utf8 = ldap_get_dn((LDAP *)ads->ldap.ld, (LDAPMessage *)res);
Fix a nasty mess, and also bug #296. passdb/pdb_ldap.c was not converting to/from utf8 for some calls. The libads code gets this right. Wonder why the passdb code doesn't use it ? Jeremy. (This used to be commit 910d21d3164c2c64773031fddaad35ea88e72a04)
2003-09-11 02:33:06 +04:00
if (!srv_dn_utf8) {
s3:printing Convert nt_printer_publish_ads() to use talloc better In particular, this removes one more user of pull_utf8_allocate() Andrew Bartlett Signed-off-by: Günther Deschner <gd@samba.org>
2009-03-18 08:31:51 +03:00
TALLOC_FREE(ctx);
Fix a nasty mess, and also bug #296. passdb/pdb_ldap.c was not converting to/from utf8 for some calls. The libads code gets this right. Wonder why the passdb code doesn't use it ? Jeremy. (This used to be commit 910d21d3164c2c64773031fddaad35ea88e72a04)
2003-09-11 02:33:06 +04:00
return WERR_SERVER_UNAVAILABLE;
}
Store printer guid in the dsspooler registry key so we don't have to query the directory server every time someone asks (This used to be commit dd81003bddc17522041e1cd2f0484e1760493e4a)
2002-12-14 00:56:34 +03:00
ads_msgfree(ads, res);
Fix a nasty mess, and also bug #296. passdb/pdb_ldap.c was not converting to/from utf8 for some calls. The libads code gets this right. Wonder why the passdb code doesn't use it ? Jeremy. (This used to be commit 910d21d3164c2c64773031fddaad35ea88e72a04)
2003-09-11 02:33:06 +04:00
srv_cn_utf8 = ldap_explode_dn(srv_dn_utf8, 1);
if (!srv_cn_utf8) {
s3:printing Convert nt_printer_publish_ads() to use talloc better In particular, this removes one more user of pull_utf8_allocate() Andrew Bartlett Signed-off-by: Günther Deschner <gd@samba.org>
2009-03-18 08:31:51 +03:00
TALLOC_FREE(ctx);
Fix a nasty mess, and also bug #296. passdb/pdb_ldap.c was not converting to/from utf8 for some calls. The libads code gets this right. Wonder why the passdb code doesn't use it ? Jeremy. (This used to be commit 910d21d3164c2c64773031fddaad35ea88e72a04)
2003-09-11 02:33:06 +04:00
ldap_memfree(srv_dn_utf8);
return WERR_SERVER_UNAVAILABLE;
}
/* Now convert to CH_UNIX. */
s3:printing Convert nt_printer_publish_ads() to use talloc better In particular, this removes one more user of pull_utf8_allocate() Andrew Bartlett Signed-off-by: Günther Deschner <gd@samba.org>
2009-03-18 08:31:51 +03:00
if (!pull_utf8_talloc(ctx, &srv_dn, srv_dn_utf8, &converted_size)) {
TALLOC_FREE(ctx);
Fix a nasty mess, and also bug #296. passdb/pdb_ldap.c was not converting to/from utf8 for some calls. The libads code gets this right. Wonder why the passdb code doesn't use it ? Jeremy. (This used to be commit 910d21d3164c2c64773031fddaad35ea88e72a04)
2003-09-11 02:33:06 +04:00
ldap_memfree(srv_dn_utf8);
ldap_memfree(srv_cn_utf8);
return WERR_SERVER_UNAVAILABLE;
}
s3:printing Convert nt_printer_publish_ads() to use talloc better In particular, this removes one more user of pull_utf8_allocate() Andrew Bartlett Signed-off-by: Günther Deschner <gd@samba.org>
2009-03-18 08:31:51 +03:00
if (!pull_utf8_talloc(ctx, &srv_cn_0, srv_cn_utf8[0], &converted_size)) {
TALLOC_FREE(ctx);
Fix a nasty mess, and also bug #296. passdb/pdb_ldap.c was not converting to/from utf8 for some calls. The libads code gets this right. Wonder why the passdb code doesn't use it ? Jeremy. (This used to be commit 910d21d3164c2c64773031fddaad35ea88e72a04)
2003-09-11 02:33:06 +04:00
ldap_memfree(srv_dn_utf8);
ldap_memfree(srv_cn_utf8);
s3:printing Convert nt_printer_publish_ads() to use talloc better In particular, this removes one more user of pull_utf8_allocate() Andrew Bartlett Signed-off-by: Günther Deschner <gd@samba.org>
2009-03-18 08:31:51 +03:00
TALLOC_FREE(srv_dn);
Fix a nasty mess, and also bug #296. passdb/pdb_ldap.c was not converting to/from utf8 for some calls. The libads code gets this right. Wonder why the passdb code doesn't use it ? Jeremy. (This used to be commit 910d21d3164c2c64773031fddaad35ea88e72a04)
2003-09-11 02:33:06 +04:00
return WERR_SERVER_UNAVAILABLE;
}
ldap_memfree(srv_dn_utf8);
ldap_memfree(srv_cn_utf8);
r21606: Implement escaping function for ldap RDN values Fix escaping of DN components and filters around the code Add some notes to commandline help messages about how to pass DNs revert jra's "concistency" commit to nsswitch/winbindd_ads.c, as it was incorrect. The 2 functions use DNs in different ways. - lookup_usergroups_member() uses the DN in a search filter, and must use the filter escaping function to escape it Escaping filters that include escaped DNs ("\," becomes "\5c,") is the correct way to do it (tested against W2k3). - lookup_usergroups_memberof() instead uses the DN ultimately as a base dn. Both functions do NOT need any DN escaping function as DNs can't be reliably escaped when in a string form, intead each single RDN value must be escaped separately. DNs coming from other ldap calls (like ads_get_dn()), do not need escaping as they come already escaped on the wire and passed as is by the ldap libraries DN filtering has been tested. For example now it is possible to do something like: 'net ads add user joe#5' as now the '#' character is correctly escaped when building the DN, previously such a call failed with Invalid DN Syntax. Simo. (This used to be commit 5b4838f62ab1a92bfe02626ef40d7f94c2598322)
2007-03-01 03:49:28 +03:00
srv_cn_escaped = escape_rdn_val_string_alloc(srv_cn_0);
if (!srv_cn_escaped) {
s3:printing Convert nt_printer_publish_ads() to use talloc better In particular, this removes one more user of pull_utf8_allocate() Andrew Bartlett Signed-off-by: Günther Deschner <gd@samba.org>
2009-03-18 08:31:51 +03:00
TALLOC_FREE(ctx);
r21606: Implement escaping function for ldap RDN values Fix escaping of DN components and filters around the code Add some notes to commandline help messages about how to pass DNs revert jra's "concistency" commit to nsswitch/winbindd_ads.c, as it was incorrect. The 2 functions use DNs in different ways. - lookup_usergroups_member() uses the DN in a search filter, and must use the filter escaping function to escape it Escaping filters that include escaped DNs ("\," becomes "\5c,") is the correct way to do it (tested against W2k3). - lookup_usergroups_memberof() instead uses the DN ultimately as a base dn. Both functions do NOT need any DN escaping function as DNs can't be reliably escaped when in a string form, intead each single RDN value must be escaped separately. DNs coming from other ldap calls (like ads_get_dn()), do not need escaping as they come already escaped on the wire and passed as is by the ldap libraries DN filtering has been tested. For example now it is possible to do something like: 'net ads add user joe#5' as now the '#' character is correctly escaped when building the DN, previously such a call failed with Invalid DN Syntax. Simo. (This used to be commit 5b4838f62ab1a92bfe02626ef40d7f94c2598322)
2007-03-01 03:49:28 +03:00
return WERR_SERVER_UNAVAILABLE;
}
sharename_escaped = escape_rdn_val_string_alloc(printer->info_2->sharename);
if (!sharename_escaped) {
SAFE_FREE(srv_cn_escaped);
s3:printing Convert nt_printer_publish_ads() to use talloc better In particular, this removes one more user of pull_utf8_allocate() Andrew Bartlett Signed-off-by: Günther Deschner <gd@samba.org>
2009-03-18 08:31:51 +03:00
TALLOC_FREE(ctx);
r21606: Implement escaping function for ldap RDN values Fix escaping of DN components and filters around the code Add some notes to commandline help messages about how to pass DNs revert jra's "concistency" commit to nsswitch/winbindd_ads.c, as it was incorrect. The 2 functions use DNs in different ways. - lookup_usergroups_member() uses the DN in a search filter, and must use the filter escaping function to escape it Escaping filters that include escaped DNs ("\," becomes "\5c,") is the correct way to do it (tested against W2k3). - lookup_usergroups_memberof() instead uses the DN ultimately as a base dn. Both functions do NOT need any DN escaping function as DNs can't be reliably escaped when in a string form, intead each single RDN value must be escaped separately. DNs coming from other ldap calls (like ads_get_dn()), do not need escaping as they come already escaped on the wire and passed as is by the ldap libraries DN filtering has been tested. For example now it is possible to do something like: 'net ads add user joe#5' as now the '#' character is correctly escaped when building the DN, previously such a call failed with Invalid DN Syntax. Simo. (This used to be commit 5b4838f62ab1a92bfe02626ef40d7f94c2598322)
2007-03-01 03:49:28 +03:00
return WERR_SERVER_UNAVAILABLE;
}
s3:printing Convert nt_printer_publish_ads() to use talloc better In particular, this removes one more user of pull_utf8_allocate() Andrew Bartlett Signed-off-by: Günther Deschner <gd@samba.org>
2009-03-18 08:31:51 +03:00
prt_dn = talloc_asprintf(ctx, "cn=%s-%s,%s", srv_cn_escaped, sharename_escaped, srv_dn);
Fix a nasty mess, and also bug #296. passdb/pdb_ldap.c was not converting to/from utf8 for some calls. The libads code gets this right. Wonder why the passdb code doesn't use it ? Jeremy. (This used to be commit 910d21d3164c2c64773031fddaad35ea88e72a04)
2003-09-11 02:33:06 +04:00
r21606: Implement escaping function for ldap RDN values Fix escaping of DN components and filters around the code Add some notes to commandline help messages about how to pass DNs revert jra's "concistency" commit to nsswitch/winbindd_ads.c, as it was incorrect. The 2 functions use DNs in different ways. - lookup_usergroups_member() uses the DN in a search filter, and must use the filter escaping function to escape it Escaping filters that include escaped DNs ("\," becomes "\5c,") is the correct way to do it (tested against W2k3). - lookup_usergroups_memberof() instead uses the DN ultimately as a base dn. Both functions do NOT need any DN escaping function as DNs can't be reliably escaped when in a string form, intead each single RDN value must be escaped separately. DNs coming from other ldap calls (like ads_get_dn()), do not need escaping as they come already escaped on the wire and passed as is by the ldap libraries DN filtering has been tested. For example now it is possible to do something like: 'net ads add user joe#5' as now the '#' character is correctly escaped when building the DN, previously such a call failed with Invalid DN Syntax. Simo. (This used to be commit 5b4838f62ab1a92bfe02626ef40d7f94c2598322)
2007-03-01 03:49:28 +03:00
SAFE_FREE(srv_cn_escaped);
SAFE_FREE(sharename_escaped);
Store printer guid in the dsspooler registry key so we don't have to query the directory server every time someone asks (This used to be commit dd81003bddc17522041e1cd2f0484e1760493e4a)
2002-12-14 00:56:34 +03:00
r2569: Patch from Rob Foehl <rwf@loonybin.net>: - fix typo in libads/ldap_printer.c:39, ads_find_printer_on_server() (originally libads-typo.patch) - fix leak in printing/nt_printing.c, is_printer_published() (originally is_printer_published-leak.patch) - fix double print_backend_init() calls, now only called from main() - restructuring in printing/nt_printing.c - replaced (un)publish_it() with ads-specific functions - moved common code to nt_printer_publish() - improved error handling in several places - added check_published_printers() in printing/nt_printing.c, to verify that each published printer is actually in the directory at startup - changed calling semantics of mod_a_printer, dump_a_printer, and update_driver_init to be more consistent with the rest of the api and reduce some copying (This used to be commit 50a5a3dbd02acb0d09133b6e42cc37d091ea901d)
2004-09-23 23:24:02 +04:00
mods = ads_init_mods(ctx);
r15569: Fix Coverity bug # 287. Jerry, can you check if WERR_NOMEM is a correct error code here? Thanks, Volker (This used to be commit 5787bd0ee90b081ae12a4a976893cb297fa7bed4)
2006-05-13 21:17:07 +04:00
if (mods == NULL) {
SAFE_FREE(prt_dn);
s3:printing Convert nt_printer_publish_ads() to use talloc better In particular, this removes one more user of pull_utf8_allocate() Andrew Bartlett Signed-off-by: Günther Deschner <gd@samba.org>
2009-03-18 08:31:51 +03:00
TALLOC_FREE(ctx);
r15569: Fix Coverity bug # 287. Jerry, can you check if WERR_NOMEM is a correct error code here? Thanks, Volker (This used to be commit 5787bd0ee90b081ae12a4a976893cb297fa7bed4)
2006-05-13 21:17:07 +04:00
return WERR_NOMEM;
}
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
get_local_printer_publishing_data(ctx, &mods, printer->info_2->data);
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
ads_mod_str(ctx, &mods, SPOOL_REG_PRINTERNAME,
r2569: Patch from Rob Foehl <rwf@loonybin.net>: - fix typo in libads/ldap_printer.c:39, ads_find_printer_on_server() (originally libads-typo.patch) - fix leak in printing/nt_printing.c, is_printer_published() (originally is_printer_published-leak.patch) - fix double print_backend_init() calls, now only called from main() - restructuring in printing/nt_printing.c - replaced (un)publish_it() with ads-specific functions - moved common code to nt_printer_publish() - improved error handling in several places - added check_published_printers() in printing/nt_printing.c, to verify that each published printer is actually in the directory at startup - changed calling semantics of mod_a_printer, dump_a_printer, and update_driver_init to be more consistent with the rest of the api and reduce some copying (This used to be commit 50a5a3dbd02acb0d09133b6e42cc37d091ea901d)
2004-09-23 23:24:02 +04:00
printer->info_2->sharename);
Store printer guid in the dsspooler registry key so we don't have to query the directory server every time someone asks (This used to be commit dd81003bddc17522041e1cd2f0484e1760493e4a)
2002-12-14 00:56:34 +03:00
/* publish it */
r3727: Update from Rob Foehl (rwf@loonybin.net): Try modifying printer before adding it,since add logic appends ObjectClass to mods, which caused a contraint violation when modifying an already published printer. Also cleanup the check_published_printers() logic when verifying published status on startup. (This used to be commit 82eb168c827b4b7310b42c0f36c504e0fa16dc99)
2004-11-14 06:12:46 +03:00
ads_rc = ads_mod_printer_entry(ads, prt_dn, ctx, &mods);
Fix a crash bug in nt_printer_publish_ads Reported by Martin Zielinski <mz@seh.de> (This used to be commit 4db26c803de52d3efccc940efc55f14131a057f5)
2008-01-16 13:39:20 +03:00
if (ads_rc.err.rc == LDAP_NO_SUCH_OBJECT) {
int i;
for (i=0; mods[i] != 0; i++)
;
mods[i] = (LDAPMod *)-1;
r3727: Update from Rob Foehl (rwf@loonybin.net): Try modifying printer before adding it,since add logic appends ObjectClass to mods, which caused a contraint violation when modifying an already published printer. Also cleanup the check_published_printers() logic when verifying published status on startup. (This used to be commit 82eb168c827b4b7310b42c0f36c504e0fa16dc99)
2004-11-14 06:12:46 +03:00
ads_rc = ads_add_printer_entry(ads, prt_dn, ctx, &mods);
Fix a crash bug in nt_printer_publish_ads Reported by Martin Zielinski <mz@seh.de> (This used to be commit 4db26c803de52d3efccc940efc55f14131a057f5)
2008-01-16 13:39:20 +03:00
}
r3727: Update from Rob Foehl (rwf@loonybin.net): Try modifying printer before adding it,since add logic appends ObjectClass to mods, which caused a contraint violation when modifying an already published printer. Also cleanup the check_published_printers() logic when verifying published status on startup. (This used to be commit 82eb168c827b4b7310b42c0f36c504e0fa16dc99)
2004-11-14 06:12:46 +03:00
if (!ADS_ERR_OK(ads_rc))
DEBUG(3, ("error publishing %s: %s\n", printer->info_2->sharename, ads_errstr(ads_rc)));
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Store printer guid in the dsspooler registry key so we don't have to query the directory server every time someone asks (This used to be commit dd81003bddc17522041e1cd2f0484e1760493e4a)
2002-12-14 00:56:34 +03:00
/* retreive the guid and store it locally */
if (ADS_ERR_OK(ads_search_dn(ads, &res, prt_dn, attrs))) {
r2569: Patch from Rob Foehl <rwf@loonybin.net>: - fix typo in libads/ldap_printer.c:39, ads_find_printer_on_server() (originally libads-typo.patch) - fix leak in printing/nt_printing.c, is_printer_published() (originally is_printer_published-leak.patch) - fix double print_backend_init() calls, now only called from main() - restructuring in printing/nt_printing.c - replaced (un)publish_it() with ads-specific functions - moved common code to nt_printer_publish() - improved error handling in several places - added check_published_printers() in printing/nt_printing.c, to verify that each published printer is actually in the directory at startup - changed calling semantics of mod_a_printer, dump_a_printer, and update_driver_init to be more consistent with the rest of the api and reduce some copying (This used to be commit 50a5a3dbd02acb0d09133b6e42cc37d091ea901d)
2004-09-23 23:24:02 +04:00
ZERO_STRUCT(guid);
Store printer guid in the dsspooler registry key so we don't have to query the directory server every time someone asks (This used to be commit dd81003bddc17522041e1cd2f0484e1760493e4a)
2002-12-14 00:56:34 +03:00
ads_pull_guid(ads, res, &guid);
ads_msgfree(ads, res);
store_printer_guid(printer->info_2, guid);
r2569: Patch from Rob Foehl <rwf@loonybin.net>: - fix typo in libads/ldap_printer.c:39, ads_find_printer_on_server() (originally libads-typo.patch) - fix leak in printing/nt_printing.c, is_printer_published() (originally is_printer_published-leak.patch) - fix double print_backend_init() calls, now only called from main() - restructuring in printing/nt_printing.c - replaced (un)publish_it() with ads-specific functions - moved common code to nt_printer_publish() - improved error handling in several places - added check_published_printers() in printing/nt_printing.c, to verify that each published printer is actually in the directory at startup - changed calling semantics of mod_a_printer, dump_a_printer, and update_driver_init to be more consistent with the rest of the api and reduce some copying (This used to be commit 50a5a3dbd02acb0d09133b6e42cc37d091ea901d)
2004-09-23 23:24:02 +04:00
win_rc = mod_a_printer(printer, 2);
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
}
s3:printing Convert nt_printer_publish_ads() to use talloc better In particular, this removes one more user of pull_utf8_allocate() Andrew Bartlett Signed-off-by: Günther Deschner <gd@samba.org>
2009-03-18 08:31:51 +03:00
TALLOC_FREE(ctx);
Store printer guid in the dsspooler registry key so we don't have to query the directory server every time someone asks (This used to be commit dd81003bddc17522041e1cd2f0484e1760493e4a)
2002-12-14 00:56:34 +03:00
r2569: Patch from Rob Foehl <rwf@loonybin.net>: - fix typo in libads/ldap_printer.c:39, ads_find_printer_on_server() (originally libads-typo.patch) - fix leak in printing/nt_printing.c, is_printer_published() (originally is_printer_published-leak.patch) - fix double print_backend_init() calls, now only called from main() - restructuring in printing/nt_printing.c - replaced (un)publish_it() with ads-specific functions - moved common code to nt_printer_publish() - improved error handling in several places - added check_published_printers() in printing/nt_printing.c, to verify that each published printer is actually in the directory at startup - changed calling semantics of mod_a_printer, dump_a_printer, and update_driver_init to be more consistent with the rest of the api and reduce some copying (This used to be commit 50a5a3dbd02acb0d09133b6e42cc37d091ea901d)
2004-09-23 23:24:02 +04:00
return win_rc;
Store printer guid in the dsspooler registry key so we don't have to query the directory server every time someone asks (This used to be commit dd81003bddc17522041e1cd2f0484e1760493e4a)
2002-12-14 00:56:34 +03:00
}
r2569: Patch from Rob Foehl <rwf@loonybin.net>: - fix typo in libads/ldap_printer.c:39, ads_find_printer_on_server() (originally libads-typo.patch) - fix leak in printing/nt_printing.c, is_printer_published() (originally is_printer_published-leak.patch) - fix double print_backend_init() calls, now only called from main() - restructuring in printing/nt_printing.c - replaced (un)publish_it() with ads-specific functions - moved common code to nt_printer_publish() - improved error handling in several places - added check_published_printers() in printing/nt_printing.c, to verify that each published printer is actually in the directory at startup - changed calling semantics of mod_a_printer, dump_a_printer, and update_driver_init to be more consistent with the rest of the api and reduce some copying (This used to be commit 50a5a3dbd02acb0d09133b6e42cc37d091ea901d)
2004-09-23 23:24:02 +04:00
static WERROR nt_printer_unpublish_ads(ADS_STRUCT *ads,
NT_PRINTER_INFO_LEVEL *printer)
Store printer guid in the dsspooler registry key so we don't have to query the directory server every time someone asks (This used to be commit dd81003bddc17522041e1cd2f0484e1760493e4a)
2002-12-14 00:56:34 +03:00
{
ADS_STATUS ads_rc;
Fix more asprintf errors and error code paths. Jeremy.
2008-12-23 22:27:19 +03:00
LDAPMessage *res = NULL;
Store printer guid in the dsspooler registry key so we don't have to query the directory server every time someone asks (This used to be commit dd81003bddc17522041e1cd2f0484e1760493e4a)
2002-12-14 00:56:34 +03:00
char *prt_dn = NULL;
r2569: Patch from Rob Foehl <rwf@loonybin.net>: - fix typo in libads/ldap_printer.c:39, ads_find_printer_on_server() (originally libads-typo.patch) - fix leak in printing/nt_printing.c, is_printer_published() (originally is_printer_published-leak.patch) - fix double print_backend_init() calls, now only called from main() - restructuring in printing/nt_printing.c - replaced (un)publish_it() with ads-specific functions - moved common code to nt_printer_publish() - improved error handling in several places - added check_published_printers() in printing/nt_printing.c, to verify that each published printer is actually in the directory at startup - changed calling semantics of mod_a_printer, dump_a_printer, and update_driver_init to be more consistent with the rest of the api and reduce some copying (This used to be commit 50a5a3dbd02acb0d09133b6e42cc37d091ea901d)
2004-09-23 23:24:02 +04:00
DEBUG(5, ("unpublishing printer %s\n", printer->info_2->printername));
large change: *) consolidates the dc location routines again (dns and netbios) get_dc_list() or get_sorted_dc_list() is the authoritative means of locating DC's again. (also inludes a flag to get_dc_list() to define if this should be a DNS only lookup or not) (however, if you set "name resolve order = hosts wins" you could still get DNS queries for domain name IFF ldap_domain2hostlist() fails. The answer? Fix your DNS setup) *) enabled DOMAIN<0x1c> lookups to be funneled through resolve_hosts resulting in a call to ldap_domain2hostlist() if lp_security() == SEC_ADS *) enables name cache for winbind ADS backend *) enable the negative connection cache for winbind ADS backend *) removes some old dead code *) consolidates some duplicate code *) moves the internal_name_resolve() to use an IP/port pair to deal with SRV RR dns replies. The namecache code also supports the IP:port syntax now as well. *) removes 'ads server' and moves the functionality back into 'password server' (which can support "hostname:port" syntax now but works fine with defaults depending on the value of lp_security()) (This used to be commit d7f7fcda425bef380441509734eca33da943c091)
2003-06-25 21:41:05 +04:00
Store printer guid in the dsspooler registry key so we don't have to query the directory server every time someone asks (This used to be commit dd81003bddc17522041e1cd2f0484e1760493e4a)
2002-12-14 00:56:34 +03:00
/* remove the printer from the directory */
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
ads_rc = ads_find_printer_on_server(ads, &res,
Store printer guid in the dsspooler registry key so we don't have to query the directory server every time someone asks (This used to be commit dd81003bddc17522041e1cd2f0484e1760493e4a)
2002-12-14 00:56:34 +03:00
printer->info_2->sharename, global_myname());
r2569: Patch from Rob Foehl <rwf@loonybin.net>: - fix typo in libads/ldap_printer.c:39, ads_find_printer_on_server() (originally libads-typo.patch) - fix leak in printing/nt_printing.c, is_printer_published() (originally is_printer_published-leak.patch) - fix double print_backend_init() calls, now only called from main() - restructuring in printing/nt_printing.c - replaced (un)publish_it() with ads-specific functions - moved common code to nt_printer_publish() - improved error handling in several places - added check_published_printers() in printing/nt_printing.c, to verify that each published printer is actually in the directory at startup - changed calling semantics of mod_a_printer, dump_a_printer, and update_driver_init to be more consistent with the rest of the api and reduce some copying (This used to be commit 50a5a3dbd02acb0d09133b6e42cc37d091ea901d)
2004-09-23 23:24:02 +04:00
Fix more asprintf errors and error code paths. Jeremy.
2008-12-23 22:27:19 +03:00
if (ADS_ERR_OK(ads_rc) && res && ads_count_replies(ads, res)) {
s3-libads: avoid NULL talloc context with ads_get_dn(). Guenther
2009-04-07 02:40:46 +04:00
prt_dn = ads_get_dn(ads, talloc_tos(), res);
r16367: Missed one, Klocwork #915. Jeremy. (This used to be commit b581fee9824712b9385e9975739a8ddbb297bca8)
2006-06-20 01:42:07 +04:00
if (!prt_dn) {
ads_msgfree(ads, res);
return WERR_NOMEM;
}
Store printer guid in the dsspooler registry key so we don't have to query the directory server every time someone asks (This used to be commit dd81003bddc17522041e1cd2f0484e1760493e4a)
2002-12-14 00:56:34 +03:00
ads_rc = ads_del_dn(ads, prt_dn);
s3:libads Make ads_get_dn() take a talloc context Also remove ads_memfree(), which was only ever a wrapper around SAFE_FREE, used only to free the DN from ads_get_ds(). This actually makes libgpo more consistant, as it mixed a talloc and a malloc based string on the same element. Andrew Bartlett Signed-off-by: Günther Deschner <gd@samba.org>
2009-03-18 09:35:03 +03:00
TALLOC_FREE(prt_dn);
Store printer guid in the dsspooler registry key so we don't have to query the directory server every time someone asks (This used to be commit dd81003bddc17522041e1cd2f0484e1760493e4a)
2002-12-14 00:56:34 +03:00
}
Fix more asprintf errors and error code paths. Jeremy.
2008-12-23 22:27:19 +03:00
if (res) {
ads_msgfree(ads, res);
}
Store printer guid in the dsspooler registry key so we don't have to query the directory server every time someone asks (This used to be commit dd81003bddc17522041e1cd2f0484e1760493e4a)
2002-12-14 00:56:34 +03:00
return WERR_OK;
}
Automatic printer publishing when using APW or choosing 'list in the directory' in printer settings. Currently very little is published, and you cannot unpublish because of a bug in win2k clients. (This used to be commit ca6360e8db30fc9be3fe3718c8b49c92dba5ecac)
2002-12-04 20:40:50 +03:00
/****************************************************************************
* Publish a printer in the directory
*
* @param snum describing printer service
* @return WERROR indicating status of publishing
***************************************************************************/
Progress on CR 601 cache the printer_info_2 with the open printer handle. cache is invalidated on a mod_a_printer() call **on that smbd**. Yes, this means that the window for admins to step on each other from different clients just got larger, but since handles a generally short lived this is probably ok. (This used to be commit 31272d3b6bb9ec62fd666301c7adfa0c1720a99b)
2003-02-25 23:53:53 +03:00
WERROR nt_printer_publish(Printer_entry *print_hnd, int snum, int action)
Automatic printer publishing when using APW or choosing 'list in the directory' in printer settings. Currently very little is published, and you cannot unpublish because of a bug in win2k clients. (This used to be commit ca6360e8db30fc9be3fe3718c8b49c92dba5ecac)
2002-12-04 20:40:50 +03:00
{
r2569: Patch from Rob Foehl <rwf@loonybin.net>: - fix typo in libads/ldap_printer.c:39, ads_find_printer_on_server() (originally libads-typo.patch) - fix leak in printing/nt_printing.c, is_printer_published() (originally is_printer_published-leak.patch) - fix double print_backend_init() calls, now only called from main() - restructuring in printing/nt_printing.c - replaced (un)publish_it() with ads-specific functions - moved common code to nt_printer_publish() - improved error handling in several places - added check_published_printers() in printing/nt_printing.c, to verify that each published printer is actually in the directory at startup - changed calling semantics of mod_a_printer, dump_a_printer, and update_driver_init to be more consistent with the rest of the api and reduce some copying (This used to be commit 50a5a3dbd02acb0d09133b6e42cc37d091ea901d)
2004-09-23 23:24:02 +04:00
ADS_STATUS ads_rc;
ADS_STRUCT *ads = NULL;
Automatic printer publishing when using APW or choosing 'list in the directory' in printer settings. Currently very little is published, and you cannot unpublish because of a bug in win2k clients. (This used to be commit ca6360e8db30fc9be3fe3718c8b49c92dba5ecac)
2002-12-04 20:40:50 +03:00
NT_PRINTER_INFO_LEVEL *printer = NULL;
WERROR win_rc;
Progress on CR 601 cache the printer_info_2 with the open printer handle. cache is invalidated on a mod_a_printer() call **on that smbd**. Yes, this means that the window for admins to step on each other from different clients just got larger, but since handles a generally short lived this is probably ok. (This used to be commit 31272d3b6bb9ec62fd666301c7adfa0c1720a99b)
2003-02-25 23:53:53 +03:00
win_rc = get_a_printer(print_hnd, &printer, 2, lp_servicename(snum));
Automatic printer publishing when using APW or choosing 'list in the directory' in printer settings. Currently very little is published, and you cannot unpublish because of a bug in win2k clients. (This used to be commit ca6360e8db30fc9be3fe3718c8b49c92dba5ecac)
2002-12-04 20:40:50 +03:00
if (!W_ERROR_IS_OK(win_rc))
r2569: Patch from Rob Foehl <rwf@loonybin.net>: - fix typo in libads/ldap_printer.c:39, ads_find_printer_on_server() (originally libads-typo.patch) - fix leak in printing/nt_printing.c, is_printer_published() (originally is_printer_published-leak.patch) - fix double print_backend_init() calls, now only called from main() - restructuring in printing/nt_printing.c - replaced (un)publish_it() with ads-specific functions - moved common code to nt_printer_publish() - improved error handling in several places - added check_published_printers() in printing/nt_printing.c, to verify that each published printer is actually in the directory at startup - changed calling semantics of mod_a_printer, dump_a_printer, and update_driver_init to be more consistent with the rest of the api and reduce some copying (This used to be commit 50a5a3dbd02acb0d09133b6e42cc37d091ea901d)
2004-09-23 23:24:02 +04:00
goto done;
Automatic printer publishing when using APW or choosing 'list in the directory' in printer settings. Currently very little is published, and you cannot unpublish because of a bug in win2k clients. (This used to be commit ca6360e8db30fc9be3fe3718c8b49c92dba5ecac)
2002-12-04 20:40:50 +03:00
r2569: Patch from Rob Foehl <rwf@loonybin.net>: - fix typo in libads/ldap_printer.c:39, ads_find_printer_on_server() (originally libads-typo.patch) - fix leak in printing/nt_printing.c, is_printer_published() (originally is_printer_published-leak.patch) - fix double print_backend_init() calls, now only called from main() - restructuring in printing/nt_printing.c - replaced (un)publish_it() with ads-specific functions - moved common code to nt_printer_publish() - improved error handling in several places - added check_published_printers() in printing/nt_printing.c, to verify that each published printer is actually in the directory at startup - changed calling semantics of mod_a_printer, dump_a_printer, and update_driver_init to be more consistent with the rest of the api and reduce some copying (This used to be commit 50a5a3dbd02acb0d09133b6e42cc37d091ea901d)
2004-09-23 23:24:02 +04:00
switch (action) {
s3-spoolss: use DSPRINT flags instead of SPOOLS_DS flags. Guenther
2009-02-27 01:40:58 +03:00
case DSPRINT_PUBLISH:
case DSPRINT_UPDATE:
r2569: Patch from Rob Foehl <rwf@loonybin.net>: - fix typo in libads/ldap_printer.c:39, ads_find_printer_on_server() (originally libads-typo.patch) - fix leak in printing/nt_printing.c, is_printer_published() (originally is_printer_published-leak.patch) - fix double print_backend_init() calls, now only called from main() - restructuring in printing/nt_printing.c - replaced (un)publish_it() with ads-specific functions - moved common code to nt_printer_publish() - improved error handling in several places - added check_published_printers() in printing/nt_printing.c, to verify that each published printer is actually in the directory at startup - changed calling semantics of mod_a_printer, dump_a_printer, and update_driver_init to be more consistent with the rest of the api and reduce some copying (This used to be commit 50a5a3dbd02acb0d09133b6e42cc37d091ea901d)
2004-09-23 23:24:02 +04:00
/* set the DsSpooler info and attributes */
if (!(map_nt_printer_info2_to_dsspooler(printer->info_2))) {
win_rc = WERR_NOMEM;
goto done;
}
printer->info_2->attributes |= PRINTER_ATTRIBUTE_PUBLISHED;
Store printer guid in the dsspooler registry key so we don't have to query the directory server every time someone asks (This used to be commit dd81003bddc17522041e1cd2f0484e1760493e4a)
2002-12-14 00:56:34 +03:00
break;
s3-spoolss: use DSPRINT flags instead of SPOOLS_DS flags. Guenther
2009-02-27 01:40:58 +03:00
case DSPRINT_UNPUBLISH:
r2569: Patch from Rob Foehl <rwf@loonybin.net>: - fix typo in libads/ldap_printer.c:39, ads_find_printer_on_server() (originally libads-typo.patch) - fix leak in printing/nt_printing.c, is_printer_published() (originally is_printer_published-leak.patch) - fix double print_backend_init() calls, now only called from main() - restructuring in printing/nt_printing.c - replaced (un)publish_it() with ads-specific functions - moved common code to nt_printer_publish() - improved error handling in several places - added check_published_printers() in printing/nt_printing.c, to verify that each published printer is actually in the directory at startup - changed calling semantics of mod_a_printer, dump_a_printer, and update_driver_init to be more consistent with the rest of the api and reduce some copying (This used to be commit 50a5a3dbd02acb0d09133b6e42cc37d091ea901d)
2004-09-23 23:24:02 +04:00
printer->info_2->attributes ^= PRINTER_ATTRIBUTE_PUBLISHED;
Store printer guid in the dsspooler registry key so we don't have to query the directory server every time someone asks (This used to be commit dd81003bddc17522041e1cd2f0484e1760493e4a)
2002-12-14 00:56:34 +03:00
break;
default:
win_rc = WERR_NOT_SUPPORTED;
r2569: Patch from Rob Foehl <rwf@loonybin.net>: - fix typo in libads/ldap_printer.c:39, ads_find_printer_on_server() (originally libads-typo.patch) - fix leak in printing/nt_printing.c, is_printer_published() (originally is_printer_published-leak.patch) - fix double print_backend_init() calls, now only called from main() - restructuring in printing/nt_printing.c - replaced (un)publish_it() with ads-specific functions - moved common code to nt_printer_publish() - improved error handling in several places - added check_published_printers() in printing/nt_printing.c, to verify that each published printer is actually in the directory at startup - changed calling semantics of mod_a_printer, dump_a_printer, and update_driver_init to be more consistent with the rest of the api and reduce some copying (This used to be commit 50a5a3dbd02acb0d09133b6e42cc37d091ea901d)
2004-09-23 23:24:02 +04:00
goto done;
}
win_rc = mod_a_printer(printer, 2);
if (!W_ERROR_IS_OK(win_rc)) {
DEBUG(3, ("err %d saving data\n", W_ERROR_V(win_rc)));
goto done;
}
r16701: Fix segv when adding a printer caused by not initializing the realm name in ads_init() in nt_printer_publish(). (This used to be commit a25e75e78db092b3992dfc6f7e2737023d43e2c3)
2006-06-30 02:37:32 +04:00
ads = ads_init(lp_realm(), lp_workgroup(), NULL);
r2569: Patch from Rob Foehl <rwf@loonybin.net>: - fix typo in libads/ldap_printer.c:39, ads_find_printer_on_server() (originally libads-typo.patch) - fix leak in printing/nt_printing.c, is_printer_published() (originally is_printer_published-leak.patch) - fix double print_backend_init() calls, now only called from main() - restructuring in printing/nt_printing.c - replaced (un)publish_it() with ads-specific functions - moved common code to nt_printer_publish() - improved error handling in several places - added check_published_printers() in printing/nt_printing.c, to verify that each published printer is actually in the directory at startup - changed calling semantics of mod_a_printer, dump_a_printer, and update_driver_init to be more consistent with the rest of the api and reduce some copying (This used to be commit 50a5a3dbd02acb0d09133b6e42cc37d091ea901d)
2004-09-23 23:24:02 +04:00
if (!ads) {
DEBUG(3, ("ads_init() failed\n"));
win_rc = WERR_SERVER_UNAVAILABLE;
goto done;
}
setenv(KRB5_ENV_CCNAME, "MEMORY:prtpub_cache", 1);
SAFE_FREE(ads->auth.password);
ads->auth.password = secrets_fetch_machine_password(lp_workgroup(),
NULL, NULL);
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
/* ads_connect() will find the DC for us */
r2569: Patch from Rob Foehl <rwf@loonybin.net>: - fix typo in libads/ldap_printer.c:39, ads_find_printer_on_server() (originally libads-typo.patch) - fix leak in printing/nt_printing.c, is_printer_published() (originally is_printer_published-leak.patch) - fix double print_backend_init() calls, now only called from main() - restructuring in printing/nt_printing.c - replaced (un)publish_it() with ads-specific functions - moved common code to nt_printer_publish() - improved error handling in several places - added check_published_printers() in printing/nt_printing.c, to verify that each published printer is actually in the directory at startup - changed calling semantics of mod_a_printer, dump_a_printer, and update_driver_init to be more consistent with the rest of the api and reduce some copying (This used to be commit 50a5a3dbd02acb0d09133b6e42cc37d091ea901d)
2004-09-23 23:24:02 +04:00
ads_rc = ads_connect(ads);
if (!ADS_ERR_OK(ads_rc)) {
DEBUG(3, ("ads_connect failed: %s\n", ads_errstr(ads_rc)));
win_rc = WERR_ACCESS_DENIED;
goto done;
}
switch (action) {
s3-spoolss: use DSPRINT flags instead of SPOOLS_DS flags. Guenther
2009-02-27 01:40:58 +03:00
case DSPRINT_PUBLISH:
case DSPRINT_UPDATE:
r2569: Patch from Rob Foehl <rwf@loonybin.net>: - fix typo in libads/ldap_printer.c:39, ads_find_printer_on_server() (originally libads-typo.patch) - fix leak in printing/nt_printing.c, is_printer_published() (originally is_printer_published-leak.patch) - fix double print_backend_init() calls, now only called from main() - restructuring in printing/nt_printing.c - replaced (un)publish_it() with ads-specific functions - moved common code to nt_printer_publish() - improved error handling in several places - added check_published_printers() in printing/nt_printing.c, to verify that each published printer is actually in the directory at startup - changed calling semantics of mod_a_printer, dump_a_printer, and update_driver_init to be more consistent with the rest of the api and reduce some copying (This used to be commit 50a5a3dbd02acb0d09133b6e42cc37d091ea901d)
2004-09-23 23:24:02 +04:00
win_rc = nt_printer_publish_ads(ads, printer);
break;
s3-spoolss: use DSPRINT flags instead of SPOOLS_DS flags. Guenther
2009-02-27 01:40:58 +03:00
case DSPRINT_UNPUBLISH:
r2569: Patch from Rob Foehl <rwf@loonybin.net>: - fix typo in libads/ldap_printer.c:39, ads_find_printer_on_server() (originally libads-typo.patch) - fix leak in printing/nt_printing.c, is_printer_published() (originally is_printer_published-leak.patch) - fix double print_backend_init() calls, now only called from main() - restructuring in printing/nt_printing.c - replaced (un)publish_it() with ads-specific functions - moved common code to nt_printer_publish() - improved error handling in several places - added check_published_printers() in printing/nt_printing.c, to verify that each published printer is actually in the directory at startup - changed calling semantics of mod_a_printer, dump_a_printer, and update_driver_init to be more consistent with the rest of the api and reduce some copying (This used to be commit 50a5a3dbd02acb0d09133b6e42cc37d091ea901d)
2004-09-23 23:24:02 +04:00
win_rc = nt_printer_unpublish_ads(ads, printer);
break;
Store printer guid in the dsspooler registry key so we don't have to query the directory server every time someone asks (This used to be commit dd81003bddc17522041e1cd2f0484e1760493e4a)
2002-12-14 00:56:34 +03:00
}
Automatic printer publishing when using APW or choosing 'list in the directory' in printer settings. Currently very little is published, and you cannot unpublish because of a bug in win2k clients. (This used to be commit ca6360e8db30fc9be3fe3718c8b49c92dba5ecac)
2002-12-04 20:40:50 +03:00
r2569: Patch from Rob Foehl <rwf@loonybin.net>: - fix typo in libads/ldap_printer.c:39, ads_find_printer_on_server() (originally libads-typo.patch) - fix leak in printing/nt_printing.c, is_printer_published() (originally is_printer_published-leak.patch) - fix double print_backend_init() calls, now only called from main() - restructuring in printing/nt_printing.c - replaced (un)publish_it() with ads-specific functions - moved common code to nt_printer_publish() - improved error handling in several places - added check_published_printers() in printing/nt_printing.c, to verify that each published printer is actually in the directory at startup - changed calling semantics of mod_a_printer, dump_a_printer, and update_driver_init to be more consistent with the rest of the api and reduce some copying (This used to be commit 50a5a3dbd02acb0d09133b6e42cc37d091ea901d)
2004-09-23 23:24:02 +04:00
done:
Store printer guid in the dsspooler registry key so we don't have to query the directory server every time someone asks (This used to be commit dd81003bddc17522041e1cd2f0484e1760493e4a)
2002-12-14 00:56:34 +03:00
free_a_printer(&printer, 2);
r2569: Patch from Rob Foehl <rwf@loonybin.net>: - fix typo in libads/ldap_printer.c:39, ads_find_printer_on_server() (originally libads-typo.patch) - fix leak in printing/nt_printing.c, is_printer_published() (originally is_printer_published-leak.patch) - fix double print_backend_init() calls, now only called from main() - restructuring in printing/nt_printing.c - replaced (un)publish_it() with ads-specific functions - moved common code to nt_printer_publish() - improved error handling in several places - added check_published_printers() in printing/nt_printing.c, to verify that each published printer is actually in the directory at startup - changed calling semantics of mod_a_printer, dump_a_printer, and update_driver_init to be more consistent with the rest of the api and reduce some copying (This used to be commit 50a5a3dbd02acb0d09133b6e42cc37d091ea901d)
2004-09-23 23:24:02 +04:00
ads_destroy(&ads);
Store printer guid in the dsspooler registry key so we don't have to query the directory server every time someone asks (This used to be commit dd81003bddc17522041e1cd2f0484e1760493e4a)
2002-12-14 00:56:34 +03:00
return win_rc;
}
More printer publishing code. - Add published attribute to info2, needed for win clients to work properly - Return proper info on getprinter 7 This means you can now look at the sharing tab of a printer and get correct info about whether it is published or not, and change it. (This used to be commit d57bddc9b22e809c79294c7eacbd5d0f115fe990)
2002-12-13 22:01:27 +03:00
r2569: Patch from Rob Foehl <rwf@loonybin.net>: - fix typo in libads/ldap_printer.c:39, ads_find_printer_on_server() (originally libads-typo.patch) - fix leak in printing/nt_printing.c, is_printer_published() (originally is_printer_published-leak.patch) - fix double print_backend_init() calls, now only called from main() - restructuring in printing/nt_printing.c - replaced (un)publish_it() with ads-specific functions - moved common code to nt_printer_publish() - improved error handling in several places - added check_published_printers() in printing/nt_printing.c, to verify that each published printer is actually in the directory at startup - changed calling semantics of mod_a_printer, dump_a_printer, and update_driver_init to be more consistent with the rest of the api and reduce some copying (This used to be commit 50a5a3dbd02acb0d09133b6e42cc37d091ea901d)
2004-09-23 23:24:02 +04:00
WERROR check_published_printers(void)
{
ADS_STATUS ads_rc;
ADS_STRUCT *ads = NULL;
int snum;
int n_services = lp_numservices();
NT_PRINTER_INFO_LEVEL *printer = NULL;
r15543: New implementation of 'net ads join' to be more like Windows XP. The motivating factor is to not require more privileges for the user account than Windows does when joining a domain. The points of interest are * net_ads_join() uses same rpc mechanisms as net_rpc_join() * Enable CLDAP queries for filling in the majority of the ADS_STRUCT->config information * Remove ldap_initialized() from sam/idmap_ad.c and libads/ldap.c * Remove some unnecessary fields from ADS_STRUCT * Manually set the dNSHostName and servicePrincipalName attribute using the machine account after the join Thanks to Guenther and Simo for the review. Still to do: * Fix the userAccountControl for DES only systems * Set the userPrincipalName in order to support things like 'kinit -k' (although we might be able to just use the sAMAccountName instead) * Re-add support for pre-creating the machine account in a specific OU (This used to be commit 4c4ea7b20f44cd200cef8c7b389d51b72eccc39b)
2006-05-12 19:17:35 +04:00
ads = ads_init(lp_realm(), lp_workgroup(), NULL);
r2569: Patch from Rob Foehl <rwf@loonybin.net>: - fix typo in libads/ldap_printer.c:39, ads_find_printer_on_server() (originally libads-typo.patch) - fix leak in printing/nt_printing.c, is_printer_published() (originally is_printer_published-leak.patch) - fix double print_backend_init() calls, now only called from main() - restructuring in printing/nt_printing.c - replaced (un)publish_it() with ads-specific functions - moved common code to nt_printer_publish() - improved error handling in several places - added check_published_printers() in printing/nt_printing.c, to verify that each published printer is actually in the directory at startup - changed calling semantics of mod_a_printer, dump_a_printer, and update_driver_init to be more consistent with the rest of the api and reduce some copying (This used to be commit 50a5a3dbd02acb0d09133b6e42cc37d091ea901d)
2004-09-23 23:24:02 +04:00
if (!ads) {
DEBUG(3, ("ads_init() failed\n"));
return WERR_SERVER_UNAVAILABLE;
}
setenv(KRB5_ENV_CCNAME, "MEMORY:prtpub_cache", 1);
SAFE_FREE(ads->auth.password);
ads->auth.password = secrets_fetch_machine_password(lp_workgroup(),
NULL, NULL);
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
/* ads_connect() will find the DC for us */
r2569: Patch from Rob Foehl <rwf@loonybin.net>: - fix typo in libads/ldap_printer.c:39, ads_find_printer_on_server() (originally libads-typo.patch) - fix leak in printing/nt_printing.c, is_printer_published() (originally is_printer_published-leak.patch) - fix double print_backend_init() calls, now only called from main() - restructuring in printing/nt_printing.c - replaced (un)publish_it() with ads-specific functions - moved common code to nt_printer_publish() - improved error handling in several places - added check_published_printers() in printing/nt_printing.c, to verify that each published printer is actually in the directory at startup - changed calling semantics of mod_a_printer, dump_a_printer, and update_driver_init to be more consistent with the rest of the api and reduce some copying (This used to be commit 50a5a3dbd02acb0d09133b6e42cc37d091ea901d)
2004-09-23 23:24:02 +04:00
ads_rc = ads_connect(ads);
if (!ADS_ERR_OK(ads_rc)) {
DEBUG(3, ("ads_connect failed: %s\n", ads_errstr(ads_rc)));
ads_destroy(&ads);
r22524: Fix memleak. Guenther (This used to be commit e55c52f6547157f2684d6eb7ba14de7a0234324d)
2007-04-26 16:09:25 +04:00
ads_kdestroy("MEMORY:prtpub_cache");
r2569: Patch from Rob Foehl <rwf@loonybin.net>: - fix typo in libads/ldap_printer.c:39, ads_find_printer_on_server() (originally libads-typo.patch) - fix leak in printing/nt_printing.c, is_printer_published() (originally is_printer_published-leak.patch) - fix double print_backend_init() calls, now only called from main() - restructuring in printing/nt_printing.c - replaced (un)publish_it() with ads-specific functions - moved common code to nt_printer_publish() - improved error handling in several places - added check_published_printers() in printing/nt_printing.c, to verify that each published printer is actually in the directory at startup - changed calling semantics of mod_a_printer, dump_a_printer, and update_driver_init to be more consistent with the rest of the api and reduce some copying (This used to be commit 50a5a3dbd02acb0d09133b6e42cc37d091ea901d)
2004-09-23 23:24:02 +04:00
return WERR_ACCESS_DENIED;
}
for (snum = 0; snum < n_services; snum++) {
if (!(lp_snum_ok(snum) && lp_print_ok(snum)))
continue;
r3727: Update from Rob Foehl (rwf@loonybin.net): Try modifying printer before adding it,since add logic appends ObjectClass to mods, which caused a contraint violation when modifying an already published printer. Also cleanup the check_published_printers() logic when verifying published status on startup. (This used to be commit 82eb168c827b4b7310b42c0f36c504e0fa16dc99)
2004-11-14 06:12:46 +03:00
if (W_ERROR_IS_OK(get_a_printer(NULL, &printer, 2,
lp_servicename(snum))) &&
(printer->info_2->attributes & PRINTER_ATTRIBUTE_PUBLISHED))
nt_printer_publish_ads(ads, printer);
r2569: Patch from Rob Foehl <rwf@loonybin.net>: - fix typo in libads/ldap_printer.c:39, ads_find_printer_on_server() (originally libads-typo.patch) - fix leak in printing/nt_printing.c, is_printer_published() (originally is_printer_published-leak.patch) - fix double print_backend_init() calls, now only called from main() - restructuring in printing/nt_printing.c - replaced (un)publish_it() with ads-specific functions - moved common code to nt_printer_publish() - improved error handling in several places - added check_published_printers() in printing/nt_printing.c, to verify that each published printer is actually in the directory at startup - changed calling semantics of mod_a_printer, dump_a_printer, and update_driver_init to be more consistent with the rest of the api and reduce some copying (This used to be commit 50a5a3dbd02acb0d09133b6e42cc37d091ea901d)
2004-09-23 23:24:02 +04:00
free_a_printer(&printer, 2);
}
ads_destroy(&ads);
r22524: Fix memleak. Guenther (This used to be commit e55c52f6547157f2684d6eb7ba14de7a0234324d)
2007-04-26 16:09:25 +04:00
ads_kdestroy("MEMORY:prtpub_cache");
r2569: Patch from Rob Foehl <rwf@loonybin.net>: - fix typo in libads/ldap_printer.c:39, ads_find_printer_on_server() (originally libads-typo.patch) - fix leak in printing/nt_printing.c, is_printer_published() (originally is_printer_published-leak.patch) - fix double print_backend_init() calls, now only called from main() - restructuring in printing/nt_printing.c - replaced (un)publish_it() with ads-specific functions - moved common code to nt_printer_publish() - improved error handling in several places - added check_published_printers() in printing/nt_printing.c, to verify that each published printer is actually in the directory at startup - changed calling semantics of mod_a_printer, dump_a_printer, and update_driver_init to be more consistent with the rest of the api and reduce some copying (This used to be commit 50a5a3dbd02acb0d09133b6e42cc37d091ea901d)
2004-09-23 23:24:02 +04:00
return WERR_OK;
}
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
bool is_printer_published(Printer_entry *print_hnd, int snum,
r18654: Rename "struct uuid" => "struct GUID" for consistency. (This used to be commit 5de76767e857e9d159ea46e2ded612ccd6d6bf19)
2006-09-19 04:12:11 +04:00
struct GUID *guid)
Store printer guid in the dsspooler registry key so we don't have to query the directory server every time someone asks (This used to be commit dd81003bddc17522041e1cd2f0484e1760493e4a)
2002-12-14 00:56:34 +03:00
{
NT_PRINTER_INFO_LEVEL *printer = NULL;
s3:registry: replace typedef REGVAL_CTR by struct regval_ctr. This paves the way for hiding the typedef and the implementation from the surface. Michael
2009-03-23 20:14:17 +03:00
struct regval_ctr *ctr;
s3:registry: replace typedef REGISTRY_VALUE by struct regval_blob Michael
2009-03-24 00:27:59 +03:00
struct regval_blob *guid_val;
Store printer guid in the dsspooler registry key so we don't have to query the directory server every time someone asks (This used to be commit dd81003bddc17522041e1cd2f0484e1760493e4a)
2002-12-14 00:56:34 +03:00
WERROR win_rc;
int i;
RIP BOOL. Convert BOOL -> bool. I found a few interesting bugs in various places whilst doing this (places that assumed BOOL == int). I also need to fix the Samba4 pidl generation (next checkin). Jeremy. (This used to be commit f35a266b3cbb3e5fa6a86be60f34fe340a3ca71f)
2007-10-19 04:40:25 +04:00
bool ret = False;
s3-registry: use pull_reg_sz() where appropriate. (and move away from rpcstr_pull and rpcstr_pull_talloc). Guenther
2009-09-30 22:00:52 +04:00
DATA_BLOB blob;
Automatic printer publishing when using APW or choosing 'list in the directory' in printer settings. Currently very little is published, and you cannot unpublish because of a bug in win2k clients. (This used to be commit ca6360e8db30fc9be3fe3718c8b49c92dba5ecac)
2002-12-04 20:40:50 +03:00
Progress on CR 601 cache the printer_info_2 with the open printer handle. cache is invalidated on a mod_a_printer() call **on that smbd**. Yes, this means that the window for admins to step on each other from different clients just got larger, but since handles a generally short lived this is probably ok. (This used to be commit 31272d3b6bb9ec62fd666301c7adfa0c1720a99b)
2003-02-25 23:53:53 +03:00
win_rc = get_a_printer(print_hnd, &printer, 2, lp_servicename(snum));
*lots of small merges form HEAD *sync up configure.in *don't build torture tools in make all *make sure to remove torture tools as part of make clean (This used to be commit 0fb724b3216eeeb97e61ff12755ca3a31bcad6ef)
2003-01-15 21:57:41 +03:00
r2569: Patch from Rob Foehl <rwf@loonybin.net>: - fix typo in libads/ldap_printer.c:39, ads_find_printer_on_server() (originally libads-typo.patch) - fix leak in printing/nt_printing.c, is_printer_published() (originally is_printer_published-leak.patch) - fix double print_backend_init() calls, now only called from main() - restructuring in printing/nt_printing.c - replaced (un)publish_it() with ads-specific functions - moved common code to nt_printer_publish() - improved error handling in several places - added check_published_printers() in printing/nt_printing.c, to verify that each published printer is actually in the directory at startup - changed calling semantics of mod_a_printer, dump_a_printer, and update_driver_init to be more consistent with the rest of the api and reduce some copying (This used to be commit 50a5a3dbd02acb0d09133b6e42cc37d091ea901d)
2004-09-23 23:24:02 +04:00
if (!W_ERROR_IS_OK(win_rc) ||
!(printer->info_2->attributes & PRINTER_ATTRIBUTE_PUBLISHED) ||
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
((i = lookup_printerkey(printer->info_2->data, SPOOL_DSSPOOLER_KEY)) < 0) ||
!(ctr = printer->info_2->data->keys[i].values) ||
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
!(guid_val = regval_ctr_getvalue(ctr, "objectGUID")))
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
{
r2569: Patch from Rob Foehl <rwf@loonybin.net>: - fix typo in libads/ldap_printer.c:39, ads_find_printer_on_server() (originally libads-typo.patch) - fix leak in printing/nt_printing.c, is_printer_published() (originally is_printer_published-leak.patch) - fix double print_backend_init() calls, now only called from main() - restructuring in printing/nt_printing.c - replaced (un)publish_it() with ads-specific functions - moved common code to nt_printer_publish() - improved error handling in several places - added check_published_printers() in printing/nt_printing.c, to verify that each published printer is actually in the directory at startup - changed calling semantics of mod_a_printer, dump_a_printer, and update_driver_init to be more consistent with the rest of the api and reduce some copying (This used to be commit 50a5a3dbd02acb0d09133b6e42cc37d091ea901d)
2004-09-23 23:24:02 +04:00
free_a_printer(&printer, 2);
*lots of small merges form HEAD *sync up configure.in *don't build torture tools in make all *make sure to remove torture tools as part of make clean (This used to be commit 0fb724b3216eeeb97e61ff12755ca3a31bcad6ef)
2003-01-15 21:57:41 +03:00
return False;
}
Automatic printer publishing when using APW or choosing 'list in the directory' in printer settings. Currently very little is published, and you cannot unpublish because of a bug in win2k clients. (This used to be commit ca6360e8db30fc9be3fe3718c8b49c92dba5ecac)
2002-12-04 20:40:50 +03:00
r21258: Fix for connecting printers from Vista by storing the printer GUID as a REG_SZ as Vista seems to whine about unknown REG_BINARY values. Thanks to Martin Zielinski <mz@seh.de> for his excellent analysis on this. (This used to be commit fa5490b71b5cd41b63b028aa8a316e1197263083)
2007-02-09 05:12:12 +03:00
/* fetching printer guids really ought to be a separate function. */
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
if ( guid ) {
s3-registry: use pull_reg_sz() where appropriate. (and move away from rpcstr_pull and rpcstr_pull_talloc). Guenther
2009-09-30 22:00:52 +04:00
char *guid_str;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
/* We used to store the guid as REG_BINARY, then swapped
r21258: Fix for connecting printers from Vista by storing the printer GUID as a REG_SZ as Vista seems to whine about unknown REG_BINARY values. Thanks to Martin Zielinski <mz@seh.de> for his excellent analysis on this. (This used to be commit fa5490b71b5cd41b63b028aa8a316e1197263083)
2007-02-09 05:12:12 +03:00
to REG_SZ for Vista compatibility so check for both */
switch ( regval_type(guid_val) ){
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
case REG_SZ:
s3-registry: use pull_reg_sz() where appropriate. (and move away from rpcstr_pull and rpcstr_pull_talloc). Guenther
2009-09-30 22:00:52 +04:00
blob = data_blob_const(regval_data_p(guid_val),
regval_size(guid_val));
s3: Remove use of iconv_convenience.
2010-05-10 02:42:06 +04:00
pull_reg_sz(talloc_tos(), &blob, (const char **)&guid_str);
Use GUID_from_string.
2008-10-14 04:33:41 +04:00
ret = NT_STATUS_IS_OK(GUID_from_string( guid_str, guid ));
s3-registry: use pull_reg_sz() where appropriate. (and move away from rpcstr_pull and rpcstr_pull_talloc). Guenther
2009-09-30 22:00:52 +04:00
talloc_free(guid_str);
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
break;
r21258: Fix for connecting printers from Vista by storing the printer GUID as a REG_SZ as Vista seems to whine about unknown REG_BINARY values. Thanks to Martin Zielinski <mz@seh.de> for his excellent analysis on this. (This used to be commit fa5490b71b5cd41b63b028aa8a316e1197263083)
2007-02-09 05:12:12 +03:00
case REG_BINARY:
if ( regval_size(guid_val) != sizeof(struct GUID) ) {
ret = False;
break;
}
memcpy(guid, regval_data_p(guid_val), sizeof(struct GUID));
break;
default:
DEBUG(0,("is_printer_published: GUID value stored as "
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
"invaluid type (%d)\n", regval_type(guid_val) ));
r21258: Fix for connecting printers from Vista by storing the printer GUID as a REG_SZ as Vista seems to whine about unknown REG_BINARY values. Thanks to Martin Zielinski <mz@seh.de> for his excellent analysis on this. (This used to be commit fa5490b71b5cd41b63b028aa8a316e1197263083)
2007-02-09 05:12:12 +03:00
break;
}
}
Store printer guid in the dsspooler registry key so we don't have to query the directory server every time someone asks (This used to be commit dd81003bddc17522041e1cd2f0484e1760493e4a)
2002-12-14 00:56:34 +03:00
r2569: Patch from Rob Foehl <rwf@loonybin.net>: - fix typo in libads/ldap_printer.c:39, ads_find_printer_on_server() (originally libads-typo.patch) - fix leak in printing/nt_printing.c, is_printer_published() (originally is_printer_published-leak.patch) - fix double print_backend_init() calls, now only called from main() - restructuring in printing/nt_printing.c - replaced (un)publish_it() with ads-specific functions - moved common code to nt_printer_publish() - improved error handling in several places - added check_published_printers() in printing/nt_printing.c, to verify that each published printer is actually in the directory at startup - changed calling semantics of mod_a_printer, dump_a_printer, and update_driver_init to be more consistent with the rest of the api and reduce some copying (This used to be commit 50a5a3dbd02acb0d09133b6e42cc37d091ea901d)
2004-09-23 23:24:02 +04:00
free_a_printer(&printer, 2);
r21258: Fix for connecting printers from Vista by storing the printer GUID as a REG_SZ as Vista seems to whine about unknown REG_BINARY values. Thanks to Martin Zielinski <mz@seh.de> for his excellent analysis on this. (This used to be commit fa5490b71b5cd41b63b028aa8a316e1197263083)
2007-02-09 05:12:12 +03:00
return ret;
Store printer guid in the dsspooler registry key so we don't have to query the directory server every time someone asks (This used to be commit dd81003bddc17522041e1cd2f0484e1760493e4a)
2002-12-14 00:56:34 +03:00
}
Automatic printer publishing when using APW or choosing 'list in the directory' in printer settings. Currently very little is published, and you cannot unpublish because of a bug in win2k clients. (This used to be commit ca6360e8db30fc9be3fe3718c8b49c92dba5ecac)
2002-12-04 20:40:50 +03:00
#else
Progress on CR 601 cache the printer_info_2 with the open printer handle. cache is invalidated on a mod_a_printer() call **on that smbd**. Yes, this means that the window for admins to step on each other from different clients just got larger, but since handles a generally short lived this is probably ok. (This used to be commit 31272d3b6bb9ec62fd666301c7adfa0c1720a99b)
2003-02-25 23:53:53 +03:00
WERROR nt_printer_publish(Printer_entry *print_hnd, int snum, int action)
Store printer guid in the dsspooler registry key so we don't have to query the directory server every time someone asks (This used to be commit dd81003bddc17522041e1cd2f0484e1760493e4a)
2002-12-14 00:56:34 +03:00
{
Automatic printer publishing when using APW or choosing 'list in the directory' in printer settings. Currently very little is published, and you cannot unpublish because of a bug in win2k clients. (This used to be commit ca6360e8db30fc9be3fe3718c8b49c92dba5ecac)
2002-12-04 20:40:50 +03:00
return WERR_OK;
}
r2569: Patch from Rob Foehl <rwf@loonybin.net>: - fix typo in libads/ldap_printer.c:39, ads_find_printer_on_server() (originally libads-typo.patch) - fix leak in printing/nt_printing.c, is_printer_published() (originally is_printer_published-leak.patch) - fix double print_backend_init() calls, now only called from main() - restructuring in printing/nt_printing.c - replaced (un)publish_it() with ads-specific functions - moved common code to nt_printer_publish() - improved error handling in several places - added check_published_printers() in printing/nt_printing.c, to verify that each published printer is actually in the directory at startup - changed calling semantics of mod_a_printer, dump_a_printer, and update_driver_init to be more consistent with the rest of the api and reduce some copying (This used to be commit 50a5a3dbd02acb0d09133b6e42cc37d091ea901d)
2004-09-23 23:24:02 +04:00
WERROR check_published_printers(void)
{
return WERR_OK;
}
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
bool is_printer_published(Printer_entry *print_hnd, int snum,
r18654: Rename "struct uuid" => "struct GUID" for consistency. (This used to be commit 5de76767e857e9d159ea46e2ded612ccd6d6bf19)
2006-09-19 04:12:11 +04:00
struct GUID *guid)
Store printer guid in the dsspooler registry key so we don't have to query the directory server every time someone asks (This used to be commit dd81003bddc17522041e1cd2f0484e1760493e4a)
2002-12-14 00:56:34 +03:00
{
return False;
}
r2569: Patch from Rob Foehl <rwf@loonybin.net>: - fix typo in libads/ldap_printer.c:39, ads_find_printer_on_server() (originally libads-typo.patch) - fix leak in printing/nt_printing.c, is_printer_published() (originally is_printer_published-leak.patch) - fix double print_backend_init() calls, now only called from main() - restructuring in printing/nt_printing.c - replaced (un)publish_it() with ads-specific functions - moved common code to nt_printer_publish() - improved error handling in several places - added check_published_printers() in printing/nt_printing.c, to verify that each published printer is actually in the directory at startup - changed calling semantics of mod_a_printer, dump_a_printer, and update_driver_init to be more consistent with the rest of the api and reduce some copying (This used to be commit 50a5a3dbd02acb0d09133b6e42cc37d091ea901d)
2004-09-23 23:24:02 +04:00
#endif /* HAVE_ADS */
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
/****************************************************************************
***************************************************************************/
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Merge from HEAD - make Samba compile with -Wwrite-strings without additional warnings. (Adds a lot of const). Andrew Bartlett (This used to be commit 3a7458f9472432ef12c43008414925fd1ce8ea0c)
2003-01-03 11:28:12 +03:00
WERROR delete_all_printer_data( NT_PRINTER_INFO_LEVEL_2 *p2, const char *key )
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
{
NT_PRINTER_DATA *data;
int i;
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
int removed_keys = 0;
int empty_slot;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
data = p2->data;
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
empty_slot = data->num_keys;
if ( !key )
return WERR_INVALID_PARAM;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
/* remove all keys */
Progress on CR 601 cache the printer_info_2 with the open printer handle. cache is invalidated on a mod_a_printer() call **on that smbd**. Yes, this means that the window for admins to step on each other from different clients just got larger, but since handles a generally short lived this is probably ok. (This used to be commit 31272d3b6bb9ec62fd666301c7adfa0c1720a99b)
2003-02-25 23:53:53 +03:00
if ( !strlen(key) ) {
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
TALLOC_FREE( data );
r12889: BUG 3380: fix crash when changing printer drivers caused by accessing a previously freed pointer (This used to be commit bcce3b69f83f52deb308d8c2f5165000468bd552)
2006-01-13 06:10:50 +03:00
p2->data = NULL;
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
DEBUG(8,("delete_all_printer_data: Removed all Printer Data from printer [%s]\n",
p2->printername ));
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
return WERR_OK;
}
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
/* remove a specific key (and all subkeys) */
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Progress on CR 601 cache the printer_info_2 with the open printer handle. cache is invalidated on a mod_a_printer() call **on that smbd**. Yes, this means that the window for admins to step on each other from different clients just got larger, but since handles a generally short lived this is probably ok. (This used to be commit 31272d3b6bb9ec62fd666301c7adfa0c1720a99b)
2003-02-25 23:53:53 +03:00
for ( i=0; i<data->num_keys; i++ ) {
if ( StrnCaseCmp( data->keys[i].name, key, strlen(key)) == 0 ) {
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
DEBUG(8,("delete_all_printer_data: Removed all Printer Data from key [%s]\n",
data->keys[i].name));
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
TALLOC_FREE( data->keys[i].name );
TALLOC_FREE( data->keys[i].values );
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
/* mark the slot as empty */
ZERO_STRUCTP( &data->keys[i] );
}
}
/* find the first empty slot */
for ( i=0; i<data->num_keys; i++ ) {
if ( !data->keys[i].name ) {
empty_slot = i;
removed_keys++;
break;
}
}
if ( i == data->num_keys )
/* nothing was removed */
return WERR_INVALID_PARAM;
/* move everything down */
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
for ( i=empty_slot+1; i<data->num_keys; i++ ) {
if ( data->keys[i].name ) {
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
memcpy( &data->keys[empty_slot], &data->keys[i], sizeof(NT_PRINTER_KEY) );
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
ZERO_STRUCTP( &data->keys[i] );
empty_slot++;
removed_keys++;
}
}
/* update count */
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
data->num_keys -= removed_keys;
/* sanity check to see if anything is left */
Progress on CR 601 cache the printer_info_2 with the open printer handle. cache is invalidated on a mod_a_printer() call **on that smbd**. Yes, this means that the window for admins to step on each other from different clients just got larger, but since handles a generally short lived this is probably ok. (This used to be commit 31272d3b6bb9ec62fd666301c7adfa0c1720a99b)
2003-02-25 23:53:53 +03:00
if ( !data->num_keys ) {
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
DEBUG(8,("delete_all_printer_data: No keys left for printer [%s]\n", p2->printername ));
SAFE_FREE( data->keys );
ZERO_STRUCTP( data );
}
return WERR_OK;
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
}
/****************************************************************************
***************************************************************************/
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Merge from HEAD - make Samba compile with -Wwrite-strings without additional warnings. (Adds a lot of const). Andrew Bartlett (This used to be commit 3a7458f9472432ef12c43008414925fd1ce8ea0c)
2003-01-03 11:28:12 +03:00
WERROR delete_printer_data( NT_PRINTER_INFO_LEVEL_2 *p2, const char *key, const char *value )
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
{
WERROR result = WERR_OK;
int key_index;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
/* we must have names on non-zero length */
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
if ( !key || !*key|| !value || !*value )
return WERR_INVALID_NAME;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
/* find the printer key first */
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
key_index = lookup_printerkey( p2->data, key );
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
if ( key_index == -1 )
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
return WERR_OK;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
make sure the printer data value exists before saying you deleted it (This used to be commit 017133ea0c3eb0579710727379585df2b585614d)
2003-08-25 17:05:48 +04:00
/* make sure the value exists so we can return the correct error code */
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
if ( !regval_ctr_getvalue( p2->data->keys[key_index].values, value ) )
make sure the printer data value exists before saying you deleted it (This used to be commit 017133ea0c3eb0579710727379585df2b585614d)
2003-08-25 17:05:48 +04:00
return WERR_BADFILE;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
regval_ctr_delvalue( p2->data->keys[key_index].values, value );
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
DEBUG(8,("delete_printer_data: Removed key => [%s], value => [%s]\n",
key, value ));
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
return result;
}
/****************************************************************************
***************************************************************************/
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
WERROR add_printer_data( NT_PRINTER_INFO_LEVEL_2 *p2, const char *key, const char *value,
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
uint32 type, uint8 *data, int real_len )
{
WERROR result = WERR_OK;
int key_index;
/* we must have names on non-zero length */
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
if ( !key || !*key|| !value || !*value )
return WERR_INVALID_NAME;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
/* find the printer key first */
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
key_index = lookup_printerkey( p2->data, key );
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
if ( key_index == -1 )
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
key_index = add_new_printer_key( p2->data, key );
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
if ( key_index == -1 )
return WERR_NOMEM;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
regval_ctr_addvalue( p2->data->keys[key_index].values, value,
get rid of more compiler warnings (This used to be commit 398bd14fc6e2f8ab2f34211270e179b8928a6669)
2003-08-15 08:42:05 +04:00
type, (const char *)data, real_len );
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
DEBUG(8,("add_printer_data: Added key => [%s], value => [%s], type=> [%d], size => [%d]\n",
key, value, type, real_len ));
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
return result;
}
/****************************************************************************
***************************************************************************/
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
s3:registry: replace typedef REGISTRY_VALUE by struct regval_blob Michael
2009-03-24 00:27:59 +03:00
struct regval_blob* get_printer_data( NT_PRINTER_INFO_LEVEL_2 *p2, const char *key, const char *value )
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
{
int key_index;
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
if ( (key_index = lookup_printerkey( p2->data, key )) == -1 )
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
return NULL;
DEBUG(8,("get_printer_data: Attempting to lookup key => [%s], value => [%s]\n",
key, value ));
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
return regval_ctr_getvalue( p2->data->keys[key_index].values, value );
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
}
/****************************************************************************
Unpack a list of registry values frem the TDB
***************************************************************************/
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
r22009: change TDB_DATA from char * to unsigned char * and fix all compiler warnings in the users metze (This used to be commit 3a28443079c141a6ce8182c65b56ca210e34f37f)
2007-03-29 13:35:51 +04:00
static int unpack_values(NT_PRINTER_DATA *printer_data, const uint8 *buf, int buflen)
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
{
int len = 0;
uint32 type;
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
fstring string;
const char *valuename = NULL;
const char *keyname = NULL;
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
char *str;
int size;
uint8 *data_p;
s3:registry: replace typedef REGISTRY_VALUE by struct regval_blob Michael
2009-03-24 00:27:59 +03:00
struct regval_blob *regval_p;
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
int key_index;
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
/* add the "PrinterDriverData" key first for performance reasons */
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
add_new_printer_key( printer_data, SPOOL_PRINTERDATA_KEY );
/* loop and unpack the rest of the registry values */
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
Progress on CR 601 cache the printer_info_2 with the open printer handle. cache is invalidated on a mod_a_printer() call **on that smbd**. Yes, this means that the window for admins to step on each other from different clients just got larger, but since handles a generally short lived this is probably ok. (This used to be commit 31272d3b6bb9ec62fd666301c7adfa0c1720a99b)
2003-02-25 23:53:53 +03:00
while ( True ) {
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
/* check to see if there are any more registry values */
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
r543: possible fix for BUG 1293 -- initialize pointer to NULL to ensure the failure check is valid (This used to be commit b7005e6989946bbd0e42d84d2688f3a96a649791)
2004-05-07 07:15:54 +04:00
regval_p = NULL;
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
len += tdb_unpack(buf+len, buflen-len, "p", &regval_p);
if ( !regval_p )
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
break;
/* unpack the next regval */
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
len += tdb_unpack(buf+len, buflen-len, "fdB",
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
string,
&type,
&size,
&data_p);
r8066: * had to modify the printer data storage slightly in ntprinters.tdb when packing values. It is a compatible change though and will not require a tdb version upgrade * Can successfully create new printer subkeys via winreg that are immediately available via spoolss calls. Still cannot delete keys yet though. That comes next. (This used to be commit 00bce2b3bb78a44842a258b1737076281297d247)
2005-07-02 05:23:21 +04:00
/* lookup for subkey names which have a type of REG_NONE */
/* there's no data with this entry */
if ( type == REG_NONE ) {
if ( (key_index=lookup_printerkey( printer_data, string)) == -1 )
add_new_printer_key( printer_data, string );
continue;
}
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
/*
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
* break of the keyname from the value name.
r783: fix bug in reading printer data from disk; all ow valuenames with embedded '\'s (This used to be commit fdc1633c348b072a6dde45a3d9b3b8a19744613d)
2004-05-19 21:17:33 +04:00
* Valuenames can have embedded '\'s so be careful.
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
* only support one level of keys. See the
r783: fix bug in reading printer data from disk; all ow valuenames with embedded '\'s (This used to be commit fdc1633c348b072a6dde45a3d9b3b8a19744613d)
2004-05-19 21:17:33 +04:00
* "Konica Fiery S300 50C-K v1.1. enu" 2k driver.
* -- jerry
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
*/
r783: fix bug in reading printer data from disk; all ow valuenames with embedded '\'s (This used to be commit fdc1633c348b072a6dde45a3d9b3b8a19744613d)
2004-05-19 21:17:33 +04:00
str = strchr_m( string, '\\');
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
/* Put in "PrinterDriverData" is no key specified */
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
if ( !str ) {
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
keyname = SPOOL_PRINTERDATA_KEY;
valuename = string;
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
}
else {
*str = '\0';
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
keyname = string;
valuename = str+1;
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
}
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
/* see if we need a new key */
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
if ( (key_index=lookup_printerkey( printer_data, keyname )) == -1 )
key_index = add_new_printer_key( printer_data, keyname );
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
if ( key_index == -1 ) {
DEBUG(0,("unpack_values: Failed to allocate a new key [%s]!\n",
keyname));
break;
}
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
r21258: Fix for connecting printers from Vista by storing the printer GUID as a REG_SZ as Vista seems to whine about unknown REG_BINARY values. Thanks to Martin Zielinski <mz@seh.de> for his excellent analysis on this. (This used to be commit fa5490b71b5cd41b63b028aa8a316e1197263083)
2007-02-09 05:12:12 +03:00
DEBUG(8,("specific: [%s:%s], len: %d\n", keyname, valuename, size));
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
/* Vista doesn't like unknown REG_BINARY values in DsSpooler.
r21258: Fix for connecting printers from Vista by storing the printer GUID as a REG_SZ as Vista seems to whine about unknown REG_BINARY values. Thanks to Martin Zielinski <mz@seh.de> for his excellent analysis on this. (This used to be commit fa5490b71b5cd41b63b028aa8a316e1197263083)
2007-02-09 05:12:12 +03:00
Thanks to Martin Zielinski for the hint. */
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
if ( type == REG_BINARY &&
strequal( keyname, SPOOL_DSSPOOLER_KEY ) &&
strequal( valuename, "objectGUID" ) )
r21258: Fix for connecting printers from Vista by storing the printer GUID as a REG_SZ as Vista seems to whine about unknown REG_BINARY values. Thanks to Martin Zielinski <mz@seh.de> for his excellent analysis on this. (This used to be commit fa5490b71b5cd41b63b028aa8a316e1197263083)
2007-02-09 05:12:12 +03:00
{
struct GUID guid;
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
r21258: Fix for connecting printers from Vista by storing the printer GUID as a REG_SZ as Vista seems to whine about unknown REG_BINARY values. Thanks to Martin Zielinski <mz@seh.de> for his excellent analysis on this. (This used to be commit fa5490b71b5cd41b63b028aa8a316e1197263083)
2007-02-09 05:12:12 +03:00
/* convert the GUID to a UNICODE string */
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
r21258: Fix for connecting printers from Vista by storing the printer GUID as a REG_SZ as Vista seems to whine about unknown REG_BINARY values. Thanks to Martin Zielinski <mz@seh.de> for his excellent analysis on this. (This used to be commit fa5490b71b5cd41b63b028aa8a316e1197263083)
2007-02-09 05:12:12 +03:00
memcpy( &guid, data_p, sizeof(struct GUID) );
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
s3-registry: use regval_ctr_addvalue_sz(). Greatly simplifies and cleanes up the code. Guenther
2009-09-24 17:01:32 +04:00
regval_ctr_addvalue_sz(printer_data->keys[key_index].values,
valuename,
GUID_string(talloc_tos(), &guid));
r21258: Fix for connecting printers from Vista by storing the printer GUID as a REG_SZ as Vista seems to whine about unknown REG_BINARY values. Thanks to Martin Zielinski <mz@seh.de> for his excellent analysis on this. (This used to be commit fa5490b71b5cd41b63b028aa8a316e1197263083)
2007-02-09 05:12:12 +03:00
} else {
/* add the value */
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
regval_ctr_addvalue( printer_data->keys[key_index].values,
valuename, type, (const char *)data_p,
r21258: Fix for connecting printers from Vista by storing the printer GUID as a REG_SZ as Vista seems to whine about unknown REG_BINARY values. Thanks to Martin Zielinski <mz@seh.de> for his excellent analysis on this. (This used to be commit fa5490b71b5cd41b63b028aa8a316e1197263083)
2007-02-09 05:12:12 +03:00
size );
}
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
Progress on CR 601 cache the printer_info_2 with the open printer handle. cache is invalidated on a mod_a_printer() call **on that smbd**. Yes, this means that the window for admins to step on each other from different clients just got larger, but since handles a generally short lived this is probably ok. (This used to be commit 31272d3b6bb9ec62fd666301c7adfa0c1720a99b)
2003-02-25 23:53:53 +03:00
SAFE_FREE(data_p); /* 'B' option to tdbpack does a malloc() */
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
}
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
return len;
}
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
/****************************************************************************
***************************************************************************/
s3-spoolss: Use better names for set_last_from_to. Use set_driver_mapping() and get_win_driver(), get_os2_driver(). Signed-off-by: Günther Deschner <gd@samba.org>
2010-05-10 17:05:46 +04:00
static char *win_driver;
static char *os2_driver;
Two more static fstrings gone. Jeremy. (This used to be commit 4056bb8645821fba95d6e9ca4d82e2d5084c1e5c)
2007-12-19 05:16:40 +03:00
s3-spoolss: Use better names for set_last_from_to. Use set_driver_mapping() and get_win_driver(), get_os2_driver(). Signed-off-by: Günther Deschner <gd@samba.org>
2010-05-10 17:05:46 +04:00
static const char *get_win_driver(void)
Two more static fstrings gone. Jeremy. (This used to be commit 4056bb8645821fba95d6e9ca4d82e2d5084c1e5c)
2007-12-19 05:16:40 +03:00
{
s3-spoolss: Use better names for set_last_from_to. Use set_driver_mapping() and get_win_driver(), get_os2_driver(). Signed-off-by: Günther Deschner <gd@samba.org>
2010-05-10 17:05:46 +04:00
if (win_driver == NULL) {
Two more static fstrings gone. Jeremy. (This used to be commit 4056bb8645821fba95d6e9ca4d82e2d5084c1e5c)
2007-12-19 05:16:40 +03:00
return "";
}
s3-spoolss: Use better names for set_last_from_to. Use set_driver_mapping() and get_win_driver(), get_os2_driver(). Signed-off-by: Günther Deschner <gd@samba.org>
2010-05-10 17:05:46 +04:00
return win_driver;
Two more static fstrings gone. Jeremy. (This used to be commit 4056bb8645821fba95d6e9ca4d82e2d5084c1e5c)
2007-12-19 05:16:40 +03:00
}
s3-spoolss: Use better names for set_last_from_to. Use set_driver_mapping() and get_win_driver(), get_os2_driver(). Signed-off-by: Günther Deschner <gd@samba.org>
2010-05-10 17:05:46 +04:00
static const char *get_os2_driver(void)
Two more static fstrings gone. Jeremy. (This used to be commit 4056bb8645821fba95d6e9ca4d82e2d5084c1e5c)
2007-12-19 05:16:40 +03:00
{
s3-spoolss: Use better names for set_last_from_to. Use set_driver_mapping() and get_win_driver(), get_os2_driver(). Signed-off-by: Günther Deschner <gd@samba.org>
2010-05-10 17:05:46 +04:00
if (os2_driver == NULL) {
Two more static fstrings gone. Jeremy. (This used to be commit 4056bb8645821fba95d6e9ca4d82e2d5084c1e5c)
2007-12-19 05:16:40 +03:00
return "";
}
s3-spoolss: Use better names for set_last_from_to. Use set_driver_mapping() and get_win_driver(), get_os2_driver(). Signed-off-by: Günther Deschner <gd@samba.org>
2010-05-10 17:05:46 +04:00
return os2_driver;
Two more static fstrings gone. Jeremy. (This used to be commit 4056bb8645821fba95d6e9ca4d82e2d5084c1e5c)
2007-12-19 05:16:40 +03:00
}
s3-spoolss: Use better names for set_last_from_to. Use set_driver_mapping() and get_win_driver(), get_os2_driver(). Signed-off-by: Günther Deschner <gd@samba.org>
2010-05-10 17:05:46 +04:00
static bool set_driver_mapping(const char *from, const char *to)
Two more static fstrings gone. Jeremy. (This used to be commit 4056bb8645821fba95d6e9ca4d82e2d5084c1e5c)
2007-12-19 05:16:40 +03:00
{
s3-spoolss: Use better names for set_last_from_to. Use set_driver_mapping() and get_win_driver(), get_os2_driver(). Signed-off-by: Günther Deschner <gd@samba.org>
2010-05-10 17:05:46 +04:00
SAFE_FREE(win_driver);
SAFE_FREE(os2_driver);
Two more static fstrings gone. Jeremy. (This used to be commit 4056bb8645821fba95d6e9ca4d82e2d5084c1e5c)
2007-12-19 05:16:40 +03:00
s3-spoolss: Use better names for set_last_from_to. Use set_driver_mapping() and get_win_driver(), get_os2_driver(). Signed-off-by: Günther Deschner <gd@samba.org>
2010-05-10 17:05:46 +04:00
win_driver = SMB_STRDUP(from);
os2_driver = SMB_STRDUP(to);
Two more static fstrings gone. Jeremy. (This used to be commit 4056bb8645821fba95d6e9ca4d82e2d5084c1e5c)
2007-12-19 05:16:40 +03:00
s3-spoolss: Use better names for set_last_from_to. Use set_driver_mapping() and get_win_driver(), get_os2_driver(). Signed-off-by: Günther Deschner <gd@samba.org>
2010-05-10 17:05:46 +04:00
if (win_driver == NULL || os2_driver == NULL) {
SAFE_FREE(win_driver);
SAFE_FREE(os2_driver);
Two more static fstrings gone. Jeremy. (This used to be commit 4056bb8645821fba95d6e9ca4d82e2d5084c1e5c)
2007-12-19 05:16:40 +03:00
return false;
}
return true;
}
Two OS/2 printer fixes from Jim McDonough @ IBM. First one adds a new info level into the lanman printing and an ioctl to the trans2 code. Andrew - this uses ASCII only. It looks ok to me but please check ! Second one adds a parameter "os2 driver map" that allows OS/2 driver names to be mapped. Jeremy. (This used to be commit da79b519e0b6b4317d7fb5260d74e0e74a7e0b46)
2001-03-23 06:12:58 +03:00
static void map_to_os2_driver(fstring drivername)
{
char *mapfile = lp_os2_driver_map();
char **lines = NULL;
int numlines = 0;
int i;
if (!strlen(drivername))
return;
if (!*mapfile)
return;
s3-spoolss: Use better names for set_last_from_to. Use set_driver_mapping() and get_win_driver(), get_os2_driver(). Signed-off-by: Günther Deschner <gd@samba.org>
2010-05-10 17:05:46 +04:00
if (strequal(drivername, get_win_driver())) {
Two more static fstrings gone. Jeremy. (This used to be commit 4056bb8645821fba95d6e9ca4d82e2d5084c1e5c)
2007-12-19 05:16:40 +03:00
DEBUG(3,("Mapped Windows driver %s to OS/2 driver %s\n",
s3-spoolss: Use better names for set_last_from_to. Use set_driver_mapping() and get_win_driver(), get_os2_driver(). Signed-off-by: Günther Deschner <gd@samba.org>
2010-05-10 17:05:46 +04:00
drivername, get_os2_driver()));
fstrcpy(drivername, get_os2_driver());
Two OS/2 printer fixes from Jim McDonough @ IBM. First one adds a new info level into the lanman printing and an ioctl to the trans2 code. Andrew - this uses ASCII only. It looks ok to me but please check ! Second one adds a parameter "os2 driver map" that allows OS/2 driver names to be mapped. Jeremy. (This used to be commit da79b519e0b6b4317d7fb5260d74e0e74a7e0b46)
2001-03-23 06:12:58 +03:00
return;
}
Use common util_file code.
2008-10-12 19:34:43 +04:00
lines = file_lines_load(mapfile, &numlines,0,NULL);
r14184: Coverity fix #56. Ensure we can't deref null. Jeremy. (This used to be commit c76092a0662714b49c3c519d6f01174b8995a036)
2006-03-11 05:12:25 +03:00
if (numlines == 0 || lines == NULL) {
Two OS/2 printer fixes from Jim McDonough @ IBM. First one adds a new info level into the lanman printing and an ioctl to the trans2 code. Andrew - this uses ASCII only. It looks ok to me but please check ! Second one adds a parameter "os2 driver map" that allows OS/2 driver names to be mapped. Jeremy. (This used to be commit da79b519e0b6b4317d7fb5260d74e0e74a7e0b46)
2001-03-23 06:12:58 +03:00
DEBUG(0,("No entries in OS/2 driver map %s\n",mapfile));
Use common util_file code.
2008-10-12 19:34:43 +04:00
TALLOC_FREE(lines);
Two OS/2 printer fixes from Jim McDonough @ IBM. First one adds a new info level into the lanman printing and an ioctl to the trans2 code. Andrew - this uses ASCII only. It looks ok to me but please check ! Second one adds a parameter "os2 driver map" that allows OS/2 driver names to be mapped. Jeremy. (This used to be commit da79b519e0b6b4317d7fb5260d74e0e74a7e0b46)
2001-03-23 06:12:58 +03:00
return;
}
DEBUG(4,("Scanning OS/2 driver map %s\n",mapfile));
for( i = 0; i < numlines; i++) {
char *nt_name = lines[i];
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
char *os2_name = strchr(nt_name,'=');
Two OS/2 printer fixes from Jim McDonough @ IBM. First one adds a new info level into the lanman printing and an ioctl to the trans2 code. Andrew - this uses ASCII only. It looks ok to me but please check ! Second one adds a parameter "os2 driver map" that allows OS/2 driver names to be mapped. Jeremy. (This used to be commit da79b519e0b6b4317d7fb5260d74e0e74a7e0b46)
2001-03-23 06:12:58 +03:00
if (!os2_name)
continue;
*os2_name++ = 0;
while (isspace(*nt_name))
nt_name++;
Merge in the NT drivers changes from 2.2. Jeremy. (This used to be commit a3781ad38ff6c70238e7e9b83324477e5c9780d5)
2001-08-10 23:38:53 +04:00
if (!*nt_name || strchr("#;",*nt_name))
Two OS/2 printer fixes from Jim McDonough @ IBM. First one adds a new info level into the lanman printing and an ioctl to the trans2 code. Andrew - this uses ASCII only. It looks ok to me but please check ! Second one adds a parameter "os2 driver map" that allows OS/2 driver names to be mapped. Jeremy. (This used to be commit da79b519e0b6b4317d7fb5260d74e0e74a7e0b46)
2001-03-23 06:12:58 +03:00
continue;
{
int l = strlen(nt_name);
while (l && isspace(nt_name[l-1])) {
nt_name[l-1] = 0;
l--;
}
}
while (isspace(*os2_name))
os2_name++;
{
int l = strlen(os2_name);
while (l && isspace(os2_name[l-1])) {
os2_name[l-1] = 0;
l--;
}
}
if (strequal(nt_name,drivername)) {
DEBUG(3,("Mapped windows driver %s to os2 driver%s\n",drivername,os2_name));
s3-spoolss: Use better names for set_last_from_to. Use set_driver_mapping() and get_win_driver(), get_os2_driver(). Signed-off-by: Günther Deschner <gd@samba.org>
2010-05-10 17:05:46 +04:00
set_driver_mapping(drivername,os2_name);
Two OS/2 printer fixes from Jim McDonough @ IBM. First one adds a new info level into the lanman printing and an ioctl to the trans2 code. Andrew - this uses ASCII only. It looks ok to me but please check ! Second one adds a parameter "os2 driver map" that allows OS/2 driver names to be mapped. Jeremy. (This used to be commit da79b519e0b6b4317d7fb5260d74e0e74a7e0b46)
2001-03-23 06:12:58 +03:00
fstrcpy(drivername,os2_name);
Use common util_file code.
2008-10-12 19:34:43 +04:00
TALLOC_FREE(lines);
Two OS/2 printer fixes from Jim McDonough @ IBM. First one adds a new info level into the lanman printing and an ioctl to the trans2 code. Andrew - this uses ASCII only. It looks ok to me but please check ! Second one adds a parameter "os2 driver map" that allows OS/2 driver names to be mapped. Jeremy. (This used to be commit da79b519e0b6b4317d7fb5260d74e0e74a7e0b46)
2001-03-23 06:12:58 +03:00
return;
}
}
Use common util_file code.
2008-10-12 19:34:43 +04:00
TALLOC_FREE(lines);
Two OS/2 printer fixes from Jim McDonough @ IBM. First one adds a new info level into the lanman printing and an ioctl to the trans2 code. Andrew - this uses ASCII only. It looks ok to me but please check ! Second one adds a parameter "os2 driver map" that allows OS/2 driver names to be mapped. Jeremy. (This used to be commit da79b519e0b6b4317d7fb5260d74e0e74a7e0b46)
2001-03-23 06:12:58 +03:00
}
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
s3-spoolss: Create a spoolss_map_to_os2_driver function. Signed-off-by: Günther Deschner <gd@samba.org>
2010-04-28 19:03:41 +04:00
/**
* @internal
*
* @brief Map a Windows driver to a OS/2 driver.
*
* @param[in] mem_ctx The memory context to use.
*
* @param[in,out] pdrivername The drivername of Windows to remap.
*
* @return WERR_OK on success, a corresponding WERROR on failure.
*/
WERROR spoolss_map_to_os2_driver(TALLOC_CTX *mem_ctx, const char **pdrivername)
{
const char *mapfile = lp_os2_driver_map();
char **lines = NULL;
const char *drivername;
int numlines = 0;
int i;
if (pdrivername == NULL || *pdrivername == NULL || *pdrivername[0] == '\0') {
return WERR_INVALID_PARAMETER;
}
drivername = *pdrivername;
if (mapfile[0] == '\0') {
return WERR_BADFILE;
}
if (strequal(drivername, get_win_driver())) {
DEBUG(3,("Mapped Windows driver %s to OS/2 driver %s\n",
drivername, get_os2_driver()));
drivername = talloc_strdup(mem_ctx, get_os2_driver());
if (drivername == NULL) {
return WERR_NOMEM;
}
*pdrivername = drivername;
return WERR_OK;
}
lines = file_lines_load(mapfile, &numlines, 0, NULL);
if (numlines == 0 || lines == NULL) {
DEBUG(0,("No entries in OS/2 driver map %s\n", mapfile));
TALLOC_FREE(lines);
return WERR_EMPTY;
}
DEBUG(4,("Scanning OS/2 driver map %s\n",mapfile));
for( i = 0; i < numlines; i++) {
char *nt_name = lines[i];
char *os2_name = strchr(nt_name, '=');
if (os2_name == NULL) {
continue;
}
*os2_name++ = '\0';
while (isspace(*nt_name)) {
nt_name++;
}
if (*nt_name == '\0' || strchr("#;", *nt_name)) {
continue;
}
{
int l = strlen(nt_name);
while (l && isspace(nt_name[l - 1])) {
nt_name[l - 1] = 0;
l--;
}
}
while (isspace(*os2_name)) {
os2_name++;
}
{
int l = strlen(os2_name);
while (l && isspace(os2_name[l-1])) {
os2_name[l-1] = 0;
l--;
}
}
if (strequal(nt_name, drivername)) {
DEBUG(3,("Mapped Windows driver %s to OS/2 driver %s\n",drivername,os2_name));
set_driver_mapping(drivername, os2_name);
drivername = talloc_strdup(mem_ctx, os2_name);
TALLOC_FREE(lines);
if (drivername == NULL) {
return WERR_NOMEM;
}
*pdrivername = drivername;
return WERR_OK;
}
}
TALLOC_FREE(lines);
return WERR_OK;
}
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
/****************************************************************************
Progress on CR 601 cache the printer_info_2 with the open printer handle. cache is invalidated on a mod_a_printer() call **on that smbd**. Yes, this means that the window for admins to step on each other from different clients just got larger, but since handles a generally short lived this is probably ok. (This used to be commit 31272d3b6bb9ec62fd666301c7adfa0c1720a99b)
2003-02-25 23:53:53 +03:00
Get a default printer info 2 struct.
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
****************************************************************************/
Fix bug #5372. With a large CUPS installation with a remote server, contacting the server when searching for a name for the location and comment fields can take so much time the client times out. When searching for a name we don't use these fields anyway, so add a function get_a_printer_search() which doesn't contact the CUPS server. Jeremy. (This used to be commit 92d9f20852d5384e92a93dd0b051034718840ca8)
2008-04-04 22:14:09 +04:00
static WERROR get_a_printer_2_default(NT_PRINTER_INFO_LEVEL_2 *info,
const char *servername,
const char* sharename,
bool get_loc_com)
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
{
r21862: add the cups comment and location lookup to get_a_printer_2_default() as well (This used to be commit 5b47c4e5c25550ad72f9e558bb50f237ba28f81e)
2007-03-17 00:52:21 +03:00
int snum = lp_servicenumber(sharename);
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
slprintf(info->servername, sizeof(info->servername)-1, "\\\\%s", servername);
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
slprintf(info->printername, sizeof(info->printername)-1, "\\\\%s\\%s",
r2768: BUG 1519: save the hostname used in the open_printer_ex() for later reuse when filling in the spolss replies (also gets rid of get_called_name() (This used to be commit 57db8ca91f52329c7f8985c04463b6b69015b0c4)
2004-10-02 00:34:12 +04:00
servername, sharename);
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
fstrcpy(info->sharename, sharename);
fstrcpy(info->portname, SAMBA_PRINTER_PORT_NAME);
printing/nt_printing.c: After long soul searching and making both Andrew and my life a misery, here is the only possible null driver fix we have found. This *SUCKS*. rpc_server/srv_spoolss_nt.c: Correct printername search. Correct portname reply Correct attributes reply. Removal of unused temp variable. Jeremy. (This used to be commit 06e71c9f8be20b84e33e143c3d0b7904225efb45)
2000-11-14 05:14:58 +03:00
Merging Gerald's "no printer driver" fix from 2.2. Jeremy. (This used to be commit 409b1e4d1b996b26eee80bf5cb4edd962e4a4c76)
2001-05-03 06:51:08 +04:00
/* by setting the driver name to an empty string, a local NT admin
can now run the **local** APW to install a local printer driver
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
for a Samba shared printer in 2.2. Without this, drivers **must** be
Merging Gerald's "no printer driver" fix from 2.2. Jeremy. (This used to be commit 409b1e4d1b996b26eee80bf5cb4edd962e4a4c76)
2001-05-03 06:51:08 +04:00
installed on the Samba server for NT clients --jerry */
merge from 2.2 (This used to be commit 96b3a65a73d403a41bf1b3aba79bd743698344ac)
2001-11-22 08:56:09 +03:00
#if 0 /* JERRY --do not uncomment-- */
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
if (!*info->drivername)
fstrcpy(info->drivername, "NO DRIVER AVAILABLE FOR THIS PRINTER");
Merging Gerald's "no printer driver" fix from 2.2. Jeremy. (This used to be commit 409b1e4d1b996b26eee80bf5cb4edd962e4a4c76)
2001-05-03 06:51:08 +04:00
#endif
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
DEBUG(10,("get_a_printer_2_default: driver name set to [%s]\n", info->drivername));
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
Remove unused wpstring and macros. Stop using pstrcpy in smbd/*.c Jeremy. (This used to be commit e72bce5b62fb0a9d0ff4a3d76490219994f303cf)
2007-12-04 02:19:22 +03:00
strlcpy(info->comment, "", sizeof(info->comment));
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
fstrcpy(info->printprocessor, "winprint");
fstrcpy(info->datatype, "RAW");
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
r21862: add the cups comment and location lookup to get_a_printer_2_default() as well (This used to be commit 5b47c4e5c25550ad72f9e558bb50f237ba28f81e)
2007-03-17 00:52:21 +03:00
#ifdef HAVE_CUPS
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
if (get_loc_com && (enum printing_types)lp_printing(snum) == PRINT_CUPS ) {
r21862: add the cups comment and location lookup to get_a_printer_2_default() as well (This used to be commit 5b47c4e5c25550ad72f9e558bb50f237ba28f81e)
2007-03-17 00:52:21 +03:00
/* Pull the location and comment strings from cups if we don't
already have one */
s3-printing: avoid mixing cups backend code with nt_printing code in cups_pull_comment_location. Guenther
2010-03-26 15:17:49 +03:00
if ( !strlen(info->location) || !strlen(info->comment) ) {
char *comment = NULL;
char *location = NULL;
if (cups_pull_comment_location(info, info->sharename,
&comment, &location)) {
strlcpy(info->comment, comment, sizeof(info->comment));
fstrcpy(info->location, location);
TALLOC_FREE(comment);
TALLOC_FREE(location);
}
}
r21862: add the cups comment and location lookup to get_a_printer_2_default() as well (This used to be commit 5b47c4e5c25550ad72f9e558bb50f237ba28f81e)
2007-03-17 00:52:21 +03:00
}
#endif
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
info->attributes = PRINTER_ATTRIBUTE_SAMBA;
Create elements in default, not in read. Jeremy. (This used to be commit 0d681ea252e0cf7fdf57d316d2bfe7caa9b4fbf5)
2000-06-06 05:34:20 +04:00
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
info->starttime = 0; /* Minutes since 12:00am GMT */
info->untiltime = 0; /* Minutes since 12:00am GMT */
info->priority = 1;
info->default_priority = 1;
info->setuptime = (uint32)time(NULL);
merge from 2.2 (This used to be commit 96b3a65a73d403a41bf1b3aba79bd743698344ac)
2001-11-22 08:56:09 +03:00
/*
* I changed this as I think it is better to have a generic
* DEVMODE than to crash Win2k explorer.exe --jerry
* See the HP Deskjet 990c Win2k drivers for an example.
merge from 2.2. of * PRINTER_ATTRIBUTE's * "default devmode" parameter (This used to be commit 90a7a1840b4823d4ebe047130a95dd15a824500b)
2002-01-22 21:14:31 +03:00
*
* However the default devmode appears to cause problems
* with the HP CLJ 8500 PCL driver. Hence the addition of
* the "default devmode" parameter --jerry 22/01/2002
merge from 2.2 (This used to be commit 96b3a65a73d403a41bf1b3aba79bd743698344ac)
2001-11-22 08:56:09 +03:00
*/
Create elements in default, not in read. Jeremy. (This used to be commit 0d681ea252e0cf7fdf57d316d2bfe7caa9b4fbf5)
2000-06-06 05:34:20 +04:00
merge from 2.2. of * PRINTER_ATTRIBUTE's * "default devmode" parameter (This used to be commit 90a7a1840b4823d4ebe047130a95dd15a824500b)
2002-01-22 21:14:31 +03:00
if (lp_default_devmode(snum)) {
r16365: Fix Klocwork #895, #898, #899, #915, #932, #938 and a few other problems Klocwork missed. Jeremy. (This used to be commit fe05769a1a85f924c67be7e5dcee4871a86948d7)
2006-06-20 01:36:19 +04:00
if ((info->devmode = construct_nt_devicemode(info->printername)) == NULL) {
merge from 2.2. of * PRINTER_ATTRIBUTE's * "default devmode" parameter (This used to be commit 90a7a1840b4823d4ebe047130a95dd15a824500b)
2002-01-22 21:14:31 +03:00
goto fail;
r16365: Fix Klocwork #895, #898, #899, #915, #932, #938 and a few other problems Klocwork missed. Jeremy. (This used to be commit fe05769a1a85f924c67be7e5dcee4871a86948d7)
2006-06-20 01:36:19 +04:00
}
} else {
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
info->devmode = NULL;
merge from 2.2 (This used to be commit 8ed7c1ffad2df03c66151c1dfe7477301bd3ebad)
2002-01-23 08:10:27 +03:00
}
JF - you might want to look at this patch. Went through and fixed up all failure possibilities. If something (malloc, file open etc.) fails, then this code goes through and cleans up all allocated resources on exit. This is the equivalent of a C++ destuctor for the allocated structures. We need code to be written like this to pass purify tests. Jeremy. (This used to be commit b260ef7cb1fb2b1e4661cc54eab403eb01fbfc35)
2000-04-05 23:48:06 +04:00
r16365: Fix Klocwork #895, #898, #899, #915, #932, #938 and a few other problems Klocwork missed. Jeremy. (This used to be commit fe05769a1a85f924c67be7e5dcee4871a86948d7)
2006-06-20 01:36:19 +04:00
if (!nt_printing_getsec(info, sharename, &info->secdesc_buf)) {
Getting back to a compilable state (not there yet but close). Added patches for random -> sys_random. Added set_effective_xxx patches for AFS code. Memory allocation changes in spoolss code. Jeremy. (This used to be commit c2099cfb033c2cdb6035f4f7f50ce21b98e1584d)
2000-06-01 21:01:34 +04:00
goto fail;
r16365: Fix Klocwork #895, #898, #899, #915, #932, #938 and a few other problems Klocwork missed. Jeremy. (This used to be commit fe05769a1a85f924c67be7e5dcee4871a86948d7)
2006-06-20 01:36:19 +04:00
}
bug-fix from tim (insure). dummy fn call for andrew to fill in. (This used to be commit 1e3c0ab29d178fe58add32672301ac497d43a3fe)
2000-05-27 06:15:08 +04:00
s3-spoolss: a default printer should have at least a "PrintDriverData" key. Guenther
2009-12-04 19:22:25 +03:00
info->data = TALLOC_ZERO_P(info, NT_PRINTER_DATA);
if (!info->data) {
goto fail;
}
add_new_printer_key(info->data, SPOOL_PRINTERDATA_KEY);
the next stage in the NTSTATUS/WERROR change. smbd and nmbd now compile, but the client code still needs some work (This used to be commit dcd6e735f709a9231860ceb9682db40ff26c9a66)
2001-09-04 11:13:01 +04:00
return WERR_OK;
Getting back to a compilable state (not there yet but close). Added patches for random -> sys_random. Added set_effective_xxx patches for AFS code. Memory allocation changes in spoolss code. Jeremy. (This used to be commit c2099cfb033c2cdb6035f4f7f50ce21b98e1584d)
2000-06-01 21:01:34 +04:00
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
fail:
if (info->devmode)
free_nt_devicemode(&info->devmode);
the next stage in the NTSTATUS/WERROR change. smbd and nmbd now compile, but the client code still needs some work (This used to be commit dcd6e735f709a9231860ceb9682db40ff26c9a66)
2001-09-04 11:13:01 +04:00
return WERR_ACCESS_DENIED;
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
}
JF - you might want to look at this patch. Went through and fixed up all failure possibilities. If something (malloc, file open etc.) fails, then this code goes through and cleans up all allocated resources on exit. This is the equivalent of a C++ destuctor for the allocated structures. We need code to be written like this to pass purify tests. Jeremy. (This used to be commit b260ef7cb1fb2b1e4661cc54eab403eb01fbfc35)
2000-04-05 23:48:06 +04:00
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
/****************************************************************************
****************************************************************************/
Fix bug #5372. With a large CUPS installation with a remote server, contacting the server when searching for a name for the location and comment fields can take so much time the client times out. When searching for a name we don't use these fields anyway, so add a function get_a_printer_search() which doesn't contact the CUPS server. Jeremy. (This used to be commit 92d9f20852d5384e92a93dd0b051034718840ca8)
2008-04-04 22:14:09 +04:00
static WERROR get_a_printer_2(NT_PRINTER_INFO_LEVEL_2 *info,
const char *servername,
const char *sharename,
bool get_loc_com)
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
{
r3069: add 'force printername' service parameter for people that want to enforce printername == sharename for spoolss printing (This used to be commit d47b8a0b4f348171df35b3b0028ce7d99fab8af3)
2004-10-20 02:13:08 +04:00
int len = 0;
int snum = lp_servicenumber(sharename);
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
TDB_DATA kbuf, dbuf;
printing/nt_printing.c: use getpwuid not smbgetpwuid. Canonicalize printernames. printing/printing.c: Insure fix for malloc of zero. rpc_parse/parse_misc.c: Enusre UNISTR's are zero filled. rpc_parse/parse_spoolss.c: Correct INFO_6 - differs between pre-releases of W2K and shipping build. rpc_server/srv_spoolss_nt.c: Canonicalize printernames. Jeremy. (This used to be commit b17e23a8ff2b44540726968355a4b7e26f244f3b)
2000-11-10 22:36:34 +03:00
fstring printername;
it never amazes me when some new things crawls out of the windows spooler. :-( When installing the Adobe PS driver onto a Samba printer via cupsaddsmb, I noticed a WIN2k client sending DeletePrinterData("DependentFiles") pver and over. I also noticed that we never checked to see if the value was valid. No now we do and return WERR_BADFILE which I think is correct. Next, I noticed that we never wrote the updated printer out to disk after a succesfully DeletePrinterData[Ex](). Finally, I found a driver (Canon BJC 1000 using the Adobe PS drivers and foomatic PPD file) that was destroying the device name string in the devmode. So now get_a_printer_2() always writes out the device name in \\server\share form. I think these changes might fix bug 294. (This used to be commit deb25780874b66e68ac597db24fbc50e7f7458b5)
2003-08-23 07:34:24 +04:00
char adevice[MAXDEVICENAME];
Change tdb_unpack "P" to return a malloc'ed string rather than expect a pstring space to put data into. Fix the (few) callers. Jeremy. (This used to be commit 7722a7d2c63f84b8105aa775b39f0ceedd4ed513)
2007-12-04 01:54:06 +03:00
char *comment = NULL;
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
kbuf = make_printer_tdbkey(talloc_tos(), sharename);
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
split the nt_drivers.tdb in 3 separate tdb files. Should speed-up lookups J.F. (This used to be commit c08e22713ea4ddbc4951dc8dcc40609eb0039ddb)
2001-07-09 22:19:04 +04:00
dbuf = tdb_fetch(tdb_printers, kbuf);
r16365: Fix Klocwork #895, #898, #899, #915, #932, #938 and a few other problems Klocwork missed. Jeremy. (This used to be commit fe05769a1a85f924c67be7e5dcee4871a86948d7)
2006-06-20 01:36:19 +04:00
if (!dbuf.dptr) {
Fix bug #5372. With a large CUPS installation with a remote server, contacting the server when searching for a name for the location and comment fields can take so much time the client times out. When searching for a name we don't use these fields anyway, so add a function get_a_printer_search() which doesn't contact the CUPS server. Jeremy. (This used to be commit 92d9f20852d5384e92a93dd0b051034718840ca8)
2008-04-04 22:14:09 +04:00
return get_a_printer_2_default(info, servername,
sharename, get_loc_com);
r16365: Fix Klocwork #895, #898, #899, #915, #932, #938 and a few other problems Klocwork missed. Jeremy. (This used to be commit fe05769a1a85f924c67be7e5dcee4871a86948d7)
2006-06-20 01:36:19 +04:00
}
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
Added John Reilly's enumports/addprinter/delprinter scripting code plus the fix for the Win9x printer drivers. Changed command names to add "command" string on the end for some consistancy with the other scripting commands. Added '%P' option to tdbpack/unpack to store long comment string. Made port name be "Samba Printer Port" if no enum port script given. Fixed prs_uint32_pre code to cope with null args. Jeremy. (This used to be commit 902ada63799cf27924c72e24e7593a8c9fb5eba9)
2000-08-01 00:41:51 +04:00
len += tdb_unpack(dbuf.dptr+len, dbuf.dsize-len, "dddddddddddfffffPfffff",
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
&info->attributes,
&info->priority,
&info->default_priority,
&info->starttime,
&info->untiltime,
&info->status,
&info->cjobs,
&info->averageppm,
&info->changeid,
&info->c_setprinter,
&info->setuptime,
info->servername,
info->printername,
info->sharename,
info->portname,
info->drivername,
Change tdb_unpack "P" to return a malloc'ed string rather than expect a pstring space to put data into. Fix the (few) callers. Jeremy. (This used to be commit 7722a7d2c63f84b8105aa775b39f0ceedd4ed513)
2007-12-04 01:54:06 +03:00
&comment,
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
info->location,
info->sepfile,
info->printprocessor,
info->datatype,
info->parameters);
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
Change tdb_unpack "P" to return a malloc'ed string rather than expect a pstring space to put data into. Fix the (few) callers. Jeremy. (This used to be commit 7722a7d2c63f84b8105aa775b39f0ceedd4ed513)
2007-12-04 01:54:06 +03:00
if (comment) {
strlcpy(info->comment, comment, sizeof(info->comment));
SAFE_FREE(comment);
}
Fixed open handle code in printers - 3 functions were always being done in order - moved them into open_printer_hnd(). Added saving of comment field. Jeremy. (This used to be commit a0ee774fe92e5d0bc84d1d6729e8c538c67e8aba)
2000-07-22 04:48:29 +04:00
/* Samba has to have shared raw drivers. */
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
info->attributes |= PRINTER_ATTRIBUTE_SAMBA;
info->attributes &= ~PRINTER_ATTRIBUTE_NOT_SAMBA;
Create elements in default, not in read. Jeremy. (This used to be commit 0d681ea252e0cf7fdf57d316d2bfe7caa9b4fbf5)
2000-06-06 05:34:20 +04:00
printing/nt_printing.c: use getpwuid not smbgetpwuid. Canonicalize printernames. printing/printing.c: Insure fix for malloc of zero. rpc_parse/parse_misc.c: Enusre UNISTR's are zero filled. rpc_parse/parse_spoolss.c: Correct INFO_6 - differs between pre-releases of W2K and shipping build. rpc_server/srv_spoolss_nt.c: Canonicalize printernames. Jeremy. (This used to be commit b17e23a8ff2b44540726968355a4b7e26f244f3b)
2000-11-10 22:36:34 +03:00
/* Restore the stripped strings. */
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
slprintf(info->servername, sizeof(info->servername)-1, "\\\\%s", servername);
r3069: add 'force printername' service parameter for people that want to enforce printername == sharename for spoolss printing (This used to be commit d47b8a0b4f348171df35b3b0028ce7d99fab8af3)
2004-10-20 02:13:08 +04:00
r16365: Fix Klocwork #895, #898, #899, #915, #932, #938 and a few other problems Klocwork missed. Jeremy. (This used to be commit fe05769a1a85f924c67be7e5dcee4871a86948d7)
2006-06-20 01:36:19 +04:00
if ( lp_force_printername(snum) ) {
r8501: * disable printer handle object cache (was mostly used for NT4 clients enumerating printer data on slow CPUs) * fix pinter and secdesc record upgrade to normalize the key (rev'd printer tdb version) * fixed problem that was normalizing the printername name field in general, this should fix the issues upgrading print servers from 3.0.14a to 3.0.20 (This used to be commit d07179de2f2a6eb1d13d0e25ac10de1a21475559)
2005-07-15 18:26:11 +04:00
slprintf(printername, sizeof(printername)-1, "\\\\%s\\%s", servername, sharename );
r16365: Fix Klocwork #895, #898, #899, #915, #932, #938 and a few other problems Klocwork missed. Jeremy. (This used to be commit fe05769a1a85f924c67be7e5dcee4871a86948d7)
2006-06-20 01:36:19 +04:00
} else {
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
slprintf(printername, sizeof(printername)-1, "\\\\%s\\%s", servername, info->printername);
r16365: Fix Klocwork #895, #898, #899, #915, #932, #938 and a few other problems Klocwork missed. Jeremy. (This used to be commit fe05769a1a85f924c67be7e5dcee4871a86948d7)
2006-06-20 01:36:19 +04:00
}
r3069: add 'force printername' service parameter for people that want to enforce printername == sharename for spoolss printing (This used to be commit d47b8a0b4f348171df35b3b0028ce7d99fab8af3)
2004-10-20 02:13:08 +04:00
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
fstrcpy(info->printername, printername);
printing/nt_printing.c: use getpwuid not smbgetpwuid. Canonicalize printernames. printing/printing.c: Insure fix for malloc of zero. rpc_parse/parse_misc.c: Enusre UNISTR's are zero filled. rpc_parse/parse_spoolss.c: Correct INFO_6 - differs between pre-releases of W2K and shipping build. rpc_server/srv_spoolss_nt.c: Canonicalize printernames. Jeremy. (This used to be commit b17e23a8ff2b44540726968355a4b7e26f244f3b)
2000-11-10 22:36:34 +03:00
r21861: Pull the comment and location from CUPS if we don't have one when fetching a printer from ntprinters.tdb. Slightly modified from original version submitted on samba-technical ml by Andy Polyakov <appro@fy.chalmers.se> (This used to be commit e859e1fdcd13c55746a53b5de4a02a3278f41815)
2007-03-17 00:46:58 +03:00
#ifdef HAVE_CUPS
Fix bug #5372. With a large CUPS installation with a remote server, contacting the server when searching for a name for the location and comment fields can take so much time the client times out. When searching for a name we don't use these fields anyway, so add a function get_a_printer_search() which doesn't contact the CUPS server. Jeremy. (This used to be commit 92d9f20852d5384e92a93dd0b051034718840ca8)
2008-04-04 22:14:09 +04:00
if (get_loc_com && (enum printing_types)lp_printing(snum) == PRINT_CUPS ) {
r21861: Pull the comment and location from CUPS if we don't have one when fetching a printer from ntprinters.tdb. Slightly modified from original version submitted on samba-technical ml by Andy Polyakov <appro@fy.chalmers.se> (This used to be commit e859e1fdcd13c55746a53b5de4a02a3278f41815)
2007-03-17 00:46:58 +03:00
/* Pull the location and comment strings from cups if we don't
already have one */
s3-printing: avoid mixing cups backend code with nt_printing code in cups_pull_comment_location. Guenther
2010-03-26 15:17:49 +03:00
if ( !strlen(info->location) || !strlen(info->comment) ) {
char *location = NULL;
comment = NULL;
if (cups_pull_comment_location(info, info->sharename,
&comment, &location)) {
strlcpy(info->comment, comment, sizeof(info->comment));
fstrcpy(info->location, location);
TALLOC_FREE(comment);
TALLOC_FREE(location);
}
}
r21861: Pull the comment and location from CUPS if we don't have one when fetching a printer from ntprinters.tdb. Slightly modified from original version submitted on samba-technical ml by Andy Polyakov <appro@fy.chalmers.se> (This used to be commit e859e1fdcd13c55746a53b5de4a02a3278f41815)
2007-03-17 00:46:58 +03:00
}
#endif
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
len += unpack_devicemode(&info->devmode,dbuf.dptr+len, dbuf.dsize-len);
merge from 2.2. of * PRINTER_ATTRIBUTE's * "default devmode" parameter (This used to be commit 90a7a1840b4823d4ebe047130a95dd15a824500b)
2002-01-22 21:14:31 +03:00
merge from 2.2 (This used to be commit 96b3a65a73d403a41bf1b3aba79bd743698344ac)
2001-11-22 08:56:09 +03:00
/*
* Some client drivers freak out if there is a NULL devmode
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
* (probably the driver is not checking before accessing
merge from 2.2 (This used to be commit 96b3a65a73d403a41bf1b3aba79bd743698344ac)
2001-11-22 08:56:09 +03:00
* the devmode pointer) --jerry
merge from 2.2. of * PRINTER_ATTRIBUTE's * "default devmode" parameter (This used to be commit 90a7a1840b4823d4ebe047130a95dd15a824500b)
2002-01-22 21:14:31 +03:00
*
* See comments in get_a_printer_2_default()
merge from 2.2 (This used to be commit 96b3a65a73d403a41bf1b3aba79bd743698344ac)
2001-11-22 08:56:09 +03:00
*/
merge from 2.2. of * PRINTER_ATTRIBUTE's * "default devmode" parameter (This used to be commit 90a7a1840b4823d4ebe047130a95dd15a824500b)
2002-01-22 21:14:31 +03:00
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
if (lp_default_devmode(snum) && !info->devmode) {
merge from 2.2 (This used to be commit 96b3a65a73d403a41bf1b3aba79bd743698344ac)
2001-11-22 08:56:09 +03:00
DEBUG(8,("get_a_printer_2: Constructing a default device mode for [%s]\n",
printername));
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
info->devmode = construct_nt_devicemode(printername);
merge from 2.2 (This used to be commit 96b3a65a73d403a41bf1b3aba79bd743698344ac)
2001-11-22 08:56:09 +03:00
}
it never amazes me when some new things crawls out of the windows spooler. :-( When installing the Adobe PS driver onto a Samba printer via cupsaddsmb, I noticed a WIN2k client sending DeletePrinterData("DependentFiles") pver and over. I also noticed that we never checked to see if the value was valid. No now we do and return WERR_BADFILE which I think is correct. Next, I noticed that we never wrote the updated printer out to disk after a succesfully DeletePrinterData[Ex](). Finally, I found a driver (Canon BJC 1000 using the Adobe PS drivers and foomatic PPD file) that was destroying the device name string in the devmode. So now get_a_printer_2() always writes out the device name in \\server\share form. I think these changes might fix bug 294. (This used to be commit deb25780874b66e68ac597db24fbc50e7f7458b5)
2003-08-23 07:34:24 +04:00
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
slprintf( adevice, sizeof(adevice), "%s", info->printername );
if (info->devmode) {
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
fstrcpy(info->devmode->devicename, adevice);
make sure we have a devmode before copying a string to the devicename; patch from metze (This used to be commit 1700e83ac8035db7d22b8c64c10f63cb3e3b9eb7)
2003-10-20 18:02:02 +04:00
}
merge from 2.2. of * PRINTER_ATTRIBUTE's * "default devmode" parameter (This used to be commit 90a7a1840b4823d4ebe047130a95dd15a824500b)
2002-01-22 21:14:31 +03:00
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
if ( !(info->data = TALLOC_ZERO_P( info, NT_PRINTER_DATA )) ) {
DEBUG(0,("unpack_values: talloc() failed!\n"));
r16365: Fix Klocwork #895, #898, #899, #915, #932, #938 and a few other problems Klocwork missed. Jeremy. (This used to be commit fe05769a1a85f924c67be7e5dcee4871a86948d7)
2006-06-20 01:36:19 +04:00
SAFE_FREE(dbuf.dptr);
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
return WERR_NOMEM;
}
len += unpack_values( info->data, dbuf.dptr+len, dbuf.dsize-len );
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
Move to talloc control of SPOOL_XXX structs. Move to talloc control of security descriptors and pointers. Syncup with 2.2 tree. Jeremy. (This used to be commit 14d5997dc841e78a619e865288486d50c245896d)
2001-02-28 03:51:02 +03:00
/* This will get the current RPC talloc context, but we should be
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
passing this as a parameter... fixme... JRA ! */
Move to talloc control of SPOOL_XXX structs. Move to talloc control of security descriptors and pointers. Syncup with 2.2 tree. Jeremy. (This used to be commit 14d5997dc841e78a619e865288486d50c245896d)
2001-02-28 03:51:02 +03:00
r16365: Fix Klocwork #895, #898, #899, #915, #932, #938 and a few other problems Klocwork missed. Jeremy. (This used to be commit fe05769a1a85f924c67be7e5dcee4871a86948d7)
2006-06-20 01:36:19 +04:00
if (!nt_printing_getsec(info, sharename, &info->secdesc_buf)) {
SAFE_FREE(dbuf.dptr);
return WERR_NOMEM;
}
fixed!! yipee! the damn "device settings cannot be displayed" error is gone. We needed to supply a default set of forms. I've added A4 and Letter by default. (This used to be commit 36f1189be1609490b6a825a2608b9cf5dc682656)
2000-06-06 05:47:11 +04:00
Two OS/2 printer fixes from Jim McDonough @ IBM. First one adds a new info level into the lanman printing and an ioctl to the trans2 code. Andrew - this uses ASCII only. It looks ok to me but please check ! Second one adds a parameter "os2 driver map" that allows OS/2 driver names to be mapped. Jeremy. (This used to be commit da79b519e0b6b4317d7fb5260d74e0e74a7e0b46)
2001-03-23 06:12:58 +03:00
/* Fix for OS/2 drivers. */
r16365: Fix Klocwork #895, #898, #899, #915, #932, #938 and a few other problems Klocwork missed. Jeremy. (This used to be commit fe05769a1a85f924c67be7e5dcee4871a86948d7)
2006-06-20 01:36:19 +04:00
if (get_remote_arch() == RA_OS2) {
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
map_to_os2_driver(info->drivername);
r16365: Fix Klocwork #895, #898, #899, #915, #932, #938 and a few other problems Klocwork missed. Jeremy. (This used to be commit fe05769a1a85f924c67be7e5dcee4871a86948d7)
2006-06-20 01:36:19 +04:00
}
Two OS/2 printer fixes from Jim McDonough @ IBM. First one adds a new info level into the lanman printing and an ioctl to the trans2 code. Andrew - this uses ASCII only. It looks ok to me but please check ! Second one adds a parameter "os2 driver map" that allows OS/2 driver names to be mapped. Jeremy. (This used to be commit da79b519e0b6b4317d7fb5260d74e0e74a7e0b46)
2001-03-23 06:12:58 +03:00
move to SAFE_FREE() (This used to be commit 09bf4425492fd96672ddd7a31d88854adcf7f0fe)
2001-09-17 13:25:57 +04:00
SAFE_FREE(dbuf.dptr);
some printer parameters are getting corrupted, possibly by the client possibly by smbd. Reset them so printing at least works while I try to figure out what is going on. (This used to be commit 70476d6767a571460fa375fb1dae884df77ca143)
2000-06-04 08:17:59 +04:00
printing/nt_printing.c: use getpwuid not smbgetpwuid. Canonicalize printernames. printing/printing.c: Insure fix for malloc of zero. rpc_parse/parse_misc.c: Enusre UNISTR's are zero filled. rpc_parse/parse_spoolss.c: Correct INFO_6 - differs between pre-releases of W2K and shipping build. rpc_server/srv_spoolss_nt.c: Canonicalize printernames. Jeremy. (This used to be commit b17e23a8ff2b44540726968355a4b7e26f244f3b)
2000-11-10 22:36:34 +03:00
DEBUG(9,("Unpacked printer [%s] name [%s] running driver [%s]\n",
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
sharename, info->printername, info->drivername));
some printer parameters are getting corrupted, possibly by the client possibly by smbd. Reset them so printing at least works while I try to figure out what is going on. (This used to be commit 70476d6767a571460fa375fb1dae884df77ca143)
2000-06-04 08:17:59 +04:00
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
return WERR_OK;
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
}
/****************************************************************************
Progress on CR 601 cache the printer_info_2 with the open printer handle. cache is invalidated on a mod_a_printer() call **on that smbd**. Yes, this means that the window for admins to step on each other from different clients just got larger, but since handles a generally short lived this is probably ok. (This used to be commit 31272d3b6bb9ec62fd666301c7adfa0c1720a99b)
2003-02-25 23:53:53 +03:00
Debugging function, dump at level 6 the struct in the logs.
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
****************************************************************************/
r2569: Patch from Rob Foehl <rwf@loonybin.net>: - fix typo in libads/ldap_printer.c:39, ads_find_printer_on_server() (originally libads-typo.patch) - fix leak in printing/nt_printing.c, is_printer_published() (originally is_printer_published-leak.patch) - fix double print_backend_init() calls, now only called from main() - restructuring in printing/nt_printing.c - replaced (un)publish_it() with ads-specific functions - moved common code to nt_printer_publish() - improved error handling in several places - added check_published_printers() in printing/nt_printing.c, to verify that each published printer is actually in the directory at startup - changed calling semantics of mod_a_printer, dump_a_printer, and update_driver_init to be more consistent with the rest of the api and reduce some copying (This used to be commit 50a5a3dbd02acb0d09133b6e42cc37d091ea901d)
2004-09-23 23:24:02 +04:00
static uint32 dump_a_printer(NT_PRINTER_INFO_LEVEL *printer, uint32 level)
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
{
Sync-up with appliance-head printing code. Jeremy. (This used to be commit fe730614d70b331ec7b1a909940395c9713ea8ac)
2000-12-06 03:37:25 +03:00
uint32 result;
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
NT_PRINTER_INFO_LEVEL_2 *info2;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
fix the reply of rpc_alter_context OpenPrinterEx is now decoding correctly the query most of the EnumXXX use the new_buffer struct. check the (un)marshalling return code. conclusion: still a long way to go. all the client code has to be rewritten, and I still wonder how to implement correctly the notify stuff. (This used to be commit 3d6d3863751787b08d40268c83221add1487a5c9)
2000-02-15 21:07:45 +03:00
DEBUG(106,("Dumping printer at level [%d]\n", level));
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Progress on CR 601 cache the printer_info_2 with the open printer handle. cache is invalidated on a mod_a_printer() call **on that smbd**. Yes, this means that the window for admins to step on each other from different clients just got larger, but since handles a generally short lived this is probably ok. (This used to be commit 31272d3b6bb9ec62fd666301c7adfa0c1720a99b)
2003-02-25 23:53:53 +03:00
switch (level) {
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
case 2:
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
{
r2569: Patch from Rob Foehl <rwf@loonybin.net>: - fix typo in libads/ldap_printer.c:39, ads_find_printer_on_server() (originally libads-typo.patch) - fix leak in printing/nt_printing.c, is_printer_published() (originally is_printer_published-leak.patch) - fix double print_backend_init() calls, now only called from main() - restructuring in printing/nt_printing.c - replaced (un)publish_it() with ads-specific functions - moved common code to nt_printer_publish() - improved error handling in several places - added check_published_printers() in printing/nt_printing.c, to verify that each published printer is actually in the directory at startup - changed calling semantics of mod_a_printer, dump_a_printer, and update_driver_init to be more consistent with the rest of the api and reduce some copying (This used to be commit 50a5a3dbd02acb0d09133b6e42cc37d091ea901d)
2004-09-23 23:24:02 +04:00
if (printer->info_2 == NULL)
Sync-up with appliance-head printing code. Jeremy. (This used to be commit fe730614d70b331ec7b1a909940395c9713ea8ac)
2000-12-06 03:37:25 +03:00
result=5;
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
else
{
r2569: Patch from Rob Foehl <rwf@loonybin.net>: - fix typo in libads/ldap_printer.c:39, ads_find_printer_on_server() (originally libads-typo.patch) - fix leak in printing/nt_printing.c, is_printer_published() (originally is_printer_published-leak.patch) - fix double print_backend_init() calls, now only called from main() - restructuring in printing/nt_printing.c - replaced (un)publish_it() with ads-specific functions - moved common code to nt_printer_publish() - improved error handling in several places - added check_published_printers() in printing/nt_printing.c, to verify that each published printer is actually in the directory at startup - changed calling semantics of mod_a_printer, dump_a_printer, and update_driver_init to be more consistent with the rest of the api and reduce some copying (This used to be commit 50a5a3dbd02acb0d09133b6e42cc37d091ea901d)
2004-09-23 23:24:02 +04:00
info2=printer->info_2;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
getprinter level 0: was to short, found most of the fields, undocumented, undecoded, nothing in MSDN, but now it works :-) cleanup of error codes. fixed some dfs declarations function. J.F. (This used to be commit 87da4404aba29a2ebd999886e4c06958c96d3e05)
2000-03-10 20:12:24 +03:00
DEBUGADD(106,("attributes:[%d]\n", info2->attributes));
DEBUGADD(106,("priority:[%d]\n", info2->priority));
fix the reply of rpc_alter_context OpenPrinterEx is now decoding correctly the query most of the EnumXXX use the new_buffer struct. check the (un)marshalling return code. conclusion: still a long way to go. all the client code has to be rewritten, and I still wonder how to implement correctly the notify stuff. (This used to be commit 3d6d3863751787b08d40268c83221add1487a5c9)
2000-02-15 21:07:45 +03:00
DEBUGADD(106,("default_priority:[%d]\n", info2->default_priority));
getprinter level 0: was to short, found most of the fields, undocumented, undecoded, nothing in MSDN, but now it works :-) cleanup of error codes. fixed some dfs declarations function. J.F. (This used to be commit 87da4404aba29a2ebd999886e4c06958c96d3e05)
2000-03-10 20:12:24 +03:00
DEBUGADD(106,("starttime:[%d]\n", info2->starttime));
DEBUGADD(106,("untiltime:[%d]\n", info2->untiltime));
Sed error. The status value in the PRINTER_INFO_2 structure isn't a WERROR but a plain old uint32. (This used to be commit 690cc12bad2a037684a43b0dcb48be8eb03aa7bc)
2002-01-07 09:13:40 +03:00
DEBUGADD(106,("status:[%d]\n", info2->status));
getprinter level 0: was to short, found most of the fields, undocumented, undecoded, nothing in MSDN, but now it works :-) cleanup of error codes. fixed some dfs declarations function. J.F. (This used to be commit 87da4404aba29a2ebd999886e4c06958c96d3e05)
2000-03-10 20:12:24 +03:00
DEBUGADD(106,("cjobs:[%d]\n", info2->cjobs));
DEBUGADD(106,("averageppm:[%d]\n", info2->averageppm));
DEBUGADD(106,("changeid:[%d]\n", info2->changeid));
DEBUGADD(106,("c_setprinter:[%d]\n", info2->c_setprinter));
a fairly big change in spoolss. got rid of the forms, drivers and printers files in the nt drivers directory and instead use a single tdb note that this is _not_ all finished. (This used to be commit 06763d1ec2fafc42f8ee3f36f0aeacceb3a7109d)
2000-05-24 10:10:21 +04:00
DEBUGADD(106,("setuptime:[%d]\n", info2->setuptime));
getprinter level 0: was to short, found most of the fields, undocumented, undecoded, nothing in MSDN, but now it works :-) cleanup of error codes. fixed some dfs declarations function. J.F. (This used to be commit 87da4404aba29a2ebd999886e4c06958c96d3e05)
2000-03-10 20:12:24 +03:00
DEBUGADD(106,("servername:[%s]\n", info2->servername));
DEBUGADD(106,("printername:[%s]\n", info2->printername));
DEBUGADD(106,("sharename:[%s]\n", info2->sharename));
DEBUGADD(106,("portname:[%s]\n", info2->portname));
DEBUGADD(106,("drivername:[%s]\n", info2->drivername));
Fixed open handle code in printers - 3 functions were always being done in order - moved them into open_printer_hnd(). Added saving of comment field. Jeremy. (This used to be commit a0ee774fe92e5d0bc84d1d6729e8c538c67e8aba)
2000-07-22 04:48:29 +04:00
DEBUGADD(106,("comment:[%s]\n", info2->comment));
getprinter level 0: was to short, found most of the fields, undocumented, undecoded, nothing in MSDN, but now it works :-) cleanup of error codes. fixed some dfs declarations function. J.F. (This used to be commit 87da4404aba29a2ebd999886e4c06958c96d3e05)
2000-03-10 20:12:24 +03:00
DEBUGADD(106,("location:[%s]\n", info2->location));
DEBUGADD(106,("sepfile:[%s]\n", info2->sepfile));
DEBUGADD(106,("printprocessor:[%s]\n", info2->printprocessor));
DEBUGADD(106,("datatype:[%s]\n", info2->datatype));
DEBUGADD(106,("parameters:[%s]\n", info2->parameters));
Sync-up with appliance-head printing code. Jeremy. (This used to be commit fe730614d70b331ec7b1a909940395c9713ea8ac)
2000-12-06 03:37:25 +03:00
result=0;
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
}
break;
}
default:
Bring printing in HEAD inline with 2.2.x and app-head. Jeremy. (This used to be commit 771ef92fc6e43725b7cc351079998a8acb74abef)
2002-02-09 07:10:24 +03:00
DEBUGADD(106,("dump_a_printer: Level %u not implemented\n", (unsigned int)level ));
Sync-up with appliance-head printing code. Jeremy. (This used to be commit fe730614d70b331ec7b1a909940395c9713ea8ac)
2000-12-06 03:37:25 +03:00
result=1;
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
break;
}
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Sync-up with appliance-head printing code. Jeremy. (This used to be commit fe730614d70b331ec7b1a909940395c9713ea8ac)
2000-12-06 03:37:25 +03:00
return result;
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
}
Another attempt at getting changeid correct. Jerry / JF please check ! This fixes a driver init bug. Jeremy. (This used to be commit 8e8d71816002c634669c0cb0234f7a35281d9cad)
2002-01-08 08:39:27 +03:00
/****************************************************************************
Update the changeid time.
My previous fix had a bug.... This is SO NASTY as some drivers need this to change, others need it static. This value will change every second, and I must hope that this is enough..... DON'T CHANGE THIS CODE WITHOUT A TEST MATRIX THE SIZE OF UTAH ! Jeremy. (This used to be commit 9fb780d951babeaf5f5b82903c717ff5ccf831cd)
2002-01-09 02:50:14 +03:00
This is SO NASTY as some drivers need this to change, others need it
static. This value will change every second, and I must hope that this
is enough..... DON'T CHANGE THIS CODE WITHOUT A TEST MATRIX THE SIZE OF
UTAH ! JRA.
Another attempt at getting changeid correct. Jerry / JF please check ! This fixes a driver init bug. Jeremy. (This used to be commit 8e8d71816002c634669c0cb0234f7a35281d9cad)
2002-01-08 08:39:27 +03:00
****************************************************************************/
My previous fix had a bug.... This is SO NASTY as some drivers need this to change, others need it static. This value will change every second, and I must hope that this is enough..... DON'T CHANGE THIS CODE WITHOUT A TEST MATRIX THE SIZE OF UTAH ! Jeremy. (This used to be commit 9fb780d951babeaf5f5b82903c717ff5ccf831cd)
2002-01-09 02:50:14 +03:00
static uint32 rev_changeid(void)
Another attempt at getting changeid correct. Jerry / JF please check ! This fixes a driver init bug. Jeremy. (This used to be commit 8e8d71816002c634669c0cb0234f7a35281d9cad)
2002-01-08 08:39:27 +03:00
{
Latest attempt at changeid. Jeremy. (This used to be commit 24ee18c77e1b61004d8ed817118a481f3d43e34c)
2002-01-12 00:52:46 +03:00
struct timeval tv;
get_process_uptime(&tv);
Bring printing in HEAD inline with 2.2.x and app-head. Jeremy. (This used to be commit 771ef92fc6e43725b7cc351079998a8acb74abef)
2002-02-09 07:10:24 +03:00
syncing up printing code with SAMBA_2_2 (already done some merges in the reverse). * add in new printer change notify code from SAMBA_2_2 * add in se_map_standard() from 2.2 in _spoolss_open_printer_ex() * sync up the _print_queue_struct in smb.h (why did someone change the user/file names in fs_user/fs_file (or vice-versa) ? ) * sync up some cli_spoolss_XXX functions (This used to be commit 5760315c1de4033fdc22684c940f18010010924f)
2002-03-15 11:14:10 +03:00
#if 1 /* JERRY */
Bring printing in HEAD inline with 2.2.x and app-head. Jeremy. (This used to be commit 771ef92fc6e43725b7cc351079998a8acb74abef)
2002-02-09 07:10:24 +03:00
/* Return changeid as msec since spooler restart */
return tv.tv_sec * 1000 + tv.tv_usec / 1000;
syncing up printing code with SAMBA_2_2 (already done some merges in the reverse). * add in new printer change notify code from SAMBA_2_2 * add in se_map_standard() from 2.2 in _spoolss_open_printer_ex() * sync up the _print_queue_struct in smb.h (why did someone change the user/file names in fs_user/fs_file (or vice-versa) ? ) * sync up some cli_spoolss_XXX functions (This used to be commit 5760315c1de4033fdc22684c940f18010010924f)
2002-03-15 11:14:10 +03:00
#else
/*
* This setting seems to work well but is too untested
* to replace the above calculation. Left in for experiementation
* of the reader --jerry (Tue Mar 12 09:15:05 CST 2002)
*/
return tv.tv_sec * 10 + tv.tv_usec / 100000;
#endif
Another attempt at getting changeid correct. Jerry / JF please check ! This fixes a driver init bug. Jeremy. (This used to be commit 8e8d71816002c634669c0cb0234f7a35281d9cad)
2002-01-08 08:39:27 +03:00
}
r1885: tighten the cache consistency with the ntprinters.tdb entry an the in memory cache associated with open printer handles; also make sure that register_messages_flags() doesn't overwrite the originally registers flags (This used to be commit 540daf71d8ad189af5dd6d45aa1ce2b3d67da752)
2004-08-18 17:55:58 +04:00
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
/*
* The function below are the high level ones.
* only those ones must be called from the spoolss code.
* JFM.
*/
/****************************************************************************
Sorry JF - no billable hours :-). I fixed the "stream of events" problem with PCL drivers. The problem was we were updating the changeid on every SETPRINTERDATA/DELETEPRINTERDATA call. We should not do this, we should just update the 'setprinter' called count. We update the changeid on calls to SETPRINTER/ADDPRINTER/ADDPRINTEREX etc. Also fixed the correct returning of the create time on printers. Jeremy. (This used to be commit 521f09829fd329f87b3d19e8871e2b989c98a58e)
2000-10-27 01:43:13 +04:00
Modify a printer. This is called from SETPRINTERDATA/DELETEPRINTERDATA.
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
****************************************************************************/
Sorry JF - no billable hours :-). I fixed the "stream of events" problem with PCL drivers. The problem was we were updating the changeid on every SETPRINTERDATA/DELETEPRINTERDATA call. We should not do this, we should just update the 'setprinter' called count. We update the changeid on calls to SETPRINTER/ADDPRINTER/ADDPRINTEREX etc. Also fixed the correct returning of the create time on printers. Jeremy. (This used to be commit 521f09829fd329f87b3d19e8871e2b989c98a58e)
2000-10-27 01:43:13 +04:00
r2569: Patch from Rob Foehl <rwf@loonybin.net>: - fix typo in libads/ldap_printer.c:39, ads_find_printer_on_server() (originally libads-typo.patch) - fix leak in printing/nt_printing.c, is_printer_published() (originally is_printer_published-leak.patch) - fix double print_backend_init() calls, now only called from main() - restructuring in printing/nt_printing.c - replaced (un)publish_it() with ads-specific functions - moved common code to nt_printer_publish() - improved error handling in several places - added check_published_printers() in printing/nt_printing.c, to verify that each published printer is actually in the directory at startup - changed calling semantics of mod_a_printer, dump_a_printer, and update_driver_init to be more consistent with the rest of the api and reduce some copying (This used to be commit 50a5a3dbd02acb0d09133b6e42cc37d091ea901d)
2004-09-23 23:24:02 +04:00
WERROR mod_a_printer(NT_PRINTER_INFO_LEVEL *printer, uint32 level)
Sorry JF - no billable hours :-). I fixed the "stream of events" problem with PCL drivers. The problem was we were updating the changeid on every SETPRINTERDATA/DELETEPRINTERDATA call. We should not do this, we should just update the 'setprinter' called count. We update the changeid on calls to SETPRINTER/ADDPRINTER/ADDPRINTEREX etc. Also fixed the correct returning of the create time on printers. Jeremy. (This used to be commit 521f09829fd329f87b3d19e8871e2b989c98a58e)
2000-10-27 01:43:13 +04:00
{
the next stage in the NTSTATUS/WERROR change. smbd and nmbd now compile, but the client code still needs some work (This used to be commit dcd6e735f709a9231860ceb9682db40ff26c9a66)
2001-09-04 11:13:01 +04:00
WERROR result;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
dump_a_printer(printer, level);
Progress on CR 601 cache the printer_info_2 with the open printer handle. cache is invalidated on a mod_a_printer() call **on that smbd**. Yes, this means that the window for admins to step on each other from different clients just got larger, but since handles a generally short lived this is probably ok. (This used to be commit 31272d3b6bb9ec62fd666301c7adfa0c1720a99b)
2003-02-25 23:53:53 +03:00
switch (level) {
Sorry JF - no billable hours :-). I fixed the "stream of events" problem with PCL drivers. The problem was we were updating the changeid on every SETPRINTERDATA/DELETEPRINTERDATA call. We should not do this, we should just update the 'setprinter' called count. We update the changeid on calls to SETPRINTER/ADDPRINTER/ADDPRINTEREX etc. Also fixed the correct returning of the create time on printers. Jeremy. (This used to be commit 521f09829fd329f87b3d19e8871e2b989c98a58e)
2000-10-27 01:43:13 +04:00
case 2:
{
ChangeID fixe from APPLIANCE_HEAD (This used to be commit 096d06a961e3a3e6f6952754875b83558448f449)
2001-12-14 23:38:04 +03:00
/*
* Update the changestamp. Emperical tests show that the
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
* ChangeID is always updated,but c_setprinter is
Bring printing in HEAD inline with 2.2.x and app-head. Jeremy. (This used to be commit 771ef92fc6e43725b7cc351079998a8acb74abef)
2002-02-09 07:10:24 +03:00
* global spooler variable (not per printer).
ChangeID fixe from APPLIANCE_HEAD (This used to be commit 096d06a961e3a3e6f6952754875b83558448f449)
2001-12-14 23:38:04 +03:00
*/
/* ChangeID **must** be increasing over the lifetime
Another attempt at getting changeid correct. Jerry / JF please check ! This fixes a driver init bug. Jeremy. (This used to be commit 8e8d71816002c634669c0cb0234f7a35281d9cad)
2002-01-08 08:39:27 +03:00
of client's spoolss service in order for the
ChangeID fixe from APPLIANCE_HEAD (This used to be commit 096d06a961e3a3e6f6952754875b83558448f449)
2001-12-14 23:38:04 +03:00
client's cache to show updates */
r2569: Patch from Rob Foehl <rwf@loonybin.net>: - fix typo in libads/ldap_printer.c:39, ads_find_printer_on_server() (originally libads-typo.patch) - fix leak in printing/nt_printing.c, is_printer_published() (originally is_printer_published-leak.patch) - fix double print_backend_init() calls, now only called from main() - restructuring in printing/nt_printing.c - replaced (un)publish_it() with ads-specific functions - moved common code to nt_printer_publish() - improved error handling in several places - added check_published_printers() in printing/nt_printing.c, to verify that each published printer is actually in the directory at startup - changed calling semantics of mod_a_printer, dump_a_printer, and update_driver_init to be more consistent with the rest of the api and reduce some copying (This used to be commit 50a5a3dbd02acb0d09133b6e42cc37d091ea901d)
2004-09-23 23:24:02 +04:00
printer->info_2->changeid = rev_changeid();
ChangeID fixe from APPLIANCE_HEAD (This used to be commit 096d06a961e3a3e6f6952754875b83558448f449)
2001-12-14 23:38:04 +03:00
/*
* Because one day someone will ask:
* NT->NT An admin connection to a remote
* printer show changes imeediately in
* the properities dialog
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
*
ChangeID fixe from APPLIANCE_HEAD (This used to be commit 096d06a961e3a3e6f6952754875b83558448f449)
2001-12-14 23:38:04 +03:00
* A non-admin connection will only show the
* changes after viewing the properites page
* 2 times. Seems to be related to a
* race condition in the client between the spooler
* updating the local cache and the Explorer.exe GUI
* actually displaying the properties.
*
* This is fixed in Win2k. admin/non-admin
* connections both display changes immediately.
*
* 14/12/01 --jerry
*/
r2569: Patch from Rob Foehl <rwf@loonybin.net>: - fix typo in libads/ldap_printer.c:39, ads_find_printer_on_server() (originally libads-typo.patch) - fix leak in printing/nt_printing.c, is_printer_published() (originally is_printer_published-leak.patch) - fix double print_backend_init() calls, now only called from main() - restructuring in printing/nt_printing.c - replaced (un)publish_it() with ads-specific functions - moved common code to nt_printer_publish() - improved error handling in several places - added check_published_printers() in printing/nt_printing.c, to verify that each published printer is actually in the directory at startup - changed calling semantics of mod_a_printer, dump_a_printer, and update_driver_init to be more consistent with the rest of the api and reduce some copying (This used to be commit 50a5a3dbd02acb0d09133b6e42cc37d091ea901d)
2004-09-23 23:24:02 +04:00
result=update_a_printer_2(printer->info_2);
Sorry JF - no billable hours :-). I fixed the "stream of events" problem with PCL drivers. The problem was we were updating the changeid on every SETPRINTERDATA/DELETEPRINTERDATA call. We should not do this, we should just update the 'setprinter' called count. We update the changeid on calls to SETPRINTER/ADDPRINTER/ADDPRINTEREX etc. Also fixed the correct returning of the create time on printers. Jeremy. (This used to be commit 521f09829fd329f87b3d19e8871e2b989c98a58e)
2000-10-27 01:43:13 +04:00
break;
}
default:
the next stage in the NTSTATUS/WERROR change. smbd and nmbd now compile, but the client code still needs some work (This used to be commit dcd6e735f709a9231860ceb9682db40ff26c9a66)
2001-09-04 11:13:01 +04:00
result=WERR_UNKNOWN_LEVEL;
Sorry JF - no billable hours :-). I fixed the "stream of events" problem with PCL drivers. The problem was we were updating the changeid on every SETPRINTERDATA/DELETEPRINTERDATA call. We should not do this, we should just update the 'setprinter' called count. We update the changeid on calls to SETPRINTER/ADDPRINTER/ADDPRINTEREX etc. Also fixed the correct returning of the create time on printers. Jeremy. (This used to be commit 521f09829fd329f87b3d19e8871e2b989c98a58e)
2000-10-27 01:43:13 +04:00
break;
}
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
Sync-up with appliance-head printing code. Jeremy. (This used to be commit fe730614d70b331ec7b1a909940395c9713ea8ac)
2000-12-06 03:37:25 +03:00
return result;
Sorry JF - no billable hours :-). I fixed the "stream of events" problem with PCL drivers. The problem was we were updating the changeid on every SETPRINTERDATA/DELETEPRINTERDATA call. We should not do this, we should just update the 'setprinter' called count. We update the changeid on calls to SETPRINTER/ADDPRINTER/ADDPRINTEREX etc. Also fixed the correct returning of the create time on printers. Jeremy. (This used to be commit 521f09829fd329f87b3d19e8871e2b989c98a58e)
2000-10-27 01:43:13 +04:00
}
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
/****************************************************************************
Getting back to a compilable state (not there yet but close). Added patches for random -> sys_random. Added set_effective_xxx patches for AFS code. Memory allocation changes in spoolss code. Jeremy. (This used to be commit c2099cfb033c2cdb6035f4f7f50ce21b98e1584d)
2000-06-01 21:01:34 +04:00
Get a NT_PRINTER_INFO_LEVEL struct. It returns malloced memory.
Move to short lived TALLOC_CTX* for allocating printer objects from the print handle cache. Fixes bug that caused smbd to consume large amounts of RAM when (a) a printer handle was kept open over an extended period of time, and (b) the client issued frequent requests that resulted in a call to get_a_printer() (This used to be commit 10b9976e0ab961dc34c9426f0a497e0f81a5e17f)
2003-12-31 01:17:14 +03:00
Previously the code had a memory allocation problem because it always
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
used the TALLOC_CTX from the Printer_entry*. This context lasts
as a long as the original handle is open. So if the client made a lot
Move to short lived TALLOC_CTX* for allocating printer objects from the print handle cache. Fixes bug that caused smbd to consume large amounts of RAM when (a) a printer handle was kept open over an extended period of time, and (b) the client issued frequent requests that resulted in a call to get_a_printer() (This used to be commit 10b9976e0ab961dc34c9426f0a497e0f81a5e17f)
2003-12-31 01:17:14 +03:00
of getprinter[data]() calls, the memory usage would climb. Now we use
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
a short lived TALLOC_CTX for printer_info_2 objects returned. We
Move to short lived TALLOC_CTX* for allocating printer objects from the print handle cache. Fixes bug that caused smbd to consume large amounts of RAM when (a) a printer handle was kept open over an extended period of time, and (b) the client issued frequent requests that resulted in a call to get_a_printer() (This used to be commit 10b9976e0ab961dc34c9426f0a497e0f81a5e17f)
2003-12-31 01:17:14 +03:00
still use the Printer_entry->ctx for maintaining the cache copy though
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
since that object must live as long as the handle by definition.
Move to short lived TALLOC_CTX* for allocating printer objects from the print handle cache. Fixes bug that caused smbd to consume large amounts of RAM when (a) a printer handle was kept open over an extended period of time, and (b) the client issued frequent requests that resulted in a call to get_a_printer() (This used to be commit 10b9976e0ab961dc34c9426f0a497e0f81a5e17f)
2003-12-31 01:17:14 +03:00
--jerry
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
****************************************************************************/
Getting back to a compilable state (not there yet but close). Added patches for random -> sys_random. Added set_effective_xxx patches for AFS code. Memory allocation changes in spoolss code. Jeremy. (This used to be commit c2099cfb033c2cdb6035f4f7f50ce21b98e1584d)
2000-06-01 21:01:34 +04:00
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
static WERROR get_a_printer_internal( Printer_entry *print_hnd, NT_PRINTER_INFO_LEVEL **pp_printer, uint32 level,
Fix bug #5372. With a large CUPS installation with a remote server, contacting the server when searching for a name for the location and comment fields can take so much time the client times out. When searching for a name we don't use these fields anyway, so add a function get_a_printer_search() which doesn't contact the CUPS server. Jeremy. (This used to be commit 92d9f20852d5384e92a93dd0b051034718840ca8)
2008-04-04 22:14:09 +04:00
const char *sharename, bool get_loc_com)
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
{
the next step in our error code handling change - added WERROR for win32 error codes - added a configure test for immediate structures still lots to do, so its not enabled by default, but the main structure is there (This used to be commit 24f9ab683dec52587ee56717e821b49c0fa3d70f)
2001-09-03 12:50:59 +04:00
WERROR result;
r2768: BUG 1519: save the hostname used in the open_printer_ex() for later reuse when filling in the spolss replies (also gets rid of get_called_name() (This used to be commit 57db8ca91f52329c7f8985c04463b6b69015b0c4)
2004-10-02 00:34:12 +04:00
fstring servername;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Modified interfaces and added checks around *all* *alloc calls so that errors are returned on memory allocation failure. Jeremy. (This used to be commit 9a118cd4a2b03146b341eeffb62144a2d29b574c)
2000-04-07 02:48:53 +04:00
DEBUG(10,("get_a_printer: [%s] level %u\n", sharename, (unsigned int)level));
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
if ( !(*pp_printer = TALLOC_ZERO_P(NULL, NT_PRINTER_INFO_LEVEL)) ) {
DEBUG(0,("get_a_printer: talloc() fail.\n"));
return WERR_NOMEM;
}
Progress on CR 601 cache the printer_info_2 with the open printer handle. cache is invalidated on a mod_a_printer() call **on that smbd**. Yes, this means that the window for admins to step on each other from different clients just got larger, but since handles a generally short lived this is probably ok. (This used to be commit 31272d3b6bb9ec62fd666301c7adfa0c1720a99b)
2003-02-25 23:53:53 +03:00
switch (level) {
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
case 2:
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
if ( !((*pp_printer)->info_2 = TALLOC_ZERO_P(*pp_printer, NT_PRINTER_INFO_LEVEL_2)) ) {
DEBUG(0,("get_a_printer: talloc() fail.\n"));
TALLOC_FREE( *pp_printer );
the next stage in the NTSTATUS/WERROR change. smbd and nmbd now compile, but the client code still needs some work (This used to be commit dcd6e735f709a9231860ceb9682db40ff26c9a66)
2001-09-04 11:13:01 +04:00
return WERR_NOMEM;
Getting back to a compilable state (not there yet but close). Added patches for random -> sys_random. Added set_effective_xxx patches for AFS code. Memory allocation changes in spoolss code. Jeremy. (This used to be commit c2099cfb033c2cdb6035f4f7f50ce21b98e1584d)
2000-06-01 21:01:34 +04:00
}
r2768: BUG 1519: save the hostname used in the open_printer_ex() for later reuse when filling in the spolss replies (also gets rid of get_called_name() (This used to be commit 57db8ca91f52329c7f8985c04463b6b69015b0c4)
2004-10-02 00:34:12 +04:00
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
if ( print_hnd )
r2768: BUG 1519: save the hostname used in the open_printer_ex() for later reuse when filling in the spolss replies (also gets rid of get_called_name() (This used to be commit 57db8ca91f52329c7f8985c04463b6b69015b0c4)
2004-10-02 00:34:12 +04:00
fstrcpy( servername, print_hnd->servername );
else {
fstrcpy( servername, "%L" );
r16945: Sync trunk -> 3.0 for 3.0.24 code. Still need to do the upper layer directories but this is what everyone is waiting for.... Jeremy. (This used to be commit 9dafb7f48ca3e7af956b0a7d1720c2546fc4cfb8)
2006-07-11 22:01:26 +04:00
standard_sub_basic( "", "", servername,
sizeof(servername)-1 );
r2768: BUG 1519: save the hostname used in the open_printer_ex() for later reuse when filling in the spolss replies (also gets rid of get_called_name() (This used to be commit 57db8ca91f52329c7f8985c04463b6b69015b0c4)
2004-10-02 00:34:12 +04:00
}
r8501: * disable printer handle object cache (was mostly used for NT4 clients enumerating printer data on slow CPUs) * fix pinter and secdesc record upgrade to normalize the key (rev'd printer tdb version) * fixed problem that was normalizing the printername name field in general, this should fix the issues upgrading print servers from 3.0.14a to 3.0.20 (This used to be commit d07179de2f2a6eb1d13d0e25ac10de1a21475559)
2005-07-15 18:26:11 +04:00
Fix bug #5372. With a large CUPS installation with a remote server, contacting the server when searching for a name for the location and comment fields can take so much time the client times out. When searching for a name we don't use these fields anyway, so add a function get_a_printer_search() which doesn't contact the CUPS server. Jeremy. (This used to be commit 92d9f20852d5384e92a93dd0b051034718840ca8)
2008-04-04 22:14:09 +04:00
result = get_a_printer_2( (*pp_printer)->info_2,
servername, sharename, get_loc_com);
fix cache coherency bug in print handle print_info_2 cache. Needs to be rewritten to use a reference counter, but this will work for now. also the memory allocation in the printing code needs to be cleaned up to use talloc exclusively. (This used to be commit 3d293027563b36411b7f84ed9d8f47f926271c6f)
2003-07-14 23:51:34 +04:00
/* we have a new printer now. Save it with this handle */
Fix bug #5372. With a large CUPS installation with a remote server, contacting the server when searching for a name for the location and comment fields can take so much time the client times out. When searching for a name we don't use these fields anyway, so add a function get_a_printer_search() which doesn't contact the CUPS server. Jeremy. (This used to be commit 92d9f20852d5384e92a93dd0b051034718840ca8)
2008-04-04 22:14:09 +04:00
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
if ( !W_ERROR_IS_OK(result) ) {
TALLOC_FREE( *pp_printer );
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
DEBUG(10,("get_a_printer: [%s] level %u returning %s\n",
Rename dos_errstr() to win_errstr() for consistency with Samba 4.
2008-11-01 19:19:26 +03:00
sharename, (unsigned int)level, win_errstr(result)));
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
return result;
Getting back to a compilable state (not there yet but close). Added patches for random -> sys_random. Added set_effective_xxx patches for AFS code. Memory allocation changes in spoolss code. Jeremy. (This used to be commit c2099cfb033c2cdb6035f4f7f50ce21b98e1584d)
2000-06-01 21:01:34 +04:00
}
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
dump_a_printer( *pp_printer, level);
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
break;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
default:
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
TALLOC_FREE( *pp_printer );
return WERR_UNKNOWN_LEVEL;
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
}
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
return WERR_OK;
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
}
Fix bug #5372. With a large CUPS installation with a remote server, contacting the server when searching for a name for the location and comment fields can take so much time the client times out. When searching for a name we don't use these fields anyway, so add a function get_a_printer_search() which doesn't contact the CUPS server. Jeremy. (This used to be commit 92d9f20852d5384e92a93dd0b051034718840ca8)
2008-04-04 22:14:09 +04:00
WERROR get_a_printer( Printer_entry *print_hnd,
NT_PRINTER_INFO_LEVEL **pp_printer,
uint32 level,
const char *sharename)
{
return get_a_printer_internal(print_hnd, pp_printer, level,
sharename, true);
}
WERROR get_a_printer_search( Printer_entry *print_hnd,
NT_PRINTER_INFO_LEVEL **pp_printer,
uint32 level,
const char *sharename)
{
return get_a_printer_internal(print_hnd, pp_printer, level,
sharename, false);
}
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
/****************************************************************************
Getting back to a compilable state (not there yet but close). Added patches for random -> sys_random. Added set_effective_xxx patches for AFS code. Memory allocation changes in spoolss code. Jeremy. (This used to be commit c2099cfb033c2cdb6035f4f7f50ce21b98e1584d)
2000-06-01 21:01:34 +04:00
Deletes a NT_PRINTER_INFO_LEVEL struct.
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
****************************************************************************/
Getting back to a compilable state (not there yet but close). Added patches for random -> sys_random. Added set_effective_xxx patches for AFS code. Memory allocation changes in spoolss code. Jeremy. (This used to be commit c2099cfb033c2cdb6035f4f7f50ce21b98e1584d)
2000-06-01 21:01:34 +04:00
uint32 free_a_printer(NT_PRINTER_INFO_LEVEL **pp_printer, uint32 level)
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
{
Getting back to a compilable state (not there yet but close). Added patches for random -> sys_random. Added set_effective_xxx patches for AFS code. Memory allocation changes in spoolss code. Jeremy. (This used to be commit c2099cfb033c2cdb6035f4f7f50ce21b98e1584d)
2000-06-01 21:01:34 +04:00
NT_PRINTER_INFO_LEVEL *printer = *pp_printer;
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
if ( !printer )
Getting back to a compilable state (not there yet but close). Added patches for random -> sys_random. Added set_effective_xxx patches for AFS code. Memory allocation changes in spoolss code. Jeremy. (This used to be commit c2099cfb033c2cdb6035f4f7f50ce21b98e1584d)
2000-06-01 21:01:34 +04:00
return 0;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Progress on CR 601 cache the printer_info_2 with the open printer handle. cache is invalidated on a mod_a_printer() call **on that smbd**. Yes, this means that the window for admins to step on each other from different clients just got larger, but since handles a generally short lived this is probably ok. (This used to be commit 31272d3b6bb9ec62fd666301c7adfa0c1720a99b)
2003-02-25 23:53:53 +03:00
switch (level) {
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
case 2:
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
if ( printer->info_2 )
Getting back to a compilable state (not there yet but close). Added patches for random -> sys_random. Added set_effective_xxx patches for AFS code. Memory allocation changes in spoolss code. Jeremy. (This used to be commit c2099cfb033c2cdb6035f4f7f50ce21b98e1584d)
2000-06-01 21:01:34 +04:00
free_nt_printer_info_level_2(&printer->info_2);
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
break;
Progress on CR 601 cache the printer_info_2 with the open printer handle. cache is invalidated on a mod_a_printer() call **on that smbd**. Yes, this means that the window for admins to step on each other from different clients just got larger, but since handles a generally short lived this is probably ok. (This used to be commit 31272d3b6bb9ec62fd666301c7adfa0c1720a99b)
2003-02-25 23:53:53 +03:00
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
default:
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
DEBUG(0,("free_a_printer: unknown level! [%d]\n", level ));
return 1;
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
}
Getting back to a compilable state (not there yet but close). Added patches for random -> sys_random. Added set_effective_xxx patches for AFS code. Memory allocation changes in spoolss code. Jeremy. (This used to be commit c2099cfb033c2cdb6035f4f7f50ce21b98e1584d)
2000-06-01 21:01:34 +04:00
r9739: conver the reg_objects (REGSUBKEY_CTR & REGVAL_CTR) to use the new talloc() features: Note that the REGSUB_CTR and REGVAL_CTR objects *must* be talloc()'d since the methods use the object pointer as the talloc context for internal private data. There is no longer a regXXX_ctr_intit() and regXXX_ctr_destroy() pair of functions. Simply TALLOC_ZERO_P() and TALLOC_FREE() the object. Also had to convert the printer_info_2->NT_PRINTER_DATA field to be talloc()'d as well. This is just a stop on the road to cleaning up the printer memory management. (This used to be commit ef721333ab9639cb5346067497e99fbd0d4425dd)
2005-08-29 18:55:40 +04:00
TALLOC_FREE(*pp_printer);
return 0;
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
}
/****************************************************************************
****************************************************************************/
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
s3-spoolss: Move info_ctr conversion to a public helper. Signed-off-by: Günther Deschner <gd@samba.org>
2010-04-15 04:46:55 +04:00
bool driver_info_ctr_to_info8(struct spoolss_AddDriverInfoCtr *r,
struct spoolss_DriverInfo8 *_info8)
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
{
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
struct spoolss_DriverInfo8 info8;
ZERO_STRUCT(info8);
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
switch (r->level) {
case 3:
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
info8.version = r->info.info3->version;
info8.driver_name = r->info.info3->driver_name;
info8.architecture = r->info.info3->architecture;
info8.driver_path = r->info.info3->driver_path;
info8.data_file = r->info.info3->data_file;
info8.config_file = r->info.info3->config_file;
info8.help_file = r->info.info3->help_file;
info8.monitor_name = r->info.info3->monitor_name;
info8.default_datatype = r->info.info3->default_datatype;
if (r->info.info3->dependent_files && r->info.info3->dependent_files->string) {
info8.dependent_files = r->info.info3->dependent_files->string;
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
}
break;
case 6:
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
info8.version = r->info.info6->version;
info8.driver_name = r->info.info6->driver_name;
info8.architecture = r->info.info6->architecture;
info8.driver_path = r->info.info6->driver_path;
info8.data_file = r->info.info6->data_file;
info8.config_file = r->info.info6->config_file;
info8.help_file = r->info.info6->help_file;
info8.monitor_name = r->info.info6->monitor_name;
info8.default_datatype = r->info.info6->default_datatype;
if (r->info.info6->dependent_files && r->info.info6->dependent_files->string) {
info8.dependent_files = r->info.info6->dependent_files->string;
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
}
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
info8.driver_date = r->info.info6->driver_date;
info8.driver_version = r->info.info6->driver_version;
info8.manufacturer_name = r->info.info6->manufacturer_name;
info8.manufacturer_url = r->info.info6->manufacturer_url;
info8.hardware_id = r->info.info6->hardware_id;
info8.provider = r->info.info6->provider;
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
break;
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
case 8:
info8.version = r->info.info8->version;
info8.driver_name = r->info.info8->driver_name;
info8.architecture = r->info.info8->architecture;
info8.driver_path = r->info.info8->driver_path;
info8.data_file = r->info.info8->data_file;
info8.config_file = r->info.info8->config_file;
info8.help_file = r->info.info8->help_file;
info8.monitor_name = r->info.info8->monitor_name;
info8.default_datatype = r->info.info8->default_datatype;
if (r->info.info8->dependent_files && r->info.info8->dependent_files->string) {
info8.dependent_files = r->info.info8->dependent_files->string;
}
if (r->info.info8->previous_names && r->info.info8->previous_names->string) {
info8.previous_names = r->info.info8->previous_names->string;
}
info8.driver_date = r->info.info8->driver_date;
info8.driver_version = r->info.info8->driver_version;
info8.manufacturer_name = r->info.info8->manufacturer_name;
info8.manufacturer_url = r->info.info8->manufacturer_url;
info8.hardware_id = r->info.info8->hardware_id;
info8.provider = r->info.info8->provider;
info8.print_processor = r->info.info8->print_processor;
info8.vendor_setup = r->info.info8->vendor_setup;
if (r->info.info8->color_profiles && r->info.info8->color_profiles->string) {
info8.color_profiles = r->info.info8->color_profiles->string;
}
info8.inf_path = r->info.info8->inf_path;
info8.printer_driver_attributes = r->info.info8->printer_driver_attributes;
if (r->info.info8->core_driver_dependencies && r->info.info8->core_driver_dependencies->string) {
info8.core_driver_dependencies = r->info.info8->core_driver_dependencies->string;
}
info8.min_inbox_driver_ver_date = r->info.info8->min_inbox_driver_ver_date;
info8.min_inbox_driver_ver_version = r->info.info8->min_inbox_driver_ver_version;
s3-printing: use spoolss types and structs while adding drivers. Guenther
2009-11-16 17:52:31 +03:00
break;
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
default:
s3-spoolss: Move info_ctr conversion to a public helper. Signed-off-by: Günther Deschner <gd@samba.org>
2010-04-15 04:46:55 +04:00
return false;
}
*_info8 = info8;
return true;
}
uint32_t add_a_printer_driver(TALLOC_CTX *mem_ctx,
struct spoolss_AddDriverInfoCtr *r,
char **driver_name,
uint32_t *version)
{
struct spoolss_DriverInfo8 info8;
ZERO_STRUCT(info8);
DEBUG(10,("adding a printer at level [%d]\n", r->level));
if (!driver_info_ctr_to_info8(r, &info8)) {
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
return -1;
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
}
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
*driver_name = talloc_strdup(mem_ctx, info8.driver_name);
if (!*driver_name) {
return -1;
}
*version = info8.version;
return add_a_printer_driver_8(&info8);
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
}
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
/****************************************************************************
****************************************************************************/
Progress on CR 601 cache the printer_info_2 with the open printer handle. cache is invalidated on a mod_a_printer() call **on that smbd**. Yes, this means that the window for admins to step on each other from different clients just got larger, but since handles a generally short lived this is probably ok. (This used to be commit 31272d3b6bb9ec62fd666301c7adfa0c1720a99b)
2003-02-25 23:53:53 +03:00
s3-printing: use spoolss types and structs while getting and deleting drivers. Guenther
2009-11-17 14:54:02 +03:00
WERROR get_a_printer_driver(TALLOC_CTX *mem_ctx,
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
struct spoolss_DriverInfo8 **driver,
s3-spoolss: apply some const in spoolss server. Guenther
2009-03-20 17:14:09 +03:00
const char *drivername, const char *architecture,
uint32_t version)
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
{
the next step in our error code handling change - added WERROR for win32 error codes - added a configure test for immediate structures still lots to do, so its not enabled by default, but the main structure is there (This used to be commit 24f9ab683dec52587ee56717e821b49c0fa3d70f)
2001-09-03 12:50:59 +04:00
WERROR result;
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
struct spoolss_DriverInfo3 info3;
struct spoolss_DriverInfo8 *info8;
ZERO_STRUCT(info3);
/* Sometime we just want any version of the driver */
if (version == DRIVER_ANY_VERSION) {
/* look for Win2k first and then for NT4 */
result = get_a_printer_driver_3(mem_ctx,
&info3,
drivername,
architecture, 3);
if (!W_ERROR_IS_OK(result)) {
result = get_a_printer_driver_3(mem_ctx,
&info3,
drivername,
architecture, 2);
}
} else {
result = get_a_printer_driver_3(mem_ctx,
&info3,
drivername,
architecture,
version);
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
}
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
s3-printing: use spoolss types and structs while getting and deleting drivers. Guenther
2009-11-17 14:54:02 +03:00
if (!W_ERROR_IS_OK(result)) {
return result;
}
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
info8 = talloc_zero(mem_ctx, struct spoolss_DriverInfo8);
if (!info8) {
return WERR_NOMEM;
}
info8->version = info3.version;
info8->driver_name = info3.driver_name;
info8->architecture = info3.architecture;
info8->driver_path = info3.driver_path;
info8->data_file = info3.data_file;
info8->config_file = info3.config_file;
info8->help_file = info3.help_file;
info8->dependent_files = info3.dependent_files;
info8->monitor_name = info3.monitor_name;
info8->default_datatype = info3.default_datatype;
*driver = info8;
s3-printing: use spoolss types and structs while getting and deleting drivers. Guenther
2009-11-17 14:54:02 +03:00
return WERR_OK;
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
}
/****************************************************************************
****************************************************************************/
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
uint32_t free_a_printer_driver(struct spoolss_DriverInfo8 *driver)
s3-printing: use spoolss types and structs while getting and deleting drivers. Guenther
2009-11-17 14:54:02 +03:00
{
talloc_free(driver);
return 0;
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
}
merge from 2.2 (deleteprinterdriver RPC) (This used to be commit 515caaf7b448e55206433a9ca04fb5078f91cde2)
2001-05-18 08:11:17 +04:00
/****************************************************************************
Determine whether or not a particular driver is currently assigned
to a printer
****************************************************************************/
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
bool printer_driver_in_use(const struct spoolss_DriverInfo8 *r)
merge from 2.2 (deleteprinterdriver RPC) (This used to be commit 515caaf7b448e55206433a9ca04fb5078f91cde2)
2001-05-18 08:11:17 +04:00
{
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
int snum;
int n_services = lp_numservices();
NT_PRINTER_INFO_LEVEL *printer = NULL;
RIP BOOL. Convert BOOL -> bool. I found a few interesting bugs in various places whilst doing this (places that assumed BOOL == int). I also need to fix the Samba4 pidl generation (next checkin). Jeremy. (This used to be commit f35a266b3cbb3e5fa6a86be60f34fe340a3ca71f)
2007-10-19 04:40:25 +04:00
bool in_use = False;
merge from 2.2 (deleteprinterdriver RPC) (This used to be commit 515caaf7b448e55206433a9ca04fb5078f91cde2)
2001-05-18 08:11:17 +04:00
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
if (!r) {
return false;
}
merge from 2.2 (deleteprinterdriver RPC) (This used to be commit 515caaf7b448e55206433a9ca04fb5078f91cde2)
2001-05-18 08:11:17 +04:00
r5683: BUG 2363: allow 'in use' driver to be removed as long as one 'Windows NT x86' driver remains' (This used to be commit 743ddbc7f204977431b8eaa48c3838b3cc9bdb11)
2005-03-08 01:06:25 +03:00
DEBUG(10,("printer_driver_in_use: Beginning search through ntprinters.tdb...\n"));
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
merge from 2.2 (deleteprinterdriver RPC) (This used to be commit 515caaf7b448e55206433a9ca04fb5078f91cde2)
2001-05-18 08:11:17 +04:00
/* loop through the printers.tdb and check for the drivername */
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r5683: BUG 2363: allow 'in use' driver to be removed as long as one 'Windows NT x86' driver remains' (This used to be commit 743ddbc7f204977431b8eaa48c3838b3cc9bdb11)
2005-03-08 01:06:25 +03:00
for (snum=0; snum<n_services && !in_use; snum++) {
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
if ( !(lp_snum_ok(snum) && lp_print_ok(snum) ) )
merge from 2.2 (deleteprinterdriver RPC) (This used to be commit 515caaf7b448e55206433a9ca04fb5078f91cde2)
2001-05-18 08:11:17 +04:00
continue;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Progress on CR 601 cache the printer_info_2 with the open printer handle. cache is invalidated on a mod_a_printer() call **on that smbd**. Yes, this means that the window for admins to step on each other from different clients just got larger, but since handles a generally short lived this is probably ok. (This used to be commit 31272d3b6bb9ec62fd666301c7adfa0c1720a99b)
2003-02-25 23:53:53 +03:00
if ( !W_ERROR_IS_OK(get_a_printer(NULL, &printer, 2, lp_servicename(snum))) )
merge from 2.2 (deleteprinterdriver RPC) (This used to be commit 515caaf7b448e55206433a9ca04fb5078f91cde2)
2001-05-18 08:11:17 +04:00
continue;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
if (strequal(r->driver_name, printer->info_2->drivername))
r5683: BUG 2363: allow 'in use' driver to be removed as long as one 'Windows NT x86' driver remains' (This used to be commit 743ddbc7f204977431b8eaa48c3838b3cc9bdb11)
2005-03-08 01:06:25 +03:00
in_use = True;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
free_a_printer( &printer, 2 );
}
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r5683: BUG 2363: allow 'in use' driver to be removed as long as one 'Windows NT x86' driver remains' (This used to be commit 743ddbc7f204977431b8eaa48c3838b3cc9bdb11)
2005-03-08 01:06:25 +03:00
DEBUG(10,("printer_driver_in_use: Completed search through ntprinters.tdb...\n"));
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r5683: BUG 2363: allow 'in use' driver to be removed as long as one 'Windows NT x86' driver remains' (This used to be commit 743ddbc7f204977431b8eaa48c3838b3cc9bdb11)
2005-03-08 01:06:25 +03:00
if ( in_use ) {
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
struct spoolss_DriverInfo8 *d;
r5683: BUG 2363: allow 'in use' driver to be removed as long as one 'Windows NT x86' driver remains' (This used to be commit 743ddbc7f204977431b8eaa48c3838b3cc9bdb11)
2005-03-08 01:06:25 +03:00
WERROR werr;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
DEBUG(5,("printer_driver_in_use: driver \"%s\" is currently in use\n", r->driver_name));
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
/* we can still remove the driver if there is one of
r5683: BUG 2363: allow 'in use' driver to be removed as long as one 'Windows NT x86' driver remains' (This used to be commit 743ddbc7f204977431b8eaa48c3838b3cc9bdb11)
2005-03-08 01:06:25 +03:00
"Windows NT x86" version 2 or 3 left */
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
if (!strequal("Windows NT x86", r->architecture)) {
werr = get_a_printer_driver(talloc_tos(), &d, r->driver_name, "Windows NT x86", DRIVER_ANY_VERSION);
r5683: BUG 2363: allow 'in use' driver to be removed as long as one 'Windows NT x86' driver remains' (This used to be commit 743ddbc7f204977431b8eaa48c3838b3cc9bdb11)
2005-03-08 01:06:25 +03:00
}
else {
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
switch (r->version) {
r5683: BUG 2363: allow 'in use' driver to be removed as long as one 'Windows NT x86' driver remains' (This used to be commit 743ddbc7f204977431b8eaa48c3838b3cc9bdb11)
2005-03-08 01:06:25 +03:00
case 2:
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
werr = get_a_printer_driver(talloc_tos(), &d, r->driver_name, "Windows NT x86", 3);
r5683: BUG 2363: allow 'in use' driver to be removed as long as one 'Windows NT x86' driver remains' (This used to be commit 743ddbc7f204977431b8eaa48c3838b3cc9bdb11)
2005-03-08 01:06:25 +03:00
break;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
case 3:
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
werr = get_a_printer_driver(talloc_tos(), &d, r->driver_name, "Windows NT x86", 2);
r5683: BUG 2363: allow 'in use' driver to be removed as long as one 'Windows NT x86' driver remains' (This used to be commit 743ddbc7f204977431b8eaa48c3838b3cc9bdb11)
2005-03-08 01:06:25 +03:00
break;
default:
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
DEBUG(0,("printer_driver_in_use: ERROR! unknown driver version (%d)\n",
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
r->version));
r5683: BUG 2363: allow 'in use' driver to be removed as long as one 'Windows NT x86' driver remains' (This used to be commit 743ddbc7f204977431b8eaa48c3838b3cc9bdb11)
2005-03-08 01:06:25 +03:00
werr = WERR_UNKNOWN_PRINTER_DRIVER;
break;
}
}
/* now check the error code */
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r5683: BUG 2363: allow 'in use' driver to be removed as long as one 'Windows NT x86' driver remains' (This used to be commit 743ddbc7f204977431b8eaa48c3838b3cc9bdb11)
2005-03-08 01:06:25 +03:00
if ( W_ERROR_IS_OK(werr) ) {
/* it's ok to remove the driver, we have other architctures left */
in_use = False;
s3-printing: use spoolss types and structs while getting and deleting drivers. Guenther
2009-11-17 14:54:02 +03:00
free_a_printer_driver(d);
r5683: BUG 2363: allow 'in use' driver to be removed as long as one 'Windows NT x86' driver remains' (This used to be commit 743ddbc7f204977431b8eaa48c3838b3cc9bdb11)
2005-03-08 01:06:25 +03:00
}
}
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
/* report that the driver is not in use by default */
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r5683: BUG 2363: allow 'in use' driver to be removed as long as one 'Windows NT x86' driver remains' (This used to be commit 743ddbc7f204977431b8eaa48c3838b3cc9bdb11)
2005-03-08 01:06:25 +03:00
return in_use;
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
}
merge from 2.2 (deleteprinterdriver RPC) (This used to be commit 515caaf7b448e55206433a9ca04fb5078f91cde2)
2001-05-18 08:11:17 +04:00
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
/**********************************************************************
Check to see if a ogiven file is in use by *info
*********************************************************************/
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
static bool drv_file_in_use(const char *file, const struct spoolss_DriverInfo8 *info)
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
{
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
int i = 0;
Fix from Martin Zielinski <mz@seh.de>. Don't delete files when they're in use by other drivers. Jeremy. (This used to be commit 205c352caeb32693a02fcfaeb3f18515719ac373)
2008-04-25 02:02:23 +04:00
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
if ( !info )
return False;
Fix from Martin Zielinski <mz@seh.de>. Don't delete files when they're in use by other drivers. Jeremy. (This used to be commit 205c352caeb32693a02fcfaeb3f18515719ac373)
2008-04-25 02:02:23 +04:00
/* mz: skip files that are in the list but already deleted */
if (!file || !file[0]) {
return false;
}
s3-printing: use spoolss types and structs while getting and deleting drivers. Guenther
2009-11-17 14:54:02 +03:00
if (strequal(file, info->driver_path))
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
return True;
SGI compiler fixes. Jeremy (This used to be commit 45bf995bf62aa6cc176d57e2f954cc2d379717ef)
2001-06-27 00:23:45 +04:00
s3-printing: use spoolss types and structs while getting and deleting drivers. Guenther
2009-11-17 14:54:02 +03:00
if (strequal(file, info->data_file))
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
return True;
s3-printing: use spoolss types and structs while getting and deleting drivers. Guenther
2009-11-17 14:54:02 +03:00
if (strequal(file, info->config_file))
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
return True;
s3-printing: use spoolss types and structs while getting and deleting drivers. Guenther
2009-11-17 14:54:02 +03:00
if (strequal(file, info->help_file))
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
return True;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
/* see of there are any dependent files to examine */
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
s3-printing: use spoolss types and structs while getting and deleting drivers. Guenther
2009-11-17 14:54:02 +03:00
if (!info->dependent_files)
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
return False;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
s3-printing: use spoolss types and structs while getting and deleting drivers. Guenther
2009-11-17 14:54:02 +03:00
while (info->dependent_files[i] && *info->dependent_files[i]) {
if (strequal(file, info->dependent_files[i]))
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
return True;
i++;
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
}
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
return False;
}
/**********************************************************************
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Utility function to remove the dependent file pointed to by the
input parameter from the list
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
*********************************************************************/
s3-printing: use spoolss types and structs while getting and deleting drivers. Guenther
2009-11-17 14:54:02 +03:00
static void trim_dependent_file(TALLOC_CTX *mem_ctx, const char **files, int idx)
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
{
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
/* bump everything down a slot */
s3-printing: use spoolss types and structs while getting and deleting drivers. Guenther
2009-11-17 14:54:02 +03:00
while (files && files[idx+1]) {
files[idx] = talloc_strdup(mem_ctx, files[idx+1]);
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
idx++;
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
}
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
s3-printing: use spoolss types and structs while getting and deleting drivers. Guenther
2009-11-17 14:54:02 +03:00
files[idx] = NULL;
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
return;
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
}
/**********************************************************************
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Check if any of the files used by src are also used by drv
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
*********************************************************************/
s3-printing: use spoolss types and structs while getting and deleting drivers. Guenther
2009-11-17 14:54:02 +03:00
static bool trim_overlap_drv_files(TALLOC_CTX *mem_ctx,
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
struct spoolss_DriverInfo8 *src,
const struct spoolss_DriverInfo8 *drv)
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
{
RIP BOOL. Convert BOOL -> bool. I found a few interesting bugs in various places whilst doing this (places that assumed BOOL == int). I also need to fix the Samba4 pidl generation (next checkin). Jeremy. (This used to be commit f35a266b3cbb3e5fa6a86be60f34fe340a3ca71f)
2007-10-19 04:40:25 +04:00
bool in_use = False;
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
int i = 0;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
if ( !src || !drv )
return False;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
/* check each file. Remove it from the src structure if it overlaps */
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
s3-printing: use spoolss types and structs while getting and deleting drivers. Guenther
2009-11-17 14:54:02 +03:00
if (drv_file_in_use(src->driver_path, drv)) {
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
in_use = True;
s3-printing: use spoolss types and structs while getting and deleting drivers. Guenther
2009-11-17 14:54:02 +03:00
DEBUG(10,("Removing driverfile [%s] from list\n", src->driver_path));
src->driver_path = talloc_strdup(mem_ctx, "");
if (!src->driver_path) { return false; }
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
}
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
s3-printing: use spoolss types and structs while getting and deleting drivers. Guenther
2009-11-17 14:54:02 +03:00
if (drv_file_in_use(src->data_file, drv)) {
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
in_use = True;
s3-printing: use spoolss types and structs while getting and deleting drivers. Guenther
2009-11-17 14:54:02 +03:00
DEBUG(10,("Removing datafile [%s] from list\n", src->data_file));
src->data_file = talloc_strdup(mem_ctx, "");
if (!src->data_file) { return false; }
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
}
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
s3-printing: use spoolss types and structs while getting and deleting drivers. Guenther
2009-11-17 14:54:02 +03:00
if (drv_file_in_use(src->config_file, drv)) {
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
in_use = True;
s3-printing: use spoolss types and structs while getting and deleting drivers. Guenther
2009-11-17 14:54:02 +03:00
DEBUG(10,("Removing configfile [%s] from list\n", src->config_file));
src->config_file = talloc_strdup(mem_ctx, "");
if (!src->config_file) { return false; }
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
}
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
s3-printing: use spoolss types and structs while getting and deleting drivers. Guenther
2009-11-17 14:54:02 +03:00
if (drv_file_in_use(src->help_file, drv)) {
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
in_use = True;
s3-printing: use spoolss types and structs while getting and deleting drivers. Guenther
2009-11-17 14:54:02 +03:00
DEBUG(10,("Removing helpfile [%s] from list\n", src->help_file));
src->help_file = talloc_strdup(mem_ctx, "");
if (!src->help_file) { return false; }
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
}
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
/* are there any dependentfiles to examine? */
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
s3-printing: use spoolss types and structs while getting and deleting drivers. Guenther
2009-11-17 14:54:02 +03:00
if (!src->dependent_files)
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
return in_use;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
s3-printing: use spoolss types and structs while getting and deleting drivers. Guenther
2009-11-17 14:54:02 +03:00
while (src->dependent_files[i] && *src->dependent_files[i]) {
if (drv_file_in_use(src->dependent_files[i], drv)) {
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
in_use = True;
s3-printing: use spoolss types and structs while getting and deleting drivers. Guenther
2009-11-17 14:54:02 +03:00
DEBUG(10,("Removing [%s] from dependent file list\n", src->dependent_files[i]));
trim_dependent_file(mem_ctx, src->dependent_files, i);
Progress on CR 601 cache the printer_info_2 with the open printer handle. cache is invalidated on a mod_a_printer() call **on that smbd**. Yes, this means that the window for admins to step on each other from different clients just got larger, but since handles a generally short lived this is probably ok. (This used to be commit 31272d3b6bb9ec62fd666301c7adfa0c1720a99b)
2003-02-25 23:53:53 +03:00
} else
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
i++;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
}
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
return in_use;
}
/****************************************************************************
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Determine whether or not a particular driver files are currently being
used by any other driver.
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
Return value is True if any files were in use by other drivers
and False otherwise.
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
Upon return, *info has been modified to only contain the driver files
which are not in use
Fix from Martin Zielinski <mz@seh.de>. Don't delete files when they're in use by other drivers. Jeremy. (This used to be commit 205c352caeb32693a02fcfaeb3f18515719ac373)
2008-04-25 02:02:23 +04:00
Fix from mz:
This needs to check all drivers to ensure that all files in use
have been removed from *info, not just the ones in the first
match.
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
****************************************************************************/
s3-printing: use spoolss types and structs while getting and deleting drivers. Guenther
2009-11-17 14:54:02 +03:00
bool printer_driver_files_in_use(TALLOC_CTX *mem_ctx,
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
struct spoolss_DriverInfo8 *info)
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
{
int i;
int ndrivers;
uint32 version;
fstring *list = NULL;
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
struct spoolss_DriverInfo8 *driver;
Fix from Martin Zielinski <mz@seh.de>. Don't delete files when they're in use by other drivers. Jeremy. (This used to be commit 205c352caeb32693a02fcfaeb3f18515719ac373)
2008-04-25 02:02:23 +04:00
bool in_use = false;
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
if ( !info )
return False;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
s3-printing: use spoolss types and structs while getting and deleting drivers. Guenther
2009-11-17 14:54:02 +03:00
version = info->version;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
/* loop over all driver versions */
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
DEBUG(5,("printer_driver_files_in_use: Beginning search through ntdrivers.tdb...\n"));
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
/* get the list of drivers */
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
list = NULL;
s3-printing: use spoolss types and structs while getting and deleting drivers. Guenther
2009-11-17 14:54:02 +03:00
ndrivers = get_ntdrivers(&list, info->architecture, version);
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
DEBUGADD(4,("we have:[%d] drivers in environment [%s] and version [%d]\n",
s3-printing: use spoolss types and structs while getting and deleting drivers. Guenther
2009-11-17 14:54:02 +03:00
ndrivers, info->architecture, version));
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
/* check each driver for overlap in files */
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Progress on CR 601 cache the printer_info_2 with the open printer handle. cache is invalidated on a mod_a_printer() call **on that smbd**. Yes, this means that the window for admins to step on each other from different clients just got larger, but since handles a generally short lived this is probably ok. (This used to be commit 31272d3b6bb9ec62fd666301c7adfa0c1720a99b)
2003-02-25 23:53:53 +03:00
for (i=0; i<ndrivers; i++) {
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
DEBUGADD(5,("\tdriver: [%s]\n", list[i]));
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
s3-printing: use spoolss types and structs while getting and deleting drivers. Guenther
2009-11-17 14:54:02 +03:00
driver = NULL;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
if (!W_ERROR_IS_OK(get_a_printer_driver(talloc_tos(), &driver, list[i], info->architecture, version))) {
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
SAFE_FREE(list);
return True;
}
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
/* check if d2 uses any files from d1 */
/* only if this is a different driver than the one being deleted */
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
if (!strequal(info->driver_name, driver->driver_name)) {
if (trim_overlap_drv_files(mem_ctx, info, driver)) {
Fix from Martin Zielinski <mz@seh.de>. Don't delete files when they're in use by other drivers. Jeremy. (This used to be commit 205c352caeb32693a02fcfaeb3f18515719ac373)
2008-04-25 02:02:23 +04:00
/* mz: Do not instantly return -
* we need to ensure this file isn't
* also in use by other drivers. */
in_use = true;
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
}
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
}
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
s3-printing: use spoolss types and structs while getting and deleting drivers. Guenther
2009-11-17 14:54:02 +03:00
free_a_printer_driver(driver);
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
}
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
SAFE_FREE(list);
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
DEBUG(5,("printer_driver_files_in_use: Completed search through ntdrivers.tdb...\n"));
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
Fix from Martin Zielinski <mz@seh.de>. Don't delete files when they're in use by other drivers. Jeremy. (This used to be commit 205c352caeb32693a02fcfaeb3f18515719ac373)
2008-04-25 02:02:23 +04:00
return in_use;
merge from 2.2 (deleteprinterdriver RPC) (This used to be commit 515caaf7b448e55206433a9ca04fb5078f91cde2)
2001-05-18 08:11:17 +04:00
}
s3: Convert a few callers of unix_convert() over to filename_convert() This patch also changes the unix convert flags to make sure the correct semantics are preservered for allowing/disallowing wildcards in the last component of the path.
2009-07-25 05:38:40 +04:00
static NTSTATUS driver_unlink_internals(connection_struct *conn,
const char *name)
{
struct smb_filename *smb_fname = NULL;
NTSTATUS status;
status = create_synthetic_smb_fname(talloc_tos(), name, NULL, NULL,
&smb_fname);
if (!NT_STATUS_IS_OK(status)) {
return status;
}
status = unlink_internals(conn, NULL, 0, smb_fname, false);
TALLOC_FREE(smb_fname);
return status;
}
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
/****************************************************************************
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
Actually delete the driver files. Make sure that
printer_driver_files_in_use() return False before calling
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
this.
****************************************************************************/
Convert delete_driver_files to use create_conn_struct Jerry, please check!
2008-11-24 01:13:11 +03:00
static bool delete_driver_files(struct pipes_struct *rpc_pipe,
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
const struct spoolss_DriverInfo8 *r)
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
{
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
int i = 0;
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
char *s;
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
const char *file;
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
connection_struct *conn;
NTSTATUS nt_status;
Convert delete_driver_files to use create_conn_struct Jerry, please check!
2008-11-24 01:13:11 +03:00
char *oldcwd;
fstring printdollar;
int printdollar_snum;
bool ret = false;
Writable string const fixes. Jeremy. (This used to be commit c832e95c2f4daf175954a60f3c56420cf2f35b45)
2003-03-05 04:30:15 +03:00
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
if (!r) {
return false;
}
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
s3-printing: use spoolss types and structs while getting and deleting drivers. Guenther
2009-11-17 14:54:02 +03:00
DEBUG(6,("delete_driver_files: deleting driver [%s] - version [%d]\n",
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
r->driver_name, r->version));
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
Convert delete_driver_files to use create_conn_struct Jerry, please check!
2008-11-24 01:13:11 +03:00
fstrcpy(printdollar, "print$");
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
Convert delete_driver_files to use create_conn_struct Jerry, please check!
2008-11-24 01:13:11 +03:00
printdollar_snum = find_service(printdollar);
if (printdollar_snum == -1) {
return false;
}
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
Convert delete_driver_files to use create_conn_struct Jerry, please check!
2008-11-24 01:13:11 +03:00
nt_status = create_conn_struct(talloc_tos(), &conn, printdollar_snum,
lp_pathname(printdollar_snum),
rpc_pipe->server_info, &oldcwd);
if (!NT_STATUS_IS_OK(nt_status)) {
DEBUG(0,("delete_driver_files: create_conn_struct "
"returned %s\n", nt_errstr(nt_status)));
return false;
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
}
r13547: add earlier checks to deny deleting a printer driver. The previous code relied upon file permissions alone. Now we check that the user is a printer administrator and that the share has not been marked read only for that user. (This used to be commit 117d9fd9e16a7afbc6772506a4f8c33ff99d33f7)
2006-02-18 00:07:26 +03:00
if ( !CAN_WRITE(conn) ) {
DEBUG(3,("delete_driver_files: Cannot delete print driver when [print$] is read-only\n"));
Convert delete_driver_files to use create_conn_struct Jerry, please check!
2008-11-24 01:13:11 +03:00
goto fail;
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
}
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
/* now delete the files; must strip the '\print$' string from
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
fron of path */
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
if (r->driver_path && r->driver_path[0]) {
if ((s = strchr(&r->driver_path[1], '\\')) != NULL) {
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
file = s;
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
DEBUG(10,("deleting driverfile [%s]\n", s));
s3: Convert a few callers of unix_convert() over to filename_convert() This patch also changes the unix convert flags to make sure the correct semantics are preservered for allowing/disallowing wildcards in the last component of the path.
2009-07-25 05:38:40 +04:00
driver_unlink_internals(conn, file);
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
}
}
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
if (r->config_file && r->config_file[0]) {
if ((s = strchr(&r->config_file[1], '\\')) != NULL) {
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
file = s;
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
DEBUG(10,("deleting configfile [%s]\n", s));
s3: Convert a few callers of unix_convert() over to filename_convert() This patch also changes the unix convert flags to make sure the correct semantics are preservered for allowing/disallowing wildcards in the last component of the path.
2009-07-25 05:38:40 +04:00
driver_unlink_internals(conn, file);
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
}
}
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
if (r->data_file && r->data_file[0]) {
if ((s = strchr(&r->data_file[1], '\\')) != NULL) {
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
file = s;
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
DEBUG(10,("deleting datafile [%s]\n", s));
s3: Convert a few callers of unix_convert() over to filename_convert() This patch also changes the unix convert flags to make sure the correct semantics are preservered for allowing/disallowing wildcards in the last component of the path.
2009-07-25 05:38:40 +04:00
driver_unlink_internals(conn, file);
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
}
}
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
if (r->help_file && r->help_file[0]) {
if ((s = strchr(&r->help_file[1], '\\')) != NULL) {
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
file = s;
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
DEBUG(10,("deleting helpfile [%s]\n", s));
s3: Convert a few callers of unix_convert() over to filename_convert() This patch also changes the unix convert flags to make sure the correct semantics are preservered for allowing/disallowing wildcards in the last component of the path.
2009-07-25 05:38:40 +04:00
driver_unlink_internals(conn, file);
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
}
}
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
/* check if we are done removing files */
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
if (r->dependent_files) {
while (r->dependent_files[i] && r->dependent_files[i][0]) {
r9086: * fix invalid read in parse_spoolss when writing a devmode to the wire * fix dup_a_regval() when size is 0 * ensure we pass a pstring to unlink_internals (fixes delete_driver code) (This used to be commit 353e63ff421c564a1b7c7cfe95982f31c871a227)
2005-08-05 04:58:31 +04:00
char *p;
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
/* bypass the "\print$" portion of the path */
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
if ((p = strchr(r->dependent_files[i]+1, '\\')) != NULL) {
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
file = p;
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
DEBUG(10,("deleting dependent file [%s]\n", file));
s3: Convert a few callers of unix_convert() over to filename_convert() This patch also changes the unix convert flags to make sure the correct semantics are preservered for allowing/disallowing wildcards in the last component of the path.
2009-07-25 05:38:40 +04:00
driver_unlink_internals(conn, file);
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
}
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
i++;
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
}
}
Convert delete_driver_files to use create_conn_struct Jerry, please check!
2008-11-24 01:13:11 +03:00
goto done;
fail:
ret = false;
done:
if (conn != NULL) {
vfs_ChDir(conn, oldcwd);
s3:smbd: conn_free_internal() can be static now metze
2009-08-07 13:48:03 +04:00
conn_free(conn);
Convert delete_driver_files to use create_conn_struct Jerry, please check!
2008-11-24 01:13:11 +03:00
}
return ret;
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
}
merge from 2.2 (deleteprinterdriver RPC) (This used to be commit 515caaf7b448e55206433a9ca04fb5078f91cde2)
2001-05-18 08:11:17 +04:00
/****************************************************************************
Remove a printer driver from the TDB. This assumes that the the driver was
previously looked up.
***************************************************************************/
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
Convert delete_driver_files to use create_conn_struct Jerry, please check!
2008-11-24 01:13:11 +03:00
WERROR delete_printer_driver(struct pipes_struct *rpc_pipe,
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
const struct spoolss_DriverInfo8 *r,
Convert delete_driver_files to use create_conn_struct Jerry, please check!
2008-11-24 01:13:11 +03:00
uint32 version, bool delete_files )
merge from 2.2 (deleteprinterdriver RPC) (This used to be commit 515caaf7b448e55206433a9ca04fb5078f91cde2)
2001-05-18 08:11:17 +04:00
{
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
char *key = NULL;
Merge the 'safe' parts of my StrnCpy patch - many of the users really wanted a pstrcpy/fstrcpy or at most a safe_strcpy(). These have the advantage of being compiler-verifiable. Get these out of the way, along with a rewrite of 'get_short_archi' in the spoolss client and server. (This pushes around const string pointers, rather than copied strings). Andrew Bartlett (This used to be commit 32fb801ddc035e8971e9911ed4b6e51892e9d1cc)
2003-04-23 17:27:35 +04:00
const char *arch;
r21989: make use of tdb_*_bystring() and string_term_tdb_data() to avoid creating the TDB_DATA struct from strings "by hand" metze (This used to be commit 1897da9efcfe58ff3c190450731f33bef3ac2ebd)
2007-03-27 15:22:07 +04:00
TDB_DATA dbuf;
merge from 2.2 (deleteprinterdriver RPC) (This used to be commit 515caaf7b448e55206433a9ca04fb5078f91cde2)
2001-05-18 08:11:17 +04:00
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
/* delete the tdb data first */
merge from 2.2 (deleteprinterdriver RPC) (This used to be commit 515caaf7b448e55206433a9ca04fb5078f91cde2)
2001-05-18 08:11:17 +04:00
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
arch = get_short_archi(r->architecture);
r16365: Fix Klocwork #895, #898, #899, #915, #932, #938 and a few other problems Klocwork missed. Jeremy. (This used to be commit fe05769a1a85f924c67be7e5dcee4871a86948d7)
2006-06-20 01:36:19 +04:00
if (!arch) {
return WERR_UNKNOWN_PRINTER_DRIVER;
}
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
if (asprintf(&key, "%s%s/%d/%s", DRIVERS_PREFIX,
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
arch, version, r->driver_name) < 0) {
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
return WERR_NOMEM;
}
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
DEBUG(5,("delete_printer_driver: key = [%s] delete_files = %s\n",
key, delete_files ? "TRUE" : "FALSE" ));
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
/* check if the driver actually exists for this environment */
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
r21989: make use of tdb_*_bystring() and string_term_tdb_data() to avoid creating the TDB_DATA struct from strings "by hand" metze (This used to be commit 1897da9efcfe58ff3c190450731f33bef3ac2ebd)
2007-03-27 15:22:07 +04:00
dbuf = tdb_fetch_bystring( tdb_drivers, key );
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
if ( !dbuf.dptr ) {
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
DEBUG(8,("delete_printer_driver: Driver unknown [%s]\n", key));
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
SAFE_FREE(key);
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
return WERR_UNKNOWN_PRINTER_DRIVER;
}
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
SAFE_FREE( dbuf.dptr );
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
Sync 3.0 branch with HEAD (This used to be commit eac75549c398f208484ae735d5a5931fed6d0e99)
2002-08-17 20:31:24 +04:00
/* ok... the driver exists so the delete should return success */
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
r21989: make use of tdb_*_bystring() and string_term_tdb_data() to avoid creating the TDB_DATA struct from strings "by hand" metze (This used to be commit 1897da9efcfe58ff3c190450731f33bef3ac2ebd)
2007-03-27 15:22:07 +04:00
if (tdb_delete_bystring(tdb_drivers, key) == -1) {
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
DEBUG (0,("delete_printer_driver: fail to delete %s!\n", key));
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
SAFE_FREE(key);
the next stage in the NTSTATUS/WERROR change. smbd and nmbd now compile, but the client code still needs some work (This used to be commit dcd6e735f709a9231860ceb9682db40ff26c9a66)
2001-09-04 11:13:01 +04:00
return WERR_ACCESS_DENIED;
merge from 2.2 (deleteprinterdriver RPC) (This used to be commit 515caaf7b448e55206433a9ca04fb5078f91cde2)
2001-05-18 08:11:17 +04:00
}
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
/*
* now delete any associated files if delete_files == True
* even if this part failes, we return succes because the
* driver doesn not exist any more
*/
if ( delete_files )
s3-spoolss: use driver level info8 everywhere in spoolss server internally. Guenther
2009-11-27 03:49:08 +03:00
delete_driver_files(rpc_pipe, r);
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
sync'ing up for 3.0alpha20 release (This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
2002-09-25 19:19:00 +04:00
DEBUG(5,("delete_printer_driver: driver delete successful [%s]\n", key));
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
SAFE_FREE(key);
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
the next stage in the NTSTATUS/WERROR change. smbd and nmbd now compile, but the client code still needs some work (This used to be commit dcd6e735f709a9231860ceb9682db40ff26c9a66)
2001-09-04 11:13:01 +04:00
return WERR_OK;
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
}
getting and setting security descriptors on printers now works this needed some fixes in tdb_unpack(). Tim, you'll need to update (This used to be commit 9422719ab4c35e4ce3199b62dd632433bf391283)
2000-05-27 13:53:11 +04:00
/****************************************************************************
Added print job substitutions for %{printername}, %{sharename} and %{portname} from the NT printer tdb. Also added checks for time restrictions before allowing a job to print. Jeremy. (This used to be commit 8cfb55e81abebf0354e6d470ed68bbac1d6560ad)
2000-08-01 04:41:19 +04:00
Store a security desc for a printer.
getting and setting security descriptors on printers now works this needed some fixes in tdb_unpack(). Tim, you'll need to update (This used to be commit 9422719ab4c35e4ce3199b62dd632433bf391283)
2000-05-27 13:53:11 +04:00
****************************************************************************/
Added print job substitutions for %{printername}, %{sharename} and %{portname} from the NT printer tdb. Also added checks for time restrictions before allowing a job to print. Jeremy. (This used to be commit 8cfb55e81abebf0354e6d470ed68bbac1d6560ad)
2000-08-01 04:41:19 +04:00
s3-secdesc: remove "typedef struct sec_desc_buf SEC_DESC_BUF". Guenther
2010-05-18 04:56:17 +04:00
WERROR nt_printing_setsec(const char *sharename, struct sec_desc_buf *secdesc_ctr)
getting and setting security descriptors on printers now works this needed some fixes in tdb_unpack(). Tim, you'll need to update (This used to be commit 9422719ab4c35e4ce3199b62dd632433bf391283)
2000-05-27 13:53:11 +04:00
{
s3-secdesc: remove "typedef struct sec_desc_buf SEC_DESC_BUF". Guenther
2010-05-18 04:56:17 +04:00
struct sec_desc_buf *new_secdesc_ctr = NULL;
struct sec_desc_buf *old_secdesc_ctr = NULL;
Ok - this is a *BIG* change - but it fixes the problems with static strings in the RPC code. This change was prompted by trying to save a long (>256) character comment in the printer properties page. The new system associates a TALLOC_CTX with the pipe struct, and frees the pool on return of a complete PDU. A global TALLOC_CTX is used for the odd buffer allocated in the BUFFERxx code, and is freed in the main loop. This code works with insure, and seems to be free of memory leaks and crashes (so far) but there are probably the occasional problem with code that uses UNISTRxx structs on the stack and expects them to contain storage without doing a init_unistrXX(). This means that rpcclient will probably be horribly broken. A TALLOC_CTX also needed associating with the struct cli_state also, to make the prs_xx code there work. The main interface change is the addition of a TALLOC_CTX to the prs_init calls - used for dynamic allocation in the prs_XXX calls. Now this is in place it should make dynamic allocation of all RPC memory on unmarshall *much* easier to fix. Jeremy. (This used to be commit 0ff2ce543ee54f7364e6d839db6d06e7ef1edcf4)
2000-07-27 04:47:19 +04:00
TALLOC_CTX *mem_ctx = NULL;
r21989: make use of tdb_*_bystring() and string_term_tdb_data() to avoid creating the TDB_DATA struct from strings "by hand" metze (This used to be commit 1897da9efcfe58ff3c190450731f33bef3ac2ebd)
2007-03-27 15:22:07 +04:00
TDB_DATA kbuf;
s3-spoolss: use marshall/unmarshall_sec_desc_buf in nt_printing_setsec/getsec. Guenther
2009-02-24 14:19:01 +03:00
TDB_DATA dbuf;
DATA_BLOB blob;
more NTSTATUS/WERROR conversion (This used to be commit ad648c5cd8ebe4be8304379117f403d7673dcbc8)
2001-09-03 14:38:13 +04:00
WERROR status;
s3-spoolss: use marshall/unmarshall_sec_desc_buf in nt_printing_setsec/getsec. Guenther
2009-02-24 14:19:01 +03:00
NTSTATUS nt_status;
Re-instated lanman printing security checks (oops). A user can now pause, resume or delete their own job even if they don't have the Manage Documents privilege. Added call to se_access_check() for changing printer properties. The Full Access privilege is required for the user to perform this. Several uninitialised variables and memory leaks plugged. Modified default ACL created on new printers to be Everyone / Print instead of Everyone / Full Access. This required some random stuffing around with the value of the revision field to correspond with the ACL that NT produces when setting the same permission on the printer. Fixed dodgy function call in printing/printfsp.c (This used to be commit 2abce4dcfa351051df6e5f789b34fa99c9b81c22)
2000-07-10 09:08:21 +04:00
Forward port the change to talloc_init() to make all talloc contexts named. Ensure we can query them. Jeremy. (This used to be commit 09a218a9f6fb0bd922940467bf8500eb4f1bcf84)
2002-12-20 23:21:31 +03:00
mem_ctx = talloc_init("nt_printing_setsec");
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
if (mem_ctx == NULL)
more NTSTATUS/WERROR conversion (This used to be commit ad648c5cd8ebe4be8304379117f403d7673dcbc8)
2001-09-03 14:38:13 +04:00
return WERR_NOMEM;
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
/* The old owner and group sids of the security descriptor are not
present when new ACEs are added or removed by changing printer
permissions through NT. If they are NULL in the new security
descriptor then copy them over from the old one. */
r18745: Use the Samba4 data structures for security descriptors and security descriptor buffers. Make security access masks simply a uint32 rather than a structure with a uint32 in it. (This used to be commit b41c52b9db5fc4a553b20a7a5a051a4afced9366)
2006-09-21 02:23:12 +04:00
if (!secdesc_ctr->sd->owner_sid || !secdesc_ctr->sd->group_sid) {
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
DOM_SID *owner_sid, *group_sid;
s3-secdesc: remove "typedef struct security_acl SEC_ACL". Guenther
2010-05-18 05:30:40 +04:00
struct security_acl *dacl, *sacl;
s3-secdesc: remove "typedef struct security_descriptor SEC_DESC". Guenther
2010-05-18 12:29:34 +04:00
struct security_descriptor *psd = NULL;
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
size_t size;
r16365: Fix Klocwork #895, #898, #899, #915, #932, #938 and a few other problems Klocwork missed. Jeremy. (This used to be commit fe05769a1a85f924c67be7e5dcee4871a86948d7)
2006-06-20 01:36:19 +04:00
if (!nt_printing_getsec(mem_ctx, sharename, &old_secdesc_ctr)) {
status = WERR_NOMEM;
goto out;
}
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
/* Pick out correct owner and group sids */
r18745: Use the Samba4 data structures for security descriptors and security descriptor buffers. Make security access masks simply a uint32 rather than a structure with a uint32 in it. (This used to be commit b41c52b9db5fc4a553b20a7a5a051a4afced9366)
2006-09-21 02:23:12 +04:00
owner_sid = secdesc_ctr->sd->owner_sid ?
secdesc_ctr->sd->owner_sid :
old_secdesc_ctr->sd->owner_sid;
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
r18745: Use the Samba4 data structures for security descriptors and security descriptor buffers. Make security access masks simply a uint32 rather than a structure with a uint32 in it. (This used to be commit b41c52b9db5fc4a553b20a7a5a051a4afced9366)
2006-09-21 02:23:12 +04:00
group_sid = secdesc_ctr->sd->group_sid ?
secdesc_ctr->sd->group_sid :
old_secdesc_ctr->sd->group_sid;
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
r18745: Use the Samba4 data structures for security descriptors and security descriptor buffers. Make security access masks simply a uint32 rather than a structure with a uint32 in it. (This used to be commit b41c52b9db5fc4a553b20a7a5a051a4afced9366)
2006-09-21 02:23:12 +04:00
dacl = secdesc_ctr->sd->dacl ?
secdesc_ctr->sd->dacl :
old_secdesc_ctr->sd->dacl;
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
r18745: Use the Samba4 data structures for security descriptors and security descriptor buffers. Make security access masks simply a uint32 rather than a structure with a uint32 in it. (This used to be commit b41c52b9db5fc4a553b20a7a5a051a4afced9366)
2006-09-21 02:23:12 +04:00
sacl = secdesc_ctr->sd->sacl ?
secdesc_ctr->sd->sacl :
old_secdesc_ctr->sd->sacl;
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
/* Make a deep copy of the security descriptor */
r18745: Use the Samba4 data structures for security descriptors and security descriptor buffers. Make security access masks simply a uint32 rather than a structure with a uint32 in it. (This used to be commit b41c52b9db5fc4a553b20a7a5a051a4afced9366)
2006-09-21 02:23:12 +04:00
psd = make_sec_desc(mem_ctx, secdesc_ctr->sd->revision, secdesc_ctr->sd->type,
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
owner_sid, group_sid,
sacl,
dacl,
&size);
r16365: Fix Klocwork #895, #898, #899, #915, #932, #938 and a few other problems Klocwork missed. Jeremy. (This used to be commit fe05769a1a85f924c67be7e5dcee4871a86948d7)
2006-06-20 01:36:19 +04:00
if (!psd) {
status = WERR_NOMEM;
goto out;
}
Move to talloc control of SPOOL_XXX structs. Move to talloc control of security descriptors and pointers. Syncup with 2.2 tree. Jeremy. (This used to be commit 14d5997dc841e78a619e865288486d50c245896d)
2001-02-28 03:51:02 +03:00
new_secdesc_ctr = make_sec_desc_buf(mem_ctx, size, psd);
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
}
if (!new_secdesc_ctr) {
new_secdesc_ctr = secdesc_ctr;
}
getting and setting security descriptors on printers now works this needed some fixes in tdb_unpack(). Tim, you'll need to update (This used to be commit 9422719ab4c35e4ce3199b62dd632433bf391283)
2000-05-27 13:53:11 +04:00
Implemented NT printer descriptor checking. Yay! User details are passed into the printing back end from the spoolss code. For each print operation these details are checked using the se_access_check() function using information from the winbind daemon. Fixed bug in nt_printing_setsec() where the user and group SIDs were trashed if the permissions were changed from NT. It is necessary to merge these sids from the previous value of the security descriptor before storing it in the tdb. (This used to be commit 8d42661d424d80e1048d08b5cad3281643231d62)
2000-07-06 11:06:05 +04:00
/* Store the security descriptor in a tdb */
s3-spoolss: use marshall/unmarshall_sec_desc_buf in nt_printing_setsec/getsec. Guenther
2009-02-24 14:19:01 +03:00
nt_status = marshall_sec_desc_buf(mem_ctx, new_secdesc_ctr,
&blob.data, &blob.length);
if (!NT_STATUS_IS_OK(nt_status)) {
status = ntstatus_to_werror(nt_status);
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
goto out;
getting and setting security descriptors on printers now works this needed some fixes in tdb_unpack(). Tim, you'll need to update (This used to be commit 9422719ab4c35e4ce3199b62dd632433bf391283)
2000-05-27 13:53:11 +04:00
}
Remove pstring from printing/*.c except for the tdb_unpack requirement (I'll be making that an allocating interface later). Jeremy. (This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)
2007-11-22 00:56:36 +03:00
kbuf = make_printers_secdesc_tdbkey(mem_ctx, sharename );
getting and setting security descriptors on printers now works this needed some fixes in tdb_unpack(). Tim, you'll need to update (This used to be commit 9422719ab4c35e4ce3199b62dd632433bf391283)
2000-05-27 13:53:11 +04:00
s3-spoolss: use marshall/unmarshall_sec_desc_buf in nt_printing_setsec/getsec. Guenther
2009-02-24 14:19:01 +03:00
dbuf.dptr = (unsigned char *)blob.data;
dbuf.dsize = blob.length;
if (tdb_trans_store(tdb_printers, kbuf, dbuf, TDB_REPLACE)==0) {
the next stage in the NTSTATUS/WERROR change. smbd and nmbd now compile, but the client code still needs some work (This used to be commit dcd6e735f709a9231860ceb9682db40ff26c9a66)
2001-09-04 11:13:01 +04:00
status = WERR_OK;
getting and setting security descriptors on printers now works this needed some fixes in tdb_unpack(). Tim, you'll need to update (This used to be commit 9422719ab4c35e4ce3199b62dd632433bf391283)
2000-05-27 13:53:11 +04:00
} else {
r8501: * disable printer handle object cache (was mostly used for NT4 clients enumerating printer data on slow CPUs) * fix pinter and secdesc record upgrade to normalize the key (rev'd printer tdb version) * fixed problem that was normalizing the printername name field in general, this should fix the issues upgrading print servers from 3.0.14a to 3.0.20 (This used to be commit d07179de2f2a6eb1d13d0e25ac10de1a21475559)
2005-07-15 18:26:11 +04:00
DEBUG(1,("Failed to store secdesc for %s\n", sharename));
more NTSTATUS/WERROR conversion (This used to be commit ad648c5cd8ebe4be8304379117f403d7673dcbc8)
2001-09-03 14:38:13 +04:00
status = WERR_BADFUNC;
getting and setting security descriptors on printers now works this needed some fixes in tdb_unpack(). Tim, you'll need to update (This used to be commit 9422719ab4c35e4ce3199b62dd632433bf391283)
2000-05-27 13:53:11 +04:00
}
Added per-share security tdb. Tidied up many slprintfs (need -1 on length). Jeremy. (This used to be commit d786191bc116c17a3f53a1c272d969942b7e5d25)
2001-04-09 00:01:51 +04:00
/* Free malloc'ed memory */
s3-spoolss: use marshall/unmarshall_sec_desc_buf in nt_printing_setsec/getsec. Guenther
2009-02-24 14:19:01 +03:00
talloc_free(blob.data);
Re-instated lanman printing security checks (oops). A user can now pause, resume or delete their own job even if they don't have the Manage Documents privilege. Added call to se_access_check() for changing printer properties. The Full Access privilege is required for the user to perform this. Several uninitialised variables and memory leaks plugged. Modified default ACL created on new printers to be Everyone / Print instead of Everyone / Full Access. This required some random stuffing around with the value of the revision field to correspond with the ACL that NT produces when setting the same permission on the printer. Fixed dodgy function call in printing/printfsp.c (This used to be commit 2abce4dcfa351051df6e5f789b34fa99c9b81c22)
2000-07-10 09:08:21 +04:00
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
out:
Sync up with Tim's changes in applience-head for SACLs. Jeremy. (This used to be commit 6b94273fc61b26e83c8d791bc626fd52055ef293)
2000-11-04 09:36:18 +03:00
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
if (mem_ctx)
talloc_destroy(mem_ctx);
getting and setting security descriptors on printers now works this needed some fixes in tdb_unpack(). Tim, you'll need to update (This used to be commit 9422719ab4c35e4ce3199b62dd632433bf391283)
2000-05-27 13:53:11 +04:00
return status;
}
/****************************************************************************
Getting back to a compilable state (not there yet but close). Added patches for random -> sys_random. Added set_effective_xxx patches for AFS code. Memory allocation changes in spoolss code. Jeremy. (This used to be commit c2099cfb033c2cdb6035f4f7f50ce21b98e1584d)
2000-06-01 21:01:34 +04:00
Construct a default security descriptor buffer for a printer.
****************************************************************************/
s3-secdesc: remove "typedef struct sec_desc_buf SEC_DESC_BUF". Guenther
2010-05-18 04:56:17 +04:00
static struct sec_desc_buf *construct_default_printer_sdb(TALLOC_CTX *ctx)
Getting back to a compilable state (not there yet but close). Added patches for random -> sys_random. Added set_effective_xxx patches for AFS code. Memory allocation changes in spoolss code. Jeremy. (This used to be commit c2099cfb033c2cdb6035f4f7f50ce21b98e1584d)
2000-06-01 21:01:34 +04:00
{
s3-secdesc: remove "typedef struct security_ace SEC_ACE". Guenther
2010-05-18 05:25:38 +04:00
struct security_ace ace[5]; /* max number of ace entries */
r4874: add DOmain Admins (Full Control) to the default printer sd if we are a DC (This used to be commit 8971a8544274a7f3643ae67be744d7dab181973d)
2005-01-20 20:42:15 +03:00
int i = 0;
Remove SEC_ACCESS. It's a uint32_t. Jeremy.
2008-10-09 20:49:03 +04:00
uint32_t sa;
s3-secdesc: remove "typedef struct security_acl SEC_ACL". Guenther
2010-05-18 05:30:40 +04:00
struct security_acl *psa = NULL;
s3-secdesc: remove "typedef struct sec_desc_buf SEC_DESC_BUF". Guenther
2010-05-18 04:56:17 +04:00
struct sec_desc_buf *sdb = NULL;
s3-secdesc: remove "typedef struct security_descriptor SEC_DESC". Guenther
2010-05-18 12:29:34 +04:00
struct security_descriptor *psd = NULL;
r7584: cleanup the default printer security descriptor (This used to be commit 26387fc74c1157157e7e8728003a39d10aeb4cc1)
2005-06-15 00:50:37 +04:00
DOM_SID adm_sid;
Getting back to a compilable state (not there yet but close). Added patches for random -> sys_random. Added set_effective_xxx patches for AFS code. Memory allocation changes in spoolss code. Jeremy. (This used to be commit c2099cfb033c2cdb6035f4f7f50ce21b98e1584d)
2000-06-01 21:01:34 +04:00
size_t sd_size;
Fixing get/set of security descriptors. Removed ugly hack for NT printing. Fixed up tdb parse stuff memory leaks. Jeremy. (This used to be commit 8ef41f31c53e14ad057d883810a1cd2301fede2a)
2000-06-07 05:49:23 +04:00
Re-instated lanman printing security checks (oops). A user can now pause, resume or delete their own job even if they don't have the Manage Documents privilege. Added call to se_access_check() for changing printer properties. The Full Access privilege is required for the user to perform this. Several uninitialised variables and memory leaks plugged. Modified default ACL created on new printers to be Everyone / Print instead of Everyone / Full Access. This required some random stuffing around with the value of the revision field to correspond with the ACL that NT produces when setting the same permission on the printer. Fixed dodgy function call in printing/printfsp.c (This used to be commit 2abce4dcfa351051df6e5f789b34fa99c9b81c22)
2000-07-10 09:08:21 +04:00
/* Create an ACE where Everyone is allowed to print */
Remove SEC_ACCESS. It's a uint32_t. Jeremy.
2008-10-09 20:49:03 +04:00
sa = PRINTER_ACE_PRINT;
r4874: add DOmain Admins (Full Control) to the default printer sd if we are a DC (This used to be commit 8971a8544274a7f3643ae67be744d7dab181973d)
2005-01-20 20:42:15 +03:00
init_sec_ace(&ace[i++], &global_sid_World, SEC_ACE_TYPE_ACCESS_ALLOWED,
Re-instated lanman printing security checks (oops). A user can now pause, resume or delete their own job even if they don't have the Manage Documents privilege. Added call to se_access_check() for changing printer properties. The Full Access privilege is required for the user to perform this. Several uninitialised variables and memory leaks plugged. Modified default ACL created on new printers to be Everyone / Print instead of Everyone / Full Access. This required some random stuffing around with the value of the revision field to correspond with the ACL that NT produces when setting the same permission on the printer. Fixed dodgy function call in printing/printfsp.c (This used to be commit 2abce4dcfa351051df6e5f789b34fa99c9b81c22)
2000-07-10 09:08:21 +04:00
sa, SEC_ACE_FLAG_CONTAINER_INHERIT);
r4874: add DOmain Admins (Full Control) to the default printer sd if we are a DC (This used to be commit 8971a8544274a7f3643ae67be744d7dab181973d)
2005-01-20 20:42:15 +03:00
/* Add the domain admins group if we are a DC */
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
r4874: add DOmain Admins (Full Control) to the default printer sd if we are a DC (This used to be commit 8971a8544274a7f3643ae67be744d7dab181973d)
2005-01-20 20:42:15 +03:00
if ( IS_DC ) {
DOM_SID domadmins_sid;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
s3: Replace most calls to sid_append_rid() by sid_compose()
2010-01-10 19:39:27 +03:00
sid_compose(&domadmins_sid, get_global_sam_sid(),
s3-rpc_misc: clean out include/rpc_misc.h. Well known rids don't really belong into an rpc header, just use the ones defined in security.idl. Guenther
2010-05-18 00:04:24 +04:00
DOMAIN_RID_ADMINS);
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Remove SEC_ACCESS. It's a uint32_t. Jeremy.
2008-10-09 20:49:03 +04:00
sa = PRINTER_ACE_FULL_CONTROL;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
init_sec_ace(&ace[i++], &domadmins_sid,
SEC_ACE_TYPE_ACCESS_ALLOWED, sa,
r7584: cleanup the default printer security descriptor (This used to be commit 26387fc74c1157157e7e8728003a39d10aeb4cc1)
2005-06-15 00:50:37 +04:00
SEC_ACE_FLAG_OBJECT_INHERIT | SEC_ACE_FLAG_INHERIT_ONLY);
r4874: add DOmain Admins (Full Control) to the default printer sd if we are a DC (This used to be commit 8971a8544274a7f3643ae67be744d7dab181973d)
2005-01-20 20:42:15 +03:00
init_sec_ace(&ace[i++], &domadmins_sid, SEC_ACE_TYPE_ACCESS_ALLOWED,
r7584: cleanup the default printer security descriptor (This used to be commit 26387fc74c1157157e7e8728003a39d10aeb4cc1)
2005-06-15 00:50:37 +04:00
sa, SEC_ACE_FLAG_CONTAINER_INHERIT);
}
else if (secrets_fetch_domain_sid(lp_workgroup(), &adm_sid)) {
s3-rpc_misc: clean out include/rpc_misc.h. Well known rids don't really belong into an rpc header, just use the ones defined in security.idl. Guenther
2010-05-18 00:04:24 +04:00
sid_append_rid(&adm_sid, DOMAIN_RID_ADMINISTRATOR);
r4874: add DOmain Admins (Full Control) to the default printer sd if we are a DC (This used to be commit 8971a8544274a7f3643ae67be744d7dab181973d)
2005-01-20 20:42:15 +03:00
Remove SEC_ACCESS. It's a uint32_t. Jeremy.
2008-10-09 20:49:03 +04:00
sa = PRINTER_ACE_FULL_CONTROL;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
init_sec_ace(&ace[i++], &adm_sid,
SEC_ACE_TYPE_ACCESS_ALLOWED, sa,
r7584: cleanup the default printer security descriptor (This used to be commit 26387fc74c1157157e7e8728003a39d10aeb4cc1)
2005-06-15 00:50:37 +04:00
SEC_ACE_FLAG_OBJECT_INHERIT | SEC_ACE_FLAG_INHERIT_ONLY);
init_sec_ace(&ace[i++], &adm_sid, SEC_ACE_TYPE_ACCESS_ALLOWED,
sa, SEC_ACE_FLAG_CONTAINER_INHERIT);
r4874: add DOmain Admins (Full Control) to the default printer sd if we are a DC (This used to be commit 8971a8544274a7f3643ae67be744d7dab181973d)
2005-01-20 20:42:15 +03:00
}
r7584: cleanup the default printer security descriptor (This used to be commit 26387fc74c1157157e7e8728003a39d10aeb4cc1)
2005-06-15 00:50:37 +04:00
/* add BUILTIN\Administrators as FULL CONTROL */
Remove SEC_ACCESS. It's a uint32_t. Jeremy.
2008-10-09 20:49:03 +04:00
sa = PRINTER_ACE_FULL_CONTROL;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
init_sec_ace(&ace[i++], &global_sid_Builtin_Administrators,
SEC_ACE_TYPE_ACCESS_ALLOWED, sa,
r7584: cleanup the default printer security descriptor (This used to be commit 26387fc74c1157157e7e8728003a39d10aeb4cc1)
2005-06-15 00:50:37 +04:00
SEC_ACE_FLAG_OBJECT_INHERIT | SEC_ACE_FLAG_INHERIT_ONLY);
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
init_sec_ace(&ace[i++], &global_sid_Builtin_Administrators,
r7584: cleanup the default printer security descriptor (This used to be commit 26387fc74c1157157e7e8728003a39d10aeb4cc1)
2005-06-15 00:50:37 +04:00
SEC_ACE_TYPE_ACCESS_ALLOWED,
sa, SEC_ACE_FLAG_CONTAINER_INHERIT);
/* Make the security descriptor owned by the BUILTIN\Administrators */
Re-instated lanman printing security checks (oops). A user can now pause, resume or delete their own job even if they don't have the Manage Documents privilege. Added call to se_access_check() for changing printer properties. The Full Access privilege is required for the user to perform this. Several uninitialised variables and memory leaks plugged. Modified default ACL created on new printers to be Everyone / Print instead of Everyone / Full Access. This required some random stuffing around with the value of the revision field to correspond with the ACL that NT produces when setting the same permission on the printer. Fixed dodgy function call in printing/printfsp.c (This used to be commit 2abce4dcfa351051df6e5f789b34fa99c9b81c22)
2000-07-10 09:08:21 +04:00
/* The ACL revision number in rpc_secdesc.h differs from the one
created by NT when setting ACE entries in printer
descriptors. NT4 complains about the property being edited by a
NT5 machine. */
r4874: add DOmain Admins (Full Control) to the default printer sd if we are a DC (This used to be commit 8971a8544274a7f3643ae67be744d7dab181973d)
2005-01-20 20:42:15 +03:00
if ((psa = make_sec_acl(ctx, NT4_ACL_REVISION, i, ace)) != NULL) {
s3-secdesc: use SD_REVISION from security.idl. Guenther
2010-05-18 14:52:18 +04:00
psd = make_sec_desc(ctx, SD_REVISION, SEC_DESC_SELF_RELATIVE,
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
&global_sid_Builtin_Administrators,
r7584: cleanup the default printer security descriptor (This used to be commit 26387fc74c1157157e7e8728003a39d10aeb4cc1)
2005-06-15 00:50:37 +04:00
&global_sid_Builtin_Administrators,
NULL, psa, &sd_size);
Fixing get/set of security descriptors. Removed ugly hack for NT printing. Fixed up tdb parse stuff memory leaks. Jeremy. (This used to be commit 8ef41f31c53e14ad057d883810a1cd2301fede2a)
2000-06-07 05:49:23 +04:00
}
Getting back to a compilable state (not there yet but close). Added patches for random -> sys_random. Added set_effective_xxx patches for AFS code. Memory allocation changes in spoolss code. Jeremy. (This used to be commit c2099cfb033c2cdb6035f4f7f50ce21b98e1584d)
2000-06-01 21:01:34 +04:00
if (!psd) {
Bring printing in HEAD inline with 2.2.x and app-head. Jeremy. (This used to be commit 771ef92fc6e43725b7cc351079998a8acb74abef)
2002-02-09 07:10:24 +03:00
DEBUG(0,("construct_default_printer_sd: Failed to make SEC_DESC.\n"));
Getting back to a compilable state (not there yet but close). Added patches for random -> sys_random. Added set_effective_xxx patches for AFS code. Memory allocation changes in spoolss code. Jeremy. (This used to be commit c2099cfb033c2cdb6035f4f7f50ce21b98e1584d)
2000-06-01 21:01:34 +04:00
return NULL;
}
Move to talloc control of SPOOL_XXX structs. Move to talloc control of security descriptors and pointers. Syncup with 2.2 tree. Jeremy. (This used to be commit 14d5997dc841e78a619e865288486d50c245896d)
2001-02-28 03:51:02 +03:00
sdb = make_sec_desc_buf(ctx, sd_size, psd);
Getting back to a compilable state (not there yet but close). Added patches for random -> sys_random. Added set_effective_xxx patches for AFS code. Memory allocation changes in spoolss code. Jeremy. (This used to be commit c2099cfb033c2cdb6035f4f7f50ce21b98e1584d)
2000-06-01 21:01:34 +04:00
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
DEBUG(4,("construct_default_printer_sdb: size = %u.\n",
Re-instated lanman printing security checks (oops). A user can now pause, resume or delete their own job even if they don't have the Manage Documents privilege. Added call to se_access_check() for changing printer properties. The Full Access privilege is required for the user to perform this. Several uninitialised variables and memory leaks plugged. Modified default ACL created on new printers to be Everyone / Print instead of Everyone / Full Access. This required some random stuffing around with the value of the revision field to correspond with the ACL that NT produces when setting the same permission on the printer. Fixed dodgy function call in printing/printfsp.c (This used to be commit 2abce4dcfa351051df6e5f789b34fa99c9b81c22)
2000-07-10 09:08:21 +04:00
(unsigned int)sd_size));
Fixing get/set of security descriptors. Removed ugly hack for NT printing. Fixed up tdb parse stuff memory leaks. Jeremy. (This used to be commit 8ef41f31c53e14ad057d883810a1cd2301fede2a)
2000-06-07 05:49:23 +04:00
Getting back to a compilable state (not there yet but close). Added patches for random -> sys_random. Added set_effective_xxx patches for AFS code. Memory allocation changes in spoolss code. Jeremy. (This used to be commit c2099cfb033c2cdb6035f4f7f50ce21b98e1584d)
2000-06-01 21:01:34 +04:00
return sdb;
}
/****************************************************************************
Get a security desc for a printer.
getting and setting security descriptors on printers now works this needed some fixes in tdb_unpack(). Tim, you'll need to update (This used to be commit 9422719ab4c35e4ce3199b62dd632433bf391283)
2000-05-27 13:53:11 +04:00
****************************************************************************/
Getting back to a compilable state (not there yet but close). Added patches for random -> sys_random. Added set_effective_xxx patches for AFS code. Memory allocation changes in spoolss code. Jeremy. (This used to be commit c2099cfb033c2cdb6035f4f7f50ce21b98e1584d)
2000-06-01 21:01:34 +04:00
s3-secdesc: remove "typedef struct sec_desc_buf SEC_DESC_BUF". Guenther
2010-05-18 04:56:17 +04:00
bool nt_printing_getsec(TALLOC_CTX *ctx, const char *sharename, struct sec_desc_buf **secdesc_ctr)
getting and setting security descriptors on printers now works this needed some fixes in tdb_unpack(). Tim, you'll need to update (This used to be commit 9422719ab4c35e4ce3199b62dd632433bf391283)
2000-05-27 13:53:11 +04:00
{
r21989: make use of tdb_*_bystring() and string_term_tdb_data() to avoid creating the TDB_DATA struct from strings "by hand" metze (This used to be commit 1897da9efcfe58ff3c190450731f33bef3ac2ebd)
2007-03-27 15:22:07 +04:00
TDB_DATA kbuf;
s3-spoolss: use marshall/unmarshall_sec_desc_buf in nt_printing_setsec/getsec. Guenther
2009-02-24 14:19:01 +03:00
TDB_DATA dbuf;
DATA_BLOB blob;
Changes from APPLIANCE_HEAD: source/Makefile.in - changes to ctags and etags rules that somehow got lost along the way. source/include/proto.h - make proto source/smbd/sec_ctx.c source/smbd/password.c - merge debugs for debugging user groups and NT token stuff. source/lib/util_str.c - capitalise domain name returned from parse_domain_user() source/nsswitch/wb_client.c - fix broken conditional in debug statement. source/include/rpc_secdes.h source/include/rpc_spoolss.h source/printing/nt_printing.c source/lib/util_seaccess.c - fix printer permission bugs related to ACE masks for printers. This adds mapping of generic access rights to object specific rights for NT printers. Still need to work out whether or not to ignore ACEs with certain flags set, though. See comments in util_seaccess.c:check_ace() for details. source/printing/nt_printing.c source/printing/printing.c - use PRINTER_ACCESS_ADMINISTER instead of JOB_ACCESS_ADMINISTER until we sort out printer/printjob permission stuff. (This used to be commit 1dba9c5cd1e6389734c648f6903abcb7c8d5b2f0)
2001-01-04 22:27:08 +03:00
char *temp;
s3-spoolss: use marshall/unmarshall_sec_desc_buf in nt_printing_setsec/getsec. Guenther
2009-02-24 14:19:01 +03:00
NTSTATUS status;
getting and setting security descriptors on printers now works this needed some fixes in tdb_unpack(). Tim, you'll need to update (This used to be commit 9422719ab4c35e4ce3199b62dd632433bf391283)
2000-05-27 13:53:11 +04:00
r8025: *how* can this code have been around so long and nver normalized the string used for printer and sec_desc key lookups ????? normalized sharename to lower case before storing/fetching from tdb. Need to look at drivers and forms tdb as well (perhaps). (This used to be commit 4aec5dce5c2d0b5c686123a624b58097be9d911a)
2005-06-30 23:33:47 +04:00
if (strlen(sharename) > 2 && (temp = strchr(sharename + 2, '\\'))) {
sharename = temp + 1;
Progress on CR 601 cache the printer_info_2 with the open printer handle. cache is invalidated on a mod_a_printer() call **on that smbd**. Yes, this means that the window for admins to step on each other from different clients just got larger, but since handles a generally short lived this is probably ok. (This used to be commit 31272d3b6bb9ec62fd666301c7adfa0c1720a99b)
2003-02-25 23:53:53 +03:00
}
Changes from APPLIANCE_HEAD: source/Makefile.in - changes to ctags and etags rules that somehow got lost along the way. source/include/proto.h - make proto source/smbd/sec_ctx.c source/smbd/password.c - merge debugs for debugging user groups and NT token stuff. source/lib/util_str.c - capitalise domain name returned from parse_domain_user() source/nsswitch/wb_client.c - fix broken conditional in debug statement. source/include/rpc_secdes.h source/include/rpc_spoolss.h source/printing/nt_printing.c source/lib/util_seaccess.c - fix printer permission bugs related to ACE masks for printers. This adds mapping of generic access rights to object specific rights for NT printers. Still need to work out whether or not to ignore ACEs with certain flags set, though. See comments in util_seaccess.c:check_ace() for details. source/printing/nt_printing.c source/printing/printing.c - use PRINTER_ACCESS_ADMINISTER instead of JOB_ACCESS_ADMINISTER until we sort out printer/printjob permission stuff. (This used to be commit 1dba9c5cd1e6389734c648f6903abcb7c8d5b2f0)
2001-01-04 22:27:08 +03:00
Moved access check for nt_printing_setsec() up into rpc function. Use sid + rid instead of lp_workgroup()/Administrator for printer owner sid as per JF's advice. Default printer owner is either the administrator of the pdc workgroup or Everyone depending on whether winbindd is running. Still the subject of some debate... Renamed se_access_check() parameters. (This used to be commit e92e161a813ac0793897ffe3d33b01054912d4c7)
2000-07-17 06:41:38 +04:00
/* Fetch security descriptor from tdb */
s3-spoolss: use marshall/unmarshall_sec_desc_buf in nt_printing_setsec/getsec. Guenther
2009-02-24 14:19:01 +03:00
kbuf = make_printers_secdesc_tdbkey(ctx, sharename);
Getting back to a compilable state (not there yet but close). Added patches for random -> sys_random. Added set_effective_xxx patches for AFS code. Memory allocation changes in spoolss code. Jeremy. (This used to be commit c2099cfb033c2cdb6035f4f7f50ce21b98e1584d)
2000-06-01 21:01:34 +04:00
s3-spoolss: use marshall/unmarshall_sec_desc_buf in nt_printing_setsec/getsec. Guenther
2009-02-24 14:19:01 +03:00
dbuf = tdb_fetch(tdb_printers, kbuf);
if (dbuf.dptr) {
Merge from appliance-head: when creating a default security descriptor for a printer, save it in ntprinters.tdb instead of recreating it every time it is required. This can save at least one winbind lookup per secdesc creation. Opening a port monitor and viewing the security tab in the properties dialog required the security descriptor to be returned 25 times! (This used to be commit f85c976acc08a16bce6cb4053708485ccdea0d77)
2001-11-26 06:39:16 +03:00
s3-spoolss: use marshall/unmarshall_sec_desc_buf in nt_printing_setsec/getsec. Guenther
2009-02-24 14:19:01 +03:00
status = unmarshall_sec_desc_buf(ctx, dbuf.dptr, dbuf.dsize,
secdesc_ctr);
SAFE_FREE(dbuf.dptr);
Merge from appliance-head: when creating a default security descriptor for a printer, save it in ntprinters.tdb instead of recreating it every time it is required. This can save at least one winbind lookup per secdesc creation. Opening a port monitor and viewing the security tab in the properties dialog required the security descriptor to be returned 25 times! (This used to be commit f85c976acc08a16bce6cb4053708485ccdea0d77)
2001-11-26 06:39:16 +03:00
s3-spoolss: use marshall/unmarshall_sec_desc_buf in nt_printing_setsec/getsec. Guenther
2009-02-24 14:19:01 +03:00
if (NT_STATUS_IS_OK(status)) {
return true;
r16365: Fix Klocwork #895, #898, #899, #915, #932, #938 and a few other problems Klocwork missed. Jeremy. (This used to be commit fe05769a1a85f924c67be7e5dcee4871a86948d7)
2006-06-20 01:36:19 +04:00
}
s3-spoolss: use marshall/unmarshall_sec_desc_buf in nt_printing_setsec/getsec. Guenther
2009-02-24 14:19:01 +03:00
}
Merge from appliance-head: when creating a default security descriptor for a printer, save it in ntprinters.tdb instead of recreating it every time it is required. This can save at least one winbind lookup per secdesc creation. Opening a port monitor and viewing the security tab in the properties dialog required the security descriptor to be returned 25 times! (This used to be commit f85c976acc08a16bce6cb4053708485ccdea0d77)
2001-11-26 06:39:16 +03:00
s3-spoolss: use marshall/unmarshall_sec_desc_buf in nt_printing_setsec/getsec. Guenther
2009-02-24 14:19:01 +03:00
*secdesc_ctr = construct_default_printer_sdb(ctx);
if (!*secdesc_ctr) {
return false;
getting and setting security descriptors on printers now works this needed some fixes in tdb_unpack(). Tim, you'll need to update (This used to be commit 9422719ab4c35e4ce3199b62dd632433bf391283)
2000-05-27 13:53:11 +04:00
}
s3-spoolss: use marshall/unmarshall_sec_desc_buf in nt_printing_setsec/getsec. Guenther
2009-02-24 14:19:01 +03:00
status = marshall_sec_desc_buf(ctx, *secdesc_ctr,
&blob.data, &blob.length);
if (NT_STATUS_IS_OK(status)) {
dbuf.dptr = (unsigned char *)blob.data;
dbuf.dsize = blob.length;
tdb_trans_store(tdb_printers, kbuf, dbuf, TDB_REPLACE);
talloc_free(blob.data);
}
r16365: Fix Klocwork #895, #898, #899, #915, #932, #938 and a few other problems Klocwork missed. Jeremy. (This used to be commit fe05769a1a85f924c67be7e5dcee4871a86948d7)
2006-06-20 01:36:19 +04:00
Bring printing in HEAD inline with 2.2.x and app-head. Jeremy. (This used to be commit 771ef92fc6e43725b7cc351079998a8acb74abef)
2002-02-09 07:10:24 +03:00
/* If security descriptor is owned by S-1-1-0 and winbindd is up,
this security descriptor has been created when winbindd was
Moved access check for nt_printing_setsec() up into rpc function. Use sid + rid instead of lp_workgroup()/Administrator for printer owner sid as per JF's advice. Default printer owner is either the administrator of the pdc workgroup or Everyone depending on whether winbindd is running. Still the subject of some debate... Renamed se_access_check() parameters. (This used to be commit e92e161a813ac0793897ffe3d33b01054912d4c7)
2000-07-17 06:41:38 +04:00
down. Take ownership of security descriptor. */
r18745: Use the Samba4 data structures for security descriptors and security descriptor buffers. Make security access masks simply a uint32 rather than a structure with a uint32 in it. (This used to be commit b41c52b9db5fc4a553b20a7a5a051a4afced9366)
2006-09-21 02:23:12 +04:00
if (sid_equal((*secdesc_ctr)->sd->owner_sid, &global_sid_World)) {
Moved access check for nt_printing_setsec() up into rpc function. Use sid + rid instead of lp_workgroup()/Administrator for printer owner sid as per JF's advice. Default printer owner is either the administrator of the pdc workgroup or Everyone depending on whether winbindd is running. Still the subject of some debate... Renamed se_access_check() parameters. (This used to be commit e92e161a813ac0793897ffe3d33b01054912d4c7)
2000-07-17 06:41:38 +04:00
DOM_SID owner_sid;
/* Change sd owner to workgroup administrator */
These changes commited on a 'no less broken' basis. The previous code attempted to call winbind to find out the domain sid. This couldn't work for a number of reasons - not the least of which was that both the client and server ends would reject any name (in this case domain name) without a \ in it (or lp_winbind_seperator()). I think this is what was intended to occour. If there is still some need to contact winbind for this information, I suggest a new call be created for this - as it the server-side code doesn't allow for this information to be extracted easily in any case. Finally, it gets in the way of the default domain code a bit - hence why I was actually looking at it... Andrew Bartlett (This used to be commit 5fe1ea7f11a314a42f867a4f159c1c63c516568f)
2002-01-26 09:02:28 +03:00
if (secrets_fetch_domain_sid(lp_workgroup(), &owner_sid)) {
s3-secdesc: remove "typedef struct sec_desc_buf SEC_DESC_BUF". Guenther
2010-05-18 04:56:17 +04:00
struct sec_desc_buf *new_secdesc_ctr = NULL;
s3-secdesc: remove "typedef struct security_descriptor SEC_DESC". Guenther
2010-05-18 12:29:34 +04:00
struct security_descriptor *psd = NULL;
Moved access check for nt_printing_setsec() up into rpc function. Use sid + rid instead of lp_workgroup()/Administrator for printer owner sid as per JF's advice. Default printer owner is either the administrator of the pdc workgroup or Everyone depending on whether winbindd is running. Still the subject of some debate... Renamed se_access_check() parameters. (This used to be commit e92e161a813ac0793897ffe3d33b01054912d4c7)
2000-07-17 06:41:38 +04:00
size_t size;
/* Create new sd */
s3-rpc_misc: clean out include/rpc_misc.h. Well known rids don't really belong into an rpc header, just use the ones defined in security.idl. Guenther
2010-05-18 00:04:24 +04:00
sid_append_rid(&owner_sid, DOMAIN_RID_ADMINISTRATOR);
Moved access check for nt_printing_setsec() up into rpc function. Use sid + rid instead of lp_workgroup()/Administrator for printer owner sid as per JF's advice. Default printer owner is either the administrator of the pdc workgroup or Everyone depending on whether winbindd is running. Still the subject of some debate... Renamed se_access_check() parameters. (This used to be commit e92e161a813ac0793897ffe3d33b01054912d4c7)
2000-07-17 06:41:38 +04:00
r18745: Use the Samba4 data structures for security descriptors and security descriptor buffers. Make security access masks simply a uint32 rather than a structure with a uint32 in it. (This used to be commit b41c52b9db5fc4a553b20a7a5a051a4afced9366)
2006-09-21 02:23:12 +04:00
psd = make_sec_desc(ctx, (*secdesc_ctr)->sd->revision, (*secdesc_ctr)->sd->type,
Moved access check for nt_printing_setsec() up into rpc function. Use sid + rid instead of lp_workgroup()/Administrator for printer owner sid as per JF's advice. Default printer owner is either the administrator of the pdc workgroup or Everyone depending on whether winbindd is running. Still the subject of some debate... Renamed se_access_check() parameters. (This used to be commit e92e161a813ac0793897ffe3d33b01054912d4c7)
2000-07-17 06:41:38 +04:00
&owner_sid,
r18745: Use the Samba4 data structures for security descriptors and security descriptor buffers. Make security access masks simply a uint32 rather than a structure with a uint32 in it. (This used to be commit b41c52b9db5fc4a553b20a7a5a051a4afced9366)
2006-09-21 02:23:12 +04:00
(*secdesc_ctr)->sd->group_sid,
(*secdesc_ctr)->sd->sacl,
(*secdesc_ctr)->sd->dacl,
Moved access check for nt_printing_setsec() up into rpc function. Use sid + rid instead of lp_workgroup()/Administrator for printer owner sid as per JF's advice. Default printer owner is either the administrator of the pdc workgroup or Everyone depending on whether winbindd is running. Still the subject of some debate... Renamed se_access_check() parameters. (This used to be commit e92e161a813ac0793897ffe3d33b01054912d4c7)
2000-07-17 06:41:38 +04:00
&size);
r16365: Fix Klocwork #895, #898, #899, #915, #932, #938 and a few other problems Klocwork missed. Jeremy. (This used to be commit fe05769a1a85f924c67be7e5dcee4871a86948d7)
2006-06-20 01:36:19 +04:00
if (!psd) {
return False;
}
Move to talloc control of SPOOL_XXX structs. Move to talloc control of security descriptors and pointers. Syncup with 2.2 tree. Jeremy. (This used to be commit 14d5997dc841e78a619e865288486d50c245896d)
2001-02-28 03:51:02 +03:00
new_secdesc_ctr = make_sec_desc_buf(ctx, size, psd);
r16365: Fix Klocwork #895, #898, #899, #915, #932, #938 and a few other problems Klocwork missed. Jeremy. (This used to be commit fe05769a1a85f924c67be7e5dcee4871a86948d7)
2006-06-20 01:36:19 +04:00
if (!new_secdesc_ctr) {
return False;
}
Moved access check for nt_printing_setsec() up into rpc function. Use sid + rid instead of lp_workgroup()/Administrator for printer owner sid as per JF's advice. Default printer owner is either the administrator of the pdc workgroup or Everyone depending on whether winbindd is running. Still the subject of some debate... Renamed se_access_check() parameters. (This used to be commit e92e161a813ac0793897ffe3d33b01054912d4c7)
2000-07-17 06:41:38 +04:00
/* Swap with other one */
*secdesc_ctr = new_secdesc_ctr;
/* Set it */
r8501: * disable printer handle object cache (was mostly used for NT4 clients enumerating printer data on slow CPUs) * fix pinter and secdesc record upgrade to normalize the key (rev'd printer tdb version) * fixed problem that was normalizing the printername name field in general, this should fix the issues upgrading print servers from 3.0.14a to 3.0.20 (This used to be commit d07179de2f2a6eb1d13d0e25ac10de1a21475559)
2005-07-15 18:26:11 +04:00
nt_printing_setsec(sharename, *secdesc_ctr);
Moved access check for nt_printing_setsec() up into rpc function. Use sid + rid instead of lp_workgroup()/Administrator for printer owner sid as per JF's advice. Default printer owner is either the administrator of the pdc workgroup or Everyone depending on whether winbindd is running. Still the subject of some debate... Renamed se_access_check() parameters. (This used to be commit e92e161a813ac0793897ffe3d33b01054912d4c7)
2000-07-17 06:41:38 +04:00
}
}
Adding in debug for SD's. Jeremy. (This used to be commit a19f936b644fedc4c59ada5f12172abed9894910)
2000-12-11 22:24:59 +03:00
if (DEBUGLEVEL >= 10) {
s3-secdesc: remove "typedef struct security_acl SEC_ACL". Guenther
2010-05-18 05:30:40 +04:00
struct security_acl *the_acl = (*secdesc_ctr)->sd->dacl;
Adding in debug for SD's. Jeremy. (This used to be commit a19f936b644fedc4c59ada5f12172abed9894910)
2000-12-11 22:24:59 +03:00
int i;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
DEBUG(10, ("secdesc_ctr for %s has %d aces:\n",
r8501: * disable printer handle object cache (was mostly used for NT4 clients enumerating printer data on slow CPUs) * fix pinter and secdesc record upgrade to normalize the key (rev'd printer tdb version) * fixed problem that was normalizing the printername name field in general, this should fix the issues upgrading print servers from 3.0.14a to 3.0.20 (This used to be commit d07179de2f2a6eb1d13d0e25ac10de1a21475559)
2005-07-15 18:26:11 +04:00
sharename, the_acl->num_aces));
Adding in debug for SD's. Jeremy. (This used to be commit a19f936b644fedc4c59ada5f12172abed9894910)
2000-12-11 22:24:59 +03:00
More debug %d -> %u issues. Jeremy. (This used to be commit 6fcb600dcd23c61d1a7d2ce8c2b7b2eea2e58623)
2001-04-28 02:17:10 +04:00
for (i = 0; i < the_acl->num_aces; i++) {
Replace sid_string_static by sid_string_dbg in DEBUGs (This used to be commit bb35e794ec129805e874ceba882bcc1e84791a09)
2007-12-15 23:11:36 +03:00
DEBUG(10, ("%s %d %d 0x%08x\n",
sid_string_dbg(&the_acl->aces[i].trustee),
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
the_acl->aces[i].type, the_acl->aces[i].flags,
the_acl->aces[i].access_mask));
Adding in debug for SD's. Jeremy. (This used to be commit a19f936b644fedc4c59ada5f12172abed9894910)
2000-12-11 22:24:59 +03:00
}
}
Getting back to a compilable state (not there yet but close). Added patches for random -> sys_random. Added set_effective_xxx patches for AFS code. Memory allocation changes in spoolss code. Jeremy. (This used to be commit c2099cfb033c2cdb6035f4f7f50ce21b98e1584d)
2000-06-01 21:01:34 +04:00
return True;
getting and setting security descriptors on printers now works this needed some fixes in tdb_unpack(). Tim, you'll need to update (This used to be commit 9422719ab4c35e4ce3199b62dd632433bf391283)
2000-05-27 13:53:11 +04:00
}
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
/* error code:
0: everything OK
1: level not implemented
2: file doesn't exist
3: can't allocate memory
4: can't free memory
5: non existant struct
*/
/*
A printer and a printer driver are 2 different things.
NT manages them separatelly, Samba does the same.
Why ? Simply because it's easier and it makes sense !
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
Now explanation: You have 3 printers behind your samba server,
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
2 of them are the same make and model (laser A and B). But laser B
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
has an 3000 sheet feeder and laser A doesn't such an option.
Your third printer is an old dot-matrix model for the accounting :-).
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
If the /usr/local/samba/lib directory (default dir), you will have
5 files to describe all of this.
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
3 files for the printers (1 by printer):
NTprinter_laser A
NTprinter_laser B
NTprinter_accounting
2 files for the drivers (1 for the laser and 1 for the dot matrix)
NTdriver_printer model X
NTdriver_printer model Y
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
jfm: I should use this comment for the text file to explain
First commit of the spoolss code to the HEAD branch. still needs a lot of cleaning/debuging. J.F. (This used to be commit bd9d4cdde9193c120c6f4e8cf72f87cd67a9387e)
2000-02-07 19:17:59 +03:00
same thing for the forms BTW.
Je devrais mettre mes commentaires en francais, ca serait mieux :-)
*/
Changes from APPLIANCE_HEAD: source/Makefile.in - changes to ctags and etags rules that somehow got lost along the way. source/include/proto.h - make proto source/smbd/sec_ctx.c source/smbd/password.c - merge debugs for debugging user groups and NT token stuff. source/lib/util_str.c - capitalise domain name returned from parse_domain_user() source/nsswitch/wb_client.c - fix broken conditional in debug statement. source/include/rpc_secdes.h source/include/rpc_spoolss.h source/printing/nt_printing.c source/lib/util_seaccess.c - fix printer permission bugs related to ACE masks for printers. This adds mapping of generic access rights to object specific rights for NT printers. Still need to work out whether or not to ignore ACEs with certain flags set, though. See comments in util_seaccess.c:check_ace() for details. source/printing/nt_printing.c source/printing/printing.c - use PRINTER_ACCESS_ADMINISTER instead of JOB_ACCESS_ADMINISTER until we sort out printer/printjob permission stuff. (This used to be commit 1dba9c5cd1e6389734c648f6903abcb7c8d5b2f0)
2001-01-04 22:27:08 +03:00
/* Convert generic access rights to printer object specific access rights.
It turns out that NT4 security descriptors use generic access rights and
NT5 the object specific ones. */
s3-secdesc: remove "typedef struct security_descriptor SEC_DESC". Guenther
2010-05-18 12:29:34 +04:00
void map_printer_permissions(struct security_descriptor *sd)
Changes from APPLIANCE_HEAD: source/Makefile.in - changes to ctags and etags rules that somehow got lost along the way. source/include/proto.h - make proto source/smbd/sec_ctx.c source/smbd/password.c - merge debugs for debugging user groups and NT token stuff. source/lib/util_str.c - capitalise domain name returned from parse_domain_user() source/nsswitch/wb_client.c - fix broken conditional in debug statement. source/include/rpc_secdes.h source/include/rpc_spoolss.h source/printing/nt_printing.c source/lib/util_seaccess.c - fix printer permission bugs related to ACE masks for printers. This adds mapping of generic access rights to object specific rights for NT printers. Still need to work out whether or not to ignore ACEs with certain flags set, though. See comments in util_seaccess.c:check_ace() for details. source/printing/nt_printing.c source/printing/printing.c - use PRINTER_ACCESS_ADMINISTER instead of JOB_ACCESS_ADMINISTER until we sort out printer/printjob permission stuff. (This used to be commit 1dba9c5cd1e6389734c648f6903abcb7c8d5b2f0)
2001-01-04 22:27:08 +03:00
{
int i;
for (i = 0; sd->dacl && i < sd->dacl->num_aces; i++) {
r18745: Use the Samba4 data structures for security descriptors and security descriptor buffers. Make security access masks simply a uint32 rather than a structure with a uint32 in it. (This used to be commit b41c52b9db5fc4a553b20a7a5a051a4afced9366)
2006-09-21 02:23:12 +04:00
se_map_generic(&sd->dacl->aces[i].access_mask,
Changes from APPLIANCE_HEAD: source/Makefile.in - changes to ctags and etags rules that somehow got lost along the way. source/include/proto.h - make proto source/smbd/sec_ctx.c source/smbd/password.c - merge debugs for debugging user groups and NT token stuff. source/lib/util_str.c - capitalise domain name returned from parse_domain_user() source/nsswitch/wb_client.c - fix broken conditional in debug statement. source/include/rpc_secdes.h source/include/rpc_spoolss.h source/printing/nt_printing.c source/lib/util_seaccess.c - fix printer permission bugs related to ACE masks for printers. This adds mapping of generic access rights to object specific rights for NT printers. Still need to work out whether or not to ignore ACEs with certain flags set, though. See comments in util_seaccess.c:check_ace() for details. source/printing/nt_printing.c source/printing/printing.c - use PRINTER_ACCESS_ADMINISTER instead of JOB_ACCESS_ADMINISTER until we sort out printer/printjob permission stuff. (This used to be commit 1dba9c5cd1e6389734c648f6903abcb7c8d5b2f0)
2001-01-04 22:27:08 +03:00
&printer_generic_mapping);
}
}
s3-secdesc: remove "typedef struct security_descriptor SEC_DESC". Guenther
2010-05-18 12:29:34 +04:00
void map_job_permissions(struct security_descriptor *sd)
Try and fix bug #5095, "Manage Documents privilege is not functional". Should map the created sd to printer jobs, not printer. Jerry please test and I'll add to 3.2 if it passes. Thanks, Jeremy. (This used to be commit 0a1fe8d6013d925ab6695f6b7f189b731ec42ccc)
2008-05-06 03:24:52 +04:00
{
int i;
for (i = 0; sd->dacl && i < sd->dacl->num_aces; i++) {
se_map_generic(&sd->dacl->aces[i].access_mask,
&job_generic_mapping);
}
}
added printer admin option any user in that list can do anything to a printer (This used to be commit 7b5912be150dd590d6195be40b0976305b8716ba)
2000-08-09 08:19:18 +04:00
/****************************************************************************
Changes from APPLIANCE_HEAD: source/printing/nt_printing.c - use se_create_child_secdesc() to create appropriate security descriptor when performing print job admin security checks. source/printing/printing.c - Use JOB_ACCESS_ADMINISTER instead of PRINTER_ACCESS_ADMINISTER in print_job_{delete,pause,resume}() - If stat'ing the job file fails, delete the job from printing.tdb - In print_job_end() check lpq cache time and do a print_queue_update() This prevents printing.tdb from growing when using NT/2K clients, and there isn't someone pressing F5 in a port monitor window. - In print_queue_resume() check lpq cache time and do a print_queue_update() Probably should do it for print_job_resume() too. (This used to be commit 0068b7741fd54706ef36ddbbc3092389d281e684)
2001-01-19 19:57:39 +03:00
Check a user has permissions to perform the given operation. We use the
permission constants defined in include/rpc_spoolss.h to check the various
actions we perform when checking printer access.
Changes from APPLIANCE_HEAD (per Tim Potter): - make proto - addition of function to convert from errno values to NT status codes (source/lib/error.c) - purge queue done without full access permission will purge only the jobs owned by that user, rather than failing. - unlock job database tdb before sending job to printer - in print_job_start(), ensure that we don't pick a jobid with an existing temporary file that may be owned by another user, as it causes silent failures. - fixes for printer permission checking for NT5 clients (source/include/rpc_spoolss.h, source/printing/nt_printing.c, source/printing/printing.c, source/rpc_server/srv_spoolss_nt.c) - change from uint8 to 'enum SID_NAME_USE' (source/rpc_server/srv_lsa.c) - fixed memory leaks for win95 driver download process (source/smbd/lanman.c) - properly free prs_structs and dacl in testsuite/printing/psec.c (This used to be commit 74af3e2caec7197e5d1ca389e2f78054a4197502)
2000-09-01 22:49:26 +04:00
PRINTER_ACCESS_ADMINISTER:
print_queue_pause, print_queue_resume, update_printer_sec,
update_printer, spoolss_addprinterex_level_2,
_spoolss_setprinterdata
Merge from appliance head of JR's changes for driver versioning. Jeremy. (This used to be commit cdbd2e99775642dc2e92004be9014bf38a92d80f)
2000-11-15 00:56:32 +03:00
Changes from APPLIANCE_HEAD (per Tim Potter): - make proto - addition of function to convert from errno values to NT status codes (source/lib/error.c) - purge queue done without full access permission will purge only the jobs owned by that user, rather than failing. - unlock job database tdb before sending job to printer - in print_job_start(), ensure that we don't pick a jobid with an existing temporary file that may be owned by another user, as it causes silent failures. - fixes for printer permission checking for NT5 clients (source/include/rpc_spoolss.h, source/printing/nt_printing.c, source/printing/printing.c, source/rpc_server/srv_spoolss_nt.c) - change from uint8 to 'enum SID_NAME_USE' (source/rpc_server/srv_lsa.c) - fixed memory leaks for win95 driver download process (source/smbd/lanman.c) - properly free prs_structs and dacl in testsuite/printing/psec.c (This used to be commit 74af3e2caec7197e5d1ca389e2f78054a4197502)
2000-09-01 22:49:26 +04:00
PRINTER_ACCESS_USE:
print_job_start
Changes from APPLIANCE_HEAD: source/printing/nt_printing.c - use se_create_child_secdesc() to create appropriate security descriptor when performing print job admin security checks. source/printing/printing.c - Use JOB_ACCESS_ADMINISTER instead of PRINTER_ACCESS_ADMINISTER in print_job_{delete,pause,resume}() - If stat'ing the job file fails, delete the job from printing.tdb - In print_job_end() check lpq cache time and do a print_queue_update() This prevents printing.tdb from growing when using NT/2K clients, and there isn't someone pressing F5 in a port monitor window. - In print_queue_resume() check lpq cache time and do a print_queue_update() Probably should do it for print_job_resume() too. (This used to be commit 0068b7741fd54706ef36ddbbc3092389d281e684)
2001-01-19 19:57:39 +03:00
JOB_ACCESS_ADMINISTER:
Changes from APPLIANCE_HEAD (per Tim Potter): - make proto - addition of function to convert from errno values to NT status codes (source/lib/error.c) - purge queue done without full access permission will purge only the jobs owned by that user, rather than failing. - unlock job database tdb before sending job to printer - in print_job_start(), ensure that we don't pick a jobid with an existing temporary file that may be owned by another user, as it causes silent failures. - fixes for printer permission checking for NT5 clients (source/include/rpc_spoolss.h, source/printing/nt_printing.c, source/printing/printing.c, source/rpc_server/srv_spoolss_nt.c) - change from uint8 to 'enum SID_NAME_USE' (source/rpc_server/srv_lsa.c) - fixed memory leaks for win95 driver download process (source/smbd/lanman.c) - properly free prs_structs and dacl in testsuite/printing/psec.c (This used to be commit 74af3e2caec7197e5d1ca389e2f78054a4197502)
2000-09-01 22:49:26 +04:00
print_job_delete, print_job_pause, print_job_resume,
print_queue_purge
Added print_access_check() function for checking printer security descriptors. Currently returns True (plus debug output) which should not affect the behaviour of nt or lanman printing. (This used to be commit a9b4710e649e887e07d68c1bf826e00c9811e4ee)
2000-06-16 12:20:44 +04:00
r4740: allow SE_PRINT_OPERATORS to have printer admin access (This used to be commit 85731706c9d794e8bd3f26ce9b1f881c1ee6a3ba)
2005-01-15 00:24:15 +03:00
Try access control in the following order (for performance reasons):
s3:nt_printing: fix a comment typo Michael
2009-04-27 19:54:23 +04:00
1) root and SE_PRINT_OPERATOR can do anything (easy check)
r4740: allow SE_PRINT_OPERATORS to have printer admin access (This used to be commit 85731706c9d794e8bd3f26ce9b1f881c1ee6a3ba)
2005-01-15 00:24:15 +03:00
2) check security descriptor (bit comparisons in memory)
3) "printer admins" (may result in numerous calls to winbind)
added printer admin option any user in that list can do anything to a printer (This used to be commit 7b5912be150dd590d6195be40b0976305b8716ba)
2000-08-09 08:19:18 +04:00
****************************************************************************/
Change print_access_check to take auth_serversupplied_info instead of current_user Reason: This is the main user of p->current_user which I would like to remove (This used to be commit fd43059b3dfa8cdac9814de1c76f963ba5de9bcb)
2008-06-24 18:03:28 +04:00
bool print_access_check(struct auth_serversupplied_info *server_info, int snum,
int access_type)
Added print_access_check() function for checking printer security descriptors. Currently returns True (plus debug output) which should not affect the behaviour of nt or lanman printing. (This used to be commit a9b4710e649e887e07d68c1bf826e00c9811e4ee)
2000-06-16 12:20:44 +04:00
{
s3-secdesc: remove "typedef struct sec_desc_buf SEC_DESC_BUF". Guenther
2010-05-18 04:56:17 +04:00
struct sec_desc_buf *secdesc = NULL;
the next stage in the NTSTATUS/WERROR change. smbd and nmbd now compile, but the client code still needs some work (This used to be commit dcd6e735f709a9231860ceb9682db40ff26c9a66)
2001-09-04 11:13:01 +04:00
uint32 access_granted;
NTSTATUS status;
updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
2002-07-15 14:35:28 +04:00
const char *pname;
Move to talloc control of SPOOL_XXX structs. Move to talloc control of security descriptors and pointers. Syncup with 2.2 tree. Jeremy. (This used to be commit 14d5997dc841e78a619e865288486d50c245896d)
2001-02-28 03:51:02 +03:00
TALLOC_CTX *mem_ctx = NULL;
r4805: Last planned change to the privileges infrastructure: * rewrote the tdb layout of privilege records in account_pol.tdb (allow for 128 bits instead of 32 bit flags) * migrated to using SE_PRIV structure instead of the PRIVILEGE_SET structure. The latter is now used for parsing routines mainly. Still need to incorporate some client support into 'net' so for setting privileges. And make use of the SeAddUserPrivilege right. (This used to be commit 41dc7f7573c6d637e19a01e7ed0e716ac0f1fb15)
2005-01-17 18:23:11 +03:00
SE_PRIV se_printop = SE_PRINT_OPERATOR;
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Changes from APPLIANCE_HEAD (per Tim Potter): - make proto - addition of function to convert from errno values to NT status codes (source/lib/error.c) - purge queue done without full access permission will purge only the jobs owned by that user, rather than failing. - unlock job database tdb before sending job to printer - in print_job_start(), ensure that we don't pick a jobid with an existing temporary file that may be owned by another user, as it causes silent failures. - fixes for printer permission checking for NT5 clients (source/include/rpc_spoolss.h, source/printing/nt_printing.c, source/printing/printing.c, source/rpc_server/srv_spoolss_nt.c) - change from uint8 to 'enum SID_NAME_USE' (source/rpc_server/srv_lsa.c) - fixed memory leaks for win95 driver download process (source/smbd/lanman.c) - properly free prs_structs and dacl in testsuite/printing/psec.c (This used to be commit 74af3e2caec7197e5d1ca389e2f78054a4197502)
2000-09-01 22:49:26 +04:00
/* If user is NULL then use the current_user structure */
r4740: allow SE_PRINT_OPERATORS to have printer admin access (This used to be commit 85731706c9d794e8bd3f26ce9b1f881c1ee6a3ba)
2005-01-15 00:24:15 +03:00
/* Always allow root or SE_PRINT_OPERATROR to do anything */
Changes from APPLIANCE_HEAD (per Tim Potter): - make proto - addition of function to convert from errno values to NT status codes (source/lib/error.c) - purge queue done without full access permission will purge only the jobs owned by that user, rather than failing. - unlock job database tdb before sending job to printer - in print_job_start(), ensure that we don't pick a jobid with an existing temporary file that may be owned by another user, as it causes silent failures. - fixes for printer permission checking for NT5 clients (source/include/rpc_spoolss.h, source/printing/nt_printing.c, source/printing/printing.c, source/rpc_server/srv_spoolss_nt.c) - change from uint8 to 'enum SID_NAME_USE' (source/rpc_server/srv_lsa.c) - fixed memory leaks for win95 driver download process (source/smbd/lanman.c) - properly free prs_structs and dacl in testsuite/printing/psec.c (This used to be commit 74af3e2caec7197e5d1ca389e2f78054a4197502)
2000-09-01 22:49:26 +04:00
s3-printing: use sec_initial_uid() instead "0" in print_access_check(). Another babystep in order to make us pass RPC-SPOOLSS. Guenther
2009-04-20 02:57:53 +04:00
if (server_info->utok.uid == sec_initial_uid()
Change print_access_check to take auth_serversupplied_info instead of current_user Reason: This is the main user of p->current_user which I would like to remove (This used to be commit fd43059b3dfa8cdac9814de1c76f963ba5de9bcb)
2008-06-24 18:03:28 +04:00
|| user_has_privileges(server_info->ptok, &se_printop ) ) {
added printer admin option any user in that list can do anything to a printer (This used to be commit 7b5912be150dd590d6195be40b0976305b8716ba)
2000-08-09 08:19:18 +04:00
return True;
}
Added print_access_check() function for checking printer security descriptors. Currently returns True (plus debug output) which should not affect the behaviour of nt or lanman printing. (This used to be commit a9b4710e649e887e07d68c1bf826e00c9811e4ee)
2000-06-16 12:20:44 +04:00
added printer admin option any user in that list can do anything to a printer (This used to be commit 7b5912be150dd590d6195be40b0976305b8716ba)
2000-08-09 08:19:18 +04:00
/* Get printer name */
Changes from APPLIANCE_HEAD (per Tim Potter): - make proto - addition of function to convert from errno values to NT status codes (source/lib/error.c) - purge queue done without full access permission will purge only the jobs owned by that user, rather than failing. - unlock job database tdb before sending job to printer - in print_job_start(), ensure that we don't pick a jobid with an existing temporary file that may be owned by another user, as it causes silent failures. - fixes for printer permission checking for NT5 clients (source/include/rpc_spoolss.h, source/printing/nt_printing.c, source/printing/printing.c, source/rpc_server/srv_spoolss_nt.c) - change from uint8 to 'enum SID_NAME_USE' (source/rpc_server/srv_lsa.c) - fixed memory leaks for win95 driver download process (source/smbd/lanman.c) - properly free prs_structs and dacl in testsuite/printing/psec.c (This used to be commit 74af3e2caec7197e5d1ca389e2f78054a4197502)
2000-09-01 22:49:26 +04:00
Implemented NT printer descriptor checking. Yay! User details are passed into the printing back end from the spoolss code. For each print operation these details are checked using the se_access_check() function using information from the winbind daemon. Fixed bug in nt_printing_setsec() where the user and group SIDs were trashed if the permissions were changed from NT. It is necessary to merge these sids from the previous value of the security descriptor before storing it in the tdb. (This used to be commit 8d42661d424d80e1048d08b5cad3281643231d62)
2000-07-06 11:06:05 +04:00
pname = PRINTERNAME(snum);
Changes from APPLIANCE_HEAD (per Tim Potter): - make proto - addition of function to convert from errno values to NT status codes (source/lib/error.c) - purge queue done without full access permission will purge only the jobs owned by that user, rather than failing. - unlock job database tdb before sending job to printer - in print_job_start(), ensure that we don't pick a jobid with an existing temporary file that may be owned by another user, as it causes silent failures. - fixes for printer permission checking for NT5 clients (source/include/rpc_spoolss.h, source/printing/nt_printing.c, source/printing/printing.c, source/rpc_server/srv_spoolss_nt.c) - change from uint8 to 'enum SID_NAME_USE' (source/rpc_server/srv_lsa.c) - fixed memory leaks for win95 driver download process (source/smbd/lanman.c) - properly free prs_structs and dacl in testsuite/printing/psec.c (This used to be commit 74af3e2caec7197e5d1ca389e2f78054a4197502)
2000-09-01 22:49:26 +04:00
Tidied up some error returns from printing calls. Still need to map UNIX errors to NT error for print job failure returns. Patch from John Reilly at HP. Jeremy. (This used to be commit 3514b5bb8fffd78e3647425d93b74e2e6291bafc)
2000-08-24 03:05:49 +04:00
if (!pname || !*pname) {
errno = EACCES;
return False;
}
Added print_access_check() function for checking printer security descriptors. Currently returns True (plus debug output) which should not affect the behaviour of nt or lanman printing. (This used to be commit a9b4710e649e887e07d68c1bf826e00c9811e4ee)
2000-06-16 12:20:44 +04:00
added printer admin option any user in that list can do anything to a printer (This used to be commit 7b5912be150dd590d6195be40b0976305b8716ba)
2000-08-09 08:19:18 +04:00
/* Get printer security descriptor */
Changes from APPLIANCE_HEAD (per Tim Potter): - make proto - addition of function to convert from errno values to NT status codes (source/lib/error.c) - purge queue done without full access permission will purge only the jobs owned by that user, rather than failing. - unlock job database tdb before sending job to printer - in print_job_start(), ensure that we don't pick a jobid with an existing temporary file that may be owned by another user, as it causes silent failures. - fixes for printer permission checking for NT5 clients (source/include/rpc_spoolss.h, source/printing/nt_printing.c, source/printing/printing.c, source/rpc_server/srv_spoolss_nt.c) - change from uint8 to 'enum SID_NAME_USE' (source/rpc_server/srv_lsa.c) - fixed memory leaks for win95 driver download process (source/smbd/lanman.c) - properly free prs_structs and dacl in testsuite/printing/psec.c (This used to be commit 74af3e2caec7197e5d1ca389e2f78054a4197502)
2000-09-01 22:49:26 +04:00
Forward port the change to talloc_init() to make all talloc contexts named. Ensure we can query them. Jeremy. (This used to be commit 09a218a9f6fb0bd922940467bf8500eb4f1bcf84)
2002-12-20 23:21:31 +03:00
if(!(mem_ctx = talloc_init("print_access_check"))) {
Move to talloc control of SPOOL_XXX structs. Move to talloc control of security descriptors and pointers. Syncup with 2.2 tree. Jeremy. (This used to be commit 14d5997dc841e78a619e865288486d50c245896d)
2001-02-28 03:51:02 +03:00
errno = ENOMEM;
return False;
}
r16365: Fix Klocwork #895, #898, #899, #915, #932, #938 and a few other problems Klocwork missed. Jeremy. (This used to be commit fe05769a1a85f924c67be7e5dcee4871a86948d7)
2006-06-20 01:36:19 +04:00
if (!nt_printing_getsec(mem_ctx, pname, &secdesc)) {
talloc_destroy(mem_ctx);
errno = ENOMEM;
return False;
}
Changes from APPLIANCE_HEAD: source/printing/nt_printing.c - use se_create_child_secdesc() to create appropriate security descriptor when performing print job admin security checks. source/printing/printing.c - Use JOB_ACCESS_ADMINISTER instead of PRINTER_ACCESS_ADMINISTER in print_job_{delete,pause,resume}() - If stat'ing the job file fails, delete the job from printing.tdb - In print_job_end() check lpq cache time and do a print_queue_update() This prevents printing.tdb from growing when using NT/2K clients, and there isn't someone pressing F5 in a port monitor window. - In print_queue_resume() check lpq cache time and do a print_queue_update() Probably should do it for print_job_resume() too. (This used to be commit 0068b7741fd54706ef36ddbbc3092389d281e684)
2001-01-19 19:57:39 +03:00
if (access_type == JOB_ACCESS_ADMINISTER) {
s3-secdesc: remove "typedef struct sec_desc_buf SEC_DESC_BUF". Guenther
2010-05-18 04:56:17 +04:00
struct sec_desc_buf *parent_secdesc = secdesc;
Changes from APPLIANCE_HEAD: source/printing/nt_printing.c - use se_create_child_secdesc() to create appropriate security descriptor when performing print job admin security checks. source/printing/printing.c - Use JOB_ACCESS_ADMINISTER instead of PRINTER_ACCESS_ADMINISTER in print_job_{delete,pause,resume}() - If stat'ing the job file fails, delete the job from printing.tdb - In print_job_end() check lpq cache time and do a print_queue_update() This prevents printing.tdb from growing when using NT/2K clients, and there isn't someone pressing F5 in a port monitor window. - In print_queue_resume() check lpq cache time and do a print_queue_update() Probably should do it for print_job_resume() too. (This used to be commit 0068b7741fd54706ef36ddbbc3092389d281e684)
2001-01-19 19:57:39 +03:00
/* Create a child security descriptor to check permissions
against. This is because print jobs are child objects
objects of a printer. */
Allow a new file to inherit the Windows ACL from its parent. Now to do the same for directories. Jeremy.
2008-10-29 23:27:14 +03:00
status = se_create_child_secdesc_buf(mem_ctx, &secdesc, parent_secdesc->sd, False);
Changes from APPLIANCE_HEAD: source/printing/nt_printing.c - use se_create_child_secdesc() to create appropriate security descriptor when performing print job admin security checks. source/printing/printing.c - Use JOB_ACCESS_ADMINISTER instead of PRINTER_ACCESS_ADMINISTER in print_job_{delete,pause,resume}() - If stat'ing the job file fails, delete the job from printing.tdb - In print_job_end() check lpq cache time and do a print_queue_update() This prevents printing.tdb from growing when using NT/2K clients, and there isn't someone pressing F5 in a port monitor window. - In print_queue_resume() check lpq cache time and do a print_queue_update() Probably should do it for print_job_resume() too. (This used to be commit 0068b7741fd54706ef36ddbbc3092389d281e684)
2001-01-19 19:57:39 +03:00
Allow a new file to inherit the Windows ACL from its parent. Now to do the same for directories. Jeremy.
2008-10-29 23:27:14 +03:00
if (!NT_STATUS_IS_OK(status)) {
r16365: Fix Klocwork #895, #898, #899, #915, #932, #938 and a few other problems Klocwork missed. Jeremy. (This used to be commit fe05769a1a85f924c67be7e5dcee4871a86948d7)
2006-06-20 01:36:19 +04:00
talloc_destroy(mem_ctx);
Allow a new file to inherit the Windows ACL from its parent. Now to do the same for directories. Jeremy.
2008-10-29 23:27:14 +03:00
errno = map_errno_from_nt_status(status);
r16365: Fix Klocwork #895, #898, #899, #915, #932, #938 and a few other problems Klocwork missed. Jeremy. (This used to be commit fe05769a1a85f924c67be7e5dcee4871a86948d7)
2006-06-20 01:36:19 +04:00
return False;
}
Try and fix bug #5095, "Manage Documents privilege is not functional". Should map the created sd to printer jobs, not printer. Jerry please test and I'll add to 3.2 if it passes. Thanks, Jeremy. (This used to be commit 0a1fe8d6013d925ab6695f6b7f189b731ec42ccc)
2008-05-06 03:24:52 +04:00
map_job_permissions(secdesc->sd);
} else {
map_printer_permissions(secdesc->sd);
Changes from APPLIANCE_HEAD: source/printing/nt_printing.c - use se_create_child_secdesc() to create appropriate security descriptor when performing print job admin security checks. source/printing/printing.c - Use JOB_ACCESS_ADMINISTER instead of PRINTER_ACCESS_ADMINISTER in print_job_{delete,pause,resume}() - If stat'ing the job file fails, delete the job from printing.tdb - In print_job_end() check lpq cache time and do a print_queue_update() This prevents printing.tdb from growing when using NT/2K clients, and there isn't someone pressing F5 in a port monitor window. - In print_queue_resume() check lpq cache time and do a print_queue_update() Probably should do it for print_job_resume() too. (This used to be commit 0068b7741fd54706ef36ddbbc3092389d281e684)
2001-01-19 19:57:39 +03:00
}
Changes from APPLIANCE_HEAD: source/Makefile.in - changes to ctags and etags rules that somehow got lost along the way. source/include/proto.h - make proto source/smbd/sec_ctx.c source/smbd/password.c - merge debugs for debugging user groups and NT token stuff. source/lib/util_str.c - capitalise domain name returned from parse_domain_user() source/nsswitch/wb_client.c - fix broken conditional in debug statement. source/include/rpc_secdes.h source/include/rpc_spoolss.h source/printing/nt_printing.c source/lib/util_seaccess.c - fix printer permission bugs related to ACE masks for printers. This adds mapping of generic access rights to object specific rights for NT printers. Still need to work out whether or not to ignore ACEs with certain flags set, though. See comments in util_seaccess.c:check_ace() for details. source/printing/nt_printing.c source/printing/printing.c - use PRINTER_ACCESS_ADMINISTER instead of JOB_ACCESS_ADMINISTER until we sort out printer/printjob permission stuff. (This used to be commit 1dba9c5cd1e6389734c648f6903abcb7c8d5b2f0)
2001-01-04 22:27:08 +03:00
Try and fix bug #5095, "Manage Documents privilege is not functional". Should map the created sd to printer jobs, not printer. Jerry please test and I'll add to 3.2 if it passes. Thanks, Jeremy. (This used to be commit 0a1fe8d6013d925ab6695f6b7f189b731ec42ccc)
2008-05-06 03:24:52 +04:00
/* Check access */
Unify se_access_check with the S4 code. Will make calculation of SEC_FLAG_MAXIMUM_ALLOWED much easier for files. Jeremy.
2008-10-31 20:51:45 +03:00
status = se_access_check(secdesc->sd, server_info->ptok, access_type,
&access_granted);
Added print_access_check() function for checking printer security descriptors. Currently returns True (plus debug output) which should not affect the behaviour of nt or lanman printing. (This used to be commit a9b4710e649e887e07d68c1bf826e00c9811e4ee)
2000-06-16 12:20:44 +04:00
Unify se_access_check with the S4 code. Will make calculation of SEC_FLAG_MAXIMUM_ALLOWED much easier for files. Jeremy.
2008-10-31 20:51:45 +03:00
DEBUG(4, ("access check was %s\n", NT_STATUS_IS_OK(status) ? "SUCCESS" : "FAILURE"));
Added print_access_check() function for checking printer security descriptors. Currently returns True (plus debug output) which should not affect the behaviour of nt or lanman printing. (This used to be commit a9b4710e649e887e07d68c1bf826e00c9811e4ee)
2000-06-16 12:20:44 +04:00
r4740: allow SE_PRINT_OPERATORS to have printer admin access (This used to be commit 85731706c9d794e8bd3f26ce9b1f881c1ee6a3ba)
2005-01-15 00:24:15 +03:00
/* see if we need to try the printer admin list */
s3-printing: Fix "printer admin" functionality. Fix bug #7255 ("printer admin" parameter does not work as expected).
2010-03-18 13:21:15 +03:00
if (!NT_STATUS_IS_OK(status) &&
Change print_access_check to take auth_serversupplied_info instead of current_user Reason: This is the main user of p->current_user which I would like to remove (This used to be commit fd43059b3dfa8cdac9814de1c76f963ba5de9bcb)
2008-06-24 18:03:28 +04:00
(token_contains_name_in_list(uidtoname(server_info->utok.uid),
NULL, NULL, server_info->ptok,
r13316: Let the carnage begin.... Sync with trunk as off r13315 (This used to be commit 17e63ac4ed8325c0d44fe62b2442449f3298559f)
2006-02-04 01:19:41 +03:00
lp_printer_admin(snum)))) {
r16365: Fix Klocwork #895, #898, #899, #915, #932, #938 and a few other problems Klocwork missed. Jeremy. (This used to be commit fe05769a1a85f924c67be7e5dcee4871a86948d7)
2006-06-20 01:36:19 +04:00
talloc_destroy(mem_ctx);
r13316: Let the carnage begin.... Sync with trunk as off r13315 (This used to be commit 17e63ac4ed8325c0d44fe62b2442449f3298559f)
2006-02-04 01:19:41 +03:00
return True;
r4740: allow SE_PRINT_OPERATORS to have printer admin access (This used to be commit 85731706c9d794e8bd3f26ce9b1f881c1ee6a3ba)
2005-01-15 00:24:15 +03:00
}
Move to talloc control of SPOOL_XXX structs. Move to talloc control of security descriptors and pointers. Syncup with 2.2 tree. Jeremy. (This used to be commit 14d5997dc841e78a619e865288486d50c245896d)
2001-02-28 03:51:02 +03:00
talloc_destroy(mem_ctx);
s3-spoolss: remove whitespace in printing code. Guenther
2009-02-09 14:40:12 +03:00
Unify se_access_check with the S4 code. Will make calculation of SEC_FLAG_MAXIMUM_ALLOWED much easier for files. Jeremy.
2008-10-31 20:51:45 +03:00
if (!NT_STATUS_IS_OK(status)) {
Tidied up some error returns from printing calls. Still need to map UNIX errors to NT error for print job failure returns. Patch from John Reilly at HP. Jeremy. (This used to be commit 3514b5bb8fffd78e3647425d93b74e2e6291bafc)
2000-08-24 03:05:49 +04:00
errno = EACCES;
r16365: Fix Klocwork #895, #898, #899, #915, #932, #938 and a few other problems Klocwork missed. Jeremy. (This used to be commit fe05769a1a85f924c67be7e5dcee4871a86948d7)
2006-06-20 01:36:19 +04:00
}
Tidied up some error returns from printing calls. Still need to map UNIX errors to NT error for print job failure returns. Patch from John Reilly at HP. Jeremy. (This used to be commit 3514b5bb8fffd78e3647425d93b74e2e6291bafc)
2000-08-24 03:05:49 +04:00
Unify se_access_check with the S4 code. Will make calculation of SEC_FLAG_MAXIMUM_ALLOWED much easier for files. Jeremy.
2008-10-31 20:51:45 +03:00
return NT_STATUS_IS_OK(status);
Added print_access_check() function for checking printer security descriptors. Currently returns True (plus debug output) which should not affect the behaviour of nt or lanman printing. (This used to be commit a9b4710e649e887e07d68c1bf826e00c9811e4ee)
2000-06-16 12:20:44 +04:00
}
Added print job substitutions for %{printername}, %{sharename} and %{portname} from the NT printer tdb. Also added checks for time restrictions before allowing a job to print. Jeremy. (This used to be commit 8cfb55e81abebf0354e6d470ed68bbac1d6560ad)
2000-08-01 04:41:19 +04:00
/****************************************************************************
Check the time parameters allow a print operation.
*****************************************************************************/
RIP BOOL. Convert BOOL -> bool. I found a few interesting bugs in various places whilst doing this (places that assumed BOOL == int). I also need to fix the Samba4 pidl generation (next checkin). Jeremy. (This used to be commit f35a266b3cbb3e5fa6a86be60f34fe340a3ca71f)
2007-10-19 04:40:25 +04:00
bool print_time_access_check(const char *servicename)
Added print job substitutions for %{printername}, %{sharename} and %{portname} from the NT printer tdb. Also added checks for time restrictions before allowing a job to print. Jeremy. (This used to be commit 8cfb55e81abebf0354e6d470ed68bbac1d6560ad)
2000-08-01 04:41:19 +04:00
{
NT_PRINTER_INFO_LEVEL *printer = NULL;
RIP BOOL. Convert BOOL -> bool. I found a few interesting bugs in various places whilst doing this (places that assumed BOOL == int). I also need to fix the Samba4 pidl generation (next checkin). Jeremy. (This used to be commit f35a266b3cbb3e5fa6a86be60f34fe340a3ca71f)
2007-10-19 04:40:25 +04:00
bool ok = False;
Added print job substitutions for %{printername}, %{sharename} and %{portname} from the NT printer tdb. Also added checks for time restrictions before allowing a job to print. Jeremy. (This used to be commit 8cfb55e81abebf0354e6d470ed68bbac1d6560ad)
2000-08-01 04:41:19 +04:00
time_t now = time(NULL);
struct tm *t;
uint32 mins;
r16945: Sync trunk -> 3.0 for 3.0.24 code. Still need to do the upper layer directories but this is what everyone is waiting for.... Jeremy. (This used to be commit 9dafb7f48ca3e7af956b0a7d1720c2546fc4cfb8)
2006-07-11 22:01:26 +04:00
if (!W_ERROR_IS_OK(get_a_printer(NULL, &printer, 2, servicename)))
Added print job substitutions for %{printername}, %{sharename} and %{portname} from the NT printer tdb. Also added checks for time restrictions before allowing a job to print. Jeremy. (This used to be commit 8cfb55e81abebf0354e6d470ed68bbac1d6560ad)
2000-08-01 04:41:19 +04:00
return False;
if (printer->info_2->starttime == 0 && printer->info_2->untiltime == 0)
ok = True;
t = gmtime(&now);
mins = (uint32)t->tm_hour*60 + (uint32)t->tm_min;
if (mins >= printer->info_2->starttime && mins <= printer->info_2->untiltime)
ok = True;
free_a_printer(&printer, 2);
Added time check test before allowing print job. Jeremy. (This used to be commit 0249de4cd91d72efb344e9fb05e2be2cb3f03945)
2000-09-13 06:24:35 +04:00
if (!ok)
errno = EACCES;
Added print job substitutions for %{printername}, %{sharename} and %{portname} from the NT printer tdb. Also added checks for time restrictions before allowing a job to print. Jeremy. (This used to be commit 8cfb55e81abebf0354e6d470ed68bbac1d6560ad)
2000-08-01 04:41:19 +04:00
return ok;
}
r2768: BUG 1519: save the hostname used in the open_printer_ex() for later reuse when filling in the spolss replies (also gets rid of get_called_name() (This used to be commit 57db8ca91f52329c7f8985c04463b6b69015b0c4)
2004-10-02 00:34:12 +04:00
/****************************************************************************
Fill in the servername sent in the _spoolss_open_printer_ex() call
****************************************************************************/
r8501: * disable printer handle object cache (was mostly used for NT4 clients enumerating printer data on slow CPUs) * fix pinter and secdesc record upgrade to normalize the key (rev'd printer tdb version) * fixed problem that was normalizing the printername name field in general, this should fix the issues upgrading print servers from 3.0.14a to 3.0.20 (This used to be commit d07179de2f2a6eb1d13d0e25ac10de1a21475559)
2005-07-15 18:26:11 +04:00
r2768: BUG 1519: save the hostname used in the open_printer_ex() for later reuse when filling in the spolss replies (also gets rid of get_called_name() (This used to be commit 57db8ca91f52329c7f8985c04463b6b69015b0c4)
2004-10-02 00:34:12 +04:00
char* get_server_name( Printer_entry *printer )
{
return printer->servername;
}
r8501: * disable printer handle object cache (was mostly used for NT4 clients enumerating printer data on slow CPUs) * fix pinter and secdesc record upgrade to normalize the key (rev'd printer tdb version) * fixed problem that was normalizing the printername name field in general, this should fix the issues upgrading print servers from 3.0.14a to 3.0.20 (This used to be commit d07179de2f2a6eb1d13d0e25ac10de1a21475559)
2005-07-15 18:26:11 +04:00
Copy Permalink