From: Jeremy Allison <jra@samba.org>
Date: Tue, 24 Apr 2007 12:56:23 +0000 (+0000)
Subject: r22502: Fix bug #4536 - delete symlinks to a directory correctly.
X-Git-Tag: samba-misc-tags/initial-v3-0-unstable~612
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dcc6517d9d349c65b045160e8a1358af088ae97a;p=thirdparty%2Fsamba.git

r22502: Fix bug #4536 - delete symlinks to a directory correctly.
Jeremy.
---

diff --git a/source/smbd/reply.c b/source/smbd/reply.c
index bf739aa6432..1acd78a1069 100644
--- a/source/smbd/reply.c
+++ b/source/smbd/reply.c
@@ -3867,7 +3867,23 @@ NTSTATUS rmdir_internals(connection_struct *conn, const char *directory)
 	int ret;
 	SMB_STRUCT_STAT st;
 
-	ret = SMB_VFS_RMDIR(conn,directory);
+	/* Might be a symlink. */
+	if(SMB_VFS_LSTAT(conn, directory, &st) != 0) {
+		return map_nt_error_from_unix(errno);
+	}
+
+	if (S_ISLNK(st.st_mode)) {
+		/* Is what it points to a directory ? */
+		if(SMB_VFS_STAT(conn, directory, &st) != 0) {
+			return map_nt_error_from_unix(errno);
+		}
+		if (!(S_ISDIR(st.st_mode))) {
+			return NT_STATUS_NOT_A_DIRECTORY;
+		}
+		ret = SMB_VFS_UNLINK(conn,directory);
+	} else {
+		ret = SMB_VFS_RMDIR(conn,directory);
+	}
 	if (ret == 0) {
 		notify_fname(conn, NOTIFY_ACTION_REMOVED,
 			     FILE_NOTIFY_CHANGE_DIR_NAME,