diff options
| author | Volker Lendecke <vlendec@samba.org> | 2007-01-31 13:09:07 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:17:34 -0500 |
| commit | 37a3339a1891f0189ff62891e6be85ace23efc33 (patch) | |
| tree | c9ebe817b0b99c677b46df209b3a9094c77c20d1 /source3/smbd/notify_fam.c | |
| parent | 6490e114b8e9ffc9d35a0eaee66f9bdef65708fc (diff) | |
| download | samba-37a3339a1891f0189ff62891e6be85ace23efc33.tar.gz samba-37a3339a1891f0189ff62891e6be85ace23efc33.tar.bz2 samba-37a3339a1891f0189ff62891e6be85ace23efc33.zip | |
r21082: Make canonicalize_path static to service.c -- we do have conn->connectpath
(This used to be commit 06f58096e3785d0e2e0b9f2053d4975e44568e15)
Diffstat (limited to 'source3/smbd/notify_fam.c')
| -rw-r--r-- | source3/smbd/notify_fam.c | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/source3/smbd/notify_fam.c b/source3/smbd/notify_fam.c index aba1f5dcb3..08dc4eabb0 100644 --- a/source3/smbd/notify_fam.c +++ b/source3/smbd/notify_fam.c @@ -189,7 +189,6 @@ static void *fam_notify_add(TALLOC_CTX *mem_ctx, files_struct *fsp, uint32 *filter) { struct fam_notify_ctx *ctx; - pstring fullpath; if ((*filter & FILE_NOTIFY_CHANGE_FILE_NAME) == 0) { DEBUG(10, ("filter = %u, no FILE_NOTIFY_CHANGE_FILE_NAME\n", @@ -197,21 +196,6 @@ static void *fam_notify_add(TALLOC_CTX *mem_ctx, return NULL; } - /* FAM needs an absolute pathname. */ - - pstrcpy(fullpath, fsp->fsp_name); - if (!canonicalize_path(fsp->conn, fullpath)) { - DEBUG(0, ("failed to canonicalize path '%s'\n", fullpath)); - return NULL; - } - - if (*fullpath != '/') { - DEBUG(0, ("canonicalized path '%s' into `%s`\n", fsp->fsp_name, - fullpath)); - DEBUGADD(0, ("but expected an absolute path\n")); - return NULL; - } - if (!(ctx = TALLOC_P(mem_ctx, struct fam_notify_ctx))) { return NULL; } @@ -226,8 +210,9 @@ static void *fam_notify_add(TALLOC_CTX *mem_ctx, ctx->filter = FILE_NOTIFY_CHANGE_FILE_NAME; - if (!(ctx->path = talloc_strdup(ctx, fullpath))) { - DEBUG(0, ("talloc_strdup failed\n")); + if (!(ctx->path = talloc_asprintf(ctx, "%s/%s", fsp->conn->connectpath, + fsp->fsp_name))) { + DEBUG(0, ("talloc_asprintf failed\n")); TALLOC_FREE(ctx); return NULL; } |