From 0fbb86cbb2d2991b2497e94b434478c6bb3a3af6 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Tue, 4 Nov 2003 13:53:41 +0000 Subject: [PATCH] added some additional logic git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@374 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/lib/getvservercfgstyle.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) 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"); -- 1.8.1.5