unbreak acl allocation

[project/ubus.git] / ubusd_acl.c

diff --git a/ubusd_acl.c b/ubusd_acl.c
index 31f8b45..1d965c0 100644 (file)
--- a/ubusd_acl.c
+++ b/ubusd_acl.c
@@ -28,6 +28,14 @@
 
 #include "ubusd.h"
 
+#ifndef SO_PEERCRED
+struct ucred {
+       int pid;
+       int uid;
+       int gid;
+};
+#endif
+
 struct ubusd_acl_obj {
        struct avl_node avl;
        struct list_head list;
@@ -92,7 +100,7 @@ ubusd_acl_check(struct ubus_client *cl, const char *obj,
        struct blob_attr *cur;
        int rem;
 
-       if (!cl->gid && !cl->gid)
+       if (!cl->gid && !cl->uid)
                return 0;
 
        acl = avl_find_ge_element(&ubusd_acls, obj, acl, avl);
@@ -135,13 +143,18 @@ ubusd_acl_check(struct ubus_client *cl, const char *obj,
 int
 ubusd_acl_init_client(struct ubus_client *cl, int fd)
 {
-       unsigned int len = sizeof(struct ucred);
        struct ucred cred;
        struct passwd *pwd;
        struct group *group;
 
+#ifdef SO_PEERCRED
+       unsigned int len = sizeof(struct ucred);
+
        if (getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &cred, &len) == -1)
                return -1;
+#else
+       memset(&cred, 0, sizeof(cred));
+#endif
 
        pwd = getpwuid(cred.uid);
        if (!pwd)
@@ -193,7 +206,7 @@ ubusd_acl_alloc_obj(struct ubusd_acl_file *file, const char *obj)
        struct ubusd_acl_obj *o;
        char *k;
 
-       o = calloc_a(1, sizeof(*o), &k, strlen(obj) + 1);
+       o = calloc_a(sizeof(*o), &k, strlen(obj) + 1);
        o->user = file->user;
        o->group = file->group;
        o->avl.key = k;