X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2Flibadacl.c;h=a43afa5c1b203a63e7d905296a56719fa0a43d49;hb=6b639194b7be7aa17e9736d1ed034e798d206de2;hp=cdd07fcfee7c7400256e9ea619cc6abea99a195d;hpb=dcaa939a0e09bceb1392488fa126232629a63aa8;p=apply-default-acl.git

diff --git a/src/libadacl.c b/src/libadacl.c
index cdd07fc..a43afa5 100644
--- a/src/libadacl.c
+++ b/src/libadacl.c
@@ -1003,7 +1003,22 @@ int apply_default_acl(const char* path, bool recursive) {
     return ACL_ERROR;
   }
   char* parent = dirname(dirname_path_copy);
-  parent_fd = safe_open(parent, O_DIRECTORY | O_NOFOLLOW);
+
+  /* Just kidding, if the path is ".", then dirname will do the wrong
+   * thing and give us "." as its parent, too. So, we handle that as a
+   * special case.
+   *
+   * WARNING: it is important that "parent" itself is not used after
+   * this point; otherwise we would need to store the correct parent
+   * path in there. But since everything uses file descriptors from
+   * now on, we only need to ensure that we get the correct parent_fd
+   * below. */
+  if (strcmp(path, ".") == 0 && strcmp(parent, ".") == 0) {
+    parent_fd = safe_open("..", O_DIRECTORY | O_NOFOLLOW);
+  }
+  else {
+    parent_fd = safe_open(parent, O_DIRECTORY | O_NOFOLLOW);
+  }
   if (parent_fd == OPEN_ERROR) {
     if (errno == ELOOP || errno == ENOTDIR) {
       /* We hit a symlink, either in the last path component (ELOOP)
@@ -1025,9 +1040,19 @@ int apply_default_acl(const char* path, bool recursive) {
   basename_path_copy = strdup(path);
   if (basename_path_copy == NULL) {
     perror("apply_default_acl (strdup)");
-    return ACL_ERROR;
+    result = ACL_ERROR;
+    goto cleanup;
+  }
+
+  /* If the basename is ".", then we don't want to open "." relative
+     to the parent_fd, so we need another special case for that
+     path. */
+  if (strcmp(path, ".") == 0 && strcmp(parent, ".") == 0) {
+    fd = open(".", O_NOFOLLOW);
+  }
+  else {
+    fd = openat(parent_fd, basename(basename_path_copy), O_NOFOLLOW);
   }
-  fd = openat(parent_fd, basename(basename_path_copy), O_NOFOLLOW);
   if (fd == OPEN_ERROR) {
     if (errno == ELOOP || errno == ENOTDIR) {
       /* We hit a symlink, either in the last path component (ELOOP)