Ticket #2469: 0001-src-core-ngx_file.c-recursively-chown-the-directorie.patch

src/core/ngx_file.c

@@ -8 +8 @@
 #include <ngx_config.h>
 #include <ngx_core.h>
 
+#include <fts.h>
 
 static ngx_int_t ngx_test_full_name(ngx_str_t *name);
 
@@ -593 +594 @@
     return NGX_OK;
 }
 
+ngx_int_t
+recursive_chown(const char *dirname, ngx_log_t *log, ngx_uid_t user)
+{
+    FTS *ftsp;
+    char *paths[] = {(char *)dirname, NULL};
+
+    ftsp = fts_open(paths, FTS_PHYSICAL, NULL);
+    if(ftsp == NULL) {
+        ngx_log_error(NGX_LOG_EMERG, log, ngx_errno,
+                      "fts_open(%s) failed", dirname);
+        return NGX_ERROR;
+    }
+
+    while (1) {
+        FTSENT *ent = fts_read(ftsp);
+        if (!ent) {
+            if (!errno) {
+                break;
+            }
+            ngx_log_error(NGX_LOG_EMERG, log, ngx_errno,
+                          "fts_read failed");
+            return NGX_ERROR;
+        }
+
+        if (chown(ent->fts_path, user, -1) < 0) {
+            ngx_log_error(NGX_LOG_EMERG, log, ngx_errno,
+                          "chown(\"%s\", %d) failed",
+                          dirname, user);
+            return NGX_ERROR;
+        }
+    }
+
+    if (fts_close(ftsp) < 0) {
+        ngx_log_error(NGX_LOG_EMERG, log, ngx_errno,
+                      "fts_close failed");
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
 
 ngx_int_t
 ngx_create_paths(ngx_cycle_t *cycle, ngx_uid_t user)
@@ -635 +676 @@
                               path[i]->name.data, user);
                 return NGX_ERROR;
             }
+
+            if (recursive_chown((const char *) path[i]->name.data, cycle->log, user)) {
+                ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,
+                              "recursive_chown(\"%s\", %d) failed",
+                              path[i]->name.data, user);
+                return NGX_ERROR;
+            }
         }
 
         if ((fi.st_mode & (S_IRUSR|S_IWUSR|S_IXUSR))