diff options
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 4 | ||||
| -rw-r--r-- | netinstall.c | 59 |
3 files changed, 47 insertions, 20 deletions
@@ -1,7 +1,7 @@ pkgbase = netinstall pkgdesc = Mikrotik Netinstall for RouterOS pkgver = 6.47.7 - pkgrel = 1 + pkgrel = 2 url = https://www.mikrotik.com/ install = netinstall.install arch = i686 @@ -14,7 +14,7 @@ pkgbase = netinstall source = netinstall.c source = netinstall.desktop sha256sums = c27212f20520ccdae2eb8df78b3ebe146707c9c4464d3daacc23abad5f0e1699 - sha256sums = 9e96737ac5ba6c83579c7f816ed72786ef0caa9db30c7b4626379048250f5187 + sha256sums = ab9a26feafb4822266634db5e654529baab431e4b6bf8c2798ecd195d441f235 sha256sums = 742b8ebf2b66697f24a27b5e6920dd4a4b92dec0fea928e8f58e499246284623 pkgname = netinstall @@ -2,7 +2,7 @@ pkgname=netinstall pkgver=6.47.7 -pkgrel=1 +pkgrel=2 pkgdesc='Mikrotik Netinstall for RouterOS' arch=('i686' 'x86_64') url='https://www.mikrotik.com/' @@ -14,7 +14,7 @@ source=("https://download.mikrotik.com/routeros/${pkgver}/netinstall-${pkgver}.z 'netinstall.c' 'netinstall.desktop') sha256sums=('c27212f20520ccdae2eb8df78b3ebe146707c9c4464d3daacc23abad5f0e1699' - '9e96737ac5ba6c83579c7f816ed72786ef0caa9db30c7b4626379048250f5187' + 'ab9a26feafb4822266634db5e654529baab431e4b6bf8c2798ecd195d441f235' '742b8ebf2b66697f24a27b5e6920dd4a4b92dec0fea928e8f58e499246284623') build() { diff --git a/netinstall.c b/netinstall.c index 7a63d1866d5b..1d50e4cc24ad 100644 --- a/netinstall.c +++ b/netinstall.c @@ -12,7 +12,6 @@ #include <stdio.h> #include <stdlib.h> #include <sys/capability.h> -#include <sys/prctl.h> #include <sys/stat.h> #include <unistd.h> @@ -20,22 +19,45 @@ #define NETINSTALL_EXE_PATH "/usr/share/netinstall/netinstall.exe" int main(int argc, char ** argv) { - cap_value_t newcap[1]; - cap_t caps = cap_get_proc(); - newcap[0] = CAP_NET_BIND_SERVICE; - cap_set_flag(caps, CAP_INHERITABLE, 1, newcap, CAP_SET); - cap_set_proc(caps); - cap_free(caps); + cap_t caps; + cap_flag_value_t cap_effective = 0, cap_permitted = 0; + const cap_value_t cap = CAP_NET_BIND_SERVICE; - if (prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_RAISE, CAP_NET_BIND_SERVICE, 0, 0)) { - perror("prctl: can not set CAP_NET_BIND_SERVICE"); - return EXIT_FAILURE; + if (!CAP_IS_SUPPORTED(cap)) { + fprintf(stderr, "Capability CAP_NET_BIND_SERVICE is not supported.\n"); + goto out10; + } + if ((caps = cap_get_proc()) == NULL) { + perror("cap_get_proc"); + goto out10; + } + if (cap_get_flag(caps, cap, CAP_EFFECTIVE, &cap_effective) == -1 || + cap_get_flag(caps, cap, CAP_PERMITTED, &cap_permitted) == -1 || + cap_effective == 0 || cap_permitted == 0) { + fprintf(stderr, "Capability CAP_NET_BIND_SERVICE is not available. Set it with setcap(8).\n"); + goto out20; + } + if (cap_set_flag(caps, CAP_INHERITABLE, 1, &cap, CAP_SET) == -1) { + perror("cap_set_flag: setting CAP_INHERITABLE for CAP_NET_BIND_SERVICE"); + goto out20; + } + if (cap_set_proc(caps) == -1) { + perror("cap_set_proc"); + goto out20; + } + if (cap_free(caps) == -1) { + perror("cap_free"); + goto out10; } - + if (cap_set_ambient(cap, CAP_SET) == -1) { + perror("cap_set_ambient: setting CAP_NET_BIND_SERVICE"); + goto out10; + } + struct stat st; const char *home = getenv("HOME"); char wineprefix[256]; - snprintf(wineprefix, sizeof wineprefix, "%s/.netinstall/wine/", home); + snprintf(wineprefix, sizeof(wineprefix), "%s/.netinstall/wine/", home); setenv("WINEPREFIX", wineprefix, 1); setenv("WINEARCH", "win64", 1); @@ -44,18 +66,18 @@ int main(int argc, char ** argv) { if (chdir(home) == -1) { perror("chdir: changing to home directory"); - return EXIT_FAILURE; + goto out10; } if (stat(".netinstall/", &st) == -1) { if (mkdir(".netinstall/", 0777) == -1) { perror("mkdir: creating directory '.netinstall/'"); - return EXIT_FAILURE; + goto out10; } - + if (system("wineboot -u") != 0) { perror("system: running wineboot"); - return EXIT_FAILURE; + goto out10; } } @@ -64,5 +86,10 @@ int main(int argc, char ** argv) { /* execv() returns only on error */ perror("execv"); + +out20: + cap_free(caps); + +out10: return EXIT_FAILURE; } |