[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-678-gd87891e

Günther Deschner gd at samba.org
Mon Feb 9 18:09:48 GMT 2009


The branch, master has been updated
       via  d87891ea3e1cf0c4e4d16ceb5b6b0a7c65cedf3f (commit)
       via  a7cf846d1e98e07f008edb322b9a37ec30593ffc (commit)
      from  84a0076c4b62d23b21153dd00ec72fe8042b39cc (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit d87891ea3e1cf0c4e4d16ceb5b6b0a7c65cedf3f
Author: Günther Deschner <gd at samba.org>
Date:   Mon Feb 9 15:32:34 2009 +0100

    s3-spoolss: remove old spoolss_AddPrintProcessor.
    
    Guenther

commit a7cf846d1e98e07f008edb322b9a37ec30593ffc
Author: Günther Deschner <gd at samba.org>
Date:   Mon Feb 9 15:31:35 2009 +0100

    s3-spoolss: use pidl for _spoolss_AddPrintProcessor.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source3/include/proto.h             |    2 -
 source3/include/rpc_spoolss.h       |   17 -----------
 source3/rpc_parse/parse_spoolss.c   |   51 -----------------------------------
 source3/rpc_server/srv_spoolss.c    |   26 +-----------------
 source3/rpc_server/srv_spoolss_nt.c |   27 +++++++++++-------
 5 files changed, 17 insertions(+), 106 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 5009e6d..670fb49 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5985,8 +5985,6 @@ bool spoolss_io_q_getprinterdriverdir(const char *desc, SPOOL_Q_GETPRINTERDRIVER
 bool spoolss_io_r_getprinterdriverdir(const char *desc, SPOOL_R_GETPRINTERDRIVERDIR *r_u, prs_struct *ps, int depth);
 bool spoolss_io_r_enumprintprocessors(const char *desc, SPOOL_R_ENUMPRINTPROCESSORS *r_u, prs_struct *ps, int depth);
 bool spoolss_io_q_enumprintprocessors(const char *desc, SPOOL_Q_ENUMPRINTPROCESSORS *q_u, prs_struct *ps, int depth);
-bool spoolss_io_q_addprintprocessor(const char *desc, SPOOL_Q_ADDPRINTPROCESSOR *q_u, prs_struct *ps, int depth);
-bool spoolss_io_r_addprintprocessor(const char *desc, SPOOL_R_ADDPRINTPROCESSOR *r_u, prs_struct *ps, int depth);
 bool spoolss_io_r_enumprintprocdatatypes(const char *desc, SPOOL_R_ENUMPRINTPROCDATATYPES *r_u, prs_struct *ps, int depth);
 bool spoolss_io_q_enumprintprocdatatypes(const char *desc, SPOOL_Q_ENUMPRINTPROCDATATYPES *q_u, prs_struct *ps, int depth);
 bool spoolss_io_q_enumprintmonitors(const char *desc, SPOOL_Q_ENUMPRINTMONITORS *q_u, prs_struct *ps, int depth);
diff --git a/source3/include/rpc_spoolss.h b/source3/include/rpc_spoolss.h
index feabd3f..b159263 100644
--- a/source3/include/rpc_spoolss.h
+++ b/source3/include/rpc_spoolss.h
@@ -1395,23 +1395,6 @@ typedef struct spool_r_getprinterdriverdirectory
 }
 SPOOL_R_GETPRINTERDRIVERDIR;
 
-typedef struct spool_q_addprintprocessor
-{
-	uint32 server_ptr;
-	UNISTR2 server;
-	UNISTR2 environment;
-	UNISTR2 path;
-	UNISTR2 name;
-}
-SPOOL_Q_ADDPRINTPROCESSOR;
-
-typedef struct spool_r_addprintprocessor
-{
-	WERROR status;
-}
-SPOOL_R_ADDPRINTPROCESSOR;
-
-
 typedef struct spool_q_enumprintprocessors
 {
 	uint32 name_ptr;
diff --git a/source3/rpc_parse/parse_spoolss.c b/source3/rpc_parse/parse_spoolss.c
index 84b764e..fbb001f 100644
--- a/source3/rpc_parse/parse_spoolss.c
+++ b/source3/rpc_parse/parse_spoolss.c
@@ -5013,57 +5013,6 @@ bool spoolss_io_q_enumprintprocessors(const char *desc, SPOOL_Q_ENUMPRINTPROCESS
 /*******************************************************************
 ********************************************************************/  
 
-bool spoolss_io_q_addprintprocessor(const char *desc, SPOOL_Q_ADDPRINTPROCESSOR *q_u, prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "spoolss_io_q_addprintprocessor");
-	depth++;
-
-	if (!prs_align(ps))
-		return False;
-		
-	if (!prs_uint32("server_ptr", ps, depth, &q_u->server_ptr))
-		return False;
-	if (!smb_io_unistr2("server", &q_u->server, q_u->server_ptr, ps, depth))
-		return False;
-		
-	if (!prs_align(ps))
-		return False;
-	if (!smb_io_unistr2("environment", &q_u->environment, True, ps, depth))
-		return False;
-		
-	if (!prs_align(ps))
-		return False;
-	if (!smb_io_unistr2("path", &q_u->path, True, ps, depth))
-		return False;
-
-	if (!prs_align(ps))
-		return False;
-	if (!smb_io_unistr2("name", &q_u->name, True, ps, depth))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
-********************************************************************/  
-
-bool spoolss_io_r_addprintprocessor(const char *desc, SPOOL_R_ADDPRINTPROCESSOR *r_u, prs_struct *ps, int depth)
-{		
-	prs_debug(ps, depth, desc, "spoolss_io_r_addprintproicessor");
-	depth++;
-
-	if (!prs_align(ps))
-		return False;
-		
-	if (!prs_werror("status", ps, depth, &r_u->status))
-		return False;
-
-	return True;		
-}
-
-/*******************************************************************
-********************************************************************/  
-
 bool spoolss_io_r_enumprintprocdatatypes(const char *desc, SPOOL_R_ENUMPRINTPROCDATATYPES *r_u, prs_struct *ps, int depth)
 {		
 	prs_debug(ps, depth, desc, "spoolss_io_r_enumprintprocdatatypes");
diff --git a/source3/rpc_server/srv_spoolss.c b/source3/rpc_server/srv_spoolss.c
index bf11bc6..cf5b4fb 100644
--- a/source3/rpc_server/srv_spoolss.c
+++ b/source3/rpc_server/srv_spoolss.c
@@ -898,31 +898,7 @@ static bool api_spoolss_enumprintprocessors(pipes_struct *p)
 
 static bool api_spoolss_addprintprocessor(pipes_struct *p)
 {
-	SPOOL_Q_ADDPRINTPROCESSOR q_u;
-	SPOOL_R_ADDPRINTPROCESSOR r_u;
-	prs_struct *data = &p->in_data.data;
-	prs_struct *rdata = &p->out_data.rdata;
-
-	ZERO_STRUCT(q_u);
-	ZERO_STRUCT(r_u);
-	
-	if(!spoolss_io_q_addprintprocessor("", &q_u, data, 0)) {
-		DEBUG(0,("spoolss_io_q_addprintprocessor: unable to unmarshall SPOOL_Q_ADDPRINTPROCESSOR.\n"));
-		return False;
-	}
-	
-	/* for now, just indicate success and ignore the add.  We'll
-	   automatically set the winprint processor for printer
-	   entries later.  Used to debug the LexMark Optra S 1855 PCL
-	   driver --jerry */
-	r_u.status = WERR_OK;
-
-	if(!spoolss_io_r_addprintprocessor("", &r_u, rdata, 0)) {
-		DEBUG(0,("spoolss_io_r_addprintprocessor: unable to marshall SPOOL_R_ADDPRINTPROCESSOR.\n"));
-		return False;
-	}
-	
-	return True;
+	return proxy_spoolss_call(p, NDR_SPOOLSS_ADDPRINTPROCESSOR);
 }
 
 /****************************************************************************
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 31ab2ca..04bbc97 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -9978,6 +9978,22 @@ WERROR _spoolss_xcvdataport(pipes_struct *p, SPOOL_Q_XCVDATAPORT *q_u, SPOOL_R_X
 
 	return WERR_INVALID_PRINT_MONITOR;
 }
+
+/****************************************************************
+ _spoolss_AddPrintProcessor
+****************************************************************/
+
+WERROR _spoolss_AddPrintProcessor(pipes_struct *p,
+				  struct spoolss_AddPrintProcessor *r)
+{
+	/* for now, just indicate success and ignore the add.  We'll
+	   automatically set the winprint processor for printer
+	   entries later.  Used to debug the LexMark Optra S 1855 PCL
+	   driver --jerry */
+
+	return WERR_OK;
+}
+
 /****************************************************************
  _spoolss_EnumPrinters
 ****************************************************************/
@@ -10111,17 +10127,6 @@ WERROR _spoolss_GetPrinterDriverDirectory(pipes_struct *p,
 }
 
 /****************************************************************
- _spoolss_AddPrintProcessor
-****************************************************************/
-
-WERROR _spoolss_AddPrintProcessor(pipes_struct *p,
-				  struct spoolss_AddPrintProcessor *r)
-{
-	p->rng_fault_state = true;
-	return WERR_NOT_SUPPORTED;
-}
-
-/****************************************************************
  _spoolss_EnumPrintProcessors
 ****************************************************************/
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list