Start an 'NTP signing server' in Samba4.

[kai/samba.git] / source / scripting / ejs / ejsrpc.c

diff --git a/source/scripting/ejs/ejsrpc.c b/source/scripting/ejs/ejsrpc.c
index 08a675a11727acdf246e6bc4ff68cb6917ddad83..c7c02dbd647ae836826f31fc1c4dbbb3ed81c031 100644 (file)
--- a/source/scripting/ejs/ejsrpc.c
+++ b/source/scripting/ejs/ejsrpc.c
@@ -7,7 +7,7 @@
    
    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,
@@ -16,8 +16,7 @@
    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"
@@ -59,7 +58,7 @@ NTSTATUS ejs_pull_struct_start(struct ejs_rpc *ejs, struct MprVar **v, const cha
 */
 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);
 }
 
@@ -69,7 +68,7 @@ NTSTATUS ejs_push_struct_start(struct ejs_rpc *ejs, struct MprVar **v, const cha
 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;
        
@@ -87,7 +86,7 @@ NTSTATUS ejs_push_uint8(struct ejs_rpc *ejs,
 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;
        
@@ -105,7 +104,7 @@ NTSTATUS ejs_push_uint16(struct ejs_rpc *ejs,
 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;
 }
@@ -122,7 +121,7 @@ NTSTATUS ejs_push_uint32(struct ejs_rpc *ejs,
 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;
 }
@@ -139,7 +138,7 @@ NTSTATUS ejs_push_int32(struct ejs_rpc *ejs,
 NTSTATUS ejs_pull_time_t(struct ejs_rpc *ejs, 
                         struct MprVar *v, const char *name, time_t *r)
 {
-       NDR_CHECK(mprGetVar(&v, name));
+       EJS_CHECK(mprGetVar(&v, name));
        *r = mprVarToInteger(v);
        return NT_STATUS_OK;
 }
@@ -153,7 +152,7 @@ NTSTATUS ejs_push_time_t(struct ejs_rpc *ejs,
 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;
 }
@@ -220,7 +219,7 @@ NTSTATUS ejs_push_NTSTATUS(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;
        
@@ -239,7 +238,7 @@ NTSTATUS ejs_push_enum(struct ejs_rpc *ejs,
 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;
 }
@@ -253,11 +252,31 @@ NTSTATUS ejs_push_string(struct ejs_rpc *ejs,
        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;
@@ -275,7 +294,7 @@ NTSTATUS ejs_push_dom_sid(struct ejs_rpc *ejs,
 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);
 }
 
@@ -292,16 +311,16 @@ NTSTATUS ejs_push_null(struct ejs_rpc *ejs, struct MprVar *v, const char *name)
        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;
 }
 
 /*
@@ -353,16 +372,16 @@ NTSTATUS ejs_push_DATA_BLOB(struct ejs_rpc *ejs,
        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));
 }
@@ -398,7 +417,7 @@ NTSTATUS ejs_push_array_uint8(struct ejs_rpc *ejs,
                              const uint8_t *r, uint32_t length)
 {
        DATA_BLOB blob;
-       blob.data = discard_const(r);
+       blob.data = (uint8_t *)discard_const(r);
        blob.length = length;
        mprSetVar(v, name, mprDataBlob(blob));
        return NT_STATUS_OK;