From 17dd88e8045cd1e33a576ded82edc6571f899c3f Mon Sep 17 00:00:00 2001 From: KLuka Date: Mon, 18 May 2015 16:26:38 +0200 Subject: [PATCH] Real IP recognition over proxy (man, help) * Manual page and output of --help parameter were updated according to changes in previous commit. --- shellinabox/shellinaboxd.c | 1 + shellinabox/shellinaboxd.man.in | 12 +++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/shellinabox/shellinaboxd.c b/shellinabox/shellinaboxd.c index bf44d2e..0df94bf 100644 --- a/shellinabox/shellinaboxd.c +++ b/shellinabox/shellinaboxd.c @@ -800,6 +800,7 @@ static void usage(void) { " ${home} - home directory\n" " ${lines} - number of rows\n" " ${peer} - name of remote peer\n" + " ${realip} - value of HTTP header field 'X-Real-IP'\n" " ${uid} - user id\n" " ${url} - the URL that serves the terminal session\n" " ${user} - user name\n" diff --git a/shellinabox/shellinaboxd.man.in b/shellinabox/shellinaboxd.man.in index 0e401a6..082b37e 100644 --- a/shellinabox/shellinaboxd.man.in +++ b/shellinabox/shellinaboxd.man.in @@ -449,6 +449,9 @@ number of rows. .B ${peer} name of remote peer. .TP +.B ${realip} +value of HTTP header field 'X-Real-IP'. +.TP .B ${uid} numeric user id. .TP @@ -458,11 +461,14 @@ the URL that serves the terminal session. .B ${user} user name. .P -Other than the default environment variables of +Other than the environment variables of .BR $TERM , -.B $COLUMNS +.B $COLUMNS, +.B $LINES, +.B $SHELLINABOX_PEERNAME, +.B $SHELLINABOX_REALIP and -.BR $LINES , +.BR $SHELLINABOX_URL, services can have environment variables passed to them, by preceding the with space separated variable assignments of the form .IR KEY = VALUE .