diff --git a/hack/isulad-tools.spec b/hack/isulad-tools.spec index 5026d1a..9fa338b 100644 --- a/hack/isulad-tools.spec +++ b/hack/isulad-tools.spec @@ -4,7 +4,7 @@ #Basic Information Name: isulad-tools Version: v0.9 -Release: 33 +Release: 34 Summary: isulad tools for IT, work with iSulad License: Mulan PSL v1 Source0: %{name}-src.tar.gz @@ -13,7 +13,6 @@ BuildRoot: %{_tmppath}/%{name}-root #Dependency BuildRequires: glibc-static BuildRequires: golang > 1.6 -BuildRequires: libsecurec libsecurec-devel Requires: iSulad Requires: util-linux @@ -108,6 +107,12 @@ chmod 0640 ${HOOK_SPEC}/hookspec.json rm -rfv %{buildroot} %changelog +* Tue Dec 26 2019 Zhangsong - 0.9.34 +- Type:enhancement +- ID:NA +- SUG:restart +- DESC:remove securec functions + * Tue Dec 11 2018 Zhangsong - 0.9.9-1 - Type:enhancement - ID:NA diff --git a/pkg/ethtool/ethtool.c b/pkg/ethtool/ethtool.c index 5a12624..764ebbc 100644 --- a/pkg/ethtool/ethtool.c +++ b/pkg/ethtool/ethtool.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #include #include @@ -35,10 +34,7 @@ int setNetDeviceTSO(int fd, char* name, int on) eval.data = on; eval.cmd = ETHTOOL_STSO; - ret = strncpy_s(ifr.ifr_name, sizeof(ifr.ifr_name), name, sizeof(ifr.ifr_name) - 1); - if (ret != EOK) { - return -1; - } + strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name) - 1); ifr.ifr_data = (void*)&eval; ret = ioctl(fd, SIOCETHTOOL, &ifr); if (ret < 0) { @@ -55,10 +51,7 @@ int setNetDeviceSG(int fd, char* name, int on) eval.data = on; eval.cmd = ETHTOOL_SSG; - ret = strncpy_s(ifr.ifr_name, sizeof(ifr.ifr_name), name, sizeof(ifr.ifr_name) - 1); - if (ret != EOK) { - return -1; - } + strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name) - 1); ifr.ifr_data = (void*)&eval; ret = ioctl(fd, SIOCETHTOOL, &ifr); if (ret < 0) { @@ -75,10 +68,7 @@ int setNetDeviceTX(int fd, char* name, int on) eval.data = on; eval.cmd = ETHTOOL_STXCSUM; - ret = strncpy_s(ifr.ifr_name, sizeof(ifr.ifr_name), name, sizeof(ifr.ifr_name) - 1); - if (ret != EOK) { - return -1; - } + strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name) - 1); ifr.ifr_data = (void*)&eval; ret = ioctl(fd, SIOCETHTOOL, &ifr); if (ret < 0) {