r20358: - fix ejs generated code for ipv4address

[jelmer/samba4-debian.git] / source / scripting / ejs / ejsrpc.h

diff --git a/source/scripting/ejs/ejsrpc.h b/source/scripting/ejs/ejsrpc.h
index a790beb804ada3cbf4473054cd988ad57bff4a72..e4be242c911afc7c41cda8f0a0d1d04a7fb29be5 100644 (file)
--- a/source/scripting/ejs/ejsrpc.h
+++ b/source/scripting/ejs/ejsrpc.h
@@ -20,6 +20,9 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include "librpc/gen_ndr/security.h"
+#include "librpc/rpc/dcerpc.h"
+
 struct ejs_rpc {
        int eid;
        const char *callname;
@@ -78,6 +81,10 @@ NTSTATUS ejs_pull_NTTIME(struct ejs_rpc *ejs,
                        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, 
@@ -86,6 +93,10 @@ NTSTATUS ejs_pull_string(struct ejs_rpc *ejs,
                         struct MprVar *v, const char *name, const char **s);
 NTSTATUS ejs_push_string(struct ejs_rpc *ejs, 
                         struct MprVar *v, const char *name, const char *s);
+NTSTATUS ejs_pull_ipv4address(struct ejs_rpc *ejs, 
+                        struct MprVar *v, const char *name, const char **s);
+NTSTATUS ejs_push_ipv4address(struct ejs_rpc *ejs, 
+                        struct MprVar *v, const char *name, const char *s);
 void ejs_set_constant_int(int eid, const char *name, int value);
 void ejs_set_constant_string(int eid, const char *name, const char *value);
 
@@ -115,23 +126,40 @@ NTSTATUS ejs_push_array_uint8(struct ejs_rpc *ejs,
                              struct MprVar *v, const char *name, 
                              const uint8_t *r, uint32_t length);
 
-#define EJS_ALLOC_SIZE(ejs, s, size) do { \
-  (s) = talloc_size(ejs, size); \
+NTSTATUS ejs_pull_GUID(struct ejs_rpc *ejs, 
+                      struct MprVar *v, const char *name, struct GUID *r);
+NTSTATUS ejs_push_GUID(struct ejs_rpc *ejs, 
+                      struct MprVar *v, const char *name, const struct GUID *r);
+
+struct lsa_String;
+NTSTATUS ejs_pull_lsa_String(struct ejs_rpc *ejs, 
+                           struct MprVar *v, const char *name, struct lsa_String *r);
+NTSTATUS ejs_push_lsa_String(struct ejs_rpc *ejs, 
+                           struct MprVar *v, const char *name, const struct lsa_String *r);
+
+struct winreg_String;
+NTSTATUS ejs_pull_winreg_String(struct ejs_rpc *ejs, 
+                            struct MprVar *v, const char *name, struct winreg_String *r);
+NTSTATUS ejs_push_winreg_String(struct ejs_rpc *ejs, 
+                            struct MprVar *v, const char *name, const struct winreg_String *r);
+
+#define EJS_ALLOC(ejs, s) do { \
+  (s) = talloc_ptrtype(ejs, (s)); \
   if (!(s)) return ejs_panic(ejs, "out of memory"); \
 } while (0)
 
-#define EJS_ALLOC(ejs, s) EJS_ALLOC_SIZE(ejs, s, sizeof(*(s)))
-
-#define EJS_ALLOC_N_SIZE(ejs, s, n, elsize) do { \
-       (s) = talloc_array_size(ejs, elsize, n); \
+#define EJS_ALLOC_N(ejs, s, n) do { \
+       (s) = talloc_array_ptrtype(ejs, (s), n); \
        if (!(s)) return ejs_panic(ejs, "out of memory"); \
 } while (0)
 
-#define EJS_ALLOC_N(ejs, s, n) EJS_ALLOC_N_SIZE(ejs, s, n, sizeof(*(s)))
-
 /* 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