Fix the comment delimiter in htdbm

Submitted by:Guenter Knauf <eflash gmx.net>
Reviewed by: bnicholes, trawick, jjclar

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@103205 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 21d08246f3d5017aff642f7636c507e8b10b0ac2..f092c70d3cbe9103bef20c9901955813ba3d48ad 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,10 @@
 Changes with Apache 2.0.50
 
+  *) Fix the comment delimiter in htdbm so that it correctly parses the 
+     username comment.  Also add a terminate function to allow NetWare 
+     to pause the output before the screen is destroyed.
+     [Guenter Knauf <eflash gmx.net>, Brad Nicholes] 
+  
   *) Fix crash when Apache was started with no Listen directives.
      [Michael Corcoran <mcorcoran warpsolutions.com>]
 

diff --git a/STATUS b/STATUS
index 172d7892c9d9d4178ec7cbdf48d808c458685e22..ba98963ccb5a4340841a1f30ec037ca5f30af39b 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/03/29 21:41:13 $]
+Last modified at [$Date: 2004/03/29 23:07:46 $]
 
 Release:
 
@@ -110,12 +110,6 @@ PATCHES TO BACKPORT FROM 2.1
            modules/dav/fs/lock.c: r1.31
        +1: trawick
 
-    *) Fix the comment delimiter so that it correctly parses the username
-        comment.  Also add a terminate function to allow NetWare to pause
-       the output before the screen is destroyed.
-       support/htdbm.c: r1.15
-       +1: bnicholes, trawick, jjclar
-
     *) Use apr_temp_dir_get for htdigest and remove the dependancy on
         the external cp/copy command. Remove the OMIT_DELONCLOSE #ifdef
        because removing the temp file happens automatically through

diff --git a/support/htdbm.c b/support/htdbm.c
index f262cb95d972dde77a68269946117b862f5daef5..f8152606d381f49c8144104b5490439a03ccb3fc 100644 (file)
--- a/support/htdbm.c
+++ b/support/htdbm.c
@@ -105,9 +105,16 @@ struct htdbm_t {
 #define HTDBM_NOFILE 4
 #define HTDBM_STDIN  5
 
+static void terminate(void)
+{
+    apr_terminate();
+#ifdef NETWARE
+    pressanykey();
+#endif
+}
+
 static void htdbm_terminate(htdbm_t *htdbm) 
 {
-    
     if (htdbm->dbm)
         apr_dbm_close(htdbm->dbm);
     htdbm->dbm = NULL;
@@ -254,7 +261,7 @@ static apr_status_t htdbm_list(htdbm_t *htdbm)
         fprintf(stderr, "    %-32s", kb);
         strncpy(rec, val.dptr, val.dsize);
         rec[val.dsize] = '\0';
-        cmnt = strchr(rec, ';');
+        cmnt = strchr(rec, ':');
         if (cmnt)
             fprintf(stderr, cmnt + 1);
         fprintf(stderr, "\n");
@@ -387,7 +394,7 @@ int main(int argc, const char * const argv[])
     int args_left = 2;
 
     apr_app_initialize(&argc, &argv, NULL);
-    atexit(apr_terminate);
+    atexit(terminate);
 
     if ((rv = htdbm_init(&pool, &h)) != APR_SUCCESS) {
         fprintf(stderr, "Unable to initialize htdbm terminating!\n");
@@ -569,7 +576,6 @@ int main(int argc, const char * const argv[])
         }
     }
     htdbm_terminate(h);
-    apr_terminate();
     
     return 0; /* Suppress compiler warning. */
 }