Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
authorJelmer Vernooij <jelmer@samba.org>
Wed, 27 Feb 2008 15:03:00 +0000 (16:03 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 27 Feb 2008 15:03:00 +0000 (16:03 +0100)
1  2 
source/ntvfs/posix/pvfs_rename.c
source/smbd/server.c

@@@ -192,11 -192,11 +192,11 @@@ static NTSTATUS pvfs_rename_one(struct 
  {
        struct pvfs_filename *name1, *name2;
        TALLOC_CTX *mem_ctx = talloc_new(req);
+       struct odb_lock *lck = NULL;
        NTSTATUS status;
-       struct odb_lock *lck, *lck2;
  
        /* resolve the wildcard pattern for this name */
 -      fname2 = pvfs_resolve_wildcard(mem_ctx, fname1, fname2);
 +      fname2 = pvfs_resolve_wildcard(mem_ctx, lp_iconv_convenience(pvfs->ntvfs->ctx->lp_ctx), fname1, fname2);
        if (fname2 == NULL) {
                return NT_STATUS_NO_MEMORY;
        }
Simple merge