r23792: convert Samba4 to GPLv3

[tprouty/samba.git] / source4 / ntvfs / posix / pvfs_rename.c

diff --git a/source4/ntvfs/posix/pvfs_rename.c b/source4/ntvfs/posix/pvfs_rename.c
index 6a397ef981a283cd6828f30ba415fe64a1e646f7..3aa63bd2cad7259a4596611301e837b55a508f24 100644 (file)
--- a/source4/ntvfs/posix/pvfs_rename.c
+++ b/source4/ntvfs/posix/pvfs_rename.c
@@ -7,7 +7,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
@@ -72,7 +71,7 @@ NTSTATUS pvfs_do_rename(struct pvfs_state *pvfs, const struct pvfs_filename *nam
        }
 
        /* this is a strange one. w2k3 gives an additional event for CHANGE_ATTRIBUTES
-          and CHANGE_CREATION on the new file when renming files, but not 
+          and CHANGE_CREATION on the new file when renaming files, but not 
           directories */
        if ((name1->dos.attrib & FILE_ATTRIBUTE_DIRECTORY) == 0) {
                notify_trigger(pvfs->notify_context, 
@@ -257,7 +256,7 @@ static NTSTATUS pvfs_rename_wildcard(struct pvfs_state *pvfs,
 {
        struct pvfs_dir *dir;
        NTSTATUS status;
-       uint_t ofs = 0;
+       off_t ofs = 0;
        const char *fname, *fname2, *dir_path;
        uint16_t attrib = ren->rename.in.attrib;
        int total_renamed = 0;