!314 modify: bind cpu core

Merge pull request !314 from 熊磊/init0215plus

services/init/init_service_manager.c

@@ -640,10 +640,7 @@ static int CheckServiceKeyName(const cJSON *curService)
     char *cfgServiceKeyList[] = {
         "name", "path", "uid", "gid", "once", "importance", "caps", "disabled",
         "writepid", "critical", "socket", "console", "dynamic", "file", "ondemand",
-        "d-caps", "apl", "jobs", "start-mode", "end-mode", "cpucore",
-#ifdef WITH_SELINUX
-        SECON_STR_IN_CFG,
-#endif // WITH_SELINUX
+        "d-caps", "apl", "jobs", "start-mode", "end-mode", "cpucore", "secon"
     };
     INIT_CHECK_RETURN_VALUE(curService != NULL, SERVICE_FAILURE);
     cJSON *child = curService->child;

services/init/standard/init.c

@@ -62,6 +62,7 @@ static int FdHolderSockInit(void)
         unlink(INIT_HOLDER_SOCKET_PATH);
     }
     struct sockaddr_un addr;
+    addr.sun_family = AF_UNIX;
     if (strncpy_s(addr.sun_path, sizeof(addr.sun_path),
         INIT_HOLDER_SOCKET_PATH, strlen(INIT_HOLDER_SOCKET_PATH)) != 0) {
         INIT_LOGE("Faild to copy fd hoder socket path");
@@ -70,7 +71,7 @@ static int FdHolderSockInit(void)
     }
     socklen_t len = (socklen_t)(offsetof(struct sockaddr_un, sun_path) + strlen(addr.sun_path) + 1);
     if (bind(sock, (struct sockaddr *)&addr, len) < 0) {
-        INIT_LOGE("Failed to binder fd folder socket");
+        INIT_LOGE("Failed to binder fd folder socket %d", errno);
         close(sock);
         return -1;
     }

services/init/standard/init_service.c

@@ -119,7 +119,7 @@ void GetAccessToken(void)
             uint64_t tokenId = GetAccessTokenId(service->name, (const char **)service->capsArgs.argv,
                 service->capsArgs.count, service->apl);
             if (tokenId  == 0) {
-                INIT_LOGE("Set totken id %lld of service \' %s \' failed", service->name, tokenId);
+                INIT_LOGE("Get totken id %lld of service \' %s \' failed", tokenId, service->name);
             }
             service->tokenId = tokenId;
         }