svn commit: r155762 - in httpd/httpd/branches/2.0.x: CHANGES STATUS support/htdigest.c

[jo...@apache.org]

Author: jorton
Date: Tue Mar  1 02:02:06 2005
New Revision: 155762

URL: http://svn.apache.org/viewcvs?view=rev&rev=155762
Log:
Merge r155681 from trunk:

* support/htdigest.c (main): Fix permissions of created files.

PR: 33765
Reviewed by: jorton, trawick, jerenkrantz

Modified:
    httpd/httpd/branches/2.0.x/CHANGES
    httpd/httpd/branches/2.0.x/STATUS
    httpd/httpd/branches/2.0.x/support/htdigest.c

Modified: httpd/httpd/branches/2.0.x/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/CHANGES?view=diff&r1=155761&r2=155762
==============================================================================
--- httpd/httpd/branches/2.0.x/CHANGES (original)
+++ httpd/httpd/branches/2.0.x/CHANGES Tue Mar  1 02:02:06 2005
@@ -1,5 +1,7 @@
 Changes with Apache 2.0.54
 
+  *) htdigest: Fix permissions of created files.  PR 33765.  [Joe Orton]
+
   *) core_input_filter: Move buckets to a persistent brigade instead of
      creating a new brigade. This stop a memory leak when proxying a 
      Streaming Media Server. PR 33382. [Paul Querna]

Modified: httpd/httpd/branches/2.0.x/STATUS
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/STATUS?view=diff&r1=155761&r2=155762
==============================================================================
--- httpd/httpd/branches/2.0.x/STATUS (original)
+++ httpd/httpd/branches/2.0.x/STATUS Tue Mar  1 02:02:06 2005
@@ -94,15 +94,11 @@
     identify exactly what the proposed changes are! ]
   [ please append new backports at the end of this list not the top. ]
 
-    *) htdigest: Fix permissions of created files
-       http://svn.apache.org/viewcvs.cgi?rev=155681&view=rev
-       PR: 33765
-       +1: jorton, trawick, jerenkrantz
-
     *) mod_ssl: Set r->user from SSLUsername earlier so that it's
        actually useful.
        http://svn.apache.org/viewcvs.cgi?rev=153280&view=rev
        http://svn.apache.org/viewcvs.cgi?rev=151493&view=rev
+       a.k.a. http://www.apache.org/~jorton/ap_ssluser.diff
        PR: 31418
        jerenkrantz comments: 151493 deletes a chunk and adds a chunk,
           with 153280 moving that added hunk elsewhere.  My brain hurts.

Modified: httpd/httpd/branches/2.0.x/support/htdigest.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/support/htdigest.c?view=diff&r1=155761&r2=155762
==============================================================================
--- httpd/httpd/branches/2.0.x/support/htdigest.c (original)
+++ httpd/httpd/branches/2.0.x/support/htdigest.c Tue Mar  1 02:02:06 2005
@@ -212,7 +212,8 @@
     if (argc == 5) {
         if (strcmp(argv[1], "-c"))
             usage();
-        rv = apr_file_open(&f, argv[2], APR_WRITE | APR_CREATE, -1, cntxt);
+        rv = apr_file_open(&f, argv[2], APR_WRITE | APR_CREATE,
+                           APR_OS_DEFAULT, cntxt);
         if (rv != APR_SUCCESS) {
             char errmsg[120];
 
@@ -242,7 +243,7 @@
         exit(1);
     }
 
-    if (apr_file_open(&f, argv[1], APR_READ, -1, cntxt) != APR_SUCCESS) {
+    if (apr_file_open(&f, argv[1], APR_READ, APR_OS_DEFAULT, cntxt) != APR_SUCCESS) {
         apr_file_printf(errfile,
                 "Could not open passwd file %s for reading.\n", argv[1]);
         apr_file_printf(errfile, "Use -c option to create new one.\n");