Commit 669a9bc0 authored by Scott Vokes's avatar Scott Vokes
Browse files

Further cleanup.

parent 0df0b0ec

src/lib/acl.c

+1 −1
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ static acl_of_file_res unpack_scopes(KineticProto_Command_Security_ACL *acl, 
                        struct json_object *jperm = json_object_array_get_idx(val, i);

                        KineticProto_Command_Security_ACL_Permission p;

                        p = permission_of_str(json_object_get_string(jperm));

                        if (p == PERM_INVALID) {

                        if (p == KINETIC_PROTO_COMMAND_SECURITY_ACL_PERMISSION_INVALID_PERMISSION) {

                            return ACL_ERROR_INVALID_FIELD;

                        } else {

                            scope->permission[scope->n_permission] = p;

src/lib/acl_types.h

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ struct ACL { 
    KineticProto_Command_Security_ACL **ACLs;

};



#define ACL_MAX_PERMISSIONS 8



typedef enum {

    ACL_OK = 0,

    ACL_END_OF_STREAM = 1,