The branch, master has been updated
via ba21b6e s4-waf: nsstest only needs replace.
via 1b293c9 spoolss: fill in PerMachineConnections add and delete IDL.
from 2516338 s4-dsdb Don't talloc_free() ares on failure, as LDB might
free it later
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit ba21b6e3d439d7c1890900b1b0b88c42548f63f0
Author: Günther Deschner <g...@samba.org>
Date: Wed Dec 15 15:39:47 2010 +0100
s4-waf: nsstest only needs replace.
Guenther
Autobuild-User: Günther Deschner <g...@samba.org>
Autobuild-Date: Thu Dec 16 11:40:52 CET 2010 on sn-devel-104
commit 1b293c90be3905911d401b2d5bb6dd5da979c809
Author: Günther Deschner <g...@samba.org>
Date: Mon Oct 4 15:03:08 2010 +0200
spoolss: fill in PerMachineConnections add and delete IDL.
Guenther
-----------------------------------------------------------------------
Summary of changes:
librpc/idl/spoolss.idl | 12 +++++++++---
nsswitch/wscript_build | 2 +-
source3/rpc_server/srv_spoolss_nt.c | 18 +++++++++---------
source4/rpc_server/spoolss/dcesrv_spoolss.c | 18 +++++++++---------
4 files changed, 28 insertions(+), 22 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/idl/spoolss.idl b/librpc/idl/spoolss.idl
index 682b86a..c74bd69 100644
--- a/librpc/idl/spoolss.idl
+++ b/librpc/idl/spoolss.idl
@@ -2986,17 +2986,23 @@ cpp_quote("#define spoolss_security_descriptor
security_descriptor")
/******************/
/* Function: 0x55 */
- [todo] WERROR spoolss_55(
+ WERROR spoolss_AddPerMachineConnection(
+ [in,unique] [string,charset(UTF16)] uint16 *server,
+ [in,ref] [string,charset(UTF16)] uint16 *printername,
+ [in,ref] [string,charset(UTF16)] uint16 *printserver,
+ [in,ref] [string,charset(UTF16)] uint16 *provider
);
/******************/
/* Function: 0x56 */
- [todo] WERROR spoolss_56(
+ WERROR spoolss_DeletePerMachineConnection(
+ [in,unique] [string,charset(UTF16)] uint16 *server,
+ [in,ref] [string,charset(UTF16)] uint16 *printername
);
/******************/
/* Function: 0x57 */
- [todo] WERROR spoolss_57(
+ [todo] WERROR spoolss_EnumPerMachineConnections(
);
/******************/
diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build
index 184d20e..a9881bd 100644
--- a/nsswitch/wscript_build
+++ b/nsswitch/wscript_build
@@ -10,7 +10,7 @@ bld.SAMBA_LIBRARY('winbind-client',
bld.SAMBA_BINARY('nsstest',
source='nsstest.c',
- deps='samba-util samba-hostconfig'
+ deps='replace'
)
diff --git a/source3/rpc_server/srv_spoolss_nt.c
b/source3/rpc_server/srv_spoolss_nt.c
index 56991ac..65314df 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -10388,33 +10388,33 @@ WERROR _spoolss_53(struct pipes_struct *p,
}
/****************************************************************
- _spoolss_55
+ _spoolss_AddPerMachineConnection
****************************************************************/
-WERROR _spoolss_55(struct pipes_struct *p,
- struct spoolss_55 *r)
+WERROR _spoolss_AddPerMachineConnection(struct pipes_struct *p,
+ struct spoolss_AddPerMachineConnection
*r)
{
p->rng_fault_state = true;
return WERR_NOT_SUPPORTED;
}
/****************************************************************
- _spoolss_56
+ _spoolss_DeletePerMachineConnection
****************************************************************/
-WERROR _spoolss_56(struct pipes_struct *p,
- struct spoolss_56 *r)
+WERROR _spoolss_DeletePerMachineConnection(struct pipes_struct *p,
+ struct
spoolss_DeletePerMachineConnection *r)
{
p->rng_fault_state = true;
return WERR_NOT_SUPPORTED;
}
/****************************************************************
- _spoolss_57
+ _spoolss_EnumPerMachineConnections
****************************************************************/
-WERROR _spoolss_57(struct pipes_struct *p,
- struct spoolss_57 *r)
+WERROR _spoolss_EnumPerMachineConnections(struct pipes_struct *p,
+ struct
spoolss_EnumPerMachineConnections *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 66cd14d..4c22d35 100644
--- a/source4/rpc_server/spoolss/dcesrv_spoolss.c
+++ b/source4/rpc_server/spoolss/dcesrv_spoolss.c
@@ -1445,30 +1445,30 @@ static WERROR
dcesrv_spoolss_DeletePrinterDriverEx(struct dcesrv_call_state *dce
/*
- spoolss_55
+ spoolss_AddPerMachineConnection
*/
-static WERROR dcesrv_spoolss_55(struct dcesrv_call_state *dce_call, TALLOC_CTX
*mem_ctx,
- struct spoolss_55 *r)
+static WERROR dcesrv_spoolss_AddPerMachineConnection(struct dcesrv_call_state
*dce_call, TALLOC_CTX *mem_ctx,
+ struct spoolss_AddPerMachineConnection *r)
{
DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
}
/*
- spoolss_56
+ spoolss_DeletePerMachineConnection
*/
-static WERROR dcesrv_spoolss_56(struct dcesrv_call_state *dce_call, TALLOC_CTX
*mem_ctx,
- struct spoolss_56 *r)
+static WERROR dcesrv_spoolss_DeletePerMachineConnection(struct
dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+ struct spoolss_DeletePerMachineConnection *r)
{
DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
}
/*
- spoolss_57
+ spoolss_EnumPerMachineConnections
*/
-static WERROR dcesrv_spoolss_57(struct dcesrv_call_state *dce_call, TALLOC_CTX
*mem_ctx,
- struct spoolss_57 *r)
+static WERROR dcesrv_spoolss_EnumPerMachineConnections(struct
dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+ struct spoolss_EnumPerMachineConnections *r)
{
DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
}
--
Samba Shared Repository
