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

Fixed a merge conflict in telnet.c

Browse Source
This commit is contained in:
koennecke
2017-04-07 07:55:40 +02:00
parent c780ad9cae
commit c4cee85b57
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
telnet.c
View File

@ -173,13 +173,8 @@ int TelnetTask(void *pData)
return 1; return 1;
} else { } else {
snprintf(pBuffer,sizeof(pBuffer)-1, "Accepted telnet connection on handle %d", snprintf(pBuffer,sizeof(pBuffer)-1, "Accepted telnet connection on handle %d",
<<<<<<< HEAD
self->pCon->sockHandle);
Log(INFO,"sys","%s",pBuffer);
=======
SCGetSockHandle(self->pCon)); SCGetSockHandle(self->pCon));
Log(INFO,"com","%s",pBuffer); Log(INFO,"com","%s",pBuffer);
>>>>>>> conclean
SendWelcome(self->pCon); SendWelcome(self->pCon);
SCSetRights(self->pCon, iRet); SCSetRights(self->pCon, iRet);
self->iLogin = 1; self->iLogin = 1;