Merging release 2.0 branch with CVS trunk

r2601 | ffr | 2008-05-30 10:26:57 +1000 (Fri, 30 May 2008) | 2 lines
This commit is contained in:
Ferdi Franceschini
2008-05-30 10:26:57 +10:00
committed by Douglas Clowes
parent 4a937e1608
commit 0749b0effa
125 changed files with 8541 additions and 1810 deletions

View File

@@ -1148,7 +1148,7 @@ static int checkHMEnd(pHistMem self, char *text){
/* do it */
Arg2Text(argc - 3, &argv[3],pBueffel, 511);
/* authorise */
if(!SCMatchRights(pCon,usMugger))
if(!SCMatchRights(pCon,usUser)) /* FIXME ffr stupid hack */
{
sprintf(pBueffel,
"ERROR: you need to be manager in order to configure %s",
@@ -1254,7 +1254,7 @@ static int checkHMEnd(pHistMem self, char *text){
eError);
return 0;
}
if(SCMatchRights(pCon,usMugger))
if(SCMatchRights(pCon,usUser)) /* FIXME ffr stupid hack */
{
iRet = HistConfigure(self,pCon,pSics);
if(iRet)