From: Enrico Scholz Date: Tue, 6 Apr 2004 23:00:46 +0000 (+0000) Subject: use switchToWatchXid() X-Git-Tag: VERSION_0_10~146 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6cb433f7ff39241cadf3dba7ae44ad9ede9cd801;p=util-vserver.git use switchToWatchXid() git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1435 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/util-vserver/src/vps.c b/util-vserver/src/vps.c index 50bfed0..ead995d 100644 --- a/util-vserver/src/vps.c +++ b/util-vserver/src/vps.c @@ -217,14 +217,17 @@ int main(int argc, char *argv[]) pid_t pid; char * data; size_t len; + char const * errptr; if (argc>1) { if (strcmp(argv[1], "--help") ==0) showHelp(1, argv[0], 0); if (strcmp(argv[1], "--version")==0) showVersion(); } - - if (vc_get_task_xid(0)!=1) - Evc_new_s_context(1, vc_get_insecurecaps(), 0); + + if (!switchToWatchXid(&errptr)) { + perror(errptr); + exit(wrapper_exit_code); + } Epipe(p); pid = Efork(); diff --git a/util-vserver/src/vserver-info.c b/util-vserver/src/vserver-info.c index b528ba6..9976e99 100644 --- a/util-vserver/src/vserver-info.c +++ b/util-vserver/src/vserver-info.c @@ -229,7 +229,7 @@ getInitPid_internal(pid_t pid, xid_t xid, pid_t *res) pos = strstr(buf, "\ninitpid: "); if (pos!=0) { - pos += sizeof("\ninitpid: ")-1; + pos += sizeof("\ninitpid: ")-1; if (strncmp(pos, "none", 4)==0) *res = -1; else *res = atoi(pos); } @@ -243,8 +243,8 @@ getInitPid_emulated(char *buf, xid_t xid) { struct dirent **namelist; int n; - - vc_new_s_context(1,0,0); // ignore errors silently... + + switchToWatchXid(0); // ignore errors silently... n = scandir("/proc", &namelist, selectPid, alphasort); if (n<0) perror("scandir()"); else while (n--) { diff --git a/util-vserver/src/vserver-stat.c b/util-vserver/src/vserver-stat.c index 765bcf1..60810e1 100644 --- a/util-vserver/src/vserver-stat.c +++ b/util-vserver/src/vserver-stat.c @@ -452,6 +452,7 @@ int main(int argc, char **argv) struct dirent* dir_entry; pid_t my_pid; struct Vector xid_data; + char const * errptr; if (argc==2) { if (strcmp(argv[1], "--help") ==0) showHelp(1, argv[0], 0); @@ -468,13 +469,10 @@ int main(int argc, char **argv) // do not include own stat my_pid = getpid(); -#if 1 - // try to switch in context 1 - if (vc_get_task_xid(0)!=1) - Evc_new_s_context(1, 0,0); -#else -# warning Compiling in debug-code -#endif + if (!switchToWatchXid(&errptr)) { + perror(errptr); + exit(1); + } Vector_init(&xid_data, sizeof(struct XidData));