linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged 2.4 branch

Browse Source 
r2828 | ffr | 2009-11-25 09:56:49 +1100 (Wed, 25 Nov 2009) | 2 lines
This commit is contained in:
Ferdi Franceschini
2009-11-25 09:56:49 +11:00
committed by Douglas Clowes
parent c58ee9fbcb
commit 2ec6505ef8
71 changed files with 2237 additions and 1528 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
conman.c
View File

@@ -572,9 +572,6 @@ extern pServer pServ;
{
return 0;
}
if (self->iMacro) {
iOut = eInternal;
}
return self->write(self,pBuffer,iOut);
}
/*-----------------------------------------------------------------------*/
@@ -718,9 +715,11 @@ static void writeToLogFiles(SConnection *self, char *buffer)
/* supress */ iRet = 0;
}
else {
sprintf(pBueffel,"Next line intended for socket(1): %d",iRet);
SICSLogWrite(pBueffel,eInternal);
SICSLogWrite(buffer,iOut);
if (self->iMacro != 1) {
sprintf(pBueffel,"Next line intended for socket(1): %d",iRet);
SICSLogWrite(pBueffel,eInternal);
SICSLogWrite(buffer,iOut);
}
}
/* write to commandlog if user or manager privilege */
@@ -1037,6 +1036,8 @@ pDynString SCEndBuffering(SConnection *pCon)
{
return 0;
}
if (strcmp(buffer, "OK") == 0)
return 1;
/* log it for any case */
if(self->pSock)