xid_t rc=VC_NOCTX;
if ((xid==VC_DYNAMIC_XID || !vc_is_dynamic_xid(xid)) &&
- (rc=vc_create_context(xid))==VC_NOCTX &&
+ (rc=vc_ctx_create(xid))==VC_NOCTX &&
errno!=EEXIST) {
perror(ENSC_WRAPPERS_PREFIX "vc_create_context()");
exit(255);
l = utilvserver_fmt_uint(buf+sizeof("rpm-fake.so #")-1, getppid());
Evc_set_vhi_name(rc, vcVHI_CONTEXT, buf, sizeof("rpm-fake.so #")+l-1);
- caps.ccaps = ~0ull;
+ caps.ccaps = 0ull;
caps.cmask = ~0ull;
- caps.bcaps = ~vc_get_insecurecaps();
+ caps.bcaps = ~vc_get_insecurebcaps();
caps.bmask = ~0ull;
Evc_set_ccaps(rc, &caps);
}
if (pid==0) {
- char const *args[15];
+ char const *args[20];
char const **ptr = args;
char const *env[] = { "HOME=/", "PATH=/bin:/usr/bin", 0 };
char const *xid_str;
+ char flag_str[ sizeof(flags)*3 + 2];
+ char caps_str[ sizeof(caps)*3 + 2];
setsid();
dup2(res_sock[1], 0);
close(res_sock[1]);
/* ... *socket[0] are marked as close-on-exec ...*/
+ flag_str[utilvserver_fmt_uint(flag_str, flags)] = '\0';
+ caps_str[utilvserver_fmt_uint(caps_str, caps)] = '\0';
+
*ptr++ = resolver;
+ *ptr++ = "-F"; *ptr++ = flag_str;
+ *ptr++ = "-C"; *ptr++ = caps_str;
if (root) { *ptr++ = "-r"; *ptr++ = root; }
if (uid) { *ptr++ = "-u"; *ptr++ = uid; }
if (gid) { *ptr++ = "-g"; *ptr++ = gid; }
int res = -1;
if (vc_isSupported(vcFEATURE_MIGRATE))
- res = vc_migrate_context(ctx);
+ res = vc_ctx_migrate(ctx);
else
#ifdef VC_ENABLE_API_COMPAT
res = vc_new_s_context(ctx,caps,flags);