instance, ujail: wire no_new_privs (-c) option

[project/procd.git] / service / validate.c

diff --git a/service/validate.c b/service/validate.c
index 2e610c7..6a449f4 100644 (file)
--- a/service/validate.c
+++ b/service/validate.c
@@ -13,6 +13,7 @@
 
 #include <libubox/blobmsg_json.h>
 #include <libubox/avl-cmp.h>
 
 #include <libubox/blobmsg_json.h>
 #include <libubox/avl-cmp.h>

+#include <json-c/json.h>

 
 #include "../procd.h"
 
 
 #include "../procd.h"
 


@@ -52,12 +53,12 @@ service_validate_dump_all(struct blob_buf *b, char *p, char *s)
                if (s && strcmp(s, v->type))
                        continue;
 
                if (s && strcmp(s, v->type))
                        continue;
 

-               o = json_object_object_get(r, v->package);
+               json_object_object_get_ex(r, v->package, &o);

                if (!o) {
                        o = json_object_new_object();
                        json_object_object_add(r, v->package, o);
                }
                if (!o) {
                        o = json_object_new_object();
                        json_object_object_add(r, v->package, o);
                }

-               t = json_object_object_get(o, v->type);
+               json_object_object_get_ex(o, v->type, &t);

                if (!t) {
                        t = json_object_new_object();
                        json_object_object_add(o, v->type, t);
                if (!t) {
                        t = json_object_new_object();
                        json_object_object_add(o, v->type, t);


@@ -66,6 +67,7 @@ service_validate_dump_all(struct blob_buf *b, char *p, char *s)
                        json_object_object_add(t, vr->option, json_object_new_string(vr->rule));
        }
        blobmsg_add_object(b, r);
                        json_object_object_add(t, vr->option, json_object_new_string(vr->rule));
        }
        blobmsg_add_object(b, r);

+       json_object_put(r);

 }
 
 void
 }
 
 void