ExternalVendorCode/conserver
1
0
Fork 0
mirror of https://github.com/bstansell/conserver.git synced 2024-12-18 20:37:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into beckerg/spymode

Browse Source
This commit is contained in:
Bryan Stansell 2024-06-03 17:31:31 -07:00 committed by GitHub
commit 806701ab42
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conserver/consent.c
View File

@ -798,6 +798,8 @@ ConsDown(CONSENT *pCE, FLAG downHard, FLAG force)
if (pCE->type == EXEC && pCE->execSlaveFD != 0) {
close(pCE->execSlaveFD);
pCE->execSlaveFD = 0;
free(pCE->execSlave);
pCE->execSlave = NULL;
}
pCE->fup = 0;
pCE->nolog = 0;

5
conserver/group.c
View File

@ -2175,7 +2175,7 @@ CommandExamine(GRPENT *pGE, CONSCLIENT *pCLServing, CONSENT *pCEServing,
char p = '\000';
switch (pCE->type) {
case EXEC:
d = pCE->execSlave;
d = (pCE->execSlaveFD > 0) ? pCE->execSlave : "(inactive)";
b = "Local";
p = ' ';
break;
@ -2343,7 +2343,8 @@ CommandInfo(GRPENT *pGE, CONSCLIENT *pCLServing, CONSENT *pCEServing,
case EXEC:
FilePrint(pCLServing->fd, FLAGTRUE, "|:%s,%lu,%s,%d:",
(pCE->exec != (char *)0 ? pCE->exec : "/bin/sh"),
(unsigned long)pCE->ipid, pCE->execSlave,
(unsigned long)pCE->ipid,
(pCE->execSlaveFD > 0) ? pCE->execSlave : "(inactive)",
FileFDNum(pCE->cofile));
break;
#if HAVE_FREEIPMI