Commit 8c2d9961 authored by Greg Williams's avatar Greg Williams
Browse files

Added missed changes to fix build.

parent 281466e4

Makefile

+2 −2
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ LIB_OBJS = \ 
	$(OUT_DIR)/kinetic_semaphore.o \

	$(OUT_DIR)/kinetic_countingsemaphore.o \

	$(OUT_DIR)/kinetic_resourcewaiter.o \

	$(OUT_DIR)/acl.o \

	$(OUT_DIR)/kinetic_acl.o \

	$(OUT_DIR)/byte_array.o \

	$(OUT_DIR)/kinetic_client.o \

	$(OUT_DIR)/kinetic_admin_client.o \
@@ -175,7 +175,7 @@ ci: stop_sims start_sims all stop_sims 


json: ${OUT_DIR}/libjson-c.a



$(OUT_DIR)/acl.o: json

$(OUT_DIR)/kinetic_acl.o: json



json_install: json

	cd ${JSONC} && \

src/lib/kinetic_controller.c

+2 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ void KineticController_HandleUnexpectedResponse(void *msg, 
            connetionInfoReceived = true;

            logTag = statusTag;

            logAtLevel = 2;

            protoLogAtLevel = 2;

            protoLogAtLevel = 3;

        }

        else {

            LOG0("WARNING: Unsolicited status received. Connection being terminated by remote!");
@@ -240,6 +240,7 @@ void KineticController_HandleUnexpectedResponse(void *msg, 
        (void*)connection->messageBus,

        connection->socket, (long long)seq_id,

        response->header.protobufLength, response->header.valueLength);

    // if (response->proto->authType == KINETIC_PROTO_MESSAGE_AUTH_TYPE_UNSOLICITEDSTATUS)

    KineticLogger_LogProtobuf(protoLogAtLevel, response->proto);



    KineticAllocator_FreeKineticResponse(response);

test/system/test_system_delete.c

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static ByteBuffer ValueBuffer; 


void setUp(void)

{

    SystemTestSetup(2);

    SystemTestSetup(1);



    KeyBuffer = ByteBuffer_CreateAndAppendCString(KeyData, sizeof(KeyData), "DELETE test key");

    TagBuffer = ByteBuffer_CreateAndAppendCString(TagData, sizeof(TagData), "SomeTagValue");

test/system/test_system_put.c

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ static uint8_t ValueData[KINETIC_OBJ_SIZE]; 
static ByteBuffer ValueBuffer;

void setUp(void)

{

    SystemTestSetup(2);

    SystemTestSetup(1);

    KeyBuffer = ByteBuffer_CreateAndAppendCString(KeyData, sizeof(KeyData), "PUT test key");

    TagBuffer = ByteBuffer_CreateAndAppendCString(TagData, sizeof(TagData), "SomeTagValue");

    VersionBuffer = ByteBuffer_CreateAndAppendCString(VersionData, sizeof(VersionData), "v1.0");

test/system/test_system_security.c

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ void test_Secure_should_set_ACL_and_only_be_able_to_executed_permitted_operation 
    /* Set the system an ACL that retains the default HMAC key and all

     * permissions on identity 1, but restricts identity 2 and changes

     * the HMAC key. */

    SystemTestSetup(2);

    SystemTestSetup(1);

    const char *ACL_path = TEST_DIR("system_test.json");

    KineticStatus res = KineticAdminClient_SetACL(Fixture.adminSession,

        ACL_path);