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

adding docs/help for new -k and exiting like other code paths

Browse Source
This commit is contained in:
Bryan Stansell 2020-10-17 17:07:01 -07:00
parent 4396ff9456
commit 3bf686ed39
No known key found for this signature in database
GPG Key ID: 28E4B7253029E7F6
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
console/console.c
View File

@ -285,6 +285,7 @@ Usage(int wantfull)
"f(F) force read/write connection (and replay)",
"h output this message",
"i(I) display status info in machine-parseable form (on master)",
"k abort connection if the console is not 'up'",
"l user use username instead of current username",
"M master master server to poll first",
"n do not read system-wide config file",
@ -312,7 +313,7 @@ Usage(int wantfull)
%s [generic-args] [-iIuwWx] [console]\n\
%s [generic-args] [-hPqQrRV] [-[bB] message] [-d [user][@console]]\n\
[-t [user][@console] message] [-[zZ] cmd]\n\n\
generic-args: [-7DEnUv] [-c cred] [-C config] [-M master]\n\
generic-args: [-7DEknUv] [-c cred] [-C config] [-M master]\n\
[-p port] [-l username]\n", progname, progname, progname);
if (wantfull) {
@ -1474,8 +1475,8 @@ CallUp(CONSFILE *pcf, char *pcMaster, char *pcMach, char *pcHow,
if (strncmp(r, "[unknown", 8) != 0 && strncmp(r, "[up]", 4) != 0) {
FileWrite(cfstdout, FLAGFALSE, r, -1);
if (config->exitdown == FLAGTRUE) {
printf("Device is down. Will exit with option 'k'\n");
kill(thepid, SIGTERM);
Error("Console is not 'up'. Exiting. (-k)");
Bye(EX_UNAVAILABLE);
}
}

6
console/console.man.in
View File

@ -28,7 +28,7 @@ console \- console server client program
.IR cmd ]
.PP
.IR generic-args :
.RB [ \-7DEnUv ]
.RB [ \-7DEknUv ]
.RB [ \-c
.IR cred ]
.RB [ \-C
@ -178,6 +178,10 @@ Same as
.B \-i
but just acts on the primary server.
.TP
.B \-k
Abort the connection if the console is not in the `up' state immediately
upon connecting.
.TP
.BI \-l user
Set the login name used for authentication to
.IR user .