From: Bradley Nicholes Date: Wed, 29 Jan 2003 17:09:50 +0000 (+0000) Subject: Enabled the -n parameter on NetWare to allow the administrator to rename X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ab345212c7b3a7bdf35f87f66a420655fccb75ac;p=apache Enabled the -n parameter on NetWare to allow the administrator to rename the console screen git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98535 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/CHANGES b/CHANGES index 763f357eaf..0bb2afbe0d 100644 --- a/CHANGES +++ b/CHANGES @@ -70,6 +70,10 @@ Changes with Apache 2.1.0-dev Changes with Apache 2.0.45 + *) Enable the -n name parameter on NetWare to allow the + administrator to rename the Apache console screen + [Brad Nicholes] + *) Fixed piped access logs on Win32 by disabling OTHER_CHILD support by default in APR. More development is required to deploy OTHER_CHILD on Win32. [William Rowe] diff --git a/server/main.c b/server/main.c index 8f1cdd5532..b831a40d2c 100644 --- a/server/main.c +++ b/server/main.c @@ -342,6 +342,10 @@ static void usage(process_rec *process) " -c \"directive\" : process directive after reading " "config files"); +#ifdef NETWARE + ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, + " -n name : set screen name"); +#endif #ifdef WIN32 ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, " -n name : set service name and use its " diff --git a/server/mpm/netware/mpm_netware.c b/server/mpm/netware/mpm_netware.c index 18d7994413..8a7949efc5 100644 --- a/server/mpm/netware/mpm_netware.c +++ b/server/mpm/netware/mpm_netware.c @@ -124,6 +124,7 @@ #include #include #include +#include /* Limit on the total --- clients will be locked out if more servers than * this are needed. It is intended solely to keep the server from crashing @@ -1058,8 +1059,13 @@ void netware_rewrite_args(process_rec *process) optbuf[0] = '-'; optbuf[2] = '\0'; apr_getopt_init(&opt, process->pool, process->argc, (char**) process->argv); - while (apr_getopt(opt, AP_SERVER_BASEARGS, optbuf + 1, &opt_arg) == APR_SUCCESS) { + while (apr_getopt(opt, AP_SERVER_BASEARGS"n:", optbuf + 1, &opt_arg) == APR_SUCCESS) { switch (optbuf[1]) { + case 'n': + if (opt_arg) { + renamescreen(opt_arg); + } + break; case 'E': /* Don't need to hold the screen open if the output is going to a file */ hold_screen_on_exit = -1;