Fix syntax errors.
[ira/wip.git] / source4 / rpc_server / spoolss / dcesrv_spoolss.c
index e3f4279669be8072579aa18c14392948e772ae51..d041d79b3e4c8acdd4622373d2161382951450ad 100644 (file)
@@ -4,10 +4,11 @@
    endpoint server for the spoolss pipe
 
    Copyright (C) Tim Potter 2004
+   Copyright (C) Stefan Metzmacher 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
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
    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.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
+#include "rpc_server/dcerpc_server.h"
+#include "librpc/gen_ndr/ndr_spoolss.h"
 #include "rpc_server/common/common.h"
-#include "rpc_server/spoolss/dcesrv_spoolss.h"
-
-static WERROR spoolss_EnumPrinters1(TALLOC_CTX *mem_ctx, 
-                                   struct ldb_message **msgs, int num_msgs,
-                                   struct ndr_push *ndr)
-{
-       struct spoolss_PrinterInfo1 *info;
-       int i;
+#include "ntptr/ntptr.h"
+#include "lib/socket/socket.h"
+#include "smbd/service_stream.h"
+#include "librpc/gen_ndr/ndr_spoolss_c.h"
+#include "auth/credentials/credentials.h"
+#include "param/param.h"
+
+enum spoolss_handle {
+       SPOOLSS_NOTIFY
+};
+
+#define SPOOLSS_BUFFER_UNION(fn,ic,info,level) \
+       ((info)?ndr_size_##fn(info, level, ic, 0):0)
+
+#define SPOOLSS_BUFFER_UNION_ARRAY(fn,ic,info,level,count) \
+       ((info)?ndr_size_##fn##_info(dce_call, ic, level, count, info):0)
+
+#define SPOOLSS_BUFFER_OK(val_true,val_false) ((r->in.offered >= r->out.needed)?val_true:val_false)
+
+static WERROR dcesrv_spoolss_parse_printer_name(TALLOC_CTX *mem_ctx, const char *name,
+                                        const char **_server_name,
+                                        const char **_object_name,
+                                        enum ntptr_HandleType *_object_type)
+{
+       char *p;
+       char *server = NULL;
+       char *server_unc = NULL;
+       const char *object = name;
+
+       /* no printername is there it's like open server */
+       if (!name) {
+               *_server_name = NULL;
+               *_object_name = NULL;
+               *_object_type = NTPTR_HANDLE_SERVER;
+               return WERR_OK;
+       }
 
-       info = talloc(mem_ctx, num_msgs * sizeof(struct spoolss_PrinterInfo1));
+       /* just "\\" is invalid */
+       if (strequal("\\\\", name)) {
+               return WERR_INVALID_PRINTER_NAME;
+       }
 
-       if (!info)
-               return WERR_NOMEM;
+       if (strncmp("\\\\", name, 2) == 0) {
+               server_unc = talloc_strdup(mem_ctx, name);
+               W_ERROR_HAVE_NO_MEMORY(server_unc);
+               server = server_unc + 2;
+
+               /* here we know we have "\\" in front not followed
+                * by '\0', now see if we have another "\" in the string
+                */
+               p = strchr_m(server, '\\');
+               if (!p) {
+                       /* there's no other "\", so it's ("\\%s",server)
+                        */
+                       *_server_name = server_unc;
+                       *_object_name = NULL;
+                       *_object_type = NTPTR_HANDLE_SERVER;
+                       return WERR_OK;
+               }
+               /* here we know that we have ("\\%s\",server),
+                * if we have '\0' as next then it's an invalid name
+                * otherwise the printer_name
+                */
+               p[0] = '\0';
+               /* everything that follows is the printer name */
+               p++;
+               object = p;
+
+               /* just "" as server is invalid */
+               if (strequal(server, "")) {
+                       return WERR_INVALID_PRINTER_NAME;
+               }
+       }
 
-       for (i = 0; i < num_msgs; i++) {
-               info[i].flags = samdb_result_uint(msgs[i], "flags", 0);
-               info[i].name = samdb_result_string(msgs[i], "name", "");
-               info[i].description = samdb_result_string(msgs[i], "description", "");
-               info[i].comment = samdb_result_string(msgs[i], "comment", "");
+       /* just "" is invalid */
+       if (strequal(object, "")) {
+               return WERR_INVALID_PRINTER_NAME;
        }
 
-       ndr_push_array(ndr, NDR_SCALARS|NDR_BUFFERS, info,
-                      sizeof(struct spoolss_PrinterInfo1), num_msgs,
-                      (ndr_push_flags_fn_t)ndr_push_spoolss_PrinterInfo1);
+#define XCV_PORT ",XcvPort "
+#define XCV_MONITOR ",XcvMonitor "
+       if (strncmp(object, XCV_PORT, strlen(XCV_PORT)) == 0) {
+               object += strlen(XCV_PORT);
 
-       return WERR_OK;
-}
+               /* just "" is invalid */
+               if (strequal(object, "")) {
+                       return WERR_INVALID_PRINTER_NAME;
+               }
 
-static WERROR spoolss_EnumPrinters2(TALLOC_CTX *mem_ctx, 
-                                   struct ldb_message **msgs, int num_msgs,
-                                   struct ndr_push *ndr)
-{
-       struct spoolss_PrinterInfo2 *info;
-       int i;
+               *_server_name = server_unc;
+               *_object_name = object;
+               *_object_type = NTPTR_HANDLE_PORT;
+               return WERR_OK;
+       } else if (strncmp(object, XCV_MONITOR, strlen(XCV_MONITOR)) == 0) {
+               object += strlen(XCV_MONITOR);
 
-       info = talloc(mem_ctx, num_msgs * sizeof(struct spoolss_PrinterInfo1));
-
-       if (!info)
-               return WERR_NOMEM;
-
-       for (i = 0; i < num_msgs; i++) {
-               info[i].servername = samdb_result_string(msgs[i], "servername", "");
-               info[i].printername = samdb_result_string(msgs[i], "printername", "");
-               info[i].sharename = samdb_result_string(msgs[i], "sharename", "");
-               info[i].portname = samdb_result_string(msgs[i], "portname", "");
-               info[i].drivername = samdb_result_string(msgs[i], "drivername", "");
-               info[i].comment = samdb_result_string(msgs[i], "comment", "");
-               info[i].location = samdb_result_string(msgs[i], "location", "");
-               /* DEVICEMODE - eek! */
-               info[i].sepfile = samdb_result_string(msgs[i], "sepfile", "");
-               info[i].printprocessor = samdb_result_string(msgs[i], "printprocessor", "");
-               info[i].datatype = samdb_result_string(msgs[i], "datatype", "");
-               info[i].parameters = samdb_result_string(msgs[i], "parameters", "");
-               /* SECURITY_DESCRIPTOR */
-               info[i].attributes = samdb_result_uint(msgs[i], "attributes", 0);
-               info[i].priority = samdb_result_uint(msgs[i], "priority", 0);
-               info[i].defaultpriority = samdb_result_uint(msgs[i], "defaultpriority", 0);
-               info[i].starttime = samdb_result_uint(msgs[i], "starttime", 0);
-               info[i].untiltime = samdb_result_uint(msgs[i], "untiltime", 0);
-               info[i].status = samdb_result_uint(msgs[i], "status", 0);
-               info[i].cjobs = samdb_result_uint(msgs[i], "cjobs", 0);
-               info[i].averageppm = samdb_result_uint(msgs[i], "averageppm", 0);
-       }
+               /* just "" is invalid */
+               if (strequal(object, "")) {
+                       return WERR_INVALID_PRINTER_NAME;
+               }
 
-       ndr_push_array(ndr, NDR_SCALARS|NDR_BUFFERS, info,
-                      sizeof(struct spoolss_PrinterInfo2), num_msgs,
-                      (ndr_push_flags_fn_t)ndr_push_spoolss_PrinterInfo2);
+               *_server_name = server_unc;
+               *_object_name = object;
+               *_object_type = NTPTR_HANDLE_MONITOR;
+               return WERR_OK;
+       }
 
+       *_server_name = server_unc;
+       *_object_name = object;
+       *_object_type = NTPTR_HANDLE_PRINTER;
        return WERR_OK;
 }
 
-static WERROR spoolss_EnumPrinters5(TALLOC_CTX *mem_ctx, 
-                                   struct ldb_message **msgs, int num_msgs,
-                                   struct ndr_push *ndr)
-{
-       struct spoolss_PrinterInfo5 *info;
+/*
+ * Check server_name is:
+ * -  "" , functions that don't allow "",
+ *         should check that on their own, before calling this function
+ * -  our name (only netbios yet, TODO: need to test dns name!)
+ * -  our ip address of the current use socket
+ * otherwise return WERR_INVALID_PRINTER_NAME
+ */
+static WERROR dcesrv_spoolss_check_server_name(struct dcesrv_call_state *dce_call, 
+                                       TALLOC_CTX *mem_ctx,
+                                       const char *server_name)
+{
+       bool ret;
+       struct socket_address *myaddr;
+       const char **aliases;
        int i;
 
-       info = talloc(mem_ctx, num_msgs * sizeof(struct spoolss_PrinterInfo1));
+       /* NULL is ok */
+       if (!server_name) return WERR_OK;
 
-       if (!info)
-               return WERR_NOMEM;
+       /* "" is ok */
+       ret = strequal("",server_name);
+       if (ret) return WERR_OK;
 
-       for (i = 0; i < num_msgs; i++) {
-               info[i].printername = samdb_result_string(msgs[i], "name", "");
-               info[i].portname = samdb_result_string(msgs[i], "port", "");
-               info[i].attributes = samdb_result_uint(msgs[i], "attributes", 0);
-               info[i].device_not_selected_timeout = samdb_result_uint(msgs[i], "device_not_selected_timeout", 0);
-               info[i].transmission_retry_timeout = samdb_result_uint(msgs[i], "transmission_retry_timeout", 0);
+       /* just "\\" is invalid */
+       if (strequal("\\\\", server_name)) {
+               return WERR_INVALID_PRINTER_NAME;
        }
 
-       ndr_push_array(ndr, NDR_SCALARS|NDR_BUFFERS, info,
-                      sizeof(struct spoolss_PrinterInfo5), num_msgs,
-                      (ndr_push_flags_fn_t)ndr_push_spoolss_PrinterInfo5);
+       /* then we need "\\" */
+       if (strncmp("\\\\", server_name, 2) != 0) {
+               return WERR_INVALID_PRINTER_NAME;
+       }
 
-       return WERR_OK;
-}
+       server_name += 2;
 
-/* 
-  spoolss_EnumPrinters 
-*/
-static WERROR spoolss_EnumPrinters(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
-                      struct spoolss_EnumPrinters *r)
-{
-       struct ndr_push *ndr;
-       void *spoolss_ctx;
-       WERROR result;
-       struct ldb_message **msgs;
-       int ret;
+       /* NETBIOS NAME is ok */
+       ret = strequal(lp_netbios_name(dce_call->conn->dce_ctx->lp_ctx), server_name);
+       if (ret) return WERR_OK;
 
-       spoolss_ctx = spoolssdb_connect();
-       if (spoolss_ctx == NULL)
-               return WERR_NOMEM;
+       aliases = lp_netbios_aliases(dce_call->conn->dce_ctx->lp_ctx);
 
-       ret = spoolssdb_search(spoolss_ctx, mem_ctx, NULL, &msgs, NULL,
-                              "(&(objectclass=printer))");
-       
-       ndr = ndr_push_init();
-
-       r->out.count = 0;
-       *r->out.buf_size = 0;
-
-       switch(r->in.level) {
-       case 1:
-               result = spoolss_EnumPrinters1(mem_ctx, msgs, ret, ndr);
-               break;
-       case 2:
-               result = spoolss_EnumPrinters2(mem_ctx, msgs, ret, ndr);
-               break;
-       case 5:
-               result = spoolss_EnumPrinters5(mem_ctx, msgs, ret, ndr);
-               break;
-       default:
-               r->out.buffer = NULL;
-               result = WERR_UNKNOWN_LEVEL;
-               goto done;
+       for (i=0; aliases && aliases[i]; i++) {
+               if (strequal(aliases[i], server_name)) {
+                       return WERR_OK;
+               }
        }
 
-       if (*r->in.buf_size < ndr->offset) {
-               *r->out.buf_size = ndr->offset;
-               result = WERR_INSUFFICIENT_BUFFER;
-               goto done;
-       }
+       /* DNS NAME is ok
+        * TODO: we need to check if aliases are also ok
+        */
+       if (lp_realm(dce_call->conn->dce_ctx->lp_ctx)) {
+               char *str;
 
-       r->out.buffer = (DATA_BLOB *)talloc(mem_ctx, sizeof(DATA_BLOB));
+               str = talloc_asprintf(mem_ctx, "%s.%s",
+                                               lp_netbios_name(dce_call->conn->dce_ctx->lp_ctx),
+                                               lp_realm(dce_call->conn->dce_ctx->lp_ctx));
+               W_ERROR_HAVE_NO_MEMORY(str);
 
-       if (!r->out.buffer) {
-               result = WERR_NOMEM;
-               goto done;
+               ret = strequal(str, server_name);
+               talloc_free(str);
+               if (ret) return WERR_OK;
        }
 
-       *r->out.buffer = data_blob_talloc(mem_ctx, ndr->data, ndr->offset);
-       *r->out.buf_size = ndr->offset;
+       myaddr = dcesrv_connection_get_my_addr(dce_call->conn, mem_ctx);
+       W_ERROR_HAVE_NO_MEMORY(myaddr);
 
- done:
-       ndr_push_free(ndr);
-       spoolssdb_close(spoolss_ctx);
+       ret = strequal(myaddr->addr, server_name);
+       talloc_free(myaddr);
+       if (ret) return WERR_OK;
 
-       return result;
+       return WERR_INVALID_PRINTER_NAME;
 }
 
-
-/*
-  destroy connection state
-*/
-static void spoolss_OpenPrinter_close(struct spoolss_openprinter_state *c_state)
+static NTSTATUS dcerpc_spoolss_bind(struct dcesrv_call_state *dce_call, const struct dcesrv_interface *iface)
 {
-       c_state->reference_count--;
-       if (c_state->reference_count == 0) {
-               talloc_destroy(c_state->mem_ctx);
-       }
+       NTSTATUS status;
+       struct ntptr_context *ntptr;
+
+       status = ntptr_init_context(dce_call->context, dce_call->conn->event_ctx, dce_call->conn->dce_ctx->lp_ctx,
+                                   lp_ntptr_providor(dce_call->conn->dce_ctx->lp_ctx), &ntptr);
+       NT_STATUS_NOT_OK_RETURN(status);
+
+       dce_call->context->private = ntptr;
+
+       return NT_STATUS_OK;
 }
 
-/*
-  destroy an open connection. This closes the database connection
+#define DCESRV_INTERFACE_SPOOLSS_BIND dcerpc_spoolss_bind
+
+/* 
+  spoolss_EnumPrinters 
 */
-static void spoolss_OpenPrinter_destroy(struct dcesrv_connection *conn, struct dcesrv_handle *h)
+static WERROR dcesrv_spoolss_EnumPrinters(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+                      struct spoolss_EnumPrinters *r)
 {
-       struct spoolss_openprinter_state *c_state = h->data;
-       spoolss_OpenPrinter_close(c_state);
+       struct ntptr_context *ntptr = talloc_get_type(dce_call->context->private, struct ntptr_context);
+       WERROR status;
+       struct smb_iconv_convenience *ic = lp_iconv_convenience(ntptr->lp_ctx);
+
+       status = dcesrv_spoolss_check_server_name(dce_call, mem_ctx, r->in.server);
+       W_ERROR_NOT_OK_RETURN(status);
+
+       status = ntptr_EnumPrinters(ntptr, mem_ctx, r);
+       W_ERROR_NOT_OK_RETURN(status);
+
+       r->out.needed   = SPOOLSS_BUFFER_UNION_ARRAY(spoolss_EnumPrinters, ic, r->out.info, r->in.level, r->out.count);
+       r->out.info     = SPOOLSS_BUFFER_OK(r->out.info, NULL);
+       r->out.count    = SPOOLSS_BUFFER_OK(r->out.count, 0);
+       return SPOOLSS_BUFFER_OK(WERR_OK, WERR_INSUFFICIENT_BUFFER);
 }
 
+static WERROR dcesrv_spoolss_OpenPrinterEx(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+                      struct spoolss_OpenPrinterEx *r);
 /* 
   spoolss_OpenPrinter 
 */
-static WERROR spoolss_OpenPrinter(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_OpenPrinter(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_OpenPrinter *r)
 {
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+       WERROR status;
+       struct spoolss_OpenPrinterEx *r2;
+
+       r2 = talloc(mem_ctx, struct spoolss_OpenPrinterEx);
+       W_ERROR_HAVE_NO_MEMORY(r2);
+
+       r2->in.printername      = r->in.printername;
+       r2->in.datatype         = r->in.datatype;
+       r2->in.devmode_ctr      = r->in.devmode_ctr;
+       r2->in.access_mask      = r->in.access_mask;
+       r2->in.level            = 1;
+       r2->in.userlevel.level1 = NULL;
+
+       r2->out.handle          = r->out.handle;
+
+       /* TODO: we should take care about async replies here,
+                if spoolss_OpenPrinterEx() would be async!
+        */
+       status = dcesrv_spoolss_OpenPrinterEx(dce_call, mem_ctx, r2);
+
+       r->out.handle           = r2->out.handle;
+
+       return status;
 }
 
 
 /* 
   spoolss_SetJob 
 */
-static WERROR spoolss_SetJob(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_SetJob(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_SetJob *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -227,7 +296,7 @@ static WERROR spoolss_SetJob(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem
 /* 
   spoolss_GetJob 
 */
-static WERROR spoolss_GetJob(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_GetJob(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_GetJob *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -237,17 +306,17 @@ static WERROR spoolss_GetJob(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem
 /* 
   spoolss_EnumJobs 
 */
-static WERROR spoolss_EnumJobs(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_EnumJobs(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_EnumJobs *r)
 {
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+       return WERR_OK;
 }
 
 
 /* 
   spoolss_AddPrinter 
 */
-static WERROR spoolss_AddPrinter(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_AddPrinter(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_AddPrinter *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -257,7 +326,7 @@ static WERROR spoolss_AddPrinter(struct dcesrv_call_state *dce_call, TALLOC_CTX
 /* 
   spoolss_DeletePrinter 
 */
-static WERROR spoolss_DeletePrinter(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_DeletePrinter(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_DeletePrinter *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -267,7 +336,7 @@ static WERROR spoolss_DeletePrinter(struct dcesrv_call_state *dce_call, TALLOC_C
 /* 
   spoolss_SetPrinter 
 */
-static WERROR spoolss_SetPrinter(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_SetPrinter(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_SetPrinter *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -277,7 +346,7 @@ static WERROR spoolss_SetPrinter(struct dcesrv_call_state *dce_call, TALLOC_CTX
 /* 
   spoolss_GetPrinter 
 */
-static WERROR spoolss_GetPrinter(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_GetPrinter(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_GetPrinter *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -287,7 +356,7 @@ static WERROR spoolss_GetPrinter(struct dcesrv_call_state *dce_call, TALLOC_CTX
 /* 
   spoolss_AddPrinterDriver 
 */
-static WERROR spoolss_AddPrinterDriver(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_AddPrinterDriver(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_AddPrinterDriver *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -297,17 +366,30 @@ static WERROR spoolss_AddPrinterDriver(struct dcesrv_call_state *dce_call, TALLO
 /* 
   spoolss_EnumPrinterDrivers 
 */
-static WERROR spoolss_EnumPrinterDrivers(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_EnumPrinterDrivers(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_EnumPrinterDrivers *r)
 {
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+       struct ntptr_context *ntptr = talloc_get_type(dce_call->context->private, struct ntptr_context);
+       WERROR status;
+       struct smb_iconv_convenience *ic = lp_iconv_convenience(ntptr->lp_ctx);
+
+       status = dcesrv_spoolss_check_server_name(dce_call, mem_ctx, r->in.server);
+       W_ERROR_NOT_OK_RETURN(status);
+
+       status = ntptr_EnumPrinterDrivers(ntptr, mem_ctx, r);
+       W_ERROR_NOT_OK_RETURN(status);
+
+       r->out.needed   = SPOOLSS_BUFFER_UNION_ARRAY(spoolss_EnumPrinterDrivers, ic, r->out.info, r->in.level, r->out.count);
+       r->out.info     = SPOOLSS_BUFFER_OK(r->out.info, NULL);
+       r->out.count    = SPOOLSS_BUFFER_OK(r->out.count, 0);
+       return SPOOLSS_BUFFER_OK(WERR_OK, WERR_INSUFFICIENT_BUFFER);
 }
 
 
 /* 
   spoolss_GetPrinterDriver 
 */
-static WERROR spoolss_GetPrinterDriver(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_GetPrinterDriver(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_GetPrinterDriver *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -317,17 +399,29 @@ static WERROR spoolss_GetPrinterDriver(struct dcesrv_call_state *dce_call, TALLO
 /* 
   spoolss_GetPrinterDriverDirectory 
 */
-static WERROR spoolss_GetPrinterDriverDirectory(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_GetPrinterDriverDirectory(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_GetPrinterDriverDirectory *r)
 {
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+       struct ntptr_context *ntptr = talloc_get_type(dce_call->context->private, struct ntptr_context);
+       WERROR status;
+       struct smb_iconv_convenience *ic = lp_iconv_convenience(ntptr->lp_ctx);
+
+       status = dcesrv_spoolss_check_server_name(dce_call, mem_ctx, r->in.server);
+       W_ERROR_NOT_OK_RETURN(status);
+
+       status = ntptr_GetPrinterDriverDirectory(ntptr, mem_ctx, r);
+       W_ERROR_NOT_OK_RETURN(status);
+
+       r->out.needed   = SPOOLSS_BUFFER_UNION(spoolss_DriverDirectoryInfo, ic, r->out.info, r->in.level);
+       r->out.info     = SPOOLSS_BUFFER_OK(r->out.info, NULL);
+       return SPOOLSS_BUFFER_OK(WERR_OK, WERR_INSUFFICIENT_BUFFER);
 }
 
 
 /* 
   spoolss_DeletePrinterDriver 
 */
-static WERROR spoolss_DeletePrinterDriver(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_DeletePrinterDriver(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_DeletePrinterDriver *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -337,7 +431,7 @@ static WERROR spoolss_DeletePrinterDriver(struct dcesrv_call_state *dce_call, TA
 /* 
   spoolss_AddPrintProcessor 
 */
-static WERROR spoolss_AddPrintProcessor(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_AddPrintProcessor(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_AddPrintProcessor *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -347,17 +441,17 @@ static WERROR spoolss_AddPrintProcessor(struct dcesrv_call_state *dce_call, TALL
 /* 
   spoolss_EnumPrintProcessors 
 */
-static WERROR spoolss_EnumPrintProcessors(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_EnumPrintProcessors(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_EnumPrintProcessors *r)
 {
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+       return WERR_OK;
 }
 
 
 /* 
   spoolss_GetPrintProcessorDirectory 
 */
-static WERROR spoolss_GetPrintProcessorDirectory(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_GetPrintProcessorDirectory(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_GetPrintProcessorDirectory *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -367,7 +461,7 @@ static WERROR spoolss_GetPrintProcessorDirectory(struct dcesrv_call_state *dce_c
 /* 
   spoolss_StartDocPrinter 
 */
-static WERROR spoolss_StartDocPrinter(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_StartDocPrinter(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_StartDocPrinter *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -377,7 +471,7 @@ static WERROR spoolss_StartDocPrinter(struct dcesrv_call_state *dce_call, TALLOC
 /* 
   spoolss_StartPagePrinter 
 */
-static WERROR spoolss_StartPagePrinter(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_StartPagePrinter(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_StartPagePrinter *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -387,7 +481,7 @@ static WERROR spoolss_StartPagePrinter(struct dcesrv_call_state *dce_call, TALLO
 /* 
   spoolss_WritePrinter 
 */
-static WERROR spoolss_WritePrinter(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_WritePrinter(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_WritePrinter *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -397,7 +491,7 @@ static WERROR spoolss_WritePrinter(struct dcesrv_call_state *dce_call, TALLOC_CT
 /* 
   spoolss_EndPagePrinter 
 */
-static WERROR spoolss_EndPagePrinter(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_EndPagePrinter(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_EndPagePrinter *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -407,7 +501,7 @@ static WERROR spoolss_EndPagePrinter(struct dcesrv_call_state *dce_call, TALLOC_
 /* 
   spoolss_AbortPrinter 
 */
-static WERROR spoolss_AbortPrinter(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_AbortPrinter(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_AbortPrinter *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -417,7 +511,7 @@ static WERROR spoolss_AbortPrinter(struct dcesrv_call_state *dce_call, TALLOC_CT
 /* 
   spoolss_ReadPrinter 
 */
-static WERROR spoolss_ReadPrinter(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_ReadPrinter(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_ReadPrinter *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -427,7 +521,7 @@ static WERROR spoolss_ReadPrinter(struct dcesrv_call_state *dce_call, TALLOC_CTX
 /* 
   spoolss_EndDocPrinter 
 */
-static WERROR spoolss_EndDocPrinter(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_EndDocPrinter(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_EndDocPrinter *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -437,7 +531,7 @@ static WERROR spoolss_EndDocPrinter(struct dcesrv_call_state *dce_call, TALLOC_C
 /* 
   spoolss_AddJob 
 */
-static WERROR spoolss_AddJob(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_AddJob(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_AddJob *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -447,7 +541,7 @@ static WERROR spoolss_AddJob(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem
 /* 
   spoolss_ScheduleJob 
 */
-static WERROR spoolss_ScheduleJob(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_ScheduleJob(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_ScheduleJob *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -457,17 +551,41 @@ static WERROR spoolss_ScheduleJob(struct dcesrv_call_state *dce_call, TALLOC_CTX
 /* 
   spoolss_GetPrinterData 
 */
-static WERROR spoolss_GetPrinterData(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_GetPrinterData(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_GetPrinterData *r)
 {
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+       struct ntptr_GenericHandle *handle;
+       struct dcesrv_handle *h;
+       WERROR status;
+       struct smb_iconv_convenience *ic = lp_iconv_convenience(dce_call->conn->dce_ctx->lp_ctx);
+
+       DCESRV_PULL_HANDLE_WERR(h, r->in.handle, DCESRV_HANDLE_ANY);
+       handle = talloc_get_type(h->data, struct ntptr_GenericHandle);
+       if (!handle)
+               return WERR_BADFID;
+
+       switch (handle->type) {
+               case NTPTR_HANDLE_SERVER:
+                       status = ntptr_GetPrintServerData(handle, mem_ctx, r);
+                       break;
+               default:
+                       status = WERR_FOOBAR;
+                       break;
+       }
+
+       W_ERROR_NOT_OK_RETURN(status);
+
+       r->out.needed   = ndr_size_spoolss_PrinterData(&r->out.data, r->out.type, ic, 0);
+       r->out.type     = SPOOLSS_BUFFER_OK(r->out.type, SPOOLSS_PRINTER_DATA_TYPE_NULL);
+       r->out.data     = SPOOLSS_BUFFER_OK(r->out.data, r->out.data);
+       return SPOOLSS_BUFFER_OK(WERR_OK, WERR_MORE_DATA);
 }
 
 
 /* 
   spoolss_SetPrinterData 
 */
-static WERROR spoolss_SetPrinterData(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_SetPrinterData(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_SetPrinterData *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -477,7 +595,7 @@ static WERROR spoolss_SetPrinterData(struct dcesrv_call_state *dce_call, TALLOC_
 /* 
   spoolss_WaitForPrinterChange 
 */
-static WERROR spoolss_WaitForPrinterChange(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_WaitForPrinterChange(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_WaitForPrinterChange *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -487,7 +605,7 @@ static WERROR spoolss_WaitForPrinterChange(struct dcesrv_call_state *dce_call, T
 /* 
   spoolss_ClosePrinter 
 */
-static WERROR spoolss_ClosePrinter(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_ClosePrinter(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_ClosePrinter *r)
 {
        struct dcesrv_handle *h;
@@ -496,10 +614,7 @@ static WERROR spoolss_ClosePrinter(struct dcesrv_call_state *dce_call, TALLOC_CT
 
        DCESRV_PULL_HANDLE_WERR(h, r->in.handle, DCESRV_HANDLE_ANY);
 
-       /* this causes the callback s_XXX_destroy() to be called by
-          the handle destroy code which destroys the state associated
-          with the handle */
-       dcesrv_handle_destroy(dce_call->conn, h);
+       talloc_free(h);
 
        ZERO_STRUCTP(r->out.handle);
 
@@ -510,87 +625,231 @@ static WERROR spoolss_ClosePrinter(struct dcesrv_call_state *dce_call, TALLOC_CT
 /* 
   spoolss_AddForm 
 */
-static WERROR spoolss_AddForm(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_AddForm(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_AddForm *r)
 {
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+       struct ntptr_GenericHandle *handle;
+       struct dcesrv_handle *h;
+       WERROR status;
+
+       DCESRV_PULL_HANDLE_WERR(h, r->in.handle, DCESRV_HANDLE_ANY);
+       handle = talloc_get_type(h->data, struct ntptr_GenericHandle);
+       if (!handle)
+               return WERR_BADFID;
+
+       switch (handle->type) {
+               case NTPTR_HANDLE_SERVER:
+                       status = ntptr_AddPrintServerForm(handle, mem_ctx, r);
+                       W_ERROR_NOT_OK_RETURN(status);
+                       break;
+               case NTPTR_HANDLE_PRINTER:
+                       status = ntptr_AddPrinterForm(handle, mem_ctx, r);
+                       W_ERROR_NOT_OK_RETURN(status);
+                       break;
+               default:
+                       return WERR_FOOBAR;
+       }
+
+       return WERR_OK;
 }
 
 
 /* 
   spoolss_DeleteForm 
 */
-static WERROR spoolss_DeleteForm(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_DeleteForm(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_DeleteForm *r)
 {
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+       struct ntptr_GenericHandle *handle;
+       struct dcesrv_handle *h;
+       WERROR status;
+
+       DCESRV_PULL_HANDLE_WERR(h, r->in.handle, DCESRV_HANDLE_ANY);
+       handle = talloc_get_type(h->data, struct ntptr_GenericHandle);
+       if (!handle)
+               return WERR_BADFID;
+
+       switch (handle->type) {
+               case NTPTR_HANDLE_SERVER:
+                       status = ntptr_DeletePrintServerForm(handle, mem_ctx, r);
+                       W_ERROR_NOT_OK_RETURN(status);
+                       break;
+               case NTPTR_HANDLE_PRINTER:
+                       status = ntptr_DeletePrinterForm(handle, mem_ctx, r);
+                       W_ERROR_NOT_OK_RETURN(status);
+                       break;
+               default:
+                       return WERR_FOOBAR;
+       }
+
+       return WERR_OK;
 }
 
 
 /* 
   spoolss_GetForm 
 */
-static WERROR spoolss_GetForm(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_GetForm(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_GetForm *r)
 {
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+       struct ntptr_GenericHandle *handle;
+       struct dcesrv_handle *h;
+       WERROR status;
+       struct smb_iconv_convenience *ic = lp_iconv_convenience(dce_call->conn->dce_ctx->lp_ctx);
+
+       DCESRV_PULL_HANDLE_WERR(h, r->in.handle, DCESRV_HANDLE_ANY);
+       handle = talloc_get_type(h->data, struct ntptr_GenericHandle);
+       if (!handle)
+               return WERR_BADFID;
+
+       switch (handle->type) {
+               case NTPTR_HANDLE_SERVER:
+                       /*
+                        * stupid, but w2k3 returns WERR_BADFID here?
+                        */
+                       return WERR_BADFID;
+               case NTPTR_HANDLE_PRINTER:
+                       status = ntptr_GetPrinterForm(handle, mem_ctx, r);
+                       W_ERROR_NOT_OK_RETURN(status);
+                       break;
+               default:
+                       return WERR_FOOBAR;
+       }
+
+       r->out.needed   = SPOOLSS_BUFFER_UNION(spoolss_FormInfo, ic, r->out.info, r->in.level);
+       r->out.info     = SPOOLSS_BUFFER_OK(r->out.info, NULL);
+       return SPOOLSS_BUFFER_OK(WERR_OK, WERR_INSUFFICIENT_BUFFER);
 }
 
 
 /* 
   spoolss_SetForm 
 */
-static WERROR spoolss_SetForm(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_SetForm(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_SetForm *r)
 {
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+       struct ntptr_GenericHandle *handle;
+       struct dcesrv_handle *h;
+       WERROR status;
+
+       DCESRV_PULL_HANDLE_WERR(h, r->in.handle, DCESRV_HANDLE_ANY);
+       handle = talloc_get_type(h->data, struct ntptr_GenericHandle);
+       if (!handle)
+               return WERR_BADFID;
+
+       switch (handle->type) {
+               case NTPTR_HANDLE_SERVER:
+                       status = ntptr_SetPrintServerForm(handle, mem_ctx, r);
+                       W_ERROR_NOT_OK_RETURN(status);
+                       break;
+               case NTPTR_HANDLE_PRINTER:
+                       status = ntptr_SetPrinterForm(handle, mem_ctx, r);
+                       W_ERROR_NOT_OK_RETURN(status);
+                       break;
+               default:
+                       return WERR_FOOBAR;
+       }
+
+       return WERR_OK;
 }
 
 
 /* 
   spoolss_EnumForms 
 */
-static WERROR spoolss_EnumForms(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_EnumForms(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_EnumForms *r)
 {
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+       struct ntptr_GenericHandle *handle;
+       struct dcesrv_handle *h;
+       WERROR status;
+       struct smb_iconv_convenience *ic = lp_iconv_convenience(dce_call->conn->dce_ctx->lp_ctx);
+
+       DCESRV_PULL_HANDLE_WERR(h, r->in.handle, DCESRV_HANDLE_ANY);
+       handle = talloc_get_type(h->data, struct ntptr_GenericHandle);
+       if (!handle)
+               return WERR_BADFID;
+
+       switch (handle->type) {
+               case NTPTR_HANDLE_SERVER:
+                       status = ntptr_EnumPrintServerForms(handle, mem_ctx, r);
+                       W_ERROR_NOT_OK_RETURN(status);
+                       break;
+               case NTPTR_HANDLE_PRINTER:
+                       status = ntptr_EnumPrinterForms(handle, mem_ctx, r);
+                       W_ERROR_NOT_OK_RETURN(status);
+                       break;
+               default:
+                       return WERR_FOOBAR;
+       }
+
+       r->out.needed   = SPOOLSS_BUFFER_UNION_ARRAY(spoolss_EnumForms, ic, r->out.info, r->in.level, r->out.count);
+       r->out.info     = SPOOLSS_BUFFER_OK(r->out.info, NULL);
+       r->out.count    = SPOOLSS_BUFFER_OK(r->out.count, 0);
+       return SPOOLSS_BUFFER_OK(WERR_OK, WERR_INSUFFICIENT_BUFFER);
 }
 
 
 /* 
   spoolss_EnumPorts 
 */
-static WERROR spoolss_EnumPorts(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_EnumPorts(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_EnumPorts *r)
 {
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+       struct ntptr_context *ntptr = talloc_get_type(dce_call->context->private, struct ntptr_context);
+       WERROR status;
+       struct smb_iconv_convenience *ic = lp_iconv_convenience(ntptr->lp_ctx);
+
+       status = dcesrv_spoolss_check_server_name(dce_call, mem_ctx, r->in.servername);
+       W_ERROR_NOT_OK_RETURN(status);
+
+       status = ntptr_EnumPorts(ntptr, mem_ctx, r);
+       W_ERROR_NOT_OK_RETURN(status);
+
+       r->out.needed   = SPOOLSS_BUFFER_UNION_ARRAY(spoolss_EnumPorts, ic, r->out.info, r->in.level, r->out.count);
+       r->out.info     = SPOOLSS_BUFFER_OK(r->out.info, NULL);
+       r->out.count    = SPOOLSS_BUFFER_OK(r->out.count, 0);
+       return SPOOLSS_BUFFER_OK(WERR_OK, WERR_INSUFFICIENT_BUFFER);
 }
 
 
 /* 
   spoolss_EnumMonitors 
 */
-static WERROR spoolss_EnumMonitors(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_EnumMonitors(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_EnumMonitors *r)
 {
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+       struct ntptr_context *ntptr = talloc_get_type(dce_call->context->private, struct ntptr_context);
+       WERROR status;
+       struct smb_iconv_convenience *ic = lp_iconv_convenience(ntptr->lp_ctx);
+
+       status = dcesrv_spoolss_check_server_name(dce_call, mem_ctx, r->in.servername);
+       W_ERROR_NOT_OK_RETURN(status);
+
+       status = ntptr_EnumMonitors(ntptr, mem_ctx, r);
+       W_ERROR_NOT_OK_RETURN(status);
+
+       r->out.needed   = SPOOLSS_BUFFER_UNION_ARRAY(spoolss_EnumMonitors, ic, r->out.info, r->in.level, r->out.count);
+       r->out.info     = SPOOLSS_BUFFER_OK(r->out.info, NULL);
+       r->out.count    = SPOOLSS_BUFFER_OK(r->out.count, 0);
+       return SPOOLSS_BUFFER_OK(WERR_OK, WERR_INSUFFICIENT_BUFFER);
 }
 
 
 /* 
   spoolss_AddPort 
 */
-static WERROR spoolss_AddPort(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_AddPort(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_AddPort *r)
 {
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+       return WERR_NOT_SUPPORTED;
 }
 
 
 /* 
   spoolss_ConfigurePort 
 */
-static WERROR spoolss_ConfigurePort(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_ConfigurePort(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_ConfigurePort *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -600,7 +859,7 @@ static WERROR spoolss_ConfigurePort(struct dcesrv_call_state *dce_call, TALLOC_C
 /* 
   spoolss_DeletePort 
 */
-static WERROR spoolss_DeletePort(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_DeletePort(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_DeletePort *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -610,7 +869,7 @@ static WERROR spoolss_DeletePort(struct dcesrv_call_state *dce_call, TALLOC_CTX
 /* 
   spoolss_CreatePrinterIC 
 */
-static WERROR spoolss_CreatePrinterIC(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_CreatePrinterIC(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_CreatePrinterIC *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -620,7 +879,7 @@ static WERROR spoolss_CreatePrinterIC(struct dcesrv_call_state *dce_call, TALLOC
 /* 
   spoolss_PlayGDIScriptOnPrinterIC 
 */
-static WERROR spoolss_PlayGDIScriptOnPrinterIC(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_PlayGDIScriptOnPrinterIC(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_PlayGDIScriptOnPrinterIC *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -630,7 +889,7 @@ static WERROR spoolss_PlayGDIScriptOnPrinterIC(struct dcesrv_call_state *dce_cal
 /* 
   spoolss_DeletePrinterIC 
 */
-static WERROR spoolss_DeletePrinterIC(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_DeletePrinterIC(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_DeletePrinterIC *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -640,7 +899,7 @@ static WERROR spoolss_DeletePrinterIC(struct dcesrv_call_state *dce_call, TALLOC
 /* 
   spoolss_AddPrinterConnection 
 */
-static WERROR spoolss_AddPrinterConnection(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_AddPrinterConnection(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_AddPrinterConnection *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -650,7 +909,7 @@ static WERROR spoolss_AddPrinterConnection(struct dcesrv_call_state *dce_call, T
 /* 
   spoolss_DeletePrinterConnection 
 */
-static WERROR spoolss_DeletePrinterConnection(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_DeletePrinterConnection(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_DeletePrinterConnection *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -660,7 +919,7 @@ static WERROR spoolss_DeletePrinterConnection(struct dcesrv_call_state *dce_call
 /* 
   spoolss_PrinterMessageBox 
 */
-static WERROR spoolss_PrinterMessageBox(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_PrinterMessageBox(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_PrinterMessageBox *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -670,7 +929,7 @@ static WERROR spoolss_PrinterMessageBox(struct dcesrv_call_state *dce_call, TALL
 /* 
   spoolss_AddMonitor 
 */
-static WERROR spoolss_AddMonitor(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_AddMonitor(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_AddMonitor *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -680,7 +939,7 @@ static WERROR spoolss_AddMonitor(struct dcesrv_call_state *dce_call, TALLOC_CTX
 /* 
   spoolss_DeleteMonitor 
 */
-static WERROR spoolss_DeleteMonitor(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_DeleteMonitor(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_DeleteMonitor *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -690,7 +949,7 @@ static WERROR spoolss_DeleteMonitor(struct dcesrv_call_state *dce_call, TALLOC_C
 /* 
   spoolss_DeletePrintProcessor 
 */
-static WERROR spoolss_DeletePrintProcessor(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_DeletePrintProcessor(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_DeletePrintProcessor *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -700,7 +959,7 @@ static WERROR spoolss_DeletePrintProcessor(struct dcesrv_call_state *dce_call, T
 /* 
   spoolss_AddPrintProvidor 
 */
-static WERROR spoolss_AddPrintProvidor(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_AddPrintProvidor(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_AddPrintProvidor *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -710,7 +969,7 @@ static WERROR spoolss_AddPrintProvidor(struct dcesrv_call_state *dce_call, TALLO
 /* 
   spoolss_DeletePrintProvidor 
 */
-static WERROR spoolss_DeletePrintProvidor(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_DeletePrintProvidor(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_DeletePrintProvidor *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -720,7 +979,7 @@ static WERROR spoolss_DeletePrintProvidor(struct dcesrv_call_state *dce_call, TA
 /* 
   spoolss_EnumPrintProcDataTypes 
 */
-static WERROR spoolss_EnumPrintProcDataTypes(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_EnumPrintProcDataTypes(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_EnumPrintProcDataTypes *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -730,7 +989,7 @@ static WERROR spoolss_EnumPrintProcDataTypes(struct dcesrv_call_state *dce_call,
 /* 
   spoolss_ResetPrinter 
 */
-static WERROR spoolss_ResetPrinter(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_ResetPrinter(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_ResetPrinter *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -740,7 +999,7 @@ static WERROR spoolss_ResetPrinter(struct dcesrv_call_state *dce_call, TALLOC_CT
 /* 
   spoolss_GetPrinterDriver2 
 */
-static WERROR spoolss_GetPrinterDriver2(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_GetPrinterDriver2(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_GetPrinterDriver2 *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -750,7 +1009,7 @@ static WERROR spoolss_GetPrinterDriver2(struct dcesrv_call_state *dce_call, TALL
 /* 
   spoolss_FindFirstPrinterChangeNotification 
 */
-static WERROR spoolss_FindFirstPrinterChangeNotification(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_FindFirstPrinterChangeNotification(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_FindFirstPrinterChangeNotification *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -760,7 +1019,7 @@ static WERROR spoolss_FindFirstPrinterChangeNotification(struct dcesrv_call_stat
 /* 
   spoolss_FindNextPrinterChangeNotification 
 */
-static WERROR spoolss_FindNextPrinterChangeNotification(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_FindNextPrinterChangeNotification(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_FindNextPrinterChangeNotification *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -770,7 +1029,7 @@ static WERROR spoolss_FindNextPrinterChangeNotification(struct dcesrv_call_state
 /* 
   spoolss_FindClosePrinterNotify 
 */
-static WERROR spoolss_FindClosePrinterNotify(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_FindClosePrinterNotify(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_FindClosePrinterNotify *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -780,7 +1039,7 @@ static WERROR spoolss_FindClosePrinterNotify(struct dcesrv_call_state *dce_call,
 /* 
   spoolss_RouterFindFirstPrinterChangeNotificationOld 
 */
-static WERROR spoolss_RouterFindFirstPrinterChangeNotificationOld(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_RouterFindFirstPrinterChangeNotificationOld(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_RouterFindFirstPrinterChangeNotificationOld *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -790,17 +1049,26 @@ static WERROR spoolss_RouterFindFirstPrinterChangeNotificationOld(struct dcesrv_
 /* 
   spoolss_ReplyOpenPrinter 
 */
-static WERROR spoolss_ReplyOpenPrinter(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_ReplyOpenPrinter(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_ReplyOpenPrinter *r)
 {
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+       struct dcesrv_handle *handle;
+
+       handle = dcesrv_handle_new(dce_call->context, SPOOLSS_NOTIFY);
+       W_ERROR_HAVE_NO_MEMORY(handle);
+
+       /* For now, just return a handle */
+
+       *r->out.handle = handle->wire_handle;
+
+       return WERR_OK;
 }
 
 
 /* 
   spoolss_RouterReplyPrinter 
 */
-static WERROR spoolss_RouterReplyPrinter(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_RouterReplyPrinter(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_RouterReplyPrinter *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -810,17 +1078,24 @@ static WERROR spoolss_RouterReplyPrinter(struct dcesrv_call_state *dce_call, TAL
 /* 
   spoolss_ReplyClosePrinter 
 */
-static WERROR spoolss_ReplyClosePrinter(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_ReplyClosePrinter(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_ReplyClosePrinter *r)
 {
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
-}
+       struct dcesrv_handle *handle;
+       
+       DCESRV_PULL_HANDLE_WERR(handle, r->in.handle, SPOOLSS_NOTIFY);
+
+       talloc_free(handle);
+
+       ZERO_STRUCTP(r->out.handle);
 
+       return WERR_OK;
+}
 
 /* 
   spoolss_AddPortEx 
 */
-static WERROR spoolss_AddPortEx(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_AddPortEx(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_AddPortEx *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -830,7 +1105,7 @@ static WERROR spoolss_AddPortEx(struct dcesrv_call_state *dce_call, TALLOC_CTX *
 /* 
   spoolss_RouterFindFirstPrinterChangeNotification 
 */
-static WERROR spoolss_RouterFindFirstPrinterChangeNotification(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_RouterFindFirstPrinterChangeNotification(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_RouterFindFirstPrinterChangeNotification *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -840,7 +1115,7 @@ static WERROR spoolss_RouterFindFirstPrinterChangeNotification(struct dcesrv_cal
 /* 
   spoolss_SpoolerInit 
 */
-static WERROR spoolss_SpoolerInit(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_SpoolerInit(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_SpoolerInit *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -850,7 +1125,7 @@ static WERROR spoolss_SpoolerInit(struct dcesrv_call_state *dce_call, TALLOC_CTX
 /* 
   spoolss_ResetPrinterEx 
 */
-static WERROR spoolss_ResetPrinterEx(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_ResetPrinterEx(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_ResetPrinterEx *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -860,17 +1135,68 @@ static WERROR spoolss_ResetPrinterEx(struct dcesrv_call_state *dce_call, TALLOC_
 /* 
   spoolss_RemoteFindFirstPrinterChangeNotifyEx 
 */
-static WERROR spoolss_RemoteFindFirstPrinterChangeNotifyEx(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_RemoteFindFirstPrinterChangeNotifyEx(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_RemoteFindFirstPrinterChangeNotifyEx *r)
 {
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+       struct dcerpc_pipe *p;
+       struct dcerpc_binding *binding;
+       NTSTATUS status;
+       struct spoolss_ReplyOpenPrinter rop;
+       struct cli_credentials *creds;
+       struct policy_handle notify_handle;
+
+       DEBUG(2, ("Received RFFPCNex from %s\n", r->in.str));
+
+       /*
+        * TODO: for now just open a connection to the client and drop it again
+        *       to keep the w2k3 PrintServer 
+        *       happy to allow to open the Add Printer GUI
+        *       and the torture suite passing
+        */
+
+       binding = talloc_zero(mem_ctx, struct dcerpc_binding);
+
+       binding->transport = NCACN_NP; 
+       if (strncmp(r->in.str, "\\\\", 2))
+               return WERR_INVALID_COMPUTERNAME;
+       binding->host = r->in.str+2;
+
+       creds = cli_credentials_init_anon(mem_ctx); /* FIXME: Use machine credentials instead ? */
+
+       status = dcerpc_pipe_connect_b(mem_ctx, &p, binding, &ndr_table_spoolss, 
+                                      creds, dce_call->event_ctx,
+                                      dce_call->conn->dce_ctx->lp_ctx);
+
+       if (NT_STATUS_IS_ERR(status)) {
+               DEBUG(0, ("unable to call back to %s\n", r->in.str));
+               return WERR_SERVER_UNAVAILABLE;
+       }
+
+       ZERO_STRUCT(rop);
+       rop.in.server_name = lp_netbios_name(dce_call->conn->dce_ctx->lp_ctx);
+       W_ERROR_HAVE_NO_MEMORY(rop.in.server_name);
+       rop.in.printer_local = 0;
+       rop.in.type = REG_NONE;
+       rop.in.unknown1 = 0;
+       rop.in.unknown2 = 0;
+       rop.out.handle = &notify_handle;
+
+       status = dcerpc_spoolss_ReplyOpenPrinter(p, mem_ctx, &rop);
+       if (NT_STATUS_IS_ERR(status)) {
+               DEBUG(0, ("unable to open remote printer %s\n", r->in.str));
+               return WERR_SERVER_UNAVAILABLE;
+       }
+
+       talloc_free(p);
+
+       return WERR_OK;
 }
 
 
 /* 
   spoolss_RouterRefreshPrinterChangeNotification 
 */
-static WERROR spoolss_RouterRefreshPrinterChangeNotification(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_RouterRefreshPrinterChangeNotification(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_RouterRefreshPrinterChangeNotification *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -880,7 +1206,7 @@ static WERROR spoolss_RouterRefreshPrinterChangeNotification(struct dcesrv_call_
 /* 
   spoolss_RemoteFindNextPrinterChangeNotifyEx 
 */
-static WERROR spoolss_RemoteFindNextPrinterChangeNotifyEx(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_RemoteFindNextPrinterChangeNotifyEx(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_RemoteFindNextPrinterChangeNotifyEx *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -890,96 +1216,69 @@ static WERROR spoolss_RemoteFindNextPrinterChangeNotifyEx(struct dcesrv_call_sta
 /* 
   spoolss_44 
 */
-static WERROR spoolss_44(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_44(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_44 *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
 }
 
-
-static WERROR spoolss_OpenPrinterEx_server(struct dcesrv_call_state *dce_call, 
-                                          TALLOC_CTX *mem_ctx,
-                                          struct spoolss_OpenPrinterEx *r)
-{
-       struct spoolss_openprinter_state *state;
-       struct dcesrv_handle *handle;
-       TALLOC_CTX *op_mem_ctx;
-
-       /* Check printername is our name */
-
-       if (!strequal(r->in.printername + 2, lp_netbios_name()))
-               return WERR_INVALID_PRINTER_NAME;
-
-       op_mem_ctx = talloc_init("spoolss_OpenPrinter");
-       if (!op_mem_ctx) {
-               return WERR_OK;
-       }
-
-       state = talloc_p(op_mem_ctx, struct spoolss_openprinter_state);
-       if (!state) {
-               return WERR_OK;
-       }
-       state->mem_ctx = op_mem_ctx;
-
-       handle = dcesrv_handle_new(dce_call->conn, SPOOLSS_HANDLE_SERVER);
-       if (!handle) {
-               talloc_destroy(state->mem_ctx);
-               return WERR_NOMEM;
-       }
-
-       handle->data = state;
-       handle->destroy = spoolss_OpenPrinter_destroy;
-
-       state->reference_count = 1;
-       state->access_mask = r->in.access_required;
-       *r->out.handle = handle->wire_handle;
-
-       return WERR_OK; 
-}
-
-static WERROR spoolss_OpenPrinterEx_printer(struct dcesrv_call_state *dce_call, 
-                                           TALLOC_CTX *mem_ctx,
-                                           struct spoolss_OpenPrinterEx *r)
-{
-       char *server = talloc_strdup(mem_ctx, r->in.printername + 2);
-       char *pos, *printer;
-
-       pos = strchr(server, '\\');
-       *pos = 0;
-       printer = talloc_strdup(mem_ctx, pos + 1);
-
-       if (!strequal(server, lp_netbios_name()))
-               return WERR_INVALID_PRINTER_NAME;
-
-       DEBUG(0, ("looking for server %s, printer %s\n", server, printer));
-       
-       return WERR_INVALID_PRINTER_NAME;
-}
-
 /* 
   spoolss_OpenPrinterEx 
 */
-static WERROR spoolss_OpenPrinterEx(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_OpenPrinterEx(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_OpenPrinterEx *r)
 {
+       struct ntptr_context *ntptr = talloc_get_type(dce_call->context->private, struct ntptr_context);
+       struct ntptr_GenericHandle *handle;
+       struct dcesrv_handle *h;
+       const char *server;
+       const char *object;
+       enum ntptr_HandleType type;
+       WERROR status;
+
        ZERO_STRUCTP(r->out.handle);
-       
-       /* Printername must start with \\ */
 
-       if (!strnequal(r->in.printername, "\\\\", 2))
-               return WERR_INVALID_PARAM;
+       status = dcesrv_spoolss_parse_printer_name(mem_ctx, r->in.printername, &server, &object, &type);
+       W_ERROR_NOT_OK_RETURN(status);
+
+       status = dcesrv_spoolss_check_server_name(dce_call, mem_ctx, server);
+       W_ERROR_NOT_OK_RETURN(status);
+
+       switch (type) {
+               case NTPTR_HANDLE_SERVER:
+                       status = ntptr_OpenPrintServer(ntptr, mem_ctx, r, server, &handle);
+                       W_ERROR_NOT_OK_RETURN(status);
+                       break;
+               case NTPTR_HANDLE_PORT:
+                       status = ntptr_OpenPort(ntptr, mem_ctx, r, object, &handle);
+                       W_ERROR_NOT_OK_RETURN(status);
+                       break;
+               case NTPTR_HANDLE_MONITOR:
+                       status = ntptr_OpenMonitor(ntptr, mem_ctx, r, object, &handle);
+                       W_ERROR_NOT_OK_RETURN(status);
+                       break;
+               case NTPTR_HANDLE_PRINTER:
+                       status = ntptr_OpenPrinter(ntptr, mem_ctx, r, object, &handle);
+                       W_ERROR_NOT_OK_RETURN(status);
+                       break;
+               default:
+                       return WERR_FOOBAR;
+       }
 
-       if (strchr_m(r->in.printername + 2, '\\'))
-               return spoolss_OpenPrinterEx_server(dce_call, mem_ctx, r);
-       
-       return spoolss_OpenPrinterEx_printer(dce_call, mem_ctx, r);
-}
+       h = dcesrv_handle_new(dce_call->context, handle->type);
+       W_ERROR_HAVE_NO_MEMORY(h);
+
+       h->data = talloc_steal(h, handle);
+
+       *r->out.handle  = h->wire_handle;
 
+       return WERR_OK;
+}
 
 /* 
   spoolss_AddPrinterEx 
 */
-static WERROR spoolss_AddPrinterEx(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_AddPrinterEx(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_AddPrinterEx *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -989,7 +1288,7 @@ static WERROR spoolss_AddPrinterEx(struct dcesrv_call_state *dce_call, TALLOC_CT
 /* 
   spoolss_47 
 */
-static WERROR spoolss_47(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_47(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_47 *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -999,7 +1298,7 @@ static WERROR spoolss_47(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx
 /* 
   spoolss_EnumPrinterData 
 */
-static WERROR spoolss_EnumPrinterData(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_EnumPrinterData(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_EnumPrinterData *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -1009,7 +1308,7 @@ static WERROR spoolss_EnumPrinterData(struct dcesrv_call_state *dce_call, TALLOC
 /* 
   spoolss_DeletePrinterData 
 */
-static WERROR spoolss_DeletePrinterData(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_DeletePrinterData(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_DeletePrinterData *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -1019,7 +1318,7 @@ static WERROR spoolss_DeletePrinterData(struct dcesrv_call_state *dce_call, TALL
 /* 
   spoolss_4a 
 */
-static WERROR spoolss_4a(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_4a(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_4a *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -1029,7 +1328,7 @@ static WERROR spoolss_4a(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx
 /* 
   spoolss_4b 
 */
-static WERROR spoolss_4b(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_4b(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_4b *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -1039,7 +1338,7 @@ static WERROR spoolss_4b(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx
 /* 
   spoolss_4c 
 */
-static WERROR spoolss_4c(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_4c(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_4c *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -1049,7 +1348,7 @@ static WERROR spoolss_4c(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx
 /* 
   spoolss_SetPrinterDataEx 
 */
-static WERROR spoolss_SetPrinterDataEx(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_SetPrinterDataEx(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_SetPrinterDataEx *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -1059,7 +1358,7 @@ static WERROR spoolss_SetPrinterDataEx(struct dcesrv_call_state *dce_call, TALLO
 /* 
   spoolss_GetPrinterDataEx 
 */
-static WERROR spoolss_GetPrinterDataEx(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_GetPrinterDataEx(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_GetPrinterDataEx *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -1069,7 +1368,7 @@ static WERROR spoolss_GetPrinterDataEx(struct dcesrv_call_state *dce_call, TALLO
 /* 
   spoolss_EnumPrinterDataEx 
 */
-static WERROR spoolss_EnumPrinterDataEx(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_EnumPrinterDataEx(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_EnumPrinterDataEx *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -1079,7 +1378,7 @@ static WERROR spoolss_EnumPrinterDataEx(struct dcesrv_call_state *dce_call, TALL
 /* 
   spoolss_EnumPrinterKey 
 */
-static WERROR spoolss_EnumPrinterKey(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_EnumPrinterKey(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_EnumPrinterKey *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -1089,7 +1388,7 @@ static WERROR spoolss_EnumPrinterKey(struct dcesrv_call_state *dce_call, TALLOC_
 /* 
   spoolss_DeletePrinterDataEx 
 */
-static WERROR spoolss_DeletePrinterDataEx(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_DeletePrinterDataEx(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_DeletePrinterDataEx *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -1099,7 +1398,7 @@ static WERROR spoolss_DeletePrinterDataEx(struct dcesrv_call_state *dce_call, TA
 /* 
   spoolss_DeletePrinterKey 
 */
-static WERROR spoolss_DeletePrinterKey(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_DeletePrinterKey(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_DeletePrinterKey *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -1109,7 +1408,7 @@ static WERROR spoolss_DeletePrinterKey(struct dcesrv_call_state *dce_call, TALLO
 /* 
   spoolss_53 
 */
-static WERROR spoolss_53(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_53(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_53 *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -1119,7 +1418,7 @@ static WERROR spoolss_53(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx
 /* 
   spoolss_DeletePrinterDriverEx 
 */
-static WERROR spoolss_DeletePrinterDriverEx(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_DeletePrinterDriverEx(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_DeletePrinterDriverEx *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -1129,7 +1428,7 @@ static WERROR spoolss_DeletePrinterDriverEx(struct dcesrv_call_state *dce_call,
 /* 
   spoolss_55 
 */
-static WERROR spoolss_55(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_55(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_55 *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -1139,7 +1438,7 @@ static WERROR spoolss_55(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx
 /* 
   spoolss_56 
 */
-static WERROR spoolss_56(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_56(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_56 *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -1149,7 +1448,7 @@ static WERROR spoolss_56(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx
 /* 
   spoolss_57 
 */
-static WERROR spoolss_57(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_57(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_57 *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -1157,19 +1456,48 @@ static WERROR spoolss_57(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx
 
 
 /* 
-  spoolss_58 
+  spoolss_XcvData
 */
-static WERROR spoolss_58(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
-                      struct spoolss_58 *r)
+static WERROR dcesrv_spoolss_XcvData(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+                      struct spoolss_XcvData *r)
 {
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+       struct ntptr_GenericHandle *handle;
+       struct dcesrv_handle *h;
+       WERROR status;
+
+       DCESRV_PULL_HANDLE_WERR(h, r->in.handle, DCESRV_HANDLE_ANY);
+       handle = talloc_get_type(h->data, struct ntptr_GenericHandle);
+
+       switch (handle->type) {
+               case NTPTR_HANDLE_SERVER:
+                       status = ntptr_XcvDataPrintServer(handle, mem_ctx, r);
+                       W_ERROR_NOT_OK_RETURN(status);
+                       break;
+               case NTPTR_HANDLE_PRINTER:
+                       status = ntptr_XcvDataPrinter(handle, mem_ctx, r);
+                       W_ERROR_NOT_OK_RETURN(status);
+                       break;
+               case NTPTR_HANDLE_PORT:
+                       status = ntptr_XcvDataPort(handle, mem_ctx, r);
+                       W_ERROR_NOT_OK_RETURN(status);
+                       break;
+               case NTPTR_HANDLE_MONITOR:
+                       status = ntptr_XcvDataMonitor(handle, mem_ctx, r);
+                       W_ERROR_NOT_OK_RETURN(status);
+                       break;
+               default:
+                       return WERR_FOOBAR;
+       }
+
+       /* TODO: handle the buffer sizes here! */
+       return WERR_OK;
 }
 
 
 /* 
   spoolss_AddPrinterDriverEx 
 */
-static WERROR spoolss_AddPrinterDriverEx(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_AddPrinterDriverEx(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_AddPrinterDriverEx *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -1179,7 +1507,7 @@ static WERROR spoolss_AddPrinterDriverEx(struct dcesrv_call_state *dce_call, TAL
 /* 
   spoolss_5a 
 */
-static WERROR spoolss_5a(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_5a(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_5a *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -1189,7 +1517,7 @@ static WERROR spoolss_5a(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx
 /* 
   spoolss_5b 
 */
-static WERROR spoolss_5b(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_5b(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_5b *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -1199,7 +1527,7 @@ static WERROR spoolss_5b(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx
 /* 
   spoolss_5c 
 */
-static WERROR spoolss_5c(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_5c(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_5c *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -1209,7 +1537,7 @@ static WERROR spoolss_5c(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx
 /* 
   spoolss_5d 
 */
-static WERROR spoolss_5d(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_5d(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_5d *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -1219,7 +1547,7 @@ static WERROR spoolss_5d(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx
 /* 
   spoolss_5e 
 */
-static WERROR spoolss_5e(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_5e(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_5e *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
@@ -1229,7 +1557,7 @@ static WERROR spoolss_5e(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx
 /* 
   spoolss_5f 
 */
-static WERROR spoolss_5f(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR dcesrv_spoolss_5f(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct spoolss_5f *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);