summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2004-04-06 14:24:13 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:51:07 -0500
commitbd0407258598839cbda81e1c21a5c5d8320d232a (patch)
treebcf2b7223e40dbcd1f00d152b2a14886949ca9cd
parentf01b3a157676ead4b8817e24740518b19b616474 (diff)
downloadsamba-bd0407258598839cbda81e1c21a5c5d8320d232a.tar.gz
samba-bd0407258598839cbda81e1c21a5c5d8320d232a.tar.bz2
samba-bd0407258598839cbda81e1c21a5c5d8320d232a.zip
r81: Make EA's case independent - fix smbtorture to test for this.
Jeremy. (This used to be commit 0661357484a33329c75457527416667feaf57ef9)
-rw-r--r--source3/smbd/trans2.c25
-rw-r--r--source3/torture/torture.c4
2 files changed, 26 insertions, 3 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index a88722edde..1e7d845714 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -274,6 +274,27 @@ static unsigned int estimate_ea_size(connection_struct *conn, files_struct *fsp,
}
/****************************************************************************
+ Ensure the EA name is case insensitive by matching any existing EA name.
+****************************************************************************/
+
+static void canonicalize_ea_name(connection_struct *conn, files_struct *fsp, const char *fname, fstring unix_ea_name)
+{
+ size_t total_ea_len;
+ TALLOC_CTX *mem_ctx = talloc_init("canonicalize_ea_name");
+ struct ea_list *ea_list = get_ea_list(mem_ctx, conn, fsp, fname, &total_ea_len);
+
+ for (; ea_list; ea_list = ea_list->next) {
+ if (strequal(&unix_ea_name[5], ea_list->ea.name)) {
+ DEBUG(10,("canonicalize_ea_name: %s -> %s\n",
+ &unix_ea_name[5], ea_list->ea.name));
+ safe_strcpy(&unix_ea_name[5], ea_list->ea.name, sizeof(fstring)-6);
+ break;
+ }
+ }
+ talloc_destroy(mem_ctx);
+}
+
+/****************************************************************************
Set or delete an extended attribute.
****************************************************************************/
@@ -317,6 +338,8 @@ static NTSTATUS set_ea(connection_struct *conn, files_struct *fsp, const char *f
pull_ascii(&unix_ea_name[5], pdata, sizeof(fstring) - 5, -1, STR_TERMINATE);
pdata += (namelen + 1);
+ canonicalize_ea_name(conn, fsp, fname, unix_ea_name);
+
DEBUG(10,("set_ea: ea_name %s ealen = %u\n", unix_ea_name, ealen));
if (ealen) {
DEBUG(10,("set_ea: data :\n"));
@@ -341,8 +364,8 @@ static NTSTATUS set_ea(connection_struct *conn, files_struct *fsp, const char *f
}
#ifdef ENOATTR
/* Removing a non existent attribute always succeeds. */
- DEBUG(10,("set_ea: deleting ea name %s didn't exist - succeeding by default.\n", unix_ea_name));
if (ret == -1 && errno == ENOATTR) {
+ DEBUG(10,("set_ea: deleting ea name %s didn't exist - succeeding by default.\n", unix_ea_name));
ret = 0;
}
#endif
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 17a2ee00a8..161aa2cd73 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -4378,11 +4378,11 @@ static BOOL run_eatest(int dummy)
}
/* Setting EA's to zero length deletes them. Test this */
- printf("Now deleting all EA's....\n");
+ printf("Now deleting all EA's - case indepenent....\n");
for (i = 0; i < 20; i++) {
fstring ea_name;
- slprintf(ea_name, sizeof(ea_name), "EA_%d", i);
+ slprintf(ea_name, sizeof(ea_name), "ea_%d", i);
if (!cli_set_ea_path(cli, fname, ea_name, "", 0)) {
printf("ea_set of name %s failed - %s\n", ea_name, cli_errstr(cli));
return False;