#undef _POSIX_SOURCE
#include "capability-compat.h"
-#ifndef CLONE_NEWNS
-# define CLONE_NEWNS 0x00020000
-#endif
-
#define LIBNAME "rpm-fake.so"
#define PLATFORM_FILE "/etc/rpm/platform"
static bool is_initialized = false;
+static bool ctx_created = false;
+
//DECLARE(rpm_execcon);
//DECLARE(execv);
DECLARE(getpwnam);
xid_t rc=VC_NOCTX;
if ((xid==VC_DYNAMIC_XID || !vc_is_dynamic_xid(xid)) &&
- (rc=vc_ctx_create(xid))==VC_NOCTX &&
+ (rc=vc_ctx_create(xid, NULL))==VC_NOCTX &&
errno!=EEXIST) {
- perror(ENSC_WRAPPERS_PREFIX "vc_create_context()");
+ perror(ENSC_WRAPPERS_PREFIX "vc_ctx_create()");
exit(255);
}
char buf[sizeof(xid_t)*3 + 128];
size_t l;
struct vc_ctx_caps caps;
+ struct vc_ctx_flags flags;
strcpy(buf, "rpm-fake.so #");
l = utilvserver_fmt_uint(buf+sizeof("rpm-fake.so #")-1, getppid());
caps.bcaps = ~vc_get_insecurebcaps();
caps.bmask = ~0ull;
Evc_set_ccaps(rc, &caps);
+
+ flags.flagword = 0;
+ flags.mask = VC_VXF_SC_HELPER;
+ Evc_set_cflags(rc, &flags);
// context will be activated later...
xid = rc;
res = true;
+ ctx_created = true;
}
}
uint8_t c;
if (read(sync_sock, &c, 1)!=1) { /*...*/ }
if (write(pw_sock, "Q", 1)!=1) { /*...*/ }
+ if (ctx_created) {
+ if (vc_isSupported(vcFEATURE_VWAIT)) {
+ if (vc_wait_exit(ctx)==-1) { /*...*/ }
+ }
+ else {
+ /* this can race */
+ if (read(sync_sock, &c, 1)!=0) { /*...*/}
+ }
+ }
}
}
int res = -1;
if (vc_isSupported(vcFEATURE_MIGRATE))
- res = vc_ctx_migrate(ctx);
+ res = vc_ctx_migrate(ctx, 0);
else {
#ifdef VC_ENABLE_API_COMPAT
res = vc_new_s_context(ctx,caps,flags);