ExternalVendorCode/conserver
1
0
Fork 0
mirror of https://github.com/bstansell/conserver.git synced 2024-12-19 04:47:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Show "(inactive)" rather than an invalid pty device name for ondemand consoles that are closed.

Browse Source 
Show "(inactive)" rather than "(null)" for ondemand consoles that have never been opened.
This commit is contained in:
Greg Becker 2024-05-25 17:31:55 -05:00
parent f6f3999437
commit c3a4e61906
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