This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "includes.h"
#include "lib/appweb/ejs/ejs.h"
#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 "librpc/gen_ndr/lsa.h"
+#include "librpc/gen_ndr/winreg.h"
#include "scripting/ejs/ejsrpc.h"
+#include "libcli/security/security.h"
/*
set the switch var to be used by the next union switch
*/
NTSTATUS ejs_push_struct_start(struct ejs_rpc *ejs, struct MprVar **v, const char *name)
{
- NDR_CHECK(mprSetVar(*v, name, mprObject(name)));
+ EJS_CHECK(mprSetVar(*v, name, mprObject(name)));
return mprGetVar(v, name);
}
NTSTATUS ejs_pull_uint8(struct ejs_rpc *ejs,
struct MprVar *v, const char *name, uint8_t *r)
{
- NDR_CHECK(mprGetVar(&v, name));
+ EJS_CHECK(mprGetVar(&v, name));
*r = mprVarToInteger(v);
return NT_STATUS_OK;
NTSTATUS ejs_pull_uint16(struct ejs_rpc *ejs,
struct MprVar *v, const char *name, uint16_t *r)
{
- NDR_CHECK(mprGetVar(&v, name));
+ EJS_CHECK(mprGetVar(&v, name));
*r = mprVarToInteger(v);
return NT_STATUS_OK;
NTSTATUS ejs_pull_uint32(struct ejs_rpc *ejs,
struct MprVar *v, const char *name, uint32_t *r)
{
- NDR_CHECK(mprGetVar(&v, name));
+ EJS_CHECK(mprGetVar(&v, name));
*r = mprVarToInteger(v);
return NT_STATUS_OK;
}
NTSTATUS ejs_pull_int32(struct ejs_rpc *ejs,
struct MprVar *v, const char *name, int32_t *r)
{
- NDR_CHECK(mprGetVar(&v, name));
+ EJS_CHECK(mprGetVar(&v, name));
*r = mprVarToInteger(v);
return NT_STATUS_OK;
}
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)
+{
+ EJS_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)
{
- NDR_CHECK(mprGetVar(&v, name));
+ EJS_CHECK(mprGetVar(&v, name));
*r = mprVarToNumber(v);
return NT_STATUS_OK;
}
}
NTSTATUS ejs_pull_dlong(struct ejs_rpc *ejs,
- struct MprVar *v, const char *name, uint64_t *r)
+ struct MprVar *v, const char *name, int64_t *r)
{
- return ejs_pull_hyper(ejs, v, name, r);
+ return ejs_pull_hyper(ejs, v, name, (uint64_t *)r);
}
NTSTATUS ejs_push_dlong(struct ejs_rpc *ejs,
- struct MprVar *v, const char *name, const uint64_t *r)
+ struct MprVar *v, const char *name, const int64_t *r)
{
- return ejs_push_hyper(ejs, v, name, r);
+ return ejs_push_hyper(ejs, v, name, (const uint64_t *)r);
}
NTSTATUS ejs_pull_udlong(struct ejs_rpc *ejs,
NTSTATUS ejs_pull_enum(struct ejs_rpc *ejs,
struct MprVar *v, const char *name, unsigned *r)
{
- NDR_CHECK(mprGetVar(&v, name));
+ EJS_CHECK(mprGetVar(&v, name));
*r = mprVarToInteger(v);
return NT_STATUS_OK;
NTSTATUS ejs_pull_string(struct ejs_rpc *ejs,
struct MprVar *v, const char *name, const char **s)
{
- NDR_CHECK(mprGetVar(&v, name));
+ EJS_CHECK(mprGetVar(&v, name));
*s = mprToString(v);
return NT_STATUS_OK;
}
return mprSetVar(v, name, mprString(s));
}
+
+/*
+ pull a ipv4address (internally a string)
+*/
+NTSTATUS ejs_pull_ipv4address(struct ejs_rpc *ejs,
+ struct MprVar *v, const char *name, const char **s)
+{
+ return ejs_pull_string(ejs, v, name, s);
+}
+
+/*
+ push a ipv4address (internally a string)
+*/
+NTSTATUS ejs_push_ipv4address(struct ejs_rpc *ejs,
+ struct MprVar *v, const char *name, const char *s)
+{
+ return ejs_push_string(ejs, v, name, s);
+}
+
+
NTSTATUS ejs_pull_dom_sid(struct ejs_rpc *ejs,
struct MprVar *v, const char *name, struct dom_sid *r)
{
struct dom_sid *sid;
- NDR_CHECK(mprGetVar(&v, name));
+ EJS_CHECK(mprGetVar(&v, name));
sid = dom_sid_parse_talloc(ejs, mprToString(v));
NT_STATUS_HAVE_NO_MEMORY(sid);
*r = *sid;
NTSTATUS ejs_pull_GUID(struct ejs_rpc *ejs,
struct MprVar *v, const char *name, struct GUID *r)
{
- NDR_CHECK(mprGetVar(&v, name));
+ EJS_CHECK(mprGetVar(&v, name));
return GUID_from_string(mprToString(v), r);
}
return mprSetVar(v, name, mprCreatePtrVar(NULL));
}
-BOOL ejs_pull_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 status = mprGetVar(&v, name);
if (!NT_STATUS_IS_OK(status)) {
- return False;
+ return false;
}
if (v->type == MPR_TYPE_PTR && v->ptr == NULL) {
- return True;
+ return true;
}
- return False;
+ return false;
}
/*
return NT_STATUS_NOT_IMPLEMENTED;
}
-NTSTATUS ejs_pull_BOOL(struct ejs_rpc *ejs,
- struct MprVar *v, const char *name, BOOL *r)
+NTSTATUS ejs_pull_bool(struct ejs_rpc *ejs,
+ struct MprVar *v, const char *name, bool *r)
{
- NDR_CHECK(mprGetVar(&v, name));
+ EJS_CHECK(mprGetVar(&v, name));
*r = mprVarToBool(v);
return NT_STATUS_OK;
}
-NTSTATUS ejs_push_BOOL(struct ejs_rpc *ejs,
- struct MprVar *v, const char *name, const BOOL *r)
+NTSTATUS ejs_push_bool(struct ejs_rpc *ejs,
+ struct MprVar *v, const char *name, const bool *r)
{
return mprSetVar(v, name, mprCreateBoolVar(*r));
}
+
+
+/*
+ pull a uint8 array from a mpr variable to a C element - treating as a data blob
+*/
+NTSTATUS ejs_pull_array_uint8(struct ejs_rpc *ejs,
+ struct MprVar *v, const char *name,
+ uint8_t *r, uint32_t length)
+{
+ NTSTATUS status;
+ DATA_BLOB *blob;
+
+ status = mprGetVar(&v, name);
+ NT_STATUS_NOT_OK_RETURN(status);
+
+ blob = mprToDataBlob(v);
+ if (blob == NULL) {
+ return NT_STATUS_OBJECT_NAME_INVALID;
+ }
+ if (blob->length != length) {
+ return NT_STATUS_INFO_LENGTH_MISMATCH;
+ }
+ memcpy(r, blob->data, length);
+ return NT_STATUS_OK;
+
+}
+
+NTSTATUS ejs_push_array_uint8(struct ejs_rpc *ejs,
+ struct MprVar *v, const char *name,
+ const uint8_t *r, uint32_t length)
+{
+ DATA_BLOB blob;
+ blob.data = (uint8_t *)discard_const(r);
+ blob.length = length;
+ mprSetVar(v, name, mprDataBlob(blob));
+ return NT_STATUS_OK;
+}
git.samba.org / kai / samba.git / blobdiff