sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-04 08:22:08 +03:00
Code Activity

r9146: - enable winreg pipe from ejs

Browse Source 
- map the result code from rpc calls into the ejs objects

- treat winreg_String like lsa_String, hiding the length elements
(This used to be commit 2f6311c9a3)
This commit is contained in:
Andrew Tridgell
2005-08-05 23:01:57 +00:00
committed by Gerald (Jerry) Carter
parent d87e1306c5
commit 31fa87f23b
5 changed files with 49 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source4/build/pidl/Parse/Pidl/Samba/EJS.pm
View File

@ -628,6 +628,11 @@ sub EjsPushFunction($)
EjsPushElementTop($e, $env);
}
if ($d->{RETURN_TYPE}) {
my $t = $d->{RETURN_TYPE};
pidl "NDR_CHECK(ejs_push_$t(ejs, v, \"result\", &r->out.result));";
}
pidl "return NT_STATUS_OK;";
deindent;
pidl "}\n";

9
source4/librpc/config.mk
View File

@ -623,6 +623,12 @@ OBJ_FILES = librpc/gen_ndr/ndr_winreg_ejs.o
REQUIRED_SUBSYSTEMS = RPC NDR_WINREG
NOPROTO = YES
[SUBSYSTEM::RPC_EJS_INITSHUTDOWN]
INIT_FUNCTION = ejs_init_initshutdown
OBJ_FILES = librpc/gen_ndr/ndr_initshutdown_ejs.o
REQUIRED_SUBSYSTEMS = RPC NDR_INITSHUTDOWN
NOPROTO = YES
[SUBSYSTEM::RPC_EJS_NETLOGON]
INIT_FUNCTION = ejs_init_netlogon
OBJ_FILES = librpc/gen_ndr/ndr_netlogon_ejs.o
@ -645,6 +651,7 @@ NOPROTO = YES
# Start SUBSYSTEM RPC_EJS
[SUBSYSTEM::RPC_EJS]
REQUIRED_SUBSYSTEMS = RPC_EJS_ECHO RPC_EJS_MISC RPC_EJS_SAMR RPC_EJS_SECURITY \
RPC_EJS_LSA RPC_EJS_SRVSVC RPC_EJS_SVCCTL RPC_EJS_IRPC
RPC_EJS_LSA RPC_EJS_SRVSVC RPC_EJS_SVCCTL RPC_EJS_IRPC RPC_EJS_WINREG \
RPC_EJS_INITSHUTDOWN
# End SUBSYSTEM RPC_EJS
################################################

2
source4/librpc/idl/winreg.idl
View File

@ -14,7 +14,7 @@
depends(lsa,initshutdown)
] interface winreg
{
typedef struct {
typedef [public,noejs] struct {
[value(strlen_m_term(name)*2)] uint16 name_len;
[value(strlen_m_term(name)*2)] uint16 name_size;
unistr *name;

31
source4/scripting/ejs/ejsrpc.c
View File

@ -25,6 +25,7 @@
#include "scripting/ejs/smbcalls.h"
#include "librpc/gen_ndr/ndr_security.h"
#include "librpc/gen_ndr/ndr_lsa.h"
#include "librpc/gen_ndr/ndr_winreg.h"
#include "scripting/ejs/ejsrpc.h"
/*
@ -182,6 +183,18 @@ NTSTATUS ejs_push_NTTIME(struct ejs_rpc *ejs,
return ejs_push_hyper(ejs, v, name, r);
}
NTSTATUS ejs_push_WERROR(struct ejs_rpc *ejs,
struct MprVar *v, const char *name, const WERROR *r)
{
return ejs_push_string(ejs, v, name, win_errstr(*r));
}
NTSTATUS ejs_push_NTSTATUS(struct ejs_rpc *ejs,
struct MprVar *v, const char *name, const NTSTATUS *r)
{
return ejs_push_string(ejs, v, name, nt_errstr(*r));
}
/*
pull a enum from a mpr variable to a C element
@ -292,6 +305,24 @@ NTSTATUS ejs_push_lsa_String(struct ejs_rpc *ejs,
return ejs_push_string(ejs, v, name, r->string);
}
/*
pull a winreg_String
*/
NTSTATUS ejs_pull_winreg_String(struct ejs_rpc *ejs,
struct MprVar *v, const char *name, struct winreg_String *r)
{
return ejs_pull_string(ejs, v, name, &r->name);
}
/*
push a winreg_String
*/
NTSTATUS ejs_push_winreg_String(struct ejs_rpc *ejs,
struct MprVar *v, const char *name, const struct winreg_String *r)
{
return ejs_push_string(ejs, v, name, r->name);
}
NTSTATUS ejs_pull_DATA_BLOB(struct ejs_rpc *ejs,
struct MprVar *v, const char *name, DATA_BLOB *r)
{

4
source4/scripting/ejs/ejsrpc.h
View File

@ -95,6 +95,10 @@ NTSTATUS ejs_push_dom_sid(struct ejs_rpc *ejs,
struct MprVar *v, const char *name, const struct dom_sid *r);
NTSTATUS ejs_push_null(struct ejs_rpc *ejs, struct MprVar *v, const char *name);
BOOL ejs_pull_null(struct ejs_rpc *ejs, struct MprVar *v, const char *name);
NTSTATUS ejs_push_WERROR(struct ejs_rpc *ejs,
struct MprVar *v, const char *name, const WERROR *r);
NTSTATUS ejs_push_NTSTATUS(struct ejs_rpc *ejs,
struct MprVar *v, const char *name, const NTSTATUS *r);
NTSTATUS ejs_pull_DATA_BLOB(struct ejs_rpc *ejs,
struct MprVar *v, const char *name, DATA_BLOB *r);
NTSTATUS ejs_push_DATA_BLOB(struct ejs_rpc *ejs,