Initial import
[samba] / source / printing / nt_printing.c
diff --git a/source/printing/nt_printing.c b/source/printing/nt_printing.c
new file mode 100644 (file)
index 0000000..1df6bb6
--- /dev/null
@@ -0,0 +1,5388 @@
+/*
+ *  Unix SMB/CIFS implementation.
+ *  RPC Pipe client / server routines
+ *  Copyright (C) Andrew Tridgell              1992-2000,
+ *  Copyright (C) Jean François Micouleau      1998-2000.
+ *  Copyright (C) Gerald Carter                2002-2005.
+ *
+ *  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
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  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.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "includes.h"
+
+extern struct current_user current_user;
+
+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 */
+
+#define FORMS_PREFIX "FORMS/"
+#define DRIVERS_PREFIX "DRIVERS/"
+#define DRIVER_INIT_PREFIX "DRIVER_INIT/"
+#define PRINTERS_PREFIX "PRINTERS/"
+#define SECDESC_PREFIX "SECDESC/"
+#define GLOBAL_C_SETPRINTER "GLOBALS/c_setprinter"
+#define NTDRIVERS_DATABASE_VERSION_1 1
+#define NTDRIVERS_DATABASE_VERSION_2 2
+#define NTDRIVERS_DATABASE_VERSION_3 3 /* little endian version of v2 */
+#define NTDRIVERS_DATABASE_VERSION_4 4 /* fix generic bits in security descriptors */
+#define NTDRIVERS_DATABASE_VERSION_5 5 /* normalize keys in ntprinters.tdb */
+
+/* Map generic permissions to printer object specific permissions */
+
+GENERIC_MAPPING printer_generic_mapping = {
+       PRINTER_READ,
+       PRINTER_WRITE,
+       PRINTER_EXECUTE,
+       PRINTER_ALL_ACCESS
+};
+
+STANDARD_MAPPING printer_std_mapping = {
+       PRINTER_READ,
+       PRINTER_WRITE,
+       PRINTER_EXECUTE,
+       PRINTER_ALL_ACCESS
+};
+
+/* Map generic permissions to print server object specific permissions */
+
+GENERIC_MAPPING printserver_generic_mapping = {
+       SERVER_READ,
+       SERVER_WRITE,
+       SERVER_EXECUTE,
+       SERVER_ALL_ACCESS
+};
+
+STANDARD_MAPPING printserver_std_mapping = {
+       SERVER_READ,
+       SERVER_WRITE,
+       SERVER_EXECUTE,
+       SERVER_ALL_ACCESS
+};
+
+/* 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. */
+static const nt_forms_struct default_forms[] = {
+       {"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},
+       {"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}
+};
+
+struct table_node {
+       const char      *long_archi;
+       const char      *short_archi;
+       int     version;
+};
+#define SPL_ARCH_WIN40         "WIN40"
+#define SPL_ARCH_W32X86                "W32X86"
+#define SPL_ARCH_W32MIPS       "W32MIPS"
+#define SPL_ARCH_W32ALPHA      "W32ALPHA"
+#define SPL_ARCH_W32PPC                "W32PPC"
+#define SPL_ARCH_IA64          "IA64"
+#define SPL_ARCH_X64           "x64"
+
+static const struct table_node archi_table[]= {
+
+       {"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 },
+       {"Windows IA64",         SPL_ARCH_IA64,         3 },
+       {"Windows x64",          SPL_ARCH_X64,          3 },
+       {NULL,                   "",            -1 }
+};
+
+
+/****************************************************************************
+ generate a new TDB_DATA key for storing a printer
+****************************************************************************/
+
+static TDB_DATA make_printer_tdbkey( const char *sharename )
+{
+       fstring share;
+       static pstring keystr;
+       TDB_DATA key;
+       
+       fstrcpy( share, sharename );
+       strlower_m( share );
+       
+       pstr_sprintf( keystr, "%s%s", PRINTERS_PREFIX, share );
+       
+       key.dptr = keystr;
+       key.dsize = strlen(keystr)+1;
+
+       return key;
+}
+
+/****************************************************************************
+ generate a new TDB_DATA key for storing a printer security descriptor
+****************************************************************************/
+
+static char* make_printers_secdesc_tdbkey( const char* sharename  )
+{
+       fstring share;
+       static pstring keystr;
+       
+       fstrcpy( share, sharename );
+       strlower_m( share );
+       
+       pstr_sprintf( keystr, "%s%s", SECDESC_PREFIX, share );
+
+       return keystr;
+}
+
+/****************************************************************************
+****************************************************************************/
+
+static BOOL upgrade_to_version_3(void)
+{
+       TDB_DATA kbuf, newkey, dbuf;
+       DEBUG(0,("upgrade_to_version_3: upgrading print tdb's to version 3\n"));
+       for (kbuf = tdb_firstkey(tdb_drivers); kbuf.dptr;
+                       newkey = tdb_nextkey(tdb_drivers, kbuf), safe_free(kbuf.dptr), kbuf=newkey) {
+
+               dbuf = tdb_fetch(tdb_drivers, kbuf);
+
+               if (strncmp(kbuf.dptr, FORMS_PREFIX, strlen(FORMS_PREFIX)) == 0) {
+                       DEBUG(0,("upgrade_to_version_3:moving form\n"));
+                       if (tdb_store(tdb_forms, kbuf, dbuf, TDB_REPLACE) != 0) {
+                               SAFE_FREE(dbuf.dptr);
+                               DEBUG(0,("upgrade_to_version_3: failed to move form. Error (%s).\n", tdb_errorstr(tdb_forms)));
+                               return False;
+                       }
+                       if (tdb_delete(tdb_drivers, kbuf) != 0) {
+                               SAFE_FREE(dbuf.dptr);
+                               DEBUG(0,("upgrade_to_version_3: failed to delete form. Error (%s)\n", tdb_errorstr(tdb_drivers)));
+                               return False;
+                       }
+               }
+               if (strncmp(kbuf.dptr, PRINTERS_PREFIX, strlen(PRINTERS_PREFIX)) == 0) {
+                       DEBUG(0,("upgrade_to_version_3:moving printer\n"));
+                       if (tdb_store(tdb_printers, kbuf, dbuf, TDB_REPLACE) != 0) {
+                               SAFE_FREE(dbuf.dptr);
+                               DEBUG(0,("upgrade_to_version_3: failed to move printer. Error (%s)\n", tdb_errorstr(tdb_printers)));
+                               return False;
+                       }
+                       if (tdb_delete(tdb_drivers, kbuf) != 0) {
+                               SAFE_FREE(dbuf.dptr);
+                               DEBUG(0,("upgrade_to_version_3: failed to delete printer. Error (%s)\n", tdb_errorstr(tdb_drivers)));
+                               return False;
+                       }
+               }
+               if (strncmp(kbuf.dptr, SECDESC_PREFIX, strlen(SECDESC_PREFIX)) == 0) {
+                       DEBUG(0,("upgrade_to_version_3:moving secdesc\n"));
+                       if (tdb_store(tdb_printers, kbuf, dbuf, TDB_REPLACE) != 0) {
+                               SAFE_FREE(dbuf.dptr);
+                               DEBUG(0,("upgrade_to_version_3: failed to move secdesc. Error (%s)\n", tdb_errorstr(tdb_printers)));
+                               return False;
+                       }
+                       if (tdb_delete(tdb_drivers, kbuf) != 0) {
+                               SAFE_FREE(dbuf.dptr);
+                               DEBUG(0,("upgrade_to_version_3: failed to delete secdesc. Error (%s)\n", tdb_errorstr(tdb_drivers)));
+                               return False;
+                       }
+               }
+               SAFE_FREE(dbuf.dptr);
+       }
+
+       return True;
+}
+
+/*******************************************************************
+ Fix an issue with security descriptors.  Printer sec_desc must 
+ use more than the generic bits that were previously used 
+ in <= 3.0.14a.  They must also have a owner and group SID assigned.
+ Otherwise, any printers than have been migrated to a Windows 
+ 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 )
+{
+       prs_struct ps;
+       SEC_DESC_BUF *sd_orig = NULL;
+       SEC_DESC_BUF *sd_new, *sd_store;
+       SEC_DESC *sec, *new_sec;
+       TALLOC_CTX *ctx = state;
+       int result, i;
+       uint32 sd_size;
+       size_t size_new_sec;
+       DOM_SID sid;
+
+       if (!data.dptr || data.dsize == 0)
+               return 0;
+
+       if ( strncmp( key.dptr, SECDESC_PREFIX, strlen(SECDESC_PREFIX) ) != 0 )
+               return 0;
+
+       /* upgrade the security descriptor */
+
+       ZERO_STRUCT( ps );
+
+       prs_init( &ps, 0, ctx, UNMARSHALL );
+       prs_give_memory( &ps, data.dptr, data.dsize, True );
+
+       if ( !sec_io_desc_buf( "sec_desc_upg_fn", &sd_orig, &ps, 1 ) ) {
+               /* delete bad entries */
+               DEBUG(0,("sec_desc_upg_fn: Failed to parse original sec_desc for %si.  Deleting....\n", key.dptr ));
+               tdb_delete( tdb_printers, key );
+               return 0;
+       }
+
+       sec = sd_orig->sec;
+               
+       /* is this even valid? */
+       
+       if ( !sec->dacl )
+               return 0;
+               
+       /* update access masks */
+       
+       for ( i=0; i<sec->dacl->num_aces; i++ ) {
+               switch ( sec->dacl->ace[i].info.mask ) {
+                       case (GENERIC_READ_ACCESS | GENERIC_WRITE_ACCESS | GENERIC_EXECUTE_ACCESS):
+                               sec->dacl->ace[i].info.mask = PRINTER_ACE_PRINT;
+                               break;
+                               
+                       case GENERIC_ALL_ACCESS:
+                               sec->dacl->ace[i].info.mask = PRINTER_ACE_FULL_CONTROL;
+                               break;
+                               
+                       case READ_CONTROL_ACCESS:
+                               sec->dacl->ace[i].info.mask = PRINTER_ACE_MANAGE_DOCUMENTS;
+                       
+                       default:        /* no change */
+                               break;
+               }
+       }
+
+       /* create a new SEC_DESC with the appropriate owner and group SIDs */
+
+       string_to_sid(&sid, "S-1-5-32-544" );
+       new_sec = make_sec_desc( ctx, SEC_DESC_REVISION, SEC_DESC_SELF_RELATIVE,
+               &sid, &sid,
+               NULL, NULL, &size_new_sec );
+       sd_new = make_sec_desc_buf( ctx, size_new_sec, new_sec );
+
+       if ( !(sd_store = sec_desc_merge( ctx, sd_new, sd_orig )) ) {
+               DEBUG(0,("sec_desc_upg_fn: Failed to update sec_desc for %s\n", key.dptr ));
+               return 0;
+       }
+       
+       /* store it back */
+       
+       sd_size = sec_desc_size(sd_store->sec) + sizeof(SEC_DESC_BUF);
+       prs_init(&ps, sd_size, ctx, MARSHALL);
+
+       if ( !sec_io_desc_buf( "sec_desc_upg_fn", &sd_store, &ps, 1 ) ) {
+               DEBUG(0,("sec_desc_upg_fn: Failed to parse new sec_desc for %s\n", key.dptr ));
+               return 0;
+       }
+
+       data.dptr = prs_data_p( &ps );
+       data.dsize = sd_size;
+       
+       result = tdb_store( tdb_printers, key, data, TDB_REPLACE );
+
+       prs_mem_free( &ps );
+       
+       /* 0 to continue and non-zero to stop traversal */
+
+       return (result == -1);
+}
+
+/*******************************************************************
+*******************************************************************/
+
+static BOOL upgrade_to_version_4(void)
+{
+       TALLOC_CTX *ctx;
+       int result;
+
+       DEBUG(0,("upgrade_to_version_4: upgrading printer security descriptors\n"));
+
+       if ( !(ctx = talloc_init( "upgrade_to_version_4" )) ) 
+               return False;
+
+       result = tdb_traverse( tdb_printers, sec_desc_upg_fn, ctx );
+
+       talloc_destroy( ctx );
+
+       return ( result != -1 );
+}
+
+/*******************************************************************
+ Fix an issue with security descriptors.  Printer sec_desc must 
+ use more than the generic bits that were previously used 
+ in <= 3.0.14a.  They must also have a owner and group SID assigned.
+ Otherwise, any printers than have been migrated to a Windows 
+ 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 )
+{
+       TDB_DATA new_key;
+       
+       if (!data.dptr || data.dsize == 0)
+               return 0;
+
+       /* upgrade printer records and security descriptors */
+       
+       if ( strncmp( key.dptr, PRINTERS_PREFIX, strlen(PRINTERS_PREFIX) ) == 0 ) {
+               new_key = make_printer_tdbkey( key.dptr+strlen(PRINTERS_PREFIX) );
+       }
+       else if ( strncmp( key.dptr, SECDESC_PREFIX, strlen(SECDESC_PREFIX) ) == 0 ) {
+               new_key.dptr = make_printers_secdesc_tdbkey( key.dptr+strlen(SECDESC_PREFIX) );
+               new_key.dsize = strlen( new_key.dptr ) + 1;
+       }
+       else {
+               /* ignore this record */
+               return 0;
+       }
+               
+       /* delete the original record and store under the normalized key */
+       
+       if ( tdb_delete( the_tdb, key ) != 0 ) {
+               DEBUG(0,("normalize_printers_fn: tdb_delete for [%s] failed!\n", 
+                       key.dptr));
+               return 1;
+       }
+       
+       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;
+       }
+       
+       return 0;
+}
+
+/*******************************************************************
+*******************************************************************/
+
+static BOOL upgrade_to_version_5(void)
+{
+       TALLOC_CTX *ctx;
+       int result;
+
+       DEBUG(0,("upgrade_to_version_5: normalizing printer keys\n"));
+
+       if ( !(ctx = talloc_init( "upgrade_to_version_5" )) ) 
+               return False;
+
+       result = tdb_traverse( tdb_printers, normalize_printers_fn, NULL );
+
+       talloc_destroy( ctx );
+
+       return ( result != -1 );
+}
+
+/****************************************************************************
+ Open the NT printing tdbs. Done once before fork().
+****************************************************************************/
+
+BOOL nt_printing_init(void)
+{
+       const char *vstring = "INFO/version";
+       WERROR win_rc;
+       int32 vers_id;
+
+       if ( tdb_drivers && tdb_printers && tdb_forms )
+               return True;
+       if (tdb_drivers)
+               tdb_close(tdb_drivers);
+       tdb_drivers = tdb_open_log(lock_path("ntdrivers.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+       if (!tdb_drivers) {
+               DEBUG(0,("nt_printing_init: Failed to open nt drivers database %s (%s)\n",
+                       lock_path("ntdrivers.tdb"), strerror(errno) ));
+               return False;
+       }
+       if (tdb_printers)
+               tdb_close(tdb_printers);
+       tdb_printers = tdb_open_log(lock_path("ntprinters.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+       if (!tdb_printers) {
+               DEBUG(0,("nt_printing_init: Failed to open nt printers database %s (%s)\n",
+                       lock_path("ntprinters.tdb"), strerror(errno) ));
+               return False;
+       }
+       if (tdb_forms)
+               tdb_close(tdb_forms);
+       tdb_forms = tdb_open_log(lock_path("ntforms.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+       if (!tdb_forms) {
+               DEBUG(0,("nt_printing_init: Failed to open nt forms database %s (%s)\n",
+                       lock_path("ntforms.tdb"), strerror(errno) ));
+               return False;
+       }
+       /* handle a Samba upgrade */
+       
+       vers_id = tdb_fetch_int32(tdb_drivers, vstring);
+       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;
+       }
+
+       if ( vers_id != NTDRIVERS_DATABASE_VERSION_5 ) {
+
+               if ((vers_id == NTDRIVERS_DATABASE_VERSION_1) || (IREV(vers_id) == NTDRIVERS_DATABASE_VERSION_1)) { 
+                       if (!upgrade_to_version_3())
+                               return False;
+                       tdb_store_int32(tdb_drivers, vstring, NTDRIVERS_DATABASE_VERSION_3);
+                       vers_id = NTDRIVERS_DATABASE_VERSION_3;
+               } 
+               
+               if ((vers_id == NTDRIVERS_DATABASE_VERSION_2) || (IREV(vers_id) == NTDRIVERS_DATABASE_VERSION_2)) {
+                       /* Written on a bigendian machine with old fetch_int code. Save as le. */
+                       /* The only upgrade between V2 and V3 is to save the version in little-endian. */
+                       tdb_store_int32(tdb_drivers, vstring, NTDRIVERS_DATABASE_VERSION_3);
+                       vers_id = NTDRIVERS_DATABASE_VERSION_3;
+               }
+
+               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;
+               }
+
+               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;
+               }
+
+
+               if ( vers_id != NTDRIVERS_DATABASE_VERSION_5 ) {
+                       DEBUG(0,("nt_printing_init: Unknown printer database version [%d]\n", vers_id));
+                       return False;
+               }
+       }
+       
+       update_c_setprinter(True);
+
+       /*
+        * register callback to handle updating printers as new
+        * drivers are installed
+        */
+
+       message_register( MSG_PRINTER_DRVUPGRADE, do_drv_upgrade_printer );
+
+       /*
+        * register callback to handle updating printer data
+        * when a driver is initialized
+        */
+
+       message_register( MSG_PRINTERDATA_INIT_RESET, reset_all_printerdata );
+
+       /* of course, none of the message callbacks matter if you don't
+          tell messages.c that you interested in receiving PRINT_GENERAL 
+          msgs.  This is done in claim_connection() */
+
+
+       if ( lp_security() == SEC_ADS ) {
+               win_rc = check_published_printers();
+               if (!W_ERROR_IS_OK(win_rc))
+                       DEBUG(0, ("nt_printing_init: error checking published printers: %s\n", dos_errstr(win_rc)));
+       }
+
+       return True;
+}
+
+/*******************************************************************
+ Function to allow filename parsing "the old way".
+********************************************************************/
+
+static BOOL driver_unix_convert(char *name,connection_struct *conn,
+               char *saved_last_component, BOOL *bad_path, SMB_STRUCT_STAT *pst)
+{
+       unix_format(name);
+       unix_clean_name(name);
+       trim_string(name,"/","/");
+       return unix_convert(name, conn, saved_last_component, bad_path, pst);
+}
+
+/*******************************************************************
+ 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;
+       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));
+       }
+       return 0;
+}
+/*******************************************************************
+ 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
+********************************************************************/
+
+uint32 update_c_setprinter(BOOL initialize)
+{
+       int32 c_setprinter;
+       int32 printer_count = 0;
+       tdb_lock_bystring(tdb_printers, GLOBAL_C_SETPRINTER, 0);
+       /* Traverse the tdb, counting the printers */
+       tdb_traverse(tdb_printers, traverse_counting_printers, (void *)&printer_count);
+       /* 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;
+       DEBUG(10,("update_c_setprinter: c_setprinter = %u\n", (unsigned int)c_setprinter));
+       tdb_store_int32(tdb_printers, GLOBAL_C_SETPRINTER, c_setprinter);
+       tdb_unlock_bystring(tdb_printers, GLOBAL_C_SETPRINTER);
+       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);
+       if (c_setprinter == (int32)-1)
+               c_setprinter = update_c_setprinter(True);
+       DEBUG(10,("get_c_setprinter: c_setprinter = %d\n", c_setprinter));
+       return (uint32)c_setprinter;
+}
+
+/****************************************************************************
+ Get builtin form struct list.
+****************************************************************************/
+
+int get_builtin_ntforms(nt_forms_struct **list)
+{
+       *list = (nt_forms_struct *)memdup(&default_forms[0], sizeof(default_forms));
+       return sizeof(default_forms) / sizeof(default_forms[0]);
+}
+
+/****************************************************************************
+ get a builtin form struct
+****************************************************************************/
+
+BOOL get_a_builtin_ntform(UNISTR2 *uni_formname,nt_forms_struct *form)
+{
+       int i,count;
+       fstring form_name;
+       unistr2_to_ascii(form_name, uni_formname, sizeof(form_name)-1);
+       DEBUGADD(6,("Looking for builtin form %s \n", form_name));
+       count = sizeof(default_forms) / sizeof(default_forms[0]);
+       for (i=0;i<count;i++) {
+               if (strequal(form_name,default_forms[i].name)) {
+                       DEBUGADD(6,("Found builtin form %s \n", form_name));
+                       memcpy(form,&default_forms[i],sizeof(*form));
+                       break;
+               }
+       }
+
+       return (i !=count);
+}
+
+/****************************************************************************
+get a form struct list
+****************************************************************************/
+int get_ntforms(nt_forms_struct **list)
+{
+       TDB_DATA kbuf, newkey, dbuf;
+       nt_forms_struct *tl;
+       nt_forms_struct form;
+       int ret;
+       int i;
+       int n = 0;
+
+       for (kbuf = tdb_firstkey(tdb_forms);
+            kbuf.dptr;
+            newkey = tdb_nextkey(tdb_forms, kbuf), safe_free(kbuf.dptr), kbuf=newkey) 
+       {
+               if (strncmp(kbuf.dptr, FORMS_PREFIX, strlen(FORMS_PREFIX)) != 0) 
+                       continue;
+               
+               dbuf = tdb_fetch(tdb_forms, kbuf);
+               if (!dbuf.dptr) 
+                       continue;
+
+               fstrcpy(form.name, kbuf.dptr+strlen(FORMS_PREFIX));
+               ret = tdb_unpack(dbuf.dptr, dbuf.dsize, "dddddddd",
+                                &i, &form.flag, &form.width, &form.length, &form.left,
+                                &form.top, &form.right, &form.bottom);
+               SAFE_FREE(dbuf.dptr);
+               if (ret != dbuf.dsize) 
+                       continue;
+
+               tl = SMB_REALLOC_ARRAY(*list, nt_forms_struct, n+1);
+               if (!tl) {
+                       DEBUG(0,("get_ntforms: Realloc fail.\n"));
+                       return 0;
+               }
+               *list = tl;
+               (*list)[n] = form;
+               n++;
+       }
+       
+
+       return n;
+}
+
+/****************************************************************************
+write a form struct list
+****************************************************************************/
+int write_ntforms(nt_forms_struct **list, int number)
+{
+       pstring buf, key;
+       int len;
+       TDB_DATA kbuf,dbuf;
+       int i;
+
+       for (i=0;i<number;i++) {
+               /* save index, so list is rebuilt in correct order */
+               len = tdb_pack(buf, sizeof(buf), "dddddddd",
+                              i, (*list)[i].flag, (*list)[i].width, (*list)[i].length,
+                              (*list)[i].left, (*list)[i].top, (*list)[i].right,
+                              (*list)[i].bottom);
+               if (len > sizeof(buf)) break;
+               slprintf(key, sizeof(key)-1, "%s%s", FORMS_PREFIX, (*list)[i].name);
+               kbuf.dsize = strlen(key)+1;
+               kbuf.dptr = key;
+               dbuf.dsize = len;
+               dbuf.dptr = buf;
+               if (tdb_store(tdb_forms, kbuf, dbuf, TDB_REPLACE) != 0) break;
+       }
+
+       return i;
+}
+
+/****************************************************************************
+add a form struct at the end of the list
+****************************************************************************/
+BOOL add_a_form(nt_forms_struct **list, const FORM *form, int *count)
+{
+       int n=0;
+       BOOL update;
+       fstring form_name;
+       nt_forms_struct *tl;
+
+       /*
+        * NT tries to add forms even when
+        * they are already in the base
+        * only update the values if already present
+        */
+
+       update=False;
+       
+       unistr2_to_ascii(form_name, &form->name, sizeof(form_name)-1);
+       for (n=0; n<*count; n++) {
+               if ( strequal((*list)[n].name, form_name) ) {
+                       update=True;
+                       break;
+               }
+       }
+
+       if (update==False) {
+               if((tl=SMB_REALLOC_ARRAY(*list, nt_forms_struct, n+1)) == NULL) {
+                       DEBUG(0,("add_a_form: failed to enlarge forms list!\n"));
+                       return False;
+               }
+               *list = tl;
+               unistr2_to_ascii((*list)[n].name, &form->name, sizeof((*list)[n].name)-1);
+               (*count)++;
+       }
+       
+       (*list)[n].flag=form->flags;
+       (*list)[n].width=form->size_x;
+       (*list)[n].length=form->size_y;
+       (*list)[n].left=form->left;
+       (*list)[n].top=form->top;
+       (*list)[n].right=form->right;
+       (*list)[n].bottom=form->bottom;
+
+       DEBUG(6,("add_a_form: Successfully %s form [%s]\n", 
+               update ? "updated" : "added", form_name));
+
+       return True;
+}
+
+/****************************************************************************
+ Delete a named form struct.
+****************************************************************************/
+
+BOOL delete_a_form(nt_forms_struct **list, UNISTR2 *del_name, int *count, WERROR *ret)
+{
+       pstring key;
+       TDB_DATA kbuf;
+       int n=0;
+       fstring form_name;
+
+       *ret = WERR_OK;
+
+       unistr2_to_ascii(form_name, del_name, sizeof(form_name)-1);
+
+       for (n=0; n<*count; n++) {
+               if (!strncmp((*list)[n].name, form_name, strlen(form_name))) {
+                       DEBUG(103, ("delete_a_form, [%s] in list\n", form_name));
+                       break;
+               }
+       }
+
+       if (n == *count) {
+               DEBUG(10,("delete_a_form, [%s] not found\n", form_name));
+               *ret = WERR_INVALID_PARAM;
+               return False;
+       }
+
+       slprintf(key, sizeof(key)-1, "%s%s", FORMS_PREFIX, (*list)[n].name);
+       kbuf.dsize = strlen(key)+1;
+       kbuf.dptr = key;
+       if (tdb_delete(tdb_forms, kbuf) != 0) {
+               *ret = WERR_NOMEM;
+               return False;
+       }
+
+       return True;
+}
+
+/****************************************************************************
+ Update a form struct.
+****************************************************************************/
+
+void update_a_form(nt_forms_struct **list, const FORM *form, int count)
+{
+       int n=0;
+       fstring form_name;
+       unistr2_to_ascii(form_name, &(form->name), sizeof(form_name)-1);
+
+       DEBUG(106, ("[%s]\n", form_name));
+       for (n=0; n<count; n++) {
+               DEBUGADD(106, ("n [%d]:[%s]\n", n, (*list)[n].name));
+               if (!strncmp((*list)[n].name, form_name, strlen(form_name)))
+                       break;
+       }
+
+       if (n==count) return;
+
+       (*list)[n].flag=form->flags;
+       (*list)[n].width=form->size_x;
+       (*list)[n].length=form->size_y;
+       (*list)[n].left=form->left;
+       (*list)[n].top=form->top;
+       (*list)[n].right=form->right;
+       (*list)[n].bottom=form->bottom;
+}
+
+/****************************************************************************
+ Get the nt drivers list.
+ Traverse the database and look-up the matching names.
+****************************************************************************/
+int get_ntdrivers(fstring **list, const char *architecture, uint32 version)
+{
+       int total=0;
+       const char *short_archi;
+       fstring *fl;
+       pstring key;
+       TDB_DATA kbuf, newkey;
+
+       short_archi = get_short_archi(architecture);
+       slprintf(key, sizeof(key)-1, "%s%s/%d/", DRIVERS_PREFIX, short_archi, version);
+
+       for (kbuf = tdb_firstkey(tdb_drivers);
+            kbuf.dptr;
+            newkey = tdb_nextkey(tdb_drivers, kbuf), safe_free(kbuf.dptr), kbuf=newkey) {
+
+               if (strncmp(kbuf.dptr, key, strlen(key)) != 0)
+                       continue;
+               
+               if((fl = SMB_REALLOC_ARRAY(*list, fstring, total+1)) == NULL) {
+                       DEBUG(0,("get_ntdrivers: failed to enlarge list!\n"));
+                       return -1;
+               }
+               else *list = fl;
+
+               fstrcpy((*list)[total], kbuf.dptr+strlen(key));
+               total++;
+       }
+
+       return(total);
+}
+
+/****************************************************************************
+function to do the mapping between the long architecture name and
+the short one.
+****************************************************************************/
+const char *get_short_archi(const char *long_archi)
+{
+        int i=-1;
+
+        DEBUG(107,("Getting architecture dependant directory\n"));
+        do {
+                i++;
+        } while ( (archi_table[i].long_archi!=NULL ) &&
+                  StrCaseCmp(long_archi, archi_table[i].long_archi) );
+
+        if (archi_table[i].long_archi==NULL) {
+                DEBUGADD(10,("Unknown architecture [%s] !\n", long_archi));
+                return NULL;
+        }
+
+       /* this might be client code - but shouldn't this be an fstrcpy etc? */
+
+
+        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));
+
+       return archi_table[i].short_archi;
+}
+
+/****************************************************************************
+ 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.
+****************************************************************************/
+
+static int get_file_version(files_struct *fsp, char *fname,uint32 *major, uint32 *minor)
+{
+       int     i;
+       char    *buf = NULL;
+       ssize_t byte_count;
+
+       if ((buf=SMB_MALLOC(PE_HEADER_SIZE)) == NULL) {
+               DEBUG(0,("get_file_version: PE file [%s] PE Header malloc failed bytes = %d\n",
+                               fname, PE_HEADER_SIZE));
+               goto error_exit;
+       }
+
+       /* Note: DOS_HEADER_SIZE < malloc'ed PE_HEADER_SIZE */
+       if ((byte_count = vfs_read_data(fsp, buf, DOS_HEADER_SIZE)) < DOS_HEADER_SIZE) {
+               DEBUG(3,("get_file_version: File [%s] DOS header too short, bytes read = %lu\n",
+                        fname, (unsigned long)byte_count));
+               goto no_version_info;
+       }
+
+       /* Is this really a DOS header? */
+       if (SVAL(buf,DOS_HEADER_MAGIC_OFFSET) != DOS_HEADER_MAGIC) {
+               DEBUG(6,("get_file_version: File [%s] bad DOS magic = 0x%x\n",
+                               fname, SVAL(buf,DOS_HEADER_MAGIC_OFFSET)));
+               goto no_version_info;
+       }
+
+       /* Skip OEM header (if any) and the DOS stub to start of Windows header */
+       if (SMB_VFS_LSEEK(fsp, fsp->fh->fd, SVAL(buf,DOS_HEADER_LFANEW_OFFSET), SEEK_SET) == (SMB_OFF_T)-1) {
+               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;
+       }
+
+       if ((byte_count = vfs_read_data(fsp, buf, PE_HEADER_SIZE)) < PE_HEADER_SIZE) {
+               DEBUG(3,("get_file_version: File [%s] Windows header too short, bytes read = %lu\n",
+                        fname, (unsigned long)byte_count));
+               /* Assume this isn't an error... the file just looks sort of like a PE/NE file */
+               goto no_version_info;
+       }
+
+       /* The header may be a PE (Portable Executable) or an NE (New Executable) */
+       if (IVAL(buf,PE_HEADER_SIGNATURE_OFFSET) == PE_HEADER_SIGNATURE) {
+               unsigned int num_sections;
+               unsigned int section_table_bytes;
+               
+               if (SVAL(buf,PE_HEADER_MACHINE_OFFSET) != PE_HEADER_MACHINE_I386) {
+                       DEBUG(3,("get_file_version: PE file [%s] wrong machine = 0x%x\n",
+                                       fname, SVAL(buf,PE_HEADER_MACHINE_OFFSET)));
+                       /* At this point, we assume the file is in error. It still could be somthing
+                        * else besides a PE file, but it unlikely at this point.
+                        */
+                       goto error_exit;
+               }
+
+               /* get the section table */
+               num_sections        = SVAL(buf,PE_HEADER_NUMBER_OF_SECTIONS);
+               section_table_bytes = num_sections * PE_HEADER_SECT_HEADER_SIZE;
+               if (section_table_bytes == 0)
+                       goto error_exit;
+
+               SAFE_FREE(buf);
+               if ((buf=SMB_MALLOC(section_table_bytes)) == NULL) {
+                       DEBUG(0,("get_file_version: PE file [%s] section table malloc failed bytes = %d\n",
+                                       fname, section_table_bytes));
+                       goto error_exit;
+               }
+
+               if ((byte_count = vfs_read_data(fsp, buf, section_table_bytes)) < section_table_bytes) {
+                       DEBUG(3,("get_file_version: PE file [%s] Section header too short, bytes read = %lu\n",
+                                fname, (unsigned long)byte_count));
+                       goto error_exit;
+               }
+
+               /* 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;
+
+                       if (strcmp(".rsrc", &buf[sec_offset+PE_HEADER_SECT_NAME_OFFSET]) == 0) {
+                               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;
+
+                               SAFE_FREE(buf);
+                               if ((buf=SMB_MALLOC(section_bytes)) == NULL) {
+                                       DEBUG(0,("get_file_version: PE file [%s] version malloc failed bytes = %d\n",
+                                                       fname, section_bytes));
+                                       goto error_exit;
+                               }
+
+                               /* Seek to the start of the .rsrc section info */
+                               if (SMB_VFS_LSEEK(fsp, fsp->fh->fd, section_pos, SEEK_SET) == (SMB_OFF_T)-1) {
+                                       DEBUG(3,("get_file_version: PE file [%s] too short for section info, errno = %d\n",
+                                                       fname, errno));
+                                       goto error_exit;
+                               }
+
+                               if ((byte_count = vfs_read_data(fsp, buf, section_bytes)) < section_bytes) {
+                                       DEBUG(3,("get_file_version: PE file [%s] .rsrc section too short, bytes read = %lu\n",
+                                                fname, (unsigned long)byte_count));
+                                       goto error_exit;
+                               }
+
+                               if (section_bytes < VS_VERSION_INFO_UNICODE_SIZE)
+                                       goto error_exit;
+
+                               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;
+
+                                               if (IVAL(buf,pos) == VS_MAGIC_VALUE) {
+                                                       *major = IVAL(buf,pos+VS_MAJOR_OFFSET);
+                                                       *minor = IVAL(buf,pos+VS_MINOR_OFFSET);
+                                                       
+                                                       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));
+                                                       SAFE_FREE(buf);
+                                                       return 1;
+                                               }
+                                       }
+                               }
+                       }
+               }
+
+               /* Version info not found, fall back to origin date/time */
+               DEBUG(10,("get_file_version: PE file [%s] has no version info\n", fname));
+               SAFE_FREE(buf);
+               return 0;
+
+       } 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 */
+               SAFE_FREE(buf);
+               if ((buf=SMB_MALLOC(VS_NE_BUF_SIZE)) == NULL) {
+                       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 */
+                                       int skip = -(SMB_VFS_LSEEK(fsp, fsp->fh->fd, 0, SEEK_CUR) - (byte_count - i) +
+                                                                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));
+                                       SAFE_FREE(buf);
+                                       return 1;
+                               }
+                       }
+               }
+
+               /* Version info not found, fall back to origin date/time */
+               DEBUG(0,("get_file_version: NE file [%s] Version info not found\n", fname));
+               SAFE_FREE(buf);
+               return 0;
+
+       } 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:
+               SAFE_FREE(buf);
+               return 0;
+
+       error_exit:
+               SAFE_FREE(buf);
+               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.
+****************************************************************************/
+
+static int file_version_is_newer(connection_struct *conn, fstring new_file, fstring old_file)
+{
+       BOOL   use_version = True;
+       pstring filepath;
+
+       uint32 new_major;
+       uint32 new_minor;
+       time_t new_create_time;
+
+       uint32 old_major;
+       uint32 old_minor;
+       time_t old_create_time;
+
+       files_struct    *fsp = NULL;
+       SMB_STRUCT_STAT st;
+       SMB_STRUCT_STAT stat_buf;
+       BOOL bad_path;
+
+       SET_STAT_INVALID(st);
+       SET_STAT_INVALID(stat_buf);
+       new_create_time = (time_t)0;
+       old_create_time = (time_t)0;
+
+       /* Get file version info (if available) for previous file (if it exists) */
+       pstrcpy(filepath, old_file);
+
+       driver_unix_convert(filepath,conn,NULL,&bad_path,&stat_buf);
+
+       fsp = open_file_ntcreate(conn, filepath, &stat_buf,
+                               FILE_GENERIC_READ,
+                               FILE_SHARE_READ|FILE_SHARE_WRITE,
+                               FILE_OPEN,
+                               0,
+                               FILE_ATTRIBUTE_NORMAL,
+                               INTERNAL_OPEN_ONLY,
+                               NULL);
+
+       if (!fsp) {
+               /* Old file not found, so by definition new file is in fact newer */
+               DEBUG(10,("file_version_is_newer: Can't open old file [%s], errno = %d\n",
+                               filepath, errno));
+               return True;
+
+       } else {
+               int ret = get_file_version(fsp, old_file, &old_major, &old_minor);
+               if (ret == -1) {
+                       goto error_exit;
+               }
+
+               if (!ret) {
+                       DEBUG(6,("file_version_is_newer: Version info not found [%s], use mod time\n",
+                                        old_file));
+                       use_version = False;
+                       if (SMB_VFS_FSTAT(fsp, fsp->fh->fd, &st) == -1) goto error_exit;
+                       old_create_time = st.st_mtime;
+                       DEBUGADD(6,("file_version_is_newer: mod time = %ld sec\n", old_create_time));
+               }
+       }
+       close_file(fsp, True);
+
+       /* Get file version info (if available) for new file */
+       pstrcpy(filepath, new_file);
+       driver_unix_convert(filepath,conn,NULL,&bad_path,&stat_buf);
+
+       fsp = open_file_ntcreate(conn, filepath, &stat_buf,
+                               FILE_GENERIC_READ,
+                               FILE_SHARE_READ|FILE_SHARE_WRITE,
+                               FILE_OPEN,
+                               0,
+                               FILE_ATTRIBUTE_NORMAL,
+                               INTERNAL_OPEN_ONLY,
+                               NULL);
+
+       if (!fsp) {
+               /* New file not found, this shouldn't occur if the caller did its job */
+               DEBUG(3,("file_version_is_newer: Can't open new file [%s], errno = %d\n",
+                               filepath, errno));
+               goto error_exit;
+
+       } else {
+               int ret = get_file_version(fsp, new_file, &new_major, &new_minor);
+               if (ret == -1) {
+                       goto error_exit;
+               }
+
+               if (!ret) {
+                       DEBUG(6,("file_version_is_newer: Version info not found [%s], use mod time\n",
+                                        new_file));
+                       use_version = False;
+                       if (SMB_VFS_FSTAT(fsp, fsp->fh->fd, &st) == -1) goto error_exit;
+                       new_create_time = st.st_mtime;
+                       DEBUGADD(6,("file_version_is_newer: mod time = %ld sec\n", new_create_time));
+               }
+       }
+       close_file(fsp, True);
+
+       if (use_version && (new_major != old_major || new_minor != old_minor)) {
+               /* Compare versions and choose the larger version number */
+               if (new_major > old_major ||
+                       (new_major == old_major && new_minor > old_minor)) {
+                       
+                       DEBUG(6,("file_version_is_newer: Replacing [%s] with [%s]\n", old_file, new_file));
+                       return True;
+               }
+               else {
+                       DEBUG(6,("file_version_is_newer: Leaving [%s] unchanged\n", old_file));
+                       return False;
+               }
+
+       } 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));
+                       return True;
+               }
+               else {
+                       DEBUG(6,("file_version_is_newer: Leaving [%s] unchanged\n", old_file));
+                       return False;
+               }
+       }
+
+       error_exit:
+               if(fsp)
+                       close_file(fsp, True);
+               return -1;
+}
+
+/****************************************************************************
+Determine the correct cVersion associated with an architecture and driver
+****************************************************************************/
+static uint32 get_correct_cversion(const char *architecture, fstring driverpath_in,
+                                  struct current_user *user, WERROR *perr)
+{
+       int               cversion;
+       NTSTATUS          nt_status;
+       pstring           driverpath;
+       DATA_BLOB         null_pw;
+       fstring           res_type;
+       files_struct      *fsp = NULL;
+       BOOL              bad_path;
+       SMB_STRUCT_STAT   st;
+       connection_struct *conn;
+
+       SET_STAT_INVALID(st);
+
+       *perr = WERR_INVALID_PARAM;
+
+       /* If architecture is Windows 95/98/ME, the version is always 0. */
+       if (strcmp(architecture, SPL_ARCH_WIN40) == 0) {
+               DEBUG(10,("get_correct_cversion: Driver is Win9x, cversion = 0\n"));
+               *perr = WERR_OK;
+               return 0;
+       }
+
+       /* 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;
+       }
+
+       /*
+        * Connect to the print$ share under the same account as the user connected
+        * to the rpc pipe. Note we must still be root to do this.
+        */
+
+       /* Null password is ok - we are already an authenticated user... */
+       null_pw = data_blob(NULL, 0);
+       fstrcpy(res_type, "A:");
+       become_root();
+       conn = make_connection_with_chdir("print$", null_pw, res_type, user->vuid, &nt_status);
+       unbecome_root();
+
+       if (conn == NULL) {
+               DEBUG(0,("get_correct_cversion: Unable to connect\n"));
+               *perr = ntstatus_to_werror(nt_status);
+               return -1;
+       }
+
+       /* We are temporarily becoming the connection user. */
+       if (!become_user(conn, user->vuid)) {
+               DEBUG(0,("get_correct_cversion: Can't become user!\n"));
+               *perr = WERR_ACCESS_DENIED;
+               return -1;
+       }
+
+       /* Open the driver file (Portable Executable format) and determine the
+        * deriver the cversion. */
+       slprintf(driverpath, sizeof(driverpath)-1, "%s/%s", architecture, driverpath_in);
+
+       driver_unix_convert(driverpath,conn,NULL,&bad_path,&st);
+
+       if ( !vfs_file_exist( conn, driverpath, &st ) ) {
+               *perr = WERR_BADFILE;
+               goto error_exit;
+       }
+
+       fsp = open_file_ntcreate(conn, driverpath, &st,
+                               FILE_GENERIC_READ,
+                               FILE_SHARE_READ|FILE_SHARE_WRITE,
+                               FILE_OPEN,
+                               0,
+                               FILE_ATTRIBUTE_NORMAL,
+                               INTERNAL_OPEN_ONLY,
+                               NULL);
+
+       if (!fsp) {
+               DEBUG(3,("get_correct_cversion: Can't open file [%s], errno = %d\n",
+                               driverpath, errno));
+               *perr = WERR_ACCESS_DENIED;
+               goto error_exit;
+       } else {
+               uint32 major;
+               uint32 minor;
+               int    ret = get_file_version(fsp, driverpath, &major, &minor);
+               if (ret == -1) goto error_exit;
+
+               if (!ret) {
+                       DEBUG(6,("get_correct_cversion: Version info not found [%s]\n", driverpath));
+                       goto error_exit;
+               }
+
+               /*
+                * This is a Microsoft'ism. See references in MSDN to VER_FILEVERSION
+                * for more details. Version in this case is not just the version of the 
+                * file, but the version in the sense of kernal mode (2) vs. user mode
+                * (3) drivers. Other bits of the version fields are the version info. 
+                * JRR 010716
+               */
+               cversion = major & 0x0000ffff;
+               switch (cversion) {
+                       case 2: /* WinNT drivers */
+                       case 3: /* Win2K drivers */
+                               break;
+                       
+                       default:
+                               DEBUG(6,("get_correct_cversion: cversion invalid [%s]  cversion = %d\n", 
+                                       driverpath, cversion));
+                               goto error_exit;
+               }
+
+               DEBUG(10,("get_correct_cversion: Version info found [%s]  major = 0x%x  minor = 0x%x\n",
+                                 driverpath, major, minor));
+       }
+
+       DEBUG(10,("get_correct_cversion: Driver file [%s] cversion = %d\n",
+               driverpath, cversion));
+
+       close_file(fsp, True);
+       close_cnum(conn, user->vuid);
+       unbecome_user();
+       *perr = WERR_OK;
+       return cversion;
+
+
+  error_exit:
+
+       if(fsp)
+               close_file(fsp, True);
+
+       close_cnum(conn, user->vuid);
+       unbecome_user();
+       return -1;
+}
+
+/****************************************************************************
+****************************************************************************/
+static WERROR clean_up_driver_struct_level_3(NT_PRINTER_DRIVER_INFO_LEVEL_3 *driver,
+                                                                                        struct current_user *user)
+{
+       const char *architecture;
+       fstring new_name;
+       char *p;
+       int i;
+       WERROR err;
+
+       /* 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 */
+       if ((p = strrchr(driver->driverpath,'\\')) != NULL) {
+               fstrcpy(new_name, p+1);
+               fstrcpy(driver->driverpath, new_name);
+       }
+
+       if ((p = strrchr(driver->datafile,'\\')) != NULL) {
+               fstrcpy(new_name, p+1);
+               fstrcpy(driver->datafile, new_name);
+       }
+
+       if ((p = strrchr(driver->configfile,'\\')) != NULL) {
+               fstrcpy(new_name, p+1);
+               fstrcpy(driver->configfile, new_name);
+       }
+
+       if ((p = strrchr(driver->helpfile,'\\')) != NULL) {
+               fstrcpy(new_name, p+1);
+               fstrcpy(driver->helpfile, new_name);
+       }
+
+       if (driver->dependentfiles) {
+               for (i=0; *driver->dependentfiles[i]; i++) {
+                       if ((p = strrchr(driver->dependentfiles[i],'\\')) != NULL) {
+                               fstrcpy(new_name, p+1);
+                               fstrcpy(driver->dependentfiles[i], new_name);
+                       }
+               }
+       }
+
+       architecture = get_short_archi(driver->environment);
+       
+       /* 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
+        */
+       if ((driver->cversion = get_correct_cversion( architecture, driver->driverpath, user, &err)) == -1)
+                       return err;
+
+       return WERR_OK;
+}
+       
+/****************************************************************************
+****************************************************************************/
+static WERROR clean_up_driver_struct_level_6(NT_PRINTER_DRIVER_INFO_LEVEL_6 *driver, struct current_user *user)
+{
+       const char *architecture;
+       fstring new_name;
+       char *p;
+       int i;
+       WERROR err;
+
+       /* 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 */
+       if ((p = strrchr(driver->driverpath,'\\')) != NULL) {
+               fstrcpy(new_name, p+1);
+               fstrcpy(driver->driverpath, new_name);
+       }
+
+       if ((p = strrchr(driver->datafile,'\\')) != NULL) {
+               fstrcpy(new_name, p+1);
+               fstrcpy(driver->datafile, new_name);
+       }
+
+       if ((p = strrchr(driver->configfile,'\\')) != NULL) {
+               fstrcpy(new_name, p+1);
+               fstrcpy(driver->configfile, new_name);
+       }
+
+       if ((p = strrchr(driver->helpfile,'\\')) != NULL) {
+               fstrcpy(new_name, p+1);
+               fstrcpy(driver->helpfile, new_name);
+       }
+
+       if (driver->dependentfiles) {
+               for (i=0; *driver->dependentfiles[i]; i++) {
+                       if ((p = strrchr(driver->dependentfiles[i],'\\')) != NULL) {
+                               fstrcpy(new_name, p+1);
+                               fstrcpy(driver->dependentfiles[i], new_name);
+                       }
+               }
+       }
+
+       architecture = get_short_archi(driver->environment);
+
+       /* 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
+        */
+
+       if ((driver->version = get_correct_cversion(architecture, driver->driverpath, user, &err)) == -1)
+                       return err;
+
+       return WERR_OK;
+}
+
+/****************************************************************************
+****************************************************************************/
+WERROR clean_up_driver_struct(NT_PRINTER_DRIVER_INFO_LEVEL driver_abstract,
+                                                         uint32 level, struct current_user *user)
+{
+       switch (level) {
+               case 3:
+               {
+                       NT_PRINTER_DRIVER_INFO_LEVEL_3 *driver;
+                       driver=driver_abstract.info_3;
+                       return clean_up_driver_struct_level_3(driver, user);
+               }
+               case 6:
+               {
+                       NT_PRINTER_DRIVER_INFO_LEVEL_6 *driver;
+                       driver=driver_abstract.info_6;
+                       return clean_up_driver_struct_level_6(driver, user);
+               }
+               default:
+                       return WERR_INVALID_PARAM;
+       }
+}
+
+/****************************************************************************
+ This function sucks and should be replaced. JRA.
+****************************************************************************/
+
+static void convert_level_6_to_level3(NT_PRINTER_DRIVER_INFO_LEVEL_3 *dst, NT_PRINTER_DRIVER_INFO_LEVEL_6 *src)
+{
+    dst->cversion  = src->version;
+
+    fstrcpy( dst->name, src->name);
+    fstrcpy( dst->environment, src->environment);
+    fstrcpy( dst->driverpath, src->driverpath);
+    fstrcpy( dst->datafile, src->datafile);
+    fstrcpy( dst->configfile, src->configfile);
+    fstrcpy( dst->helpfile, src->helpfile);
+    fstrcpy( dst->monitorname, src->monitorname);
+    fstrcpy( dst->defaultdatatype, src->defaultdatatype);
+    dst->dependentfiles = src->dependentfiles;
+}
+
+#if 0 /* Debugging function */
+
+static char* ffmt(unsigned char *c){
+       int i;
+       static char ffmt_str[17];
+
+       for (i=0; i<16; i++) {
+               if ((c[i] < ' ') || (c[i] > '~'))
+                       ffmt_str[i]='.';
+               else
+                       ffmt_str[i]=c[i];
+       }
+    ffmt_str[16]='\0';
+       return ffmt_str;
+}
+
+#endif
+
+/****************************************************************************
+****************************************************************************/
+WERROR move_driver_to_download_area(NT_PRINTER_DRIVER_INFO_LEVEL driver_abstract, uint32 level, 
+                                 struct current_user *user, WERROR *perr)
+{
+       NT_PRINTER_DRIVER_INFO_LEVEL_3 *driver;
+       NT_PRINTER_DRIVER_INFO_LEVEL_3 converted_driver;
+       const char *architecture;
+       pstring new_dir;
+       pstring old_name;
+       pstring new_name;
+       DATA_BLOB null_pw;
+       connection_struct *conn;
+       NTSTATUS nt_status;
+       pstring inbuf;
+       pstring outbuf;
+       fstring res_type;
+       BOOL bad_path;
+       SMB_STRUCT_STAT st;
+       int ver = 0;
+       int i;
+       int err;
+
+       memset(inbuf, '\0', sizeof(inbuf));
+       memset(outbuf, '\0', sizeof(outbuf));
+       *perr = WERR_OK;
+
+       if (level==3)
+               driver=driver_abstract.info_3;
+       else if (level==6) {
+               convert_level_6_to_level3(&converted_driver, driver_abstract.info_6);
+               driver = &converted_driver;
+       } else {
+               DEBUG(0,("move_driver_to_download_area: Unknown info level (%u)\n", (unsigned int)level ));
+               return WERR_UNKNOWN_LEVEL;
+       }
+
+       architecture = get_short_archi(driver->environment);
+
+       /*
+        * Connect to the print$ share under the same account as the user connected to the rpc pipe.
+        * Note we must be root to do this.
+        */
+
+       null_pw = data_blob(NULL, 0);
+       fstrcpy(res_type, "A:");
+       become_root();
+       conn = make_connection_with_chdir("print$", null_pw, res_type, user->vuid, &nt_status);
+       unbecome_root();
+
+       if (conn == NULL) {
+               DEBUG(0,("move_driver_to_download_area: Unable to connect\n"));
+               *perr = ntstatus_to_werror(nt_status);
+               return WERR_NO_SUCH_SHARE;
+       }
+
+       /*
+        * Save who we are - we are temporarily becoming the connection user.
+        */
+
+       if (!become_user(conn, conn->vuid)) {
+               DEBUG(0,("move_driver_to_download_area: Can't become user!\n"));
+               return WERR_ACCESS_DENIED;
+       }
+
+       /*
+        * make the directories version and version\driver_name
+        * under the architecture directory.
+        */
+       DEBUG(5,("Creating first directory\n"));
+       slprintf(new_dir, sizeof(new_dir)-1, "%s/%d", architecture, driver->cversion);
+       driver_unix_convert(new_dir, conn, NULL, &bad_path, &st);
+       mkdir_internal(conn, new_dir, bad_path);
+
+       /* 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
+        * file already exists in archi\cversion\, if so, check that the version
+        * info (or time stamps if version info is unavailable) is newer (or the
+        * date is later). If it is, move it to archi\cversion\filexxx.yyy.
+        * Otherwise, delete the file.
+        *
+        * If a file is not moved to archi\cversion\ because of an error, all the
+        * rest of the 'unmoved' driver files are removed from archi\. If one or
+        * more of the driver's files was already moved to archi\cversion\, it
+        * 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
+        */
+
+       DEBUG(5,("Moving files now !\n"));
+
+       if (driver->driverpath && strlen(driver->driverpath)) {
+               slprintf(new_name, sizeof(new_name)-1, "%s/%s", architecture, driver->driverpath);      
+               slprintf(old_name, sizeof(old_name)-1, "%s/%s", new_dir, driver->driverpath);   
+               if (ver != -1 && (ver=file_version_is_newer(conn, new_name, old_name)) > 0) {
+                       driver_unix_convert(new_name, conn, NULL, &bad_path, &st);
+                       if ( !copy_file(new_name, old_name, conn, OPENX_FILE_EXISTS_TRUNCATE|
+                                               OPENX_FILE_CREATE_IF_NOT_EXIST, 0, False, &err) ) {
+                               DEBUG(0,("move_driver_to_download_area: Unable to rename [%s] to [%s]\n",
+                                               new_name, old_name));
+                               *perr = WERR_ACCESS_DENIED;
+                               ver = -1;
+                       }
+               } 
+       }
+
+       if (driver->datafile && strlen(driver->datafile)) {
+               if (!strequal(driver->datafile, driver->driverpath)) {
+                       slprintf(new_name, sizeof(new_name)-1, "%s/%s", architecture, driver->datafile);        
+                       slprintf(old_name, sizeof(old_name)-1, "%s/%s", new_dir, driver->datafile);     
+                       if (ver != -1 && (ver=file_version_is_newer(conn, new_name, old_name)) > 0) {
+                               driver_unix_convert(new_name, conn, NULL, &bad_path, &st);
+                               if ( !copy_file(new_name, old_name, conn, OPENX_FILE_EXISTS_TRUNCATE|
+                                               OPENX_FILE_CREATE_IF_NOT_EXIST, 0, False, &err) ) {
+                                       DEBUG(0,("move_driver_to_download_area: Unable to rename [%s] to [%s]\n",
+                                                       new_name, old_name));
+                                       *perr = WERR_ACCESS_DENIED;
+                                       ver = -1;
+                               }
+                       }
+               }
+       }
+
+       if (driver->configfile && strlen(driver->configfile)) {
+               if (!strequal(driver->configfile, driver->driverpath) &&
+                       !strequal(driver->configfile, driver->datafile)) {
+                       slprintf(new_name, sizeof(new_name)-1, "%s/%s", architecture, driver->configfile);      
+                       slprintf(old_name, sizeof(old_name)-1, "%s/%s", new_dir, driver->configfile);   
+                       if (ver != -1 && (ver=file_version_is_newer(conn, new_name, old_name)) > 0) {
+                               driver_unix_convert(new_name, conn, NULL, &bad_path, &st);
+                               if ( !copy_file(new_name, old_name, conn, OPENX_FILE_EXISTS_TRUNCATE|
+                                               OPENX_FILE_CREATE_IF_NOT_EXIST, 0, False, &err) ) {
+                                       DEBUG(0,("move_driver_to_download_area: Unable to rename [%s] to [%s]\n",
+                                                       new_name, old_name));
+                                       *perr = WERR_ACCESS_DENIED;
+                                       ver = -1;
+                               }
+                       }
+               }
+       }
+
+       if (driver->helpfile && strlen(driver->helpfile)) {
+               if (!strequal(driver->helpfile, driver->driverpath) &&
+                       !strequal(driver->helpfile, driver->datafile) &&
+                       !strequal(driver->helpfile, driver->configfile)) {
+                       slprintf(new_name, sizeof(new_name)-1, "%s/%s", architecture, driver->helpfile);        
+                       slprintf(old_name, sizeof(old_name)-1, "%s/%s", new_dir, driver->helpfile);     
+                       if (ver != -1 && (ver=file_version_is_newer(conn, new_name, old_name)) > 0) {
+                               driver_unix_convert(new_name, conn, NULL, &bad_path, &st);
+                               if ( !copy_file(new_name, old_name, conn, OPENX_FILE_EXISTS_TRUNCATE|
+                                               OPENX_FILE_CREATE_IF_NOT_EXIST, 0, False, &err) ) {
+                                       DEBUG(0,("move_driver_to_download_area: Unable to rename [%s] to [%s]\n",
+                                                       new_name, old_name));
+                                       *perr = WERR_ACCESS_DENIED;
+                                       ver = -1;
+                               }
+                       }
+               }
+       }
+
+       if (driver->dependentfiles) {
+               for (i=0; *driver->dependentfiles[i]; i++) {
+                       if (!strequal(driver->dependentfiles[i], driver->driverpath) &&
+                               !strequal(driver->dependentfiles[i], driver->datafile) &&
+                               !strequal(driver->dependentfiles[i], driver->configfile) &&
+                               !strequal(driver->dependentfiles[i], driver->helpfile)) {
+                               int j;
+                               for (j=0; j < i; j++) {
+                                       if (strequal(driver->dependentfiles[i], driver->dependentfiles[j])) {
+                                               goto NextDriver;
+                                       }
+                               }
+
+                               slprintf(new_name, sizeof(new_name)-1, "%s/%s", architecture, driver->dependentfiles[i]);       
+                               slprintf(old_name, sizeof(old_name)-1, "%s/%s", new_dir, driver->dependentfiles[i]);    
+                               if (ver != -1 && (ver=file_version_is_newer(conn, new_name, old_name)) > 0) {
+                                       driver_unix_convert(new_name, conn, NULL, &bad_path, &st);
+                                       if ( !copy_file(new_name, old_name, conn,
+                                                       OPENX_FILE_EXISTS_TRUNCATE|
+                                                       OPENX_FILE_CREATE_IF_NOT_EXIST, 0, False, &err) ) {
+                                               DEBUG(0,("move_driver_to_download_area: Unable to rename [%s] to [%s]\n",
+                                                               new_name, old_name));
+                                               *perr = WERR_ACCESS_DENIED;
+                                               ver = -1;
+                                       }
+                               }
+                       }
+               NextDriver: ;
+               }
+       }
+
+       close_cnum(conn, user->vuid);
+       unbecome_user();
+
+       return ver != -1 ? WERR_OK : WERR_UNKNOWN_PRINTER_DRIVER;
+}
+
+/****************************************************************************
+****************************************************************************/
+static uint32 add_a_printer_driver_3(NT_PRINTER_DRIVER_INFO_LEVEL_3 *driver)
+{
+       int len, buflen;
+       const char *architecture;
+       pstring directory;
+       fstring temp_name;
+       pstring key;
+       char *buf;
+       int i, ret;
+       TDB_DATA kbuf, dbuf;
+
+       architecture = get_short_archi(driver->environment);
+
+       /* The names are relative. We store them in the form: \print$\arch\version\driver.xxx
+        * \\server is added in the rpc server layer.
+        * It does make sense to NOT store the server's name in the printer TDB.
+        */
+
+       slprintf(directory, sizeof(directory)-1, "\\print$\\%s\\%d\\", architecture, driver->cversion);
+
+       /* .inf files do not always list a file for each of the four standard files. 
+        * Don't prepend a path to a null filename, or client claims:
+        *   "The server on which the printer resides does not have a suitable 
+        *   <printer driver name> printer driver installed. Click OK if you 
+        *   wish to install the driver on your local machine."
+        */
+       if (strlen(driver->driverpath)) {
+               fstrcpy(temp_name, driver->driverpath);
+               slprintf(driver->driverpath, sizeof(driver->driverpath)-1, "%s%s", directory, temp_name);
+       }
+
+       if (strlen(driver->datafile)) {
+               fstrcpy(temp_name, driver->datafile);
+               slprintf(driver->datafile, sizeof(driver->datafile)-1, "%s%s", directory, temp_name);
+       }
+
+       if (strlen(driver->configfile)) {
+               fstrcpy(temp_name, driver->configfile);
+               slprintf(driver->configfile, sizeof(driver->configfile)-1, "%s%s", directory, temp_name);
+       }
+
+       if (strlen(driver->helpfile)) {
+               fstrcpy(temp_name, driver->helpfile);
+               slprintf(driver->helpfile, sizeof(driver->helpfile)-1, "%s%s", directory, temp_name);
+       }
+
+       if (driver->dependentfiles) {
+               for (i=0; *driver->dependentfiles[i]; i++) {
+                       fstrcpy(temp_name, driver->dependentfiles[i]);
+                       slprintf(driver->dependentfiles[i], sizeof(driver->dependentfiles[i])-1, "%s%s", directory, temp_name);
+               }
+       }
+
+       slprintf(key, sizeof(key)-1, "%s%s/%d/%s", DRIVERS_PREFIX, architecture, driver->cversion, driver->name);
+
+       DEBUG(5,("add_a_printer_driver_3: Adding driver with key %s\n", key ));
+
+       buf = NULL;
+       len = buflen = 0;
+
+ again:
+       len = 0;
+       len += tdb_pack(buf+len, buflen-len, "dffffffff",
+                       driver->cversion,
+                       driver->name,
+                       driver->environment,
+                       driver->driverpath,
+                       driver->datafile,
+                       driver->configfile,
+                       driver->helpfile,
+                       driver->monitorname,
+                       driver->defaultdatatype);
+
+       if (driver->dependentfiles) {
+               for (i=0; *driver->dependentfiles[i]; i++) {
+                       len += tdb_pack(buf+len, buflen-len, "f",
+                                       driver->dependentfiles[i]);
+               }
+       }
+
+       if (len != buflen) {
+               char *tb;
+
+               tb = (char *)SMB_REALLOC(buf, len);
+               if (!tb) {
+                       DEBUG(0,("add_a_printer_driver_3: failed to enlarge buffer\n!"));
+                       ret = -1;
+                       goto done;
+               }
+               else buf = tb;
+               buflen = len;
+               goto again;
+       }
+
+
+       kbuf.dptr = key;
+       kbuf.dsize = strlen(key)+1;
+       dbuf.dptr = buf;
+       dbuf.dsize = len;
+       
+       ret = tdb_store(tdb_drivers, kbuf, dbuf, TDB_REPLACE);
+
+done:
+       if (ret)
+               DEBUG(0,("add_a_printer_driver_3: Adding driver with key %s failed.\n", key ));
+
+       SAFE_FREE(buf);
+       return ret;
+}
+
+/****************************************************************************
+****************************************************************************/
+static uint32 add_a_printer_driver_6(NT_PRINTER_DRIVER_INFO_LEVEL_6 *driver)
+{
+       NT_PRINTER_DRIVER_INFO_LEVEL_3 info3;
+
+       ZERO_STRUCT(info3);
+       info3.cversion = driver->version;
+       fstrcpy(info3.name,driver->name);
+       fstrcpy(info3.environment,driver->environment);
+       fstrcpy(info3.driverpath,driver->driverpath);
+       fstrcpy(info3.datafile,driver->datafile);
+       fstrcpy(info3.configfile,driver->configfile);
+       fstrcpy(info3.helpfile,driver->helpfile);
+       fstrcpy(info3.monitorname,driver->monitorname);
+       fstrcpy(info3.defaultdatatype,driver->defaultdatatype);
+       info3.dependentfiles = driver->dependentfiles;
+
+       return add_a_printer_driver_3(&info3);
+}
+
+
+/****************************************************************************
+****************************************************************************/
+static WERROR get_a_printer_driver_3_default(NT_PRINTER_DRIVER_INFO_LEVEL_3 **info_ptr, const char *driver, const char *arch)
+{
+       NT_PRINTER_DRIVER_INFO_LEVEL_3 info;
+
+       ZERO_STRUCT(info);
+
+       fstrcpy(info.name, driver);
+       fstrcpy(info.defaultdatatype, "RAW");
+       
+       fstrcpy(info.driverpath, "");
+       fstrcpy(info.datafile, "");
+       fstrcpy(info.configfile, "");
+       fstrcpy(info.helpfile, "");
+
+       if ((info.dependentfiles= SMB_MALLOC_ARRAY(fstring, 2)) == NULL)
+               return WERR_NOMEM;
+
+       memset(info.dependentfiles, '\0', 2*sizeof(fstring));
+       fstrcpy(info.dependentfiles[0], "");
+
+       *info_ptr = memdup(&info, sizeof(info));
+       
+       return WERR_OK;
+}
+
+/****************************************************************************
+****************************************************************************/
+static WERROR get_a_printer_driver_3(NT_PRINTER_DRIVER_INFO_LEVEL_3 **info_ptr, fstring drivername, const char *arch, uint32 version)
+{
+       NT_PRINTER_DRIVER_INFO_LEVEL_3 driver;
+       TDB_DATA kbuf, dbuf;
+       const char *architecture;
+       int len = 0;
+       int i;
+       pstring key;
+
+       ZERO_STRUCT(driver);
+
+       architecture = get_short_archi(arch);
+
+       if ( !architecture )
+               return WERR_UNKNOWN_PRINTER_DRIVER;
+       
+       /* Windows 4.0 (i.e. win9x) should always use a version of 0 */
+       
+       if ( strcmp( architecture, SPL_ARCH_WIN40 ) == 0 )
+               version = 0;
+
+       DEBUG(8,("get_a_printer_driver_3: [%s%s/%d/%s]\n", DRIVERS_PREFIX, architecture, version, drivername));
+
+       slprintf(key, sizeof(key)-1, "%s%s/%d/%s", DRIVERS_PREFIX, architecture, version, drivername);
+
+       kbuf.dptr = key;
+       kbuf.dsize = strlen(key)+1;
+       
+       dbuf = tdb_fetch(tdb_drivers, kbuf);
+       if (!dbuf.dptr) 
+               return WERR_UNKNOWN_PRINTER_DRIVER;
+
+       len += tdb_unpack(dbuf.dptr, dbuf.dsize, "dffffffff",
+                         &driver.cversion,
+                         driver.name,
+                         driver.environment,
+                         driver.driverpath,
+                         driver.datafile,
+                         driver.configfile,
+                         driver.helpfile,
+                         driver.monitorname,
+                         driver.defaultdatatype);
+
+       i=0;
+       while (len < dbuf.dsize) {
+               fstring *tddfs;
+
+               tddfs = SMB_REALLOC_ARRAY(driver.dependentfiles, fstring, i+2);
+               if ( !tddfs ) {
+                       DEBUG(0,("get_a_printer_driver_3: failed to enlarge buffer!\n"));
+                       break;
+               }
+               else 
+                       driver.dependentfiles = tddfs;
+
+               len += tdb_unpack(dbuf.dptr+len, dbuf.dsize-len, "f",
+                                 &driver.dependentfiles[i]);
+               i++;
+       }
+       
+       if ( driver.dependentfiles )
+               fstrcpy( driver.dependentfiles[i], "" );
+
+       SAFE_FREE(dbuf.dptr);
+
+       if (len != dbuf.dsize) {
+               SAFE_FREE(driver.dependentfiles);
+
+               return get_a_printer_driver_3_default(info_ptr, drivername, arch);
+       }
+
+       *info_ptr = (NT_PRINTER_DRIVER_INFO_LEVEL_3 *)memdup(&driver, sizeof(driver));
+
+       return WERR_OK;
+}
+
+/****************************************************************************
+ Debugging function, dump at level 6 the struct in the logs.
+****************************************************************************/
+
+static uint32 dump_a_printer_driver(NT_PRINTER_DRIVER_INFO_LEVEL driver, uint32 level)
+{
+       uint32 result;
+       NT_PRINTER_DRIVER_INFO_LEVEL_3 *info3;
+       int i;
+       
+       DEBUG(20,("Dumping printer driver at level [%d]\n", level));
+       
+       switch (level)
+       {
+               case 3:
+               {
+                       if (driver.info_3 == NULL)
+                               result=5;
+                       else {
+                               info3=driver.info_3;
+                       
+                               DEBUGADD(20,("version:[%d]\n",         info3->cversion));
+                               DEBUGADD(20,("name:[%s]\n",            info3->name));
+                               DEBUGADD(20,("environment:[%s]\n",     info3->environment));
+                               DEBUGADD(20,("driverpath:[%s]\n",      info3->driverpath));
+                               DEBUGADD(20,("datafile:[%s]\n",        info3->datafile));
+                               DEBUGADD(20,("configfile:[%s]\n",      info3->configfile));
+                               DEBUGADD(20,("helpfile:[%s]\n",        info3->helpfile));
+                               DEBUGADD(20,("monitorname:[%s]\n",     info3->monitorname));
+                               DEBUGADD(20,("defaultdatatype:[%s]\n", info3->defaultdatatype));
+                               
+                               for (i=0; info3->dependentfiles &&
+                                         *info3->dependentfiles[i]; i++) {
+                                       DEBUGADD(20,("dependentfile:[%s]\n",
+                                                     info3->dependentfiles[i]));
+                               }
+                               result=0;
+                       }
+                       break;
+               }
+               default:
+                       DEBUGADD(20,("dump_a_printer_driver: Level %u not implemented\n", (unsigned int)level));
+                       result=1;
+                       break;
+       }
+       
+       return result;
+}
+
+/****************************************************************************
+****************************************************************************/
+int pack_devicemode(NT_DEVICEMODE *nt_devmode, char *buf, int buflen)
+{
+       int len = 0;
+
+       len += tdb_pack(buf+len, buflen-len, "p", nt_devmode);
+
+       if (!nt_devmode)
+               return len;
+
+       len += tdb_pack(buf+len, buflen-len, "ffwwwwwwwwwwwwwwwwwwddddddddddddddp",
+                       nt_devmode->devicename,
+                       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,
+                       
+                       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,
+                       nt_devmode->nt_dev_private);
+
+       
+       if (nt_devmode->nt_dev_private) {
+               len += tdb_pack(buf+len, buflen-len, "B",
+                               nt_devmode->driverextra,
+                               nt_devmode->nt_dev_private);
+       }
+
+       DEBUG(8,("Packed devicemode [%s]\n", nt_devmode->formname));
+
+       return len;
+}
+
+/****************************************************************************
+ Pack all values in all printer keys
+ ***************************************************************************/
+static int pack_values(NT_PRINTER_DATA *data, char *buf, int buflen)
+{
+       int             len = 0;
+       int             i, j;
+       REGISTRY_VALUE  *val;
+       REGVAL_CTR      *val_ctr;
+       pstring         path;
+       int             num_values;
+
+       if ( !data )
+               return 0;
+
+       /* loop over all keys */
+               
+       for ( i=0; i<data->num_keys; i++ ) {    
+               val_ctr = data->keys[i].values;
+               num_values = regval_ctr_numvals( val_ctr );
+
+               /* pack the keyname followed by a empty value */
+
+               len += tdb_pack(buf+len, buflen-len, "pPdB", 
+                               &data->keys[i].name,
+                               data->keys[i].name, 
+                               REG_NONE,
+                               0,
+                               NULL);
+               
+               /* now loop over all values */
+               
+               for ( j=0; j<num_values; j++ ) {
+                       /* pathname should be stored as <key>\<value> */
+                       
+                       val = regval_ctr_specific_value( val_ctr, j );
+                       pstrcpy( path, data->keys[i].name );
+                       pstrcat( path, "\\" );
+                       pstrcat( path, regval_name(val) );
+                       
+                       len += tdb_pack(buf+len, buflen-len, "pPdB",
+                                       val,
+                                       path,
+                                       regval_type(val),
+                                       regval_size(val),
+                                       regval_data_p(val) );
+
+                       DEBUG(8,("specific: [%s], len: %d\n", regval_name(val), regval_size(val)));
+               }
+       
+       }
+
+       /* terminator */
+       
+       len += tdb_pack(buf+len, buflen-len, "p", NULL);
+
+       return len;
+}
+
+
+/****************************************************************************
+ Delete a printer - this just deletes the printer info file, any open
+ handles are not affected.
+****************************************************************************/
+
+uint32 del_a_printer(const char *sharename)
+{
+       pstring key;
+       TDB_DATA kbuf;
+       pstring printdb_path;
+
+       slprintf(key, sizeof(key)-1, "%s%s", PRINTERS_PREFIX, sharename);
+       kbuf.dptr=key;
+       kbuf.dsize=strlen(key)+1;
+       tdb_delete(tdb_printers, kbuf);
+
+       slprintf(key, sizeof(key)-1, "%s%s", SECDESC_PREFIX, sharename);
+       kbuf.dptr=key;
+       kbuf.dsize=strlen(key)+1;
+       tdb_delete(tdb_printers, kbuf);
+
+       close_all_print_db();
+
+       if (geteuid() == 0) {
+               pstrcpy(printdb_path, lock_path("printing/"));
+               pstrcat(printdb_path, sharename);
+               pstrcat(printdb_path, ".tdb");
+
+               unlink(printdb_path);
+       }
+
+       return 0;
+}
+
+/****************************************************************************
+****************************************************************************/
+static WERROR update_a_printer_2(NT_PRINTER_INFO_LEVEL_2 *info)
+{
+       char *buf;
+       int buflen, len;
+       WERROR ret;
+       TDB_DATA kbuf, dbuf;
+       
+       /*
+        * 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.
+        * we currently don't support things like i
+        * path=\\other_server\printer
+        *
+        * We only store the printername, not \\server\printername
+        */
+
+       if ( info->servername[0] != '\0' ) {
+               trim_string(info->printername, info->servername, NULL);
+               trim_char(info->printername, '\\', '\0');
+               info->servername[0]='\0';
+       }
+
+       /*
+        * 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;
+
+ again:        
+       len = 0;
+       len += tdb_pack(buf+len, buflen-len, "dddddddddddfffffPfffff",
+                       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,
+                       info->comment,
+                       info->location,
+                       info->sepfile,
+                       info->printprocessor,
+                       info->datatype,
+                       info->parameters);
+
+       len += pack_devicemode(info->devmode, buf+len, buflen-len);
+       
+       len += pack_values( info->data, buf+len, buflen-len );
+
+       if (buflen != len) {
+               char *tb;
+
+               tb = (char *)SMB_REALLOC(buf, len);
+               if (!tb) {
+                       DEBUG(0,("update_a_printer_2: failed to enlarge buffer!\n"));
+                       ret = WERR_NOMEM;
+                       goto done;
+               }
+               else buf = tb;
+               buflen = len;
+               goto again;
+       }
+       
+
+       kbuf = make_printer_tdbkey( info->sharename );
+
+       dbuf.dptr = buf;
+       dbuf.dsize = len;
+
+       ret = (tdb_store(tdb_printers, kbuf, dbuf, TDB_REPLACE) == 0? WERR_OK : WERR_NOMEM);
+
+done:
+       if (!W_ERROR_IS_OK(ret))
+               DEBUG(8, ("error updating printer to tdb on disk\n"));
+
+       SAFE_FREE(buf);
+
+       DEBUG(8,("packed printer [%s] with driver [%s] portname=[%s] len=%d\n",
+                info->sharename, info->drivername, info->portname, len));
+
+       return ret;
+}
+
+
+/****************************************************************************
+ Malloc and return an NT devicemode.
+****************************************************************************/
+
+NT_DEVICEMODE *construct_nt_devicemode(const fstring default_devicename)
+{
+
+       char adevice[MAXDEVICENAME];
+       NT_DEVICEMODE *nt_devmode = SMB_MALLOC_P(NT_DEVICEMODE);
+
+       if (nt_devmode == NULL) {
+               DEBUG(0,("construct_nt_devicemode: malloc fail.\n"));
+               return NULL;
+       }
+
+       ZERO_STRUCTP(nt_devmode);
+
+       slprintf(adevice, sizeof(adevice), "%s", default_devicename);
+       fstrcpy(nt_devmode->devicename, adevice);       
+       
+       fstrcpy(nt_devmode->formname, "Letter");
+
+       nt_devmode->specversion      = 0x0401;
+       nt_devmode->driverversion    = 0x0400;
+       nt_devmode->size             = 0x00DC;
+       nt_devmode->driverextra      = 0x0000;
+       nt_devmode->fields           = FORMNAME | TTOPTION | PRINTQUALITY |
+                                      DEFAULTSOURCE | COPIES | SCALE |
+                                      PAPERSIZE | ORIENTATION;
+       nt_devmode->orientation      = 1;
+       nt_devmode->papersize        = PAPER_LETTER;
+       nt_devmode->paperlength      = 0;
+       nt_devmode->paperwidth       = 0;
+       nt_devmode->scale            = 0x64;
+       nt_devmode->copies           = 1;
+       nt_devmode->defaultsource    = BIN_FORMSOURCE;
+       nt_devmode->printquality     = RES_HIGH;           /* 0x0258 */
+       nt_devmode->color            = COLOR_MONOCHROME;
+       nt_devmode->duplex           = DUP_SIMPLEX;
+       nt_devmode->yresolution      = 0;
+       nt_devmode->ttoption         = TT_SUBDEV;
+       nt_devmode->collate          = COLLATE_FALSE;
+       nt_devmode->icmmethod        = 0;
+       nt_devmode->icmintent        = 0;
+       nt_devmode->mediatype        = 0;
+       nt_devmode->dithertype       = 0;
+
+       /* non utilisés par un driver d'imprimante */
+       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;
+       
+       nt_devmode->nt_dev_private = NULL;
+       return nt_devmode;
+}
+
+/****************************************************************************
+ Deepcopy an NT devicemode.
+****************************************************************************/
+
+NT_DEVICEMODE *dup_nt_devicemode(NT_DEVICEMODE *nt_devicemode)
+{
+       NT_DEVICEMODE *new_nt_devicemode = NULL;
+
+       if ( !nt_devicemode )
+               return NULL;
+
+       if ((new_nt_devicemode = (NT_DEVICEMODE *)memdup(nt_devicemode, sizeof(NT_DEVICEMODE))) == NULL) {
+               DEBUG(0,("dup_nt_devicemode: malloc fail.\n"));
+               return NULL;
+       }
+
+       new_nt_devicemode->nt_dev_private = NULL;
+       if (nt_devicemode->nt_dev_private != NULL) {
+               if ((new_nt_devicemode->nt_dev_private = memdup(nt_devicemode->nt_dev_private, nt_devicemode->driverextra)) == NULL) {
+                       SAFE_FREE(new_nt_devicemode);
+                       DEBUG(0,("dup_nt_devicemode: malloc fail.\n"));
+                       return NULL;
+        }
+       }
+
+       return new_nt_devicemode;
+}
+
+/****************************************************************************
+ Clean up and deallocate a (maybe partially) allocated NT_DEVICEMODE.
+****************************************************************************/
+
+void free_nt_devicemode(NT_DEVICEMODE **devmode_ptr)
+{
+       NT_DEVICEMODE *nt_devmode = *devmode_ptr;
+
+       if(nt_devmode == NULL)
+               return;
+
+       DEBUG(106,("free_nt_devicemode: deleting DEVMODE\n"));
+
+       SAFE_FREE(nt_devmode->nt_dev_private);
+       SAFE_FREE(*devmode_ptr);
+}
+
+/****************************************************************************
+ Clean up and deallocate a (maybe partially) allocated NT_PRINTER_INFO_LEVEL_2.
+****************************************************************************/
+
+static void free_nt_printer_info_level_2(NT_PRINTER_INFO_LEVEL_2 **info_ptr)
+{
+       NT_PRINTER_INFO_LEVEL_2 *info = *info_ptr;
+
+       if ( !info )
+               return;
+
+       free_nt_devicemode(&info->devmode);
+
+       TALLOC_FREE( *info_ptr );
+}
+
+
+/****************************************************************************
+****************************************************************************/
+int unpack_devicemode(NT_DEVICEMODE **nt_devmode, char *buf, int buflen)
+{
+       int len = 0;
+       int extra_len = 0;
+       NT_DEVICEMODE devmode;
+       
+       ZERO_STRUCT(devmode);
+
+       len += tdb_unpack(buf+len, buflen-len, "p", nt_devmode);
+
+       if (!*nt_devmode) return len;
+
+       len += tdb_unpack(buf+len, buflen-len, "ffwwwwwwwwwwwwwwwwwwddddddddddddddp",
+                         devmode.devicename,
+                         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,
+                       
+                         &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,
+                         &devmode.nt_dev_private);
+       
+       if (devmode.nt_dev_private) {
+               /* the len in tdb_unpack is an int value and
+                * devmode.driverextra is only a short
+                */
+               len += tdb_unpack(buf+len, buflen-len, "B", &extra_len, &devmode.nt_dev_private);
+               devmode.driverextra=(uint16)extra_len;
+               
+               /* check to catch an invalid TDB entry so we don't segfault */
+               if (devmode.driverextra == 0) {
+                       devmode.nt_dev_private = NULL;
+               }
+       }
+
+       *nt_devmode = (NT_DEVICEMODE *)memdup(&devmode, sizeof(devmode));
+
+       DEBUG(8,("Unpacked devicemode [%s](%s)\n", devmode.devicename, devmode.formname));
+       if (devmode.nt_dev_private)
+               DEBUG(8,("with a private section of %d bytes\n", devmode.driverextra));
+
+       return len;
+}
+
+/****************************************************************************
+ Allocate and initialize a new slot.
+***************************************************************************/
+int add_new_printer_key( NT_PRINTER_DATA *data, const char *name )
+{
+       NT_PRINTER_KEY  *d;
+       int             key_index;
+       
+       if ( !name || !data )
+               return -1;
+
+       /* allocate another slot in the NT_PRINTER_KEY array */
+       
+       if ( !(d = TALLOC_REALLOC_ARRAY( data, data->keys, NT_PRINTER_KEY, data->num_keys+1)) ) {
+               DEBUG(0,("add_new_printer_key: Realloc() failed!\n"));
+               return -1;
+       }
+
+       data->keys = d;
+       
+       key_index = data->num_keys;
+       
+       /* initialze new key */
+       
+       data->keys[key_index].name = talloc_strdup( data, name );
+       
+       if ( !(data->keys[key_index].values = TALLOC_ZERO_P( data, REGVAL_CTR )) ) 
+               return -1;
+       
+       data->num_keys++;
+
+       DEBUG(10,("add_new_printer_key: Inserted new data key [%s]\n", name ));
+       
+       return key_index;
+}
+
+/****************************************************************************
+ search for a registry key name in the existing printer data
+ ***************************************************************************/
+
+int delete_printer_key( NT_PRINTER_DATA *data, const char *name )
+{
+       int i;
+       
+       for ( i=0; i<data->num_keys; i++ ) {
+               if ( strequal( data->keys[i].name, name ) ) {
+               
+                       /* cleanup memory */
+                       
+                       TALLOC_FREE( data->keys[i].name );
+                       TALLOC_FREE( data->keys[i].values );
+                       
+                       /* if not the end of the array, move remaining elements down one slot */
+                       
+                       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) );
+                               
+                       break;
+               }
+       }
+       
+
+       return data->num_keys;
+}
+
+/****************************************************************************
+ search for a registry key name in the existing printer data
+ ***************************************************************************/
+int lookup_printerkey( NT_PRINTER_DATA *data, const char *name )
+{
+       int             key_index = -1;
+       int             i;
+       
+       if ( !data || !name )
+               return -1;
+
+       DEBUG(12,("lookup_printerkey: Looking for [%s]\n", name));
+
+       /* loop over all existing keys */
+       
+       for ( i=0; i<data->num_keys; i++ ) {
+               if ( strequal(data->keys[i].name, name) ) {
+                       DEBUG(12,("lookup_printerkey: Found [%s]!\n", name));
+                       key_index = i;
+                       break;
+               
+               }
+       }
+       
+       return key_index;
+}
+
+/****************************************************************************
+ ***************************************************************************/
+
+int get_printer_subkeys( NT_PRINTER_DATA *data, const char* key, fstring **subkeys )
+{
+       int     i, j;
+       int     key_len;
+       int     num_subkeys = 0;
+       char    *p;
+       fstring *ptr, *subkeys_ptr = NULL;
+       fstring subkeyname;
+       
+       if ( !data )
+               return 0;
+
+       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++ ) {
+               
+                       /* found a match, so allocate space and copy the name */
+                       
+                       if ( !(ptr = SMB_REALLOC_ARRAY( subkeys_ptr, fstring, num_subkeys+2)) ) {
+                               DEBUG(0,("get_printer_subkeys: Realloc failed for [%d] entries!\n", 
+                                       num_subkeys+1));
+                               SAFE_FREE( subkeys );
+                               return -1;
+                       }
+                       
+                       subkeys_ptr = ptr;
+                       fstrcpy( subkeys_ptr[num_subkeys], data->keys[i].name );
+                       num_subkeys++;
+               }
+
+               goto done;
+       }
+               
+       /* asking for the subkeys of some key */
+       /* subkey paths are stored in the key name using '\' as the delimiter */
+
+       for ( i=0; i<data->num_keys; i++ ) {
+               if ( StrnCaseCmp(data->keys[i].name, key, strlen(key)) == 0 ) {
+                       
+                       /* if we found the exact key, then break */
+                       key_len = strlen( key );
+                       if ( strlen(data->keys[i].name) == key_len )
+                               break;
+                       
+                       /* get subkey path */
+
+                       p = data->keys[i].name + key_len;
+                       if ( *p == '\\' )
+                               p++;
+                       fstrcpy( subkeyname, p );
+                       if ( (p = strchr( subkeyname, '\\' )) )
+                               *p = '\0';
+                       
+                       /* don't add a key more than once */
+                       
+                       for ( j=0; j<num_subkeys; j++ ) {
+                               if ( strequal( subkeys_ptr[j], subkeyname ) )
+                                       break;
+                       }
+                       
+                       if ( j != num_subkeys )
+                               continue;
+
+                       /* found a match, so allocate space and copy the name */
+                       
+                       if ( !(ptr = SMB_REALLOC_ARRAY( subkeys_ptr, fstring, num_subkeys+2)) ) {
+                               DEBUG(0,("get_printer_subkeys: Realloc failed for [%d] entries!\n", 
+                                       num_subkeys+1));
+                               SAFE_FREE( subkeys );
+                               return 0;
+                       }
+                       
+                       subkeys_ptr = ptr;
+                       fstrcpy( subkeys_ptr[num_subkeys], subkeyname );
+                       num_subkeys++;
+               }
+               
+       }
+       
+       /* return error if the key was not found */
+       
+       if ( i == data->num_keys )
+               return -1;
+       
+done:
+       /* tag off the end */
+       
+       if (num_subkeys)
+               fstrcpy(subkeys_ptr[num_subkeys], "" );
+       
+       *subkeys = subkeys_ptr;
+
+       return num_subkeys;
+}
+
+#ifdef HAVE_ADS
+static void map_sz_into_ctr(REGVAL_CTR *ctr, const char *val_name, 
+                           const char *sz)
+{
+       smb_ucs2_t conv_str[1024];
+       size_t str_size;
+
+       regval_ctr_delvalue(ctr, val_name);
+       str_size = push_ucs2(NULL, conv_str, sz, sizeof(conv_str),
+                            STR_TERMINATE | STR_NOALIGN);
+       regval_ctr_addvalue(ctr, val_name, REG_SZ, 
+                           (char *) conv_str, str_size);
+}
+
+static void map_dword_into_ctr(REGVAL_CTR *ctr, const char *val_name, 
+                              uint32 dword)
+{
+       regval_ctr_delvalue(ctr, val_name);
+       regval_ctr_addvalue(ctr, val_name, REG_DWORD,
+                           (char *) &dword, sizeof(dword));
+}
+
+static void map_bool_into_ctr(REGVAL_CTR *ctr, const char *val_name,
+                             BOOL b)
+{
+       uint8 bin_bool = (b ? 1 : 0);
+       regval_ctr_delvalue(ctr, val_name);
+       regval_ctr_addvalue(ctr, val_name, REG_BINARY, 
+                           (char *) &bin_bool, sizeof(bin_bool));
+}
+
+static void map_single_multi_sz_into_ctr(REGVAL_CTR *ctr, const char *val_name,
+                                        const char *multi_sz)
+{
+       smb_ucs2_t *conv_strs = NULL;
+       size_t str_size;
+
+       /* a multi-sz has to have a null string terminator, i.e., the last
+          string must be followed by two nulls */
+       str_size = strlen(multi_sz) + 2;
+       conv_strs = SMB_CALLOC_ARRAY(smb_ucs2_t, str_size);
+       if (!conv_strs) {
+               return;
+       }
+
+       /* Change to byte units. */
+       str_size *= sizeof(smb_ucs2_t);
+       push_ucs2(NULL, conv_strs, multi_sz, str_size, 
+                 STR_TERMINATE | STR_NOALIGN);
+
+       regval_ctr_delvalue(ctr, val_name);
+       regval_ctr_addvalue(ctr, val_name, REG_MULTI_SZ, 
+                           (char *) conv_strs, str_size);      
+       safe_free(conv_strs);
+       
+}
+
+/****************************************************************************
+ * Map the NT_PRINTER_INFO_LEVEL_2 data into DsSpooler keys for publishing.
+ *
+ * @param info2 NT_PRINTER_INFO_LEVEL_2 describing printer - gets modified
+ * @return BOOL indicating success or failure
+ ***************************************************************************/
+
+static BOOL map_nt_printer_info2_to_dsspooler(NT_PRINTER_INFO_LEVEL_2 *info2)
+{
+       REGVAL_CTR *ctr = NULL;
+       fstring longname;
+       fstring dnssuffix;
+       char *allocated_string = NULL;
+        const char *ascii_str;
+       int i;
+
+       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;
+
+       map_sz_into_ctr(ctr, SPOOL_REG_PRINTERNAME, info2->sharename);
+       map_sz_into_ctr(ctr, SPOOL_REG_SHORTSERVERNAME, global_myname());
+
+       /* we make the assumption that the netbios name is the same 
+          as the DNS name sinc ethe former will be what we used to 
+          join the domain */
+
+       if ( get_mydnsdomname( dnssuffix ) )
+               fstr_sprintf( longname, "%s.%s", global_myname(), dnssuffix );
+       else
+               fstrcpy( longname, global_myname() );
+               
+       map_sz_into_ctr(ctr, SPOOL_REG_SERVERNAME, longname);
+
+       asprintf(&allocated_string, "\\\\%s\\%s", longname, info2->sharename);
+       map_sz_into_ctr(ctr, SPOOL_REG_UNCNAME, allocated_string);
+       SAFE_FREE(allocated_string);
+
+       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,
+                         (info2->attributes & 
+                          PRINTER_ATTRIBUTE_KEEPPRINTEDJOBS));
+
+       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);
+
+       return True;
+}
+
+static void store_printer_guid(NT_PRINTER_INFO_LEVEL_2 *info2, 
+                              struct uuid guid)
+{
+       int i;
+       REGVAL_CTR *ctr=NULL;
+
+       /* find the DsSpooler key */
+       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;
+
+       regval_ctr_delvalue(ctr, "objectGUID");
+       regval_ctr_addvalue(ctr, "objectGUID", REG_BINARY, 
+                           (char *) &guid, sizeof(struct uuid));       
+}
+
+static WERROR nt_printer_publish_ads(ADS_STRUCT *ads,
+                                     NT_PRINTER_INFO_LEVEL *printer)
+{
+       ADS_STATUS ads_rc;
+       void *res;
+       char *prt_dn = NULL, *srv_dn, *srv_cn_0;
+       char *srv_dn_utf8, **srv_cn_utf8;
+       TALLOC_CTX *ctx;
+       ADS_MODLIST mods;
+       const char *attrs[] = {"objectGUID", NULL};
+       struct uuid guid;
+       WERROR win_rc = WERR_OK;
+
+       DEBUG(5, ("publishing printer %s\n", printer->info_2->printername));
+
+       /* figure out where to publish */
+       ads_find_machine_acct(ads, &res, global_myname());
+
+       /* We use ldap_get_dn here as we need the answer
+        * in utf8 to call ldap_explode_dn(). JRA. */
+
+       srv_dn_utf8 = ldap_get_dn(ads->ld, res);
+       if (!srv_dn_utf8) {
+               ads_destroy(&ads);
+               return WERR_SERVER_UNAVAILABLE;
+       }
+       ads_msgfree(ads, res);
+       srv_cn_utf8 = ldap_explode_dn(srv_dn_utf8, 1);
+       if (!srv_cn_utf8) {
+               ldap_memfree(srv_dn_utf8);
+               ads_destroy(&ads);
+               return WERR_SERVER_UNAVAILABLE;
+       }
+       /* Now convert to CH_UNIX. */
+       if (pull_utf8_allocate(&srv_dn, srv_dn_utf8) == (size_t)-1) {
+               ldap_memfree(srv_dn_utf8);
+               ldap_memfree(srv_cn_utf8);
+               ads_destroy(&ads);
+               return WERR_SERVER_UNAVAILABLE;
+       }
+       if (pull_utf8_allocate(&srv_cn_0, srv_cn_utf8[0]) == (size_t)-1) {
+               ldap_memfree(srv_dn_utf8);
+               ldap_memfree(srv_cn_utf8);
+               ads_destroy(&ads);
+               SAFE_FREE(srv_dn);
+               return WERR_SERVER_UNAVAILABLE;
+       }
+
+       ldap_memfree(srv_dn_utf8);
+       ldap_memfree(srv_cn_utf8);
+
+       asprintf(&prt_dn, "cn=%s-%s,%s", srv_cn_0, 
+                printer->info_2->sharename, srv_dn);
+
+       SAFE_FREE(srv_dn);
+       SAFE_FREE(srv_cn_0);
+
+       /* build the ads mods */
+       ctx = talloc_init("nt_printer_publish_ads");
+       mods = ads_init_mods(ctx);
+
+       get_local_printer_publishing_data(ctx, &mods, printer->info_2->data);
+       ads_mod_str(ctx, &mods, SPOOL_REG_PRINTERNAME, 
+                   printer->info_2->sharename);
+
+       /* publish it */
+       ads_rc = ads_mod_printer_entry(ads, prt_dn, ctx, &mods);
+       if (ads_rc.err.rc == LDAP_NO_SUCH_OBJECT)
+               ads_rc = ads_add_printer_entry(ads, prt_dn, ctx, &mods);
+
+       if (!ADS_ERR_OK(ads_rc))
+               DEBUG(3, ("error publishing %s: %s\n", printer->info_2->sharename, ads_errstr(ads_rc)));
+       
+       talloc_destroy(ctx);
+
+       /* retreive the guid and store it locally */
+       if (ADS_ERR_OK(ads_search_dn(ads, &res, prt_dn, attrs))) {
+               ZERO_STRUCT(guid);
+               ads_pull_guid(ads, res, &guid);
+               ads_msgfree(ads, res);
+               store_printer_guid(printer->info_2, guid);
+               win_rc = mod_a_printer(printer, 2);
+       } 
+
+       SAFE_FREE(prt_dn);
+       return win_rc;
+}
+
+static WERROR nt_printer_unpublish_ads(ADS_STRUCT *ads,
+                                       NT_PRINTER_INFO_LEVEL *printer)
+{
+       ADS_STATUS ads_rc;
+       void *res;
+       char *prt_dn = NULL;
+
+       DEBUG(5, ("unpublishing printer %s\n", printer->info_2->printername));
+
+       /* remove the printer from the directory */
+       ads_rc = ads_find_printer_on_server(ads, &res, 
+                           printer->info_2->sharename, global_myname());
+
+       if (ADS_ERR_OK(ads_rc) && ads_count_replies(ads, res)) {
+               prt_dn = ads_get_dn(ads, res);
+               ads_rc = ads_del_dn(ads, prt_dn);
+               ads_memfree(ads, prt_dn);
+       }
+
+       ads_msgfree(ads, res);
+       return WERR_OK;
+}
+
+/****************************************************************************
+ * Publish a printer in the directory
+ *
+ * @param snum describing printer service
+ * @return WERROR indicating status of publishing
+ ***************************************************************************/
+
+WERROR nt_printer_publish(Printer_entry *print_hnd, int snum, int action)
+{
+       ADS_STATUS ads_rc;
+       ADS_STRUCT *ads = NULL;
+       NT_PRINTER_INFO_LEVEL *printer = NULL;
+       WERROR win_rc;
+
+       win_rc = get_a_printer(print_hnd, &printer, 2, lp_servicename(snum));
+       if (!W_ERROR_IS_OK(win_rc))
+               goto done;
+
+       switch (action) {
+       case SPOOL_DS_PUBLISH:
+       case SPOOL_DS_UPDATE:
+               /* 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;
+               break;
+       case SPOOL_DS_UNPUBLISH:
+               printer->info_2->attributes ^= PRINTER_ATTRIBUTE_PUBLISHED;
+               break;
+       default:
+               win_rc = WERR_NOT_SUPPORTED;
+               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;
+       }
+
+       ads = ads_init(NULL, NULL, NULL);
+       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);
+
+       /* ads_connect() will find the DC for us */                                         
+       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) {
+       case SPOOL_DS_PUBLISH:
+       case SPOOL_DS_UPDATE:
+               win_rc = nt_printer_publish_ads(ads, printer);
+               break;
+       case SPOOL_DS_UNPUBLISH:
+               win_rc = nt_printer_unpublish_ads(ads, printer);
+               break;
+       }
+
+done:
+       free_a_printer(&printer, 2);
+       ads_destroy(&ads);
+       return win_rc;
+}
+
+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;
+
+       ads = ads_init(NULL, NULL, NULL);
+       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);
+
+       /* ads_connect() will find the DC for us */                                         
+       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);
+               return WERR_ACCESS_DENIED;
+       }
+
+       for (snum = 0; snum < n_services; snum++) {
+               if (!(lp_snum_ok(snum) && lp_print_ok(snum)))
+                       continue;
+
+               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);
+
+               free_a_printer(&printer, 2);
+       }
+
+       ads_destroy(&ads);
+       return WERR_OK;
+}
+
+BOOL is_printer_published(Printer_entry *print_hnd, int snum, 
+                         struct uuid *guid)
+{
+       NT_PRINTER_INFO_LEVEL *printer = NULL;
+       REGVAL_CTR *ctr;
+       REGISTRY_VALUE *guid_val;
+       WERROR win_rc;
+       int i;
+
+       win_rc = get_a_printer(print_hnd, &printer, 2, lp_servicename(snum));
+
+       if (!W_ERROR_IS_OK(win_rc) ||
+           !(printer->info_2->attributes & PRINTER_ATTRIBUTE_PUBLISHED) ||
+           ((i = lookup_printerkey(printer->info_2->data, SPOOL_DSSPOOLER_KEY)) < 0) ||
+           !(ctr = printer->info_2->data->keys[i].values) ||
+           !(guid_val = regval_ctr_getvalue(ctr, "objectGUID"))) 
+       {
+               free_a_printer(&printer, 2);
+               return False;
+       }
+
+       /* fetching printer guids really ought to be a separate function.. */
+       if (guid && regval_size(guid_val) == sizeof(struct uuid))
+               memcpy(guid, regval_data_p(guid_val), sizeof(struct uuid));
+
+       free_a_printer(&printer, 2);
+       return True;
+}
+#else
+WERROR nt_printer_publish(Printer_entry *print_hnd, int snum, int action)
+{
+       return WERR_OK;
+}
+
+WERROR check_published_printers(void)
+{
+       return WERR_OK;
+}
+
+BOOL is_printer_published(Printer_entry *print_hnd, int snum, 
+                         struct uuid *guid)
+{
+       return False;
+}
+#endif /* HAVE_ADS */
+
+/****************************************************************************
+ ***************************************************************************/
+WERROR delete_all_printer_data( NT_PRINTER_INFO_LEVEL_2 *p2, const char *key )
+{
+       NT_PRINTER_DATA *data;
+       int             i;
+       int             removed_keys = 0;
+       int             empty_slot;
+       
+       data = p2->data;
+       empty_slot = data->num_keys;
+
+       if ( !key )
+               return WERR_INVALID_PARAM;
+       
+       /* remove all keys */
+
+       if ( !strlen(key) ) {
+       
+               TALLOC_FREE( data );
+
+               p2->data = NULL;
+
+               DEBUG(8,("delete_all_printer_data: Removed all Printer Data from printer [%s]\n",
+                       p2->printername ));
+       
+               return WERR_OK;
+       }
+
+       /* remove a specific key (and all subkeys) */
+       
+       for ( i=0; i<data->num_keys; i++ ) {
+               if ( StrnCaseCmp( data->keys[i].name, key, strlen(key)) == 0 ) {
+                       DEBUG(8,("delete_all_printer_data: Removed all Printer Data from key [%s]\n",
+                               data->keys[i].name));
+               
+                       TALLOC_FREE( data->keys[i].name );
+                       TALLOC_FREE( data->keys[i].values );
+
+                       /* 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 */
+       
+       for ( i=empty_slot+1; i<data->num_keys; i++ ) {
+               if ( data->keys[i].name ) {
+                       memcpy( &data->keys[empty_slot], &data->keys[i], sizeof(NT_PRINTER_KEY) ); 
+                       ZERO_STRUCTP( &data->keys[i] );
+                       empty_slot++;
+                       removed_keys++;
+               }
+       }
+
+       /* update count */
+               
+       data->num_keys -= removed_keys;
+
+       /* sanity check to see if anything is left */
+
+       if ( !data->num_keys ) {
+               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;
+}
+
+/****************************************************************************
+ ***************************************************************************/
+WERROR delete_printer_data( NT_PRINTER_INFO_LEVEL_2 *p2, const char *key, const char *value )
+{
+       WERROR          result = WERR_OK;
+       int             key_index;
+       
+       /* we must have names on non-zero length */
+       
+       if ( !key || !*key|| !value || !*value )
+               return WERR_INVALID_NAME;
+               
+       /* find the printer key first */
+
+       key_index = lookup_printerkey( p2->data, key );
+       if ( key_index == -1 )
+               return WERR_OK;
+       
+       /* make sure the value exists so we can return the correct error code */
+       
+       if ( !regval_ctr_getvalue( p2->data->keys[key_index].values, value ) )
+               return WERR_BADFILE;
+               
+       regval_ctr_delvalue( p2->data->keys[key_index].values, value );
+       
+       DEBUG(8,("delete_printer_data: Removed key => [%s], value => [%s]\n",
+               key, value ));
+       
+       return result;
+}
+
+/****************************************************************************
+ ***************************************************************************/
+WERROR add_printer_data( NT_PRINTER_INFO_LEVEL_2 *p2, const char *key, const char *value, 
+                           uint32 type, uint8 *data, int real_len )
+{
+       WERROR          result = WERR_OK;
+       int             key_index;
+
+       /* we must have names on non-zero length */
+       
+       if ( !key || !*key|| !value || !*value )
+               return WERR_INVALID_NAME;
+               
+       /* find the printer key first */
+       
+       key_index = lookup_printerkey( p2->data, key );
+       if ( key_index == -1 )
+               key_index = add_new_printer_key( p2->data, key );
+               
+       if ( key_index == -1 )
+               return WERR_NOMEM;
+       
+       regval_ctr_addvalue( p2->data->keys[key_index].values, value,
+               type, (const char *)data, real_len );
+       
+       DEBUG(8,("add_printer_data: Added key => [%s], value => [%s], type=> [%d], size => [%d]\n",
+               key, value, type, real_len  ));
+       
+       return result;
+}
+
+/****************************************************************************
+ ***************************************************************************/
+REGISTRY_VALUE* get_printer_data( NT_PRINTER_INFO_LEVEL_2 *p2, const char *key, const char *value )
+{
+       int             key_index;
+
+       if ( (key_index = lookup_printerkey( p2->data, key )) == -1 )
+               return NULL;
+
+       DEBUG(8,("get_printer_data: Attempting to lookup key => [%s], value => [%s]\n",
+               key, value ));
+
+       return regval_ctr_getvalue( p2->data->keys[key_index].values, value );
+}
+
+/****************************************************************************
+ Unpack a list of registry values frem the TDB
+ ***************************************************************************/
+static int unpack_values(NT_PRINTER_DATA *printer_data, char *buf, int buflen)
+{
+       int             len = 0;
+       uint32          type;
+       pstring         string, valuename, keyname;
+       char            *str;
+       int             size;
+       uint8           *data_p;
+       REGISTRY_VALUE  *regval_p;
+       int             key_index;
+
+       /* add the "PrinterDriverData" key first for performance reasons */
+       
+       add_new_printer_key( printer_data, SPOOL_PRINTERDATA_KEY );
+
+       /* loop and unpack the rest of the registry values */
+       
+       while ( True ) {
+       
+               /* check to see if there are any more registry values */
+               
+               regval_p = NULL;
+               len += tdb_unpack(buf+len, buflen-len, "p", &regval_p);         
+               if ( !regval_p ) 
+                       break;
+
+               /* unpack the next regval */
+               
+               len += tdb_unpack(buf+len, buflen-len, "fdB",
+                                 string,
+                                 &type,
+                                 &size,
+                                 &data_p);
+
+               /* 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;
+               }
+       
+               /*
+                * break of the keyname from the value name.  
+                * Valuenames can have embedded '\'s so be careful.
+                * only support one level of keys.  See the 
+                * "Konica Fiery S300 50C-K v1.1. enu" 2k driver.
+                * -- jerry
+                */     
+                
+               str = strchr_m( string, '\\');
+               
+               /* Put in "PrinterDriverData" is no key specified */
+               
+               if ( !str ) {
+                       pstrcpy( keyname, SPOOL_PRINTERDATA_KEY );
+                       pstrcpy( valuename, string );
+               }
+               else {
+                       *str = '\0';
+                       pstrcpy( keyname, string );
+                       pstrcpy( valuename, str+1 );
+               }
+                       
+               /* see if we need a new key */
+               
+               if ( (key_index=lookup_printerkey( printer_data, keyname )) == -1 )
+                       key_index = add_new_printer_key( printer_data, keyname );
+                       
+               if ( key_index == -1 ) {
+                       DEBUG(0,("unpack_values: Failed to allocate a new key [%s]!\n",
+                               keyname));
+                       break;
+               }
+               
+               /* add the new value */
+               
+               regval_ctr_addvalue( printer_data->keys[key_index].values, valuename, type, (const char *)data_p, size );
+
+               SAFE_FREE(data_p); /* 'B' option to tdbpack does a malloc() */
+
+               DEBUG(8,("specific: [%s:%s], len: %d\n", keyname, valuename, size));
+       }
+
+       return len;
+}
+
+/****************************************************************************
+ ***************************************************************************/
+
+static void map_to_os2_driver(fstring drivername)
+{
+       static BOOL initialised=False;
+       static fstring last_from,last_to;
+       char *mapfile = lp_os2_driver_map();
+       char **lines = NULL;
+       int numlines = 0;
+       int i;
+
+       if (!strlen(drivername))
+               return;
+
+       if (!*mapfile)
+               return;
+
+       if (!initialised) {
+               *last_from = *last_to = 0;
+               initialised = True;
+       }
+
+       if (strequal(drivername,last_from)) {
+               DEBUG(3,("Mapped Windows driver %s to OS/2 driver %s\n",drivername,last_to));
+               fstrcpy(drivername,last_to);
+               return;
+       }
+
+       lines = file_lines_load(mapfile, &numlines);
+       if (numlines == 0) {
+               DEBUG(0,("No entries in OS/2 driver map %s\n",mapfile));
+               return;
+       }
+
+       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)
+                       continue;
+
+               *os2_name++ = 0;
+
+               while (isspace(*nt_name))
+                       nt_name++;
+
+               if (!*nt_name || 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 os2 driver%s\n",drivername,os2_name));
+                       fstrcpy(last_from,drivername);
+                       fstrcpy(last_to,os2_name);
+                       fstrcpy(drivername,os2_name);
+                       file_lines_free(lines);
+                       return;
+               }
+       }
+
+       file_lines_free(lines);
+}
+
+/****************************************************************************
+ Get a default printer info 2 struct.
+****************************************************************************/
+static WERROR get_a_printer_2_default(NT_PRINTER_INFO_LEVEL_2 *info, const char *servername, const char* sharename)
+{
+       int snum;
+
+       snum = lp_servicenumber(sharename);
+
+       slprintf(info->servername, sizeof(info->servername)-1, "\\\\%s", servername);
+       slprintf(info->printername, sizeof(info->printername)-1, "\\\\%s\\%s", 
+               servername, sharename);
+       fstrcpy(info->sharename, sharename);
+       fstrcpy(info->portname, SAMBA_PRINTER_PORT_NAME);
+
+       /* 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
+          for a Samba shared printer in 2.2.  Without this, drivers **must** be 
+          installed on the Samba server for NT clients --jerry */
+#if 0  /* JERRY --do not uncomment-- */
+       if (!*info->drivername)
+               fstrcpy(info->drivername, "NO DRIVER AVAILABLE FOR THIS PRINTER");
+#endif
+
+
+       DEBUG(10,("get_a_printer_2_default: driver name set to [%s]\n", info->drivername));
+
+       pstrcpy(info->comment, "");
+       fstrcpy(info->printprocessor, "winprint");
+       fstrcpy(info->datatype, "RAW");
+
+       info->attributes = PRINTER_ATTRIBUTE_SAMBA;
+
+       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);
+
+       /*
+        * 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.
+        *
+        * 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
+        */
+
+       if (lp_default_devmode(snum)) {
+               if ((info->devmode = construct_nt_devicemode(info->printername)) == NULL)
+                       goto fail;
+       }
+       else {
+               info->devmode = NULL;
+       }
+
+       if (!nt_printing_getsec(info, sharename, &info->secdesc_buf))
+               goto fail;
+
+       return WERR_OK;
+
+fail:
+       if (info->devmode)
+               free_nt_devicemode(&info->devmode);
+
+       return WERR_ACCESS_DENIED;
+}
+
+/****************************************************************************
+****************************************************************************/
+static WERROR get_a_printer_2(NT_PRINTER_INFO_LEVEL_2 *info, const char *servername, const char *sharename)
+{
+       int len = 0;
+       int snum = lp_servicenumber(sharename);
+       TDB_DATA kbuf, dbuf;
+       fstring printername;
+       char adevice[MAXDEVICENAME];
+               
+       kbuf = make_printer_tdbkey( sharename );
+
+       dbuf = tdb_fetch(tdb_printers, kbuf);
+       if (!dbuf.dptr)
+               return get_a_printer_2_default(info, servername, sharename);
+
+       len += tdb_unpack(dbuf.dptr+len, dbuf.dsize-len, "dddddddddddfffffPfffff",
+                       &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,
+                       info->comment,
+                       info->location,
+                       info->sepfile,
+                       info->printprocessor,
+                       info->datatype,
+                       info->parameters);
+
+       /* Samba has to have shared raw drivers. */
+       info->attributes |= PRINTER_ATTRIBUTE_SAMBA;
+       info->attributes &= ~PRINTER_ATTRIBUTE_NOT_SAMBA;
+
+       /* Restore the stripped strings. */
+       slprintf(info->servername, sizeof(info->servername)-1, "\\\\%s", servername);
+
+       if ( lp_force_printername(snum) )
+               slprintf(printername, sizeof(printername)-1, "\\\\%s\\%s", servername, sharename );
+       else 
+               slprintf(printername, sizeof(printername)-1, "\\\\%s\\%s", servername, info->printername);
+
+       fstrcpy(info->printername, printername);
+
+       len += unpack_devicemode(&info->devmode,dbuf.dptr+len, dbuf.dsize-len);
+
+       /*
+        * Some client drivers freak out if there is a NULL devmode
+        * (probably the driver is not checking before accessing 
+        * the devmode pointer)   --jerry
+        *
+        * See comments in get_a_printer_2_default()
+        */
+
+       if (lp_default_devmode(snum) && !info->devmode) {
+               DEBUG(8,("get_a_printer_2: Constructing a default device mode for [%s]\n",
+                       printername));
+               info->devmode = construct_nt_devicemode(printername);
+       }
+
+       slprintf( adevice, sizeof(adevice), "%s", info->printername );
+       if (info->devmode) {
+               fstrcpy(info->devmode->devicename, adevice);    
+       }
+
+       if ( !(info->data = TALLOC_ZERO_P( info, NT_PRINTER_DATA )) ) {
+               DEBUG(0,("unpack_values: talloc() failed!\n"));
+               return WERR_NOMEM;
+       }
+       len += unpack_values( info->data, dbuf.dptr+len, dbuf.dsize-len );
+
+       /* This will get the current RPC talloc context, but we should be
+          passing this as a parameter... fixme... JRA ! */
+
+       nt_printing_getsec(info, sharename, &info->secdesc_buf);
+
+       /* Fix for OS/2 drivers. */
+
+       if (get_remote_arch() == RA_OS2)
+               map_to_os2_driver(info->drivername);
+
+       SAFE_FREE(dbuf.dptr);
+
+       DEBUG(9,("Unpacked printer [%s] name [%s] running driver [%s]\n",
+                sharename, info->printername, info->drivername));
+
+       return WERR_OK; 
+}
+
+/****************************************************************************
+ Debugging function, dump at level 6 the struct in the logs.
+****************************************************************************/
+static uint32 dump_a_printer(NT_PRINTER_INFO_LEVEL *printer, uint32 level)
+{
+       uint32 result;
+       NT_PRINTER_INFO_LEVEL_2 *info2;
+       
+       DEBUG(106,("Dumping printer at level [%d]\n", level));
+       
+       switch (level) {
+               case 2:
+               {
+                       if (printer->info_2 == NULL)
+                               result=5;
+                       else
+                       {
+                               info2=printer->info_2;
+                       
+                               DEBUGADD(106,("attributes:[%d]\n", info2->attributes));
+                               DEBUGADD(106,("priority:[%d]\n", info2->priority));
+                               DEBUGADD(106,("default_priority:[%d]\n", info2->default_priority));
+                               DEBUGADD(106,("starttime:[%d]\n", info2->starttime));
+                               DEBUGADD(106,("untiltime:[%d]\n", info2->untiltime));
+                               DEBUGADD(106,("status:[%d]\n", info2->status));
+                               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));
+                               DEBUGADD(106,("setuptime:[%d]\n", info2->setuptime));
+
+                               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));
+                               DEBUGADD(106,("comment:[%s]\n", info2->comment));
+                               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));
+                               result=0;
+                       }
+                       break;
+               }
+               default:
+                       DEBUGADD(106,("dump_a_printer: Level %u not implemented\n", (unsigned int)level ));
+                       result=1;
+                       break;
+       }
+       
+       return result;
+}
+
+/****************************************************************************
+ Update the changeid time.
+ 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.
+****************************************************************************/
+
+static uint32 rev_changeid(void)
+{
+       struct timeval tv;
+
+       get_process_uptime(&tv);
+
+#if 1  /* JERRY */
+       /* Return changeid as msec since spooler restart */
+       return tv.tv_sec * 1000 + tv.tv_usec / 1000;
+#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
+}
+
+
+/*
+ * The function below are the high level ones.
+ * only those ones must be called from the spoolss code.
+ * JFM.
+ */
+
+/****************************************************************************
+ Modify a printer. This is called from SETPRINTERDATA/DELETEPRINTERDATA.
+****************************************************************************/
+
+WERROR mod_a_printer(NT_PRINTER_INFO_LEVEL *printer, uint32 level)
+{
+       WERROR result;
+       
+       dump_a_printer(printer, level); 
+       
+       switch (level) {
+               case 2:
+               {
+                       /*
+                        * Update the changestamp.  Emperical tests show that the
+                        * ChangeID is always updated,but c_setprinter is  
+                        *  global spooler variable (not per printer).
+                        */
+
+                       /* ChangeID **must** be increasing over the lifetime
+                          of client's spoolss service in order for the
+                          client's cache to show updates */
+
+                       printer->info_2->changeid = rev_changeid();
+
+                       /*
+                        * Because one day someone will ask:
+                        * NT->NT       An admin connection to a remote
+                        *              printer show changes imeediately in
+                        *              the properities dialog
+                        *      
+                        *              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
+                        */
+
+                       result=update_a_printer_2(printer->info_2);
+                       
+                       break;
+               }
+               default:
+                       result=WERR_UNKNOWN_LEVEL;
+                       break;
+       }
+       
+       return result;
+}
+
+/****************************************************************************
+ Initialize printer devmode & data with previously saved driver init values.
+****************************************************************************/
+
+static BOOL set_driver_init_2( NT_PRINTER_INFO_LEVEL_2 *info_ptr )
+{
+       int                     len = 0;
+       pstring                 key;
+       TDB_DATA                kbuf, dbuf;
+       NT_PRINTER_INFO_LEVEL_2 info;
+
+
+       ZERO_STRUCT(info);
+
+       /*
+        * Delete any printer data 'values' already set. When called for driver
+        * replace, there will generally be some, but during an add printer, there
+        * should not be any (if there are delete them).
+        */
+        
+       if ( info_ptr->data )
+               delete_all_printer_data( info_ptr, "" );
+       
+       slprintf(key, sizeof(key)-1, "%s%s", DRIVER_INIT_PREFIX, info_ptr->drivername);
+
+       kbuf.dptr = key;
+       kbuf.dsize = strlen(key)+1;
+
+       dbuf = tdb_fetch(tdb_drivers, kbuf);
+       if (!dbuf.dptr) {
+               /*
+                * When changing to a driver that has no init info in the tdb, remove
+                * the previous drivers init info and leave the new on blank.
+                */
+               free_nt_devicemode(&info_ptr->devmode);
+               return False;
+       }
+       
+       /*
+        * Get the saved DEVMODE..
+        */
+        
+       len += unpack_devicemode(&info.devmode,dbuf.dptr+len, dbuf.dsize-len);
+
+       /*
+        * The saved DEVMODE contains the devicename from the printer used during
+        * the initialization save. Change it to reflect the new printer.
+        */
+        
+       if ( info.devmode ) {
+               ZERO_STRUCT(info.devmode->devicename);
+               fstrcpy(info.devmode->devicename, info_ptr->printername);
+       }
+
+       /*
+        * NT/2k does not change out the entire DeviceMode of a printer
+        * when changing the driver.  Only the driverextra, private, & 
+        * driverversion fields.   --jerry  (Thu Mar 14 08:58:43 CST 2002)
+        *
+        * Later examination revealed that Windows NT/2k does reset the
+        * the printer's device mode, bit **only** when you change a 
+        * property of the device mode such as the page orientation.
+        * --jerry
+        */
+
+
+       /* Bind the saved DEVMODE to the new the printer */
+        
+       free_nt_devicemode(&info_ptr->devmode);
+       info_ptr->devmode = info.devmode;
+
+       DEBUG(10,("set_driver_init_2: Set printer [%s] init %s DEVMODE for driver [%s]\n",
+               info_ptr->printername, info_ptr->devmode?"VALID":"NULL", info_ptr->drivername));
+
+       /* Add the printer data 'values' to the new printer */
+
+       if ( !(info_ptr->data = TALLOC_ZERO_P( info_ptr, NT_PRINTER_DATA )) ) {
+               DEBUG(0,("set_driver_init_2: talloc() failed!\n"));
+               return False;
+       }
+        
+       len += unpack_values( info_ptr->data, dbuf.dptr+len, dbuf.dsize-len );
+       
+
+       SAFE_FREE(dbuf.dptr);
+
+       return True;    
+}
+
+/****************************************************************************
+ Initialize printer devmode & data with previously saved driver init values.
+ When a printer is created using AddPrinter, the drivername bound to the
+ printer is used to lookup previously saved driver initialization info, which
+ is bound to the new printer.
+****************************************************************************/
+
+BOOL set_driver_init(NT_PRINTER_INFO_LEVEL *printer, uint32 level)
+{
+       BOOL result = False;
+       
+       switch (level) {
+               case 2:
+                       result = set_driver_init_2(printer->info_2);
+                       break;
+                       
+               default:
+                       DEBUG(0,("set_driver_init: Programmer's error!  Unknown driver_init level [%d]\n",
+                               level));
+                       break;
+       }
+       
+       return result;
+}
+
+/****************************************************************************
+ Delete driver init data stored for a specified driver
+****************************************************************************/
+
+BOOL del_driver_init(char *drivername)
+{
+       pstring key;
+       TDB_DATA kbuf;
+
+       if (!drivername || !*drivername) {
+               DEBUG(3,("del_driver_init: No drivername specified!\n"));
+               return False;
+       }
+
+       slprintf(key, sizeof(key)-1, "%s%s", DRIVER_INIT_PREFIX, drivername);
+
+       kbuf.dptr = key;
+       kbuf.dsize = strlen(key)+1;
+
+       DEBUG(6,("del_driver_init: Removing driver init data for [%s]\n", drivername));
+
+       return (tdb_delete(tdb_drivers, kbuf) == 0);
+}
+
+/****************************************************************************
+ Pack up the DEVMODE and values for a printer into a 'driver init' entry 
+ in the tdb. Note: this is different from the driver entry and the printer
+ entry. There should be a single driver init entry for each driver regardless
+ of whether it was installed from NT or 2K. Technically, they should be
+ different, but they work out to the same struct.
+****************************************************************************/
+
+static uint32 update_driver_init_2(NT_PRINTER_INFO_LEVEL_2 *info)
+{
+       pstring key;
+       char *buf;
+       int buflen, len, ret;
+       TDB_DATA kbuf, dbuf;
+
+       buf = NULL;
+       buflen = 0;
+
+ again:        
+       len = 0;
+       len += pack_devicemode(info->devmode, buf+len, buflen-len);
+
+       len += pack_values( info->data, buf+len, buflen-len );
+
+       if (buflen < len) {
+               char *tb;
+
+               tb = (char *)SMB_REALLOC(buf, len);
+               if (!tb) {
+                       DEBUG(0, ("update_driver_init_2: failed to enlarge buffer!\n"));
+                       ret = -1;
+                       goto done;
+               }
+               else
+                       buf = tb;
+               buflen = len;
+               goto again;
+       }
+
+       slprintf(key, sizeof(key)-1, "%s%s", DRIVER_INIT_PREFIX, info->drivername);
+
+       kbuf.dptr = key;
+       kbuf.dsize = strlen(key)+1;
+       dbuf.dptr = buf;
+       dbuf.dsize = len;
+
+       ret = tdb_store(tdb_drivers, kbuf, dbuf, TDB_REPLACE);
+
+done:
+       if (ret == -1)
+               DEBUG(8, ("update_driver_init_2: error updating printer init to tdb on disk\n"));
+
+       SAFE_FREE(buf);
+
+       DEBUG(10,("update_driver_init_2: Saved printer [%s] init DEVMODE & values for driver [%s]\n",
+                info->sharename, info->drivername));
+
+       return ret;
+}
+
+/****************************************************************************
+ Update (i.e. save) the driver init info (DEVMODE and values) for a printer
+****************************************************************************/
+
+static uint32 update_driver_init(NT_PRINTER_INFO_LEVEL *printer, uint32 level)
+{
+       uint32 result;
+       
+       dump_a_printer(printer, level); 
+       
+       switch (level) {
+               case 2:
+                       result = update_driver_init_2(printer->info_2);
+                       break;
+               default:
+                       result = 1;
+                       break;
+       }
+       
+       return result;
+}
+
+/****************************************************************************
+ Convert the printer data value, a REG_BINARY array, into an initialization 
+ DEVMODE. Note: the array must be parsed as if it was a DEVMODE in an rpc...
+ got to keep the endians happy :).
+****************************************************************************/
+
+static BOOL convert_driver_init( TALLOC_CTX *ctx, NT_DEVICEMODE *nt_devmode, uint8 *data, uint32 data_len )
+{
+       BOOL       result = False;
+       prs_struct ps;
+       DEVICEMODE devmode;
+
+       ZERO_STRUCT(devmode);
+
+       prs_init(&ps, 0, ctx, UNMARSHALL);
+       ps.data_p      = (char *)data;
+       ps.buffer_size = data_len;
+
+       if (spoolss_io_devmode("phantom DEVMODE", &ps, 0, &devmode))
+               result = convert_devicemode("", &devmode, &nt_devmode);
+       else
+               DEBUG(10,("convert_driver_init: error parsing DEVMODE\n"));
+
+       return result;
+}
+
+/****************************************************************************
+ Set the DRIVER_INIT info in the tdb. Requires Win32 client code that:
+
+ 1. Use the driver's config DLL to this UNC printername and:
+    a. Call DrvPrintEvent with PRINTER_EVENT_INITIALIZE
+    b. Call DrvConvertDevMode with CDM_DRIVER_DEFAULT to get default DEVMODE
+ 2. Call SetPrinterData with the 'magic' key and the DEVMODE as data.
+
+ The last step triggers saving the "driver initialization" information for
+ this printer into the tdb. Later, new printers that use this driver will
+ have this initialization information bound to them. This simulates the
+ driver initialization, as if it had run on the Samba server (as it would
+ have done on NT).
+
+ The Win32 client side code requirement sucks! But until we can run arbitrary
+ Win32 printer driver code on any Unix that Samba runs on, we are stuck with it.
+ It would have been easier to use SetPrinter because all the UNMARSHALLING of
+ the DEVMODE is done there, but 2K/XP clients do not set the DEVMODE... think
+ about it and you will realize why.  JRR 010720
+****************************************************************************/
+
+static WERROR save_driver_init_2(NT_PRINTER_INFO_LEVEL *printer, uint8 *data, uint32 data_len )
+{
+       WERROR        status       = WERR_OK;
+       TALLOC_CTX    *ctx         = NULL;
+       NT_DEVICEMODE *nt_devmode  = NULL;
+       NT_DEVICEMODE *tmp_devmode = printer->info_2->devmode;
+       
+       /*
+        * When the DEVMODE is already set on the printer, don't try to unpack it.
+        */
+       DEBUG(8,("save_driver_init_2: Enter...\n"));
+       
+       if ( !printer->info_2->devmode && data_len ) {
+               /*
+                * Set devmode on printer info, so entire printer initialization can be
+                * saved to tdb.
+                */
+
+               if ((ctx = talloc_init("save_driver_init_2")) == NULL)
+                       return WERR_NOMEM;
+
+               if ((nt_devmode = SMB_MALLOC_P(NT_DEVICEMODE)) == NULL) {
+                       status = WERR_NOMEM;
+                       goto done;
+               }
+       
+               ZERO_STRUCTP(nt_devmode);
+
+               /*
+                * The DEVMODE is held in the 'data' component of the param in raw binary.
+                * Convert it to to a devmode structure
+                */
+               if ( !convert_driver_init( ctx, nt_devmode, data, data_len )) {
+                       DEBUG(10,("save_driver_init_2: error converting DEVMODE\n"));
+                       status = WERR_INVALID_PARAM;
+                       goto done;
+               }
+
+               printer->info_2->devmode = nt_devmode;
+       }
+
+       /*
+        * Pack up and add (or update) the DEVMODE and any current printer data to
+        * a 'driver init' element in the tdb
+        * 
+        */
+
+       if ( update_driver_init(printer, 2) != 0 ) {
+               DEBUG(10,("save_driver_init_2: error updating DEVMODE\n"));
+               status = WERR_NOMEM;
+               goto done;
+       }
+       
+       /*
+        * If driver initialization info was successfully saved, set the current 
+        * printer to match it. This allows initialization of the current printer 
+        * as well as the driver.
+        */
+       status = mod_a_printer(printer, 2);
+       if (!W_ERROR_IS_OK(status)) {
+               DEBUG(10,("save_driver_init_2: error setting DEVMODE on printer [%s]\n",
+                                 printer->info_2->printername));
+       }
+       
+  done:
+       talloc_destroy(ctx);
+       free_nt_devicemode( &nt_devmode );
+       
+       printer->info_2->devmode = tmp_devmode;
+
+       return status;
+}
+
+/****************************************************************************
+ Update the driver init info (DEVMODE and specifics) for a printer
+****************************************************************************/
+
+WERROR save_driver_init(NT_PRINTER_INFO_LEVEL *printer, uint32 level, uint8 *data, uint32 data_len)
+{
+       WERROR status = WERR_OK;
+       
+       switch (level) {
+               case 2:
+                       status = save_driver_init_2( printer, data, data_len );
+                       break;
+               default:
+                       status = WERR_UNKNOWN_LEVEL;
+                       break;
+       }
+       
+       return status;
+}
+
+/****************************************************************************
+ Get a NT_PRINTER_INFO_LEVEL struct. It returns malloced memory.
+
+ Previously the code had a memory allocation problem because it always
+ 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 
+ of getprinter[data]() calls, the memory usage would climb.  Now we use
+ a short lived TALLOC_CTX for printer_info_2 objects returned.  We 
+ still use the Printer_entry->ctx for maintaining the cache copy though
+ since that object must live as long as the handle by definition.  
+                                                    --jerry
+
+****************************************************************************/
+
+WERROR get_a_printer( Printer_entry *print_hnd, NT_PRINTER_INFO_LEVEL **pp_printer, uint32 level, 
+                       const char *sharename)
+{
+       WERROR result;
+       fstring servername;
+       
+       DEBUG(10,("get_a_printer: [%s] level %u\n", sharename, (unsigned int)level));
+
+       if ( !(*pp_printer = TALLOC_ZERO_P(NULL, NT_PRINTER_INFO_LEVEL)) ) {
+               DEBUG(0,("get_a_printer: talloc() fail.\n"));
+               return WERR_NOMEM;
+       }
+
+       switch (level) {
+               case 2:
+                       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 );
+                               return WERR_NOMEM;
+                       }
+
+                       if ( print_hnd ) 
+                               fstrcpy( servername, print_hnd->servername );
+                       else {
+                               fstrcpy( servername, "%L" );
+                               standard_sub_basic( "", servername, sizeof(servername)-1 );
+                       }
+
+                       result = get_a_printer_2( (*pp_printer)->info_2, servername, sharename );
+       
+                       
+                       /* we have a new printer now.  Save it with this handle */
+                       
+                       if ( !W_ERROR_IS_OK(result) ) {
+                               TALLOC_FREE( *pp_printer );
+                               DEBUG(10,("get_a_printer: [%s] level %u returning %s\n", 
+                                       sharename, (unsigned int)level, dos_errstr(result)));
+                               return result;
+                       }
+
+                       dump_a_printer( *pp_printer, level);
+                       
+                       break;
+                       
+               default:
+                       TALLOC_FREE( *pp_printer );
+                       return WERR_UNKNOWN_LEVEL;
+       }
+       
+       return WERR_OK;
+}
+
+/****************************************************************************
+ Deletes a NT_PRINTER_INFO_LEVEL struct.
+****************************************************************************/
+
+uint32 free_a_printer(NT_PRINTER_INFO_LEVEL **pp_printer, uint32 level)
+{
+       NT_PRINTER_INFO_LEVEL *printer = *pp_printer;
+
+       if ( !printer )
+               return 0;
+       
+       switch (level) {
+               case 2:
+                       if ( printer->info_2 ) 
+                               free_nt_printer_info_level_2(&printer->info_2);
+                       break;
+
+               default:
+                       DEBUG(0,("free_a_printer: unknown level! [%d]\n", level ));
+                       return 1;
+       }
+
+       TALLOC_FREE(*pp_printer);
+
+       return 0;
+}
+
+/****************************************************************************
+****************************************************************************/
+uint32 add_a_printer_driver(NT_PRINTER_DRIVER_INFO_LEVEL driver, uint32 level)
+{
+       uint32 result;
+       DEBUG(104,("adding a printer at level [%d]\n", level));
+       dump_a_printer_driver(driver, level);
+       
+       switch (level) {
+               case 3:
+                       result=add_a_printer_driver_3(driver.info_3);
+                       break;
+
+               case 6:
+                       result=add_a_printer_driver_6(driver.info_6);
+                       break;
+
+               default:
+                       result=1;
+                       break;
+       }
+       
+       return result;
+}
+/****************************************************************************
+****************************************************************************/
+
+WERROR get_a_printer_driver(NT_PRINTER_DRIVER_INFO_LEVEL *driver, uint32 level,
+                            fstring drivername, const char *architecture, uint32 version)
+{
+       WERROR result;
+       
+       switch (level) {
+               case 3:
+                       /* 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(&driver->info_3, drivername, 
+                                               architecture, 3);
+                                               
+                               if ( !W_ERROR_IS_OK(result) ) {
+                                       result = get_a_printer_driver_3( &driver->info_3, 
+                                                       drivername, architecture, 2 );
+                               }
+                       } else {
+                               result = get_a_printer_driver_3(&driver->info_3, drivername, 
+                                       architecture, version);                         
+                       }
+                       break;
+                       
+               default:
+                       result=W_ERROR(1);
+                       break;
+       }
+       
+       if (W_ERROR_IS_OK(result))
+               dump_a_printer_driver(*driver, level);
+               
+       return result;
+}
+
+/****************************************************************************
+****************************************************************************/
+uint32 free_a_printer_driver(NT_PRINTER_DRIVER_INFO_LEVEL driver, uint32 level)
+{
+       uint32 result;
+       
+       switch (level) {
+               case 3:
+               {
+                       NT_PRINTER_DRIVER_INFO_LEVEL_3 *info3;
+                       if (driver.info_3 != NULL)
+                       {
+                               info3=driver.info_3;
+                               SAFE_FREE(info3->dependentfiles);
+                               ZERO_STRUCTP(info3);
+                               SAFE_FREE(info3);
+                               result=0;
+                       } else {
+                               result=4;
+                       }
+                       break;
+               }
+               case 6:
+               {
+                       NT_PRINTER_DRIVER_INFO_LEVEL_6 *info6;
+                       if (driver.info_6 != NULL) {
+                               info6=driver.info_6;
+                               SAFE_FREE(info6->dependentfiles);
+                               SAFE_FREE(info6->previousnames);
+                               ZERO_STRUCTP(info6);
+                               SAFE_FREE(info6);
+                               result=0;
+                       } else {
+                               result=4;
+                       }
+                       break;
+               }
+               default:
+                       result=1;
+                       break;
+       }
+       return result;
+}
+
+
+/****************************************************************************
+  Determine whether or not a particular driver is currently assigned
+  to a printer
+****************************************************************************/
+
+BOOL printer_driver_in_use ( NT_PRINTER_DRIVER_INFO_LEVEL_3 *info_3 )
+{
+       int snum;
+       int n_services = lp_numservices();
+       NT_PRINTER_INFO_LEVEL *printer = NULL;
+       BOOL in_use = False;
+
+       if ( !info_3 ) 
+               return False;
+
+       DEBUG(10,("printer_driver_in_use: Beginning search through ntprinters.tdb...\n"));
+       
+       /* loop through the printers.tdb and check for the drivername */
+       
+       for (snum=0; snum<n_services && !in_use; snum++) {
+               if ( !(lp_snum_ok(snum) && lp_print_ok(snum) ) )
+                       continue;
+               
+               if ( !W_ERROR_IS_OK(get_a_printer(NULL, &printer, 2, lp_servicename(snum))) )
+                       continue;
+               
+               if ( strequal(info_3->name, printer->info_2->drivername) ) 
+                       in_use = True;
+               
+               free_a_printer( &printer, 2 );
+       }
+       
+       DEBUG(10,("printer_driver_in_use: Completed search through ntprinters.tdb...\n"));
+       
+       if ( in_use ) {
+               NT_PRINTER_DRIVER_INFO_LEVEL d;
+               WERROR werr;
+               
+               DEBUG(5,("printer_driver_in_use: driver \"%s\" is currently in use\n", info_3->name));
+               
+               /* we can still remove the driver if there is one of 
+                  "Windows NT x86" version 2 or 3 left */
+                  
+               if ( !strequal( "Windows NT x86", info_3->environment ) ) {
+                       werr = get_a_printer_driver( &d, 3, info_3->name, "Windows NT x86", DRIVER_ANY_VERSION );                       
+               }
+               else {
+                       switch ( info_3->cversion ) {
+                       case 2:
+                               werr = get_a_printer_driver( &d, 3, info_3->name, "Windows NT x86", 3 );
+                               break;
+                       case 3: 
+                               werr = get_a_printer_driver( &d, 3, info_3->name, "Windows NT x86", 2 );
+                               break;
+                       default:
+                               DEBUG(0,("printer_driver_in_use: ERROR! unknown driver version (%d)\n", 
+                                       info_3->cversion));
+                               werr = WERR_UNKNOWN_PRINTER_DRIVER;
+                               break;
+                       }
+               }
+
+               /* now check the error code */
+                               
+               if ( W_ERROR_IS_OK(werr) ) {
+                       /* it's ok to remove the driver, we have other architctures left */
+                       in_use = False;
+                       free_a_printer_driver( d, 3 );
+               }
+       }
+       
+       /* report that the driver is not in use by default */
+       
+       return in_use;
+}
+
+
+/**********************************************************************
+ Check to see if a ogiven file is in use by *info
+ *********************************************************************/
+static BOOL drv_file_in_use( char* file, NT_PRINTER_DRIVER_INFO_LEVEL_3 *info )
+{
+       int i = 0;
+       
+       if ( !info )
+               return False;
+               
+       if ( strequal(file, info->driverpath) )
+               return True;
+
+       if ( strequal(file, info->datafile) )
+               return True;
+
+       if ( strequal(file, info->configfile) )
+               return True;
+
+       if ( strequal(file, info->helpfile) )
+               return True;
+       
+       /* see of there are any dependent files to examine */
+       
+       if ( !info->dependentfiles )
+               return False;
+       
+       while ( *info->dependentfiles[i] ) {
+               if ( strequal(file, info->dependentfiles[i]) )
+                       return True;
+               i++;
+       }
+       
+       return False;
+
+}
+
+/**********************************************************************
+ Utility function to remove the dependent file pointed to by the 
+ input parameter from the list 
+ *********************************************************************/
+
+static void trim_dependent_file( fstring files[], int idx )
+{
+       
+       /* bump everything down a slot */
+
+       while( *files[idx+1] ) {
+               fstrcpy( files[idx], files[idx+1] );
+               idx++;
+       }
+       
+       *files[idx] = '\0';
+
+       return; 
+}
+
+/**********************************************************************
+ Check if any of the files used by src are also used by drv 
+ *********************************************************************/
+
+static BOOL trim_overlap_drv_files( NT_PRINTER_DRIVER_INFO_LEVEL_3 *src, 
+                                      NT_PRINTER_DRIVER_INFO_LEVEL_3 *drv )
+{
+       BOOL    in_use = False;
+       int     i = 0;
+       
+       if ( !src || !drv )
+               return False;
+               
+       /* check each file.  Remove it from the src structure if it overlaps */
+       
+       if ( drv_file_in_use(src->driverpath, drv) ) {
+               in_use = True;
+               DEBUG(10,("Removing driverfile [%s] from list\n", src->driverpath));
+               fstrcpy( src->driverpath, "" );
+       }
+               
+       if ( drv_file_in_use(src->datafile, drv) ) {
+               in_use = True;
+               DEBUG(10,("Removing datafile [%s] from list\n", src->datafile));
+               fstrcpy( src->datafile, "" );
+       }
+               
+       if ( drv_file_in_use(src->configfile, drv) ) {
+               in_use = True;
+               DEBUG(10,("Removing configfile [%s] from list\n", src->configfile));
+               fstrcpy( src->configfile, "" );
+       }
+               
+       if ( drv_file_in_use(src->helpfile, drv) ) {
+               in_use = True;
+               DEBUG(10,("Removing helpfile [%s] from list\n", src->helpfile));
+               fstrcpy( src->helpfile, "" );
+       }
+       
+       /* are there any dependentfiles to examine? */
+       
+       if ( !src->dependentfiles )
+               return in_use;
+               
+       while ( *src->dependentfiles[i] ) {
+               if ( drv_file_in_use(src->dependentfiles[i], drv) ) {
+                       in_use = True;
+                       DEBUG(10,("Removing [%s] from dependent file list\n", src->dependentfiles[i]));
+                       trim_dependent_file( src->dependentfiles, i );
+               } else
+                       i++;
+       }               
+               
+       return in_use;
+}
+
+/****************************************************************************
+  Determine whether or not a particular driver files are currently being 
+  used by any other driver.  
+  
+  Return value is True if any files were in use by other drivers
+  and False otherwise.
+  
+  Upon return, *info has been modified to only contain the driver files
+  which are not in use
+****************************************************************************/
+
+BOOL printer_driver_files_in_use ( NT_PRINTER_DRIVER_INFO_LEVEL_3 *info )
+{
+       int                             i;
+       int                             ndrivers;
+       uint32                          version;
+       fstring                         *list = NULL;
+       NT_PRINTER_DRIVER_INFO_LEVEL    driver;
+       
+       if ( !info )
+               return False;
+       
+       version = info->cversion;
+       
+       /* loop over all driver versions */
+       
+       DEBUG(5,("printer_driver_files_in_use: Beginning search through ntdrivers.tdb...\n"));
+       
+       /* get the list of drivers */
+               
+       list = NULL;
+       ndrivers = get_ntdrivers(&list, info->environment, version);
+               
+       DEBUGADD(4,("we have:[%d] drivers in environment [%s] and version [%d]\n", 
+               ndrivers, info->environment, version));
+
+       /* check each driver for overlap in files */
+               
+       for (i=0; i<ndrivers; i++) {
+               DEBUGADD(5,("\tdriver: [%s]\n", list[i]));
+                       
+               ZERO_STRUCT(driver);
+                       
+               if ( !W_ERROR_IS_OK(get_a_printer_driver(&driver, 3, list[i], info->environment, version)) ) {
+                       SAFE_FREE(list);
+                       return True;
+               }
+                       
+               /* check if d2 uses any files from d1 */
+               /* only if this is a different driver than the one being deleted */
+                       
+               if ( !strequal(info->name, driver.info_3->name) ) {
+                       if ( trim_overlap_drv_files(info, driver.info_3) ) {
+                               free_a_printer_driver(driver, 3);
+                               SAFE_FREE( list );
+                               return True;
+                       }
+               }
+       
+               free_a_printer_driver(driver, 3);
+       }       
+       
+       SAFE_FREE(list);
+       
+       DEBUG(5,("printer_driver_files_in_use: Completed search through ntdrivers.tdb...\n"));
+       
+       driver.info_3 = info;
+       
+       if ( DEBUGLEVEL >= 20 )
+               dump_a_printer_driver( driver, 3 );
+       
+       return False;
+}
+
+/****************************************************************************
+  Actually delete the driver files.  Make sure that 
+  printer_driver_files_in_use() return False before calling 
+  this.
+****************************************************************************/
+
+static BOOL delete_driver_files( NT_PRINTER_DRIVER_INFO_LEVEL_3 *info_3, struct current_user *user )
+{
+       int i = 0;
+       char *s;
+       pstring file;
+       connection_struct *conn;
+       DATA_BLOB null_pw;
+       NTSTATUS nt_status;
+       fstring res_type;
+       BOOL bad_path;
+       SMB_STRUCT_STAT  st;
+
+       if ( !info_3 )
+               return False;
+               
+       DEBUG(6,("delete_driver_files: deleting driver [%s] - version [%d]\n", info_3->name, info_3->cversion));
+       
+       /*
+        * Connect to the print$ share under the same account as the 
+        * user connected to the rpc pipe. Note we must be root to 
+        * do this.
+        */
+        
+       null_pw = data_blob( NULL, 0 );
+       fstrcpy(res_type, "A:");
+       become_root();
+        conn = make_connection_with_chdir( "print$", null_pw, res_type, user->vuid, &nt_status );
+       unbecome_root();
+       
+       if ( !conn ) {
+               DEBUG(0,("delete_driver_files: Unable to connect\n"));
+               return False;
+       }
+
+       if ( !CAN_WRITE(conn) ) {
+               DEBUG(3,("delete_driver_files: Cannot delete print driver when [print$] is read-only\n"));
+               return False;
+       }
+
+        /* Save who we are - we are temporarily becoming the connection user. */
+
+       if ( !become_user(conn, conn->vuid) ) {
+               DEBUG(0,("delete_driver_files: Can't become user!\n"));
+               return False;
+       }
+
+       /* now delete the files; must strip the '\print$' string from 
+          fron of path                                                */
+       
+       if ( *info_3->driverpath ) {
+               if ( (s = strchr( &info_3->driverpath[1], '\\' )) != NULL ) {
+                       pstrcpy( file, s );
+                       driver_unix_convert(file, conn, NULL, &bad_path, &st);
+                       DEBUG(10,("deleting driverfile [%s]\n", s));
+                       unlink_internals(conn, 0, file, False);
+               }
+       }
+               
+       if ( *info_3->configfile ) {
+               if ( (s = strchr( &info_3->configfile[1], '\\' )) != NULL ) {
+                       pstrcpy( file, s );
+                       driver_unix_convert(file, conn, NULL, &bad_path, &st);
+                       DEBUG(10,("deleting configfile [%s]\n", s));
+                       unlink_internals(conn, 0, file, False);
+               }
+       }
+       
+       if ( *info_3->datafile ) {
+               if ( (s = strchr( &info_3->datafile[1], '\\' )) != NULL ) {
+                       pstrcpy( file, s );
+                       driver_unix_convert(file, conn, NULL, &bad_path, &st);
+                       DEBUG(10,("deleting datafile [%s]\n", s));
+                       unlink_internals(conn, 0, file, False);
+               }
+       }
+       
+       if ( *info_3->helpfile ) {
+               if ( (s = strchr( &info_3->helpfile[1], '\\' )) != NULL ) {
+                       pstrcpy( file, s );
+                       driver_unix_convert(file, conn, NULL, &bad_path, &st);
+                       DEBUG(10,("deleting helpfile [%s]\n", s));
+                       unlink_internals(conn, 0, file, False);
+               }
+       }
+       
+       /* check if we are done removing files */
+       
+       if ( info_3->dependentfiles ) {
+               while ( info_3->dependentfiles[i][0] ) {
+                       char *p;
+
+                       /* bypass the "\print$" portion of the path */
+                       
+                       if ( (p = strchr( info_3->dependentfiles[i]+1, '\\' )) != NULL ) {
+                               pstrcpy( file, p );
+                               driver_unix_convert(file, conn, NULL, &bad_path, &st);
+                               DEBUG(10,("deleting dependent file [%s]\n", file));
+                               unlink_internals(conn, 0, file, False);
+                       }
+                       
+                       i++;
+               }
+       }
+
+       unbecome_user();
+       
+       return True;
+}
+
+/****************************************************************************
+ Remove a printer driver from the TDB.  This assumes that the the driver was
+ previously looked up.
+ ***************************************************************************/
+
+WERROR delete_printer_driver( NT_PRINTER_DRIVER_INFO_LEVEL_3 *info_3, struct current_user *user,
+                              uint32 version, BOOL delete_files )
+{
+       pstring         key;
+       const char     *arch;
+       TDB_DATA        kbuf, dbuf;
+       NT_PRINTER_DRIVER_INFO_LEVEL    ctr;
+
+       /* delete the tdb data first */
+
+       arch = get_short_archi(info_3->environment);
+       slprintf(key, sizeof(key)-1, "%s%s/%d/%s", DRIVERS_PREFIX,
+               arch, version, info_3->name);
+
+       DEBUG(5,("delete_printer_driver: key = [%s] delete_files = %s\n",
+               key, delete_files ? "TRUE" : "FALSE" ));
+
+       ctr.info_3 = info_3;
+       dump_a_printer_driver( ctr, 3 );
+
+       kbuf.dptr=key;
+       kbuf.dsize=strlen(key)+1;
+
+       /* check if the driver actually exists for this environment */
+       
+       dbuf = tdb_fetch( tdb_drivers, kbuf );
+       if ( !dbuf.dptr ) {
+               DEBUG(8,("delete_printer_driver: Driver unknown [%s]\n", key));
+               return WERR_UNKNOWN_PRINTER_DRIVER;
+       }
+               
+       SAFE_FREE( dbuf.dptr );
+       
+       /* ok... the driver exists so the delete should return success */
+               
+       if (tdb_delete(tdb_drivers, kbuf) == -1) {
+               DEBUG (0,("delete_printer_driver: fail to delete %s!\n", key));
+               return WERR_ACCESS_DENIED;
+       }
+
+       /*
+        * 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 )
+               delete_driver_files( info_3, user );
+                       
+               
+       DEBUG(5,("delete_printer_driver: driver delete successful [%s]\n", key));
+
+       return WERR_OK;
+       }
+       
+/****************************************************************************
+ Store a security desc for a printer.
+****************************************************************************/
+
+WERROR nt_printing_setsec(const char *sharename, SEC_DESC_BUF *secdesc_ctr)
+{
+       SEC_DESC_BUF *new_secdesc_ctr = NULL;
+       SEC_DESC_BUF *old_secdesc_ctr = NULL;
+       prs_struct ps;
+       TALLOC_CTX *mem_ctx = NULL;
+       char *key;
+       WERROR status;
+
+       mem_ctx = talloc_init("nt_printing_setsec");
+       if (mem_ctx == NULL)
+               return WERR_NOMEM;
+
+        /* 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. */
+
+       if (!secdesc_ctr->sec->owner_sid || !secdesc_ctr->sec->grp_sid) {
+               DOM_SID *owner_sid, *group_sid;
+               SEC_ACL *dacl, *sacl;
+               SEC_DESC *psd = NULL;
+               size_t size;
+
+               nt_printing_getsec(mem_ctx, sharename, &old_secdesc_ctr);
+
+               /* Pick out correct owner and group sids */
+
+               owner_sid = secdesc_ctr->sec->owner_sid ?
+                       secdesc_ctr->sec->owner_sid :
+                       old_secdesc_ctr->sec->owner_sid;
+
+               group_sid = secdesc_ctr->sec->grp_sid ?
+                       secdesc_ctr->sec->grp_sid :
+                       old_secdesc_ctr->sec->grp_sid;
+
+               dacl = secdesc_ctr->sec->dacl ?
+                       secdesc_ctr->sec->dacl :
+                       old_secdesc_ctr->sec->dacl;
+
+               sacl = secdesc_ctr->sec->sacl ?
+                       secdesc_ctr->sec->sacl :
+                       old_secdesc_ctr->sec->sacl;
+
+               /* Make a deep copy of the security descriptor */
+
+               psd = make_sec_desc(mem_ctx, secdesc_ctr->sec->revision, secdesc_ctr->sec->type,
+                                   owner_sid, group_sid,
+                                   sacl,
+                                   dacl,
+                                   &size);
+
+               new_secdesc_ctr = make_sec_desc_buf(mem_ctx, size, psd);
+       }
+
+       if (!new_secdesc_ctr) {
+               new_secdesc_ctr = secdesc_ctr;
+       }
+
+       /* Store the security descriptor in a tdb */
+
+       prs_init(&ps, (uint32)sec_desc_size(new_secdesc_ctr->sec) +
+                sizeof(SEC_DESC_BUF), mem_ctx, MARSHALL);
+
+       if (!sec_io_desc_buf("nt_printing_setsec", &new_secdesc_ctr,
+                            &ps, 1)) {
+               status = WERR_BADFUNC;
+               goto out;
+       }
+
+       key = make_printers_secdesc_tdbkey( sharename );
+
+       if (tdb_prs_store(tdb_printers, key, &ps)==0) {
+               status = WERR_OK;
+       } else {
+               DEBUG(1,("Failed to store secdesc for %s\n", sharename));
+               status = WERR_BADFUNC;
+       }
+
+       /* Free malloc'ed memory */
+
+ out:
+
+       prs_mem_free(&ps);
+       if (mem_ctx)
+               talloc_destroy(mem_ctx);
+       return status;
+}
+
+/****************************************************************************
+ Construct a default security descriptor buffer for a printer.
+****************************************************************************/
+
+static SEC_DESC_BUF *construct_default_printer_sdb(TALLOC_CTX *ctx)
+{
+       SEC_ACE ace[5]; /* max number of ace entries */
+       int i = 0;
+       SEC_ACCESS sa;
+       SEC_ACL *psa = NULL;
+       SEC_DESC_BUF *sdb = NULL;
+       SEC_DESC *psd = NULL;
+       DOM_SID adm_sid;
+       size_t sd_size;
+
+       /* Create an ACE where Everyone is allowed to print */
+
+       init_sec_access(&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_copy(&domadmins_sid, get_global_sam_sid());
+               sid_append_rid(&domadmins_sid, DOMAIN_GROUP_RID_ADMINS);
+               
+               init_sec_access(&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)) {
+               sid_append_rid(&adm_sid, DOMAIN_USER_RID_ADMIN);
+
+               init_sec_access(&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 */
+
+       init_sec_access(&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(ctx, NT4_ACL_REVISION, i, ace)) != NULL) {
+               psd = make_sec_desc(ctx, SEC_DESC_REVISION, SEC_DESC_SELF_RELATIVE,
+                       &global_sid_Builtin_Administrators, 
+                       &global_sid_Builtin_Administrators,
+                       NULL, psa, &sd_size);
+       }
+
+       if (!psd) {
+               DEBUG(0,("construct_default_printer_sd: Failed to make SEC_DESC.\n"));
+               return NULL;
+       }
+
+       sdb = make_sec_desc_buf(ctx, sd_size, psd);
+
+       DEBUG(4,("construct_default_printer_sdb: size = %u.\n",
+                (unsigned int)sd_size));
+
+       return sdb;
+}
+
+/****************************************************************************
+ Get a security desc for a printer.
+****************************************************************************/
+
+BOOL nt_printing_getsec(TALLOC_CTX *ctx, const char *sharename, SEC_DESC_BUF **secdesc_ctr)
+{
+       prs_struct ps;
+       char *key;
+       char *temp;
+
+       if (strlen(sharename) > 2 && (temp = strchr(sharename + 2, '\\'))) {
+               sharename = temp + 1;
+       }
+
+       /* Fetch security descriptor from tdb */
+
+       key = make_printers_secdesc_tdbkey( sharename  );
+
+       if (tdb_prs_fetch(tdb_printers, key, &ps, ctx)!=0 ||
+           !sec_io_desc_buf("nt_printing_getsec", secdesc_ctr, &ps, 1)) {
+
+               DEBUG(4,("using default secdesc for %s\n", sharename));
+
+               if (!(*secdesc_ctr = construct_default_printer_sdb(ctx))) {
+                       return False;
+               }
+
+               /* Save default security descriptor for later */
+
+               prs_init(&ps, (uint32)sec_desc_size((*secdesc_ctr)->sec) +
+                               sizeof(SEC_DESC_BUF), ctx, MARSHALL);
+
+               if (sec_io_desc_buf("nt_printing_getsec", secdesc_ctr, &ps, 1))
+                       tdb_prs_store(tdb_printers, key, &ps);
+
+               prs_mem_free(&ps);
+
+               return True;
+       }
+
+       /* If security descriptor is owned by S-1-1-0 and winbindd is up,
+          this security descriptor has been created when winbindd was
+          down.  Take ownership of security descriptor. */
+
+       if (sid_equal((*secdesc_ctr)->sec->owner_sid, &global_sid_World)) {
+               DOM_SID owner_sid;
+
+               /* Change sd owner to workgroup administrator */
+
+               if (secrets_fetch_domain_sid(lp_workgroup(), &owner_sid)) {
+                       SEC_DESC_BUF *new_secdesc_ctr = NULL;
+                       SEC_DESC *psd = NULL;
+                       size_t size;
+
+                       /* Create new sd */
+
+                       sid_append_rid(&owner_sid, DOMAIN_USER_RID_ADMIN);
+
+                       psd = make_sec_desc(ctx, (*secdesc_ctr)->sec->revision, (*secdesc_ctr)->sec->type,
+                                           &owner_sid,
+                                           (*secdesc_ctr)->sec->grp_sid,
+                                           (*secdesc_ctr)->sec->sacl,
+                                           (*secdesc_ctr)->sec->dacl,
+                                           &size);
+
+                       new_secdesc_ctr = make_sec_desc_buf(ctx, size, psd);
+
+                       /* Swap with other one */
+
+                       *secdesc_ctr = new_secdesc_ctr;
+
+                       /* Set it */
+
+                       nt_printing_setsec(sharename, *secdesc_ctr);
+               }
+       }
+
+       if (DEBUGLEVEL >= 10) {
+               SEC_ACL *the_acl = (*secdesc_ctr)->sec->dacl;
+               int i;
+
+               DEBUG(10, ("secdesc_ctr for %s has %d aces:\n", 
+                          sharename, the_acl->num_aces));
+
+               for (i = 0; i < the_acl->num_aces; i++) {
+                       fstring sid_str;
+
+                       sid_to_string(sid_str, &the_acl->ace[i].trustee);
+
+                       DEBUG(10, ("%s %d %d 0x%08x\n", sid_str,
+                                  the_acl->ace[i].type, the_acl->ace[i].flags, 
+                                  the_acl->ace[i].info.mask)); 
+               }
+       }
+
+       prs_mem_free(&ps);
+       return True;
+}
+
+/* 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 !
+       
+       Now explanation: You have 3 printers behind your samba server,
+       2 of them are the same make and model (laser A and B). But laser B
+       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 :-).
+       
+       If the /usr/local/samba/lib directory (default dir), you will have
+       5 files to describe all of this.
+       
+       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
+
+jfm: I should use this comment for the text file to explain
+       same thing for the forms BTW.
+       Je devrais mettre mes commentaires en francais, ca serait mieux :-)
+
+*/
+
+/* 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. */
+
+void map_printer_permissions(SEC_DESC *sd)
+{
+       int i;
+
+       for (i = 0; sd->dacl && i < sd->dacl->num_aces; i++) {
+               se_map_generic(&sd->dacl->ace[i].info.mask,
+                              &printer_generic_mapping);
+       }
+}
+
+/****************************************************************************
+ 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.
+
+   PRINTER_ACCESS_ADMINISTER:
+       print_queue_pause, print_queue_resume, update_printer_sec,
+       update_printer, spoolss_addprinterex_level_2,
+       _spoolss_setprinterdata
+
+   PRINTER_ACCESS_USE:
+       print_job_start
+
+   JOB_ACCESS_ADMINISTER:
+       print_job_delete, print_job_pause, print_job_resume,
+       print_queue_purge
+
+  Try access control in the following order (for performance reasons):
+    1)  root ans SE_PRINT_OPERATOR can do anything (easy check) 
+    2)  check security descriptor (bit comparisons in memory)
+    3)  "printer admins" (may result in numerous calls to winbind)
+
+ ****************************************************************************/
+BOOL print_access_check(struct current_user *user, int snum, int access_type)
+{
+       SEC_DESC_BUF *secdesc = NULL;
+       uint32 access_granted;
+       NTSTATUS status;
+       BOOL result;
+       const char *pname;
+       TALLOC_CTX *mem_ctx = NULL;
+       SE_PRIV se_printop = SE_PRINT_OPERATOR;
+       
+       /* If user is NULL then use the current_user structure */
+
+       if (!user)
+               user = &current_user;
+
+       /* Always allow root or SE_PRINT_OPERATROR to do anything */
+
+       if ( user->uid == 0 || user_has_privileges(user->nt_user_token, &se_printop ) ) {
+               return True;
+       }
+
+       /* Get printer name */
+
+       pname = PRINTERNAME(snum);
+
+       if (!pname || !*pname) {
+               errno = EACCES;
+               return False;
+       }
+
+       /* Get printer security descriptor */
+
+       if(!(mem_ctx = talloc_init("print_access_check"))) {
+               errno = ENOMEM;
+               return False;
+       }
+
+       nt_printing_getsec(mem_ctx, pname, &secdesc);
+
+       if (access_type == JOB_ACCESS_ADMINISTER) {
+               SEC_DESC_BUF *parent_secdesc = secdesc;
+
+               /* Create a child security descriptor to check permissions
+                  against.  This is because print jobs are child objects
+                  objects of a printer. */
+
+               secdesc = se_create_child_secdesc(mem_ctx, parent_secdesc->sec, False);
+
+               /* Now this is the bit that really confuses me.  The access
+                  type needs to be changed from JOB_ACCESS_ADMINISTER to
+                  PRINTER_ACCESS_ADMINISTER for this to work.  Something
+                  to do with the child (job) object becoming like a
+                  printer??  -tpot */
+
+               access_type = PRINTER_ACCESS_ADMINISTER;
+       }
+       
+       /* Check access */
+       
+       map_printer_permissions(secdesc->sec);
+
+       result = se_access_check(secdesc->sec, user->nt_user_token, access_type,
+                                &access_granted, &status);
+
+       DEBUG(4, ("access check was %s\n", result ? "SUCCESS" : "FAILURE"));
+
+        /* see if we need to try the printer admin list */
+
+        if ( access_granted == 0 ) {
+                if ( user_in_list(uidtoname(user->uid), lp_printer_admin(snum), user->groups, user->ngroups) )
+                        return True;
+        }
+
+       talloc_destroy(mem_ctx);
+       
+       if (!result)
+               errno = EACCES;
+
+       return result;
+}
+
+/****************************************************************************
+ Check the time parameters allow a print operation.
+*****************************************************************************/
+
+BOOL print_time_access_check(int snum)
+{
+       NT_PRINTER_INFO_LEVEL *printer = NULL;
+       BOOL ok = False;
+       time_t now = time(NULL);
+       struct tm *t;
+       uint32 mins;
+
+       if (!W_ERROR_IS_OK(get_a_printer(NULL, &printer, 2, lp_servicename(snum))))
+               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);
+
+       if (!ok)
+               errno = EACCES;
+
+       return ok;
+}
+
+/****************************************************************************
+ Fill in the servername sent in the _spoolss_open_printer_ex() call
+****************************************************************************/
+
+char* get_server_name( Printer_entry *printer )
+{
+       return printer->servername;
+}
+
+