fd = open(pathname, O_RDONLY);
- if (fd==-1 ||
- (len=lseek(fd, 0, SEEK_END))==-1 ||
+ if (fd==-1) return VC_NOCTX;
+ if ((len=lseek(fd, 0, SEEK_END))==-1 ||
(len>50) ||
- (lseek(fd, 0, SEEK_SET)==-1))
+ (lseek(fd, 0, SEEK_SET)==-1)) {
+ close(fd);
return VC_NOCTX;
+ }
{
char buf[len+1];
char *errptr;
xid_t res;
- if (TEMP_FAILURE_RETRY(read(fd, buf, len+1))!=len)
- return VC_NOCTX;
+ if (TEMP_FAILURE_RETRY(read(fd, buf, len+1))!=len) res = VC_NOCTX;
+ else {
+ buf[len] = '\0';
- res = strtol(buf, &errptr, 10);
- if (*errptr!='\0' && *errptr!='\n') return VC_NOCTX;
+ res = strtol(buf, &errptr, 10);
+ if (*errptr!='\0' && *errptr!='\n') res = VC_NOCTX;
+ }
+ close(fd);
return res;
}
}
memcpy(buf+idx, "/run", 5); // appends '\0' too
res = getCtxFromFile(buf);
- if (is_running) *is_running = res!=VC_NOCTX;
+
+ // when context information could be read, we have to verify that
+ // it belongs to a running vserver and the both vservers are
+ // identically
+ if (res!=VC_NOCTX) {
+ char *cur_name;
+ struct vc_vx_info info;
+
+ // determine the vserver which is associated with the xid
+ // resp. skip this step when the context does not exist
+ cur_name = (vc_get_vx_info(res, &info)!=-1 ?
+ vc_getVserverByCtx_Internal(res, &style, 0, false) : 0);
+
+ buf[idx] = '\0'; // cut off the '/run' from the vserver name
+ res = ((cur_name!=0 &&
+ vc_compareVserverById(buf, vcCFG_RECENT_FULL,
+ cur_name, vcCFG_RECENT_FULL)==0)
+ ? res
+ : VC_NOCTX); // correct the value of 'res'
+
+ free(cur_name);
+ }
+
+ if (is_running) // fill 'is_running' information...
+ *is_running = res!=VC_NOCTX;
if (res==VC_NOCTX && honor_static) {
memcpy(buf+idx, "/context", 9); // appends '\0' too