X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Frpm-fake.c;h=26c5fa8cbd04cb9babe03281b71b47d27597ce8e;hb=df13e5523df231124858003c93bdaa3b7a361f07;hp=e19fe889cb51954c38c22c34c5cd1d830e56a5f5;hpb=497c1688595953b76fcc0e79226e4038753c423f;p=util-vserver.git diff --git a/src/rpm-fake.c b/src/rpm-fake.c index e19fe88..26c5fa8 100644 --- a/src/rpm-fake.c +++ b/src/rpm-fake.c @@ -96,6 +96,8 @@ static unsigned int debug_level = 0; static bool is_initialized = false; +static bool ctx_created = false; + //DECLARE(rpm_execcon); //DECLARE(execv); DECLARE(getpwnam); @@ -255,6 +257,7 @@ setupContext(xid_t xid, char const **xid_str) 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()); @@ -265,11 +268,16 @@ setupContext(xid_t xid, char const **xid_str) 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; } } @@ -510,12 +518,14 @@ exitRPMFake() uint8_t c; if (read(sync_sock, &c, 1)!=1) { /*...*/ } if (write(pw_sock, "Q", 1)!=1) { /*...*/ } - if (vc_isSupported(vcFEATURE_VWAIT)) { - if (vc_wait_exit(ctx)==-1) { /*...*/ } - } - else { - /* this can race */ - if (read(sync_sock, &c, 1)!=0) { /*...*/} + 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) { /*...*/} + } } } }