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 763f357eafd229739a8e1c1f09634c025efd0479..0bb2afbe0d3a09c7ad6fd252d2671bb89c38d3e4 100644 (file)
--- 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 8f1cdd5532d370a5381cb03a1406a87685a15b2f..b831a40d2c49be833450fff24d185b9205ff7e54 100644 (file)
--- 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 18d79944138b046428a54139876b1849b9df5c9f..8a7949efc5941443bd542ed9781adb7b54fc893a 100644 (file)
--- a/server/mpm/netware/mpm_netware.c
+++ b/server/mpm/netware/mpm_netware.c
@@ -124,6 +124,7 @@
 #include <netware.h>
 #include <nks/netware.h>
 #include <library.h>
+#include <screen.h>
 
 /* 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;