Merge r155681 from trunk:

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

PR: 33765
Reviewed by: jorton, trawick, jerenkrantz

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

diff --git a/CHANGES b/CHANGES
index 4c19dc719242dfb905990b338f7032b151d64227..63a940a4dc7122755de841032b36303b19e2d9f6 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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]

diff --git a/STATUS b/STATUS
index 63adb6165d93822cfa21bdba65098c48e2be6241..2ea1d78d5298a668e4c38a09da4cbac58a77347a 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -94,15 +94,11 @@ PATCHES TO BACKPORT FROM TRUNK:
     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.

diff --git a/support/htdigest.c b/support/htdigest.c
index 254fd4c5bf11b70cc0c41983de849f26e956d0cf..998d7af32c98bc15d3becefbcc7b28afe0a55445 100644 (file)
--- a/support/htdigest.c
+++ b/support/htdigest.c
@@ -212,7 +212,8 @@ int main(int argc, const char * const argv[])
     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 @@ int main(int argc, const char * const argv[])
         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");