Author: jelmer Date: 2005-12-27 18:15:18 +0000 (Tue, 27 Dec 2005) New Revision: 12516
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12516 Log: Fix drsuapi and netlogon javascript bindings Modified: branches/SAMBA_4_0/source/librpc/config.mk branches/SAMBA_4_0/source/scripting/ejs/ejsrpc.c branches/SAMBA_4_0/source/scripting/ejs/ejsrpc.h Changeset: Modified: branches/SAMBA_4_0/source/librpc/config.mk =================================================================== --- branches/SAMBA_4_0/source/librpc/config.mk 2005-12-27 17:50:53 UTC (rev 12515) +++ branches/SAMBA_4_0/source/librpc/config.mk 2005-12-27 18:15:18 UTC (rev 12516) @@ -593,7 +593,6 @@ INIT_FUNCTION = ejs_init_drsuapi OBJ_FILES = gen_ndr/ndr_drsuapi_ejs.o SUBSYSTEM = SMBCALLS -ENABLE = NO REQUIRED_SUBSYSTEMS = LIBRPC NDR_DRSUAPI NOPROTO = YES @@ -644,7 +643,6 @@ INIT_FUNCTION = ejs_init_netlogon OBJ_FILES = gen_ndr/ndr_netlogon_ejs.o SUBSYSTEM = SMBCALLS -ENABLE = NO REQUIRED_SUBSYSTEMS = LIBRPC NDR_NETLOGON NOPROTO = YES Modified: branches/SAMBA_4_0/source/scripting/ejs/ejsrpc.c =================================================================== --- branches/SAMBA_4_0/source/scripting/ejs/ejsrpc.c 2005-12-27 17:50:53 UTC (rev 12515) +++ branches/SAMBA_4_0/source/scripting/ejs/ejsrpc.c 2005-12-27 18:15:18 UTC (rev 12516) @@ -133,6 +133,23 @@ return mprSetVar(v, name, mprCreateIntegerVar(*r)); } +/* + pull a uint32 from a mpr variable to a C element +*/ +NTSTATUS ejs_pull_time_t(struct ejs_rpc *ejs, + struct MprVar *v, const char *name, time_t *r) +{ + NDR_CHECK(mprGetVar(&v, name)); + *r = mprVarToInteger(v); + return NT_STATUS_OK; +} + +NTSTATUS ejs_push_time_t(struct ejs_rpc *ejs, + struct MprVar *v, const char *name, const time_t *r) +{ + return mprSetVar(v, name, mprCreateIntegerVar(*r)); +} + NTSTATUS ejs_pull_hyper(struct ejs_rpc *ejs, struct MprVar *v, const char *name, uint64_t *r) { Modified: branches/SAMBA_4_0/source/scripting/ejs/ejsrpc.h =================================================================== --- branches/SAMBA_4_0/source/scripting/ejs/ejsrpc.h 2005-12-27 17:50:53 UTC (rev 12515) +++ branches/SAMBA_4_0/source/scripting/ejs/ejsrpc.h 2005-12-27 18:15:18 UTC (rev 12516) @@ -78,6 +78,10 @@ struct MprVar *v, const char *name, uint64_t *r); NTSTATUS ejs_push_NTTIME(struct ejs_rpc *ejs, struct MprVar *v, const char *name, const uint64_t *r); +NTSTATUS ejs_pull_time_t(struct ejs_rpc *ejs, + struct MprVar *v, const char *name, time_t *r); +NTSTATUS ejs_push_time_t(struct ejs_rpc *ejs, + struct MprVar *v, const char *name, const time_t *r); NTSTATUS ejs_pull_enum(struct ejs_rpc *ejs, struct MprVar *v, const char *name, unsigned *r); NTSTATUS ejs_push_enum(struct ejs_rpc *ejs, @@ -149,6 +153,10 @@ /* some types are equivalent for ejs */ #define ejs_pull_dom_sid2 ejs_pull_dom_sid #define ejs_push_dom_sid2 ejs_push_dom_sid +#define ejs_pull_dom_sid28 ejs_pull_dom_sid +#define ejs_push_dom_sid28 ejs_push_dom_sid #define ejs_pull_NTTIME_hyper ejs_pull_NTTIME #define ejs_push_NTTIME_hyper ejs_push_NTTIME +#define ejs_pull_NTTIME_1sec ejs_pull_NTTIME +#define ejs_push_NTTIME_1sec ejs_push_NTTIME
