[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  355849e spoolss: fill in spoolss_DeletePort IDL.
       via  279e0c9 spoolss: fill in spoolss_SetPort IDL.
       via  2ff1c9e spoolss: fill in spoolss_AddPortEx IDL.
      from  7d0d6d4 s4:kdc/db-glue.c - remove unused variable

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


- Log -----------------------------------------------------------------
commit 355849ed4cbe5cea86edf6b5414d264c0637ac64
Author: Günther Deschner <gd at samba.org>
Date:   Mon Oct 4 09:28:41 2010 +0200

    spoolss: fill in spoolss_DeletePort IDL.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Mon Oct  4 08:10:16 UTC 2010 on sn-devel-104

commit 279e0c9610075a95ffe79f8fa223bf2427f83468
Author: Günther Deschner <gd at samba.org>
Date:   Sun Oct 3 08:13:35 2010 +0200

    spoolss: fill in spoolss_SetPort IDL.
    
    Guenther

commit 2ff1c9eb30f220a4c490afc695a951de7b3c45f9
Author: Günther Deschner <gd at samba.org>
Date:   Sun Oct 3 07:24:56 2010 +0200

    spoolss: fill in spoolss_AddPortEx IDL.
    
    Guenther

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

Summary of changes:
 librpc/idl/spoolss.idl                      |   58 +++++++++++++++++++++++++-
 source3/rpc_server/srv_spoolss_nt.c         |    6 +-
 source4/rpc_server/spoolss/dcesrv_spoolss.c |    6 +-
 3 files changed, 61 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/idl/spoolss.idl b/librpc/idl/spoolss.idl
index a957a54..682b86a 100644
--- a/librpc/idl/spoolss.idl
+++ b/librpc/idl/spoolss.idl
@@ -2233,6 +2233,42 @@ cpp_quote("#define spoolss_security_descriptor security_descriptor")
 
 	/******************/
 	/* Function: 0x25 */
+
+	typedef [public,gensize] struct {
+		[string,charset(UTF16)] uint16 *port_name;
+	} spoolss_SetPortInfo1;
+
+	typedef [public,gensize] struct {
+		[string,charset(UTF16)] uint16 *port_name;
+		[string,charset(UTF16)] uint16 *monitor_name;
+		[string,charset(UTF16)] uint16 *description;
+		spoolss_PortType port_type;
+		uint32 reserved;
+	} spoolss_SetPortInfo2;
+
+	typedef [public,gensize] struct {
+		spoolss_PortStatus status;
+		[string,charset(UTF16)] uint16 *status_string;
+		spoolss_PortSeverity severity;
+	} spoolss_SetPortInfo3;
+
+	typedef [public,gensize] struct {
+		[string,charset(UTF16)] uint16 *port_name;
+		DATA_BLOB monitor_data; /* relative ?? */
+	} spoolss_SetPortInfoFF;
+
+	typedef [switch_type(uint32)] union {
+		[case(1)] spoolss_SetPortInfo1 *info1;
+		[case(2)] spoolss_SetPortInfo2 *info2;
+		[case(3)] spoolss_SetPortInfo3 *info3;
+		[case(0xff)] spoolss_SetPortInfoFF *infoFF;
+	} spoolss_SetPortInfo;
+
+	typedef struct {
+		uint32 level;
+		[switch_is(level)] spoolss_SetPrinterInfo info;
+	} spoolss_SetPortInfoContainer;
+
 	WERROR spoolss_AddPort(
 	       [in,unique] [string,charset(UTF16)] uint16 *server_name,
 	       [in] uint32 unknown,
@@ -2246,7 +2282,10 @@ cpp_quote("#define spoolss_security_descriptor security_descriptor")
 
 	/******************/
 	/* Function: 0x27 */
-	[todo] WERROR spoolss_DeletePort(
+	WERROR spoolss_DeletePort(
+	       [in,unique] [string,charset(UTF16)] uint16 *server_name,
+	       [in] uint32 ptr,
+	       [in,ref] [string,charset(UTF16)] uint16 *port_name
 	);
 
 	/******************/
@@ -2470,7 +2509,17 @@ cpp_quote("#define spoolss_security_descriptor security_descriptor")
 
 	/******************/
 	/* Function: 0x3d */
-	[todo] WERROR spoolss_AddPortEx(
+
+	typedef struct {
+		uint32 monitor_data_size;
+		[size_is(monitor_data_size),unique] uint8 *monitor_data;
+	} spoolss_PortVarContainer;
+
+	WERROR spoolss_AddPortEx(
+		[in,unique] [string,charset(UTF16)] uint16 *servername,
+		[in,ref] spoolss_SetPortInfoContainer *port_ctr,
+		[in,ref] spoolss_PortVarContainer *port_var_ctr,
+		[in,unique] [string,charset(UTF16)] uint16 *monitor_name
 	);
 
 	/******************/
@@ -2785,7 +2834,10 @@ cpp_quote("#define spoolss_security_descriptor security_descriptor")
 
 	/******************/
 	/* Function: 0x47 */
-	[todo] WERROR spoolss_47(
+	WERROR spoolss_SetPort(
+		[in,unique] [string,charset(UTF16)] uint16 *servername,
+		[in,unique] [string,charset(UTF16)] uint16 *port_name,
+		[in,ref] spoolss_SetPortInfoContainer *port_ctr
 	);
 
 	/******************/
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index d79c931..8c4067b 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -10294,11 +10294,11 @@ WERROR _spoolss_44(struct pipes_struct *p,
 }
 
 /****************************************************************
- _spoolss_47
+ _spoolss_SetPort
 ****************************************************************/
 
-WERROR _spoolss_47(struct pipes_struct *p,
-		   struct spoolss_47 *r)
+WERROR _spoolss_SetPort(struct pipes_struct *p,
+			struct spoolss_SetPort *r)
 {
 	p->rng_fault_state = true;
 	return WERR_NOT_SUPPORTED;
diff --git a/source4/rpc_server/spoolss/dcesrv_spoolss.c b/source4/rpc_server/spoolss/dcesrv_spoolss.c
index e17fb81..66cd14d 100644
--- a/source4/rpc_server/spoolss/dcesrv_spoolss.c
+++ b/source4/rpc_server/spoolss/dcesrv_spoolss.c
@@ -1305,10 +1305,10 @@ static WERROR dcesrv_spoolss_AddPrinterEx(struct dcesrv_call_state *dce_call, TA
 
 
 /* 
-  spoolss_47 
+  spoolss_SetPort
 */
-static WERROR dcesrv_spoolss_47(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
-		       struct spoolss_47 *r)
+static WERROR dcesrv_spoolss_SetPort(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+		       struct spoolss_SetPort *r)
 {
 	DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
 }


-- 
Samba Shared Repository