X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Flib%2Fgetvservercfgstyle.c;h=cc5643333f7bdd3d66f89cf13e08ac1e5a93da23;hb=f49070ceb13d75d475ea9b15caf4d5949627b6ff;hp=f56143b143e1c2ea783de36c75bc3492b23e258f;hpb=f30fdcfd6caa637eaaee58301d1f67cf9901eb29;p=util-vserver.git diff --git a/util-vserver/lib/getvservercfgstyle.c b/util-vserver/lib/getvservercfgstyle.c index f56143b..cc56433 100644 --- a/util-vserver/lib/getvservercfgstyle.c +++ b/util-vserver/lib/getvservercfgstyle.c @@ -35,7 +35,7 @@ vc_getVserverCfgStyle(char const *id) size_t l1 = strlen(id); char buf[l1 + MAX(sizeof(CONFDIR "/"),sizeof(DEFAULT_VSERVERDIR "/")) + - sizeof("/legacy") - 1]; + MAX(sizeof("/legacy"), sizeof(".conf")) - 1]; char * marker = 0; strcpy(buf, id); @@ -54,10 +54,19 @@ vc_getVserverCfgStyle(char const *id) strcpy(buf, DEFAULT_VSERVERDIR "/"); strcpy(buf+sizeof(DEFAULT_VSERVERDIR)+1 - 1, id); - if (access(buf, X_OK)) res = vcCFG_LEGACY; + if (access(buf, X_OK)==0) res = vcCFG_LEGACY; + } + + if (res==vcCFG_LEGACY) { + strcpy(buf, CONFDIR "/"); + strcpy(buf+sizeof(CONFDIR "/") - 1, id); + strcpy(buf+sizeof(CONFDIR "/")+l1 - 1, ".conf"); + + if (access(buf, R_OK)!=0) res = vcCFG_NONE; } } + if (res==vcCFG_RECENT_FULL || res==vcCFG_RECENT_SHORT) { assert(marker!=0); strcpy(marker, "/legacy");