Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial

diff --cc source/ntvfs/posix/pvfs_rename.c
index 65755e05cb7eaf37dd84f06b9e6236af0bca6585,5693e793141c7e51854092e5085eb34037bb66ab..17c073ccabdeebfd4b9027ca11851dbf22dd603f
--- 1/source/ntvfs/posix/pvfs_rename.c
--- 2/source/ntvfs/posix/pvfs_rename.c
+++ b/source/ntvfs/posix/pvfs_rename.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;
        }

diff --cc source/smbd/server.c
Simple merge