diff options
| author | Jeremy Allison <jra@samba.org> | 2011-10-18 11:54:53 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2011-10-19 00:05:45 +0200 |
| commit | 8d54bdb5e199b2198990ee8d572662a128506337 (patch) | |
| tree | 9d199f0af97daa0924584c8e93605354305109f7 | |
| parent | f5ae41d8235fe54ca04542877059aaa2e287b0c2 (diff) | |
| download | samba-8d54bdb5e199b2198990ee8d572662a128506337.tar.gz samba-8d54bdb5e199b2198990ee8d572662a128506337.tar.bz2 samba-8d54bdb5e199b2198990ee8d572662a128506337.zip | |
vfs_netatalk should be using strstr_m, not strstr to find .AppleDouble paths.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Wed Oct 19 00:05:45 CEST 2011 on sn-devel-104
| -rw-r--r-- | source3/modules/vfs_netatalk.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/modules/vfs_netatalk.c b/source3/modules/vfs_netatalk.c index 4c65af7e8a..3e5606b553 100644 --- a/source3/modules/vfs_netatalk.c +++ b/source3/modules/vfs_netatalk.c @@ -73,7 +73,7 @@ static int atalk_build_paths(TALLOC_CTX *ctx, const char *path, #if 0 DEBUG(3, ("ATALK: PATH: %s[%s]\n", path, fname)); #endif - if (strstr(path, APPLEDOUBLE) || strstr(fname, APPLEDOUBLE)) { + if (strstr_m(path, APPLEDOUBLE) || strstr_m(fname, APPLEDOUBLE)) { DEBUG(3, ("ATALK: path %s[%s] already contains %s\n", path, fname, APPLEDOUBLE)); return -1; } @@ -126,7 +126,7 @@ static void atalk_add_to_list(name_compare_entry **list) if (cur_list) { for (i = 0, count = 0; cur_list[i].name; i ++, count ++) { - if (strstr(cur_list[i].name, APPLEDOUBLE)) + if (strstr_m(cur_list[i].name, APPLEDOUBLE)) return; } } @@ -235,7 +235,7 @@ static int atalk_rmdir(struct vfs_handle_struct *handle, const char *path) * from this module, gotta use talloc stuff.. */ - strstr(path, APPLEDOUBLE) ? (add = False) : (add = True); + strstr_m(path, APPLEDOUBLE) ? (add = False) : (add = True); if (!(ctx = talloc_init("remove_directory"))) goto exit_rmdir; @@ -317,13 +317,13 @@ static int atalk_unlink(struct vfs_handle_struct *handle, if (!handle->conn->hide_list) return ret; for (i = 0; handle->conn->veto_list[i].name; i ++) { - if (strstr(handle->conn->veto_list[i].name, APPLEDOUBLE)) + if (strstr_m(handle->conn->veto_list[i].name, APPLEDOUBLE)) break; } if (!handle->conn->veto_list[i].name) { for (i = 0; handle->conn->hide_list[i].name; i ++) { - if (strstr(handle->conn->hide_list[i].name, APPLEDOUBLE)) + if (strstr_m(handle->conn->hide_list[i].name, APPLEDOUBLE)) break; else { DEBUG(3, ("ATALK: %s is not hidden, skipped..\n", |