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

[ira/wip.git] / source4 / client / smbmnt.c

diff --git a/source4/client/smbmnt.c b/source4/client/smbmnt.c
index ce406179cfdd9d71f2e56f0a49f4e9616a52d17c..0d619a88fe5e4d3d09d43cb890463a5df69435c5 100644 (file)
--- a/source4/client/smbmnt.c
+++ b/source4/client/smbmnt.c
@@ -28,8 +28,8 @@
 static uid_t mount_uid;
 static gid_t mount_gid;
 static int mount_ro;
-static unsigned mount_fmask;
-static unsigned mount_dmask;
+static uint_t mount_fmask;
+static uint_t mount_dmask;
 static int user_mount;
 static char *options;
 
@@ -139,7 +139,7 @@ static int mount_ok(char *mount_point)
 /* Tries to mount using the appropriate format. For 2.2 the struct,
    for 2.4 the ascii version. */
 static int
-do_mount(char *share_name, unsigned int flags, struct smb_mount_data *data)
+do_mount(char *share_name, uint_t flags, struct smb_mount_data *data)
 {
        pstring opts;
        struct utsname uts;
@@ -173,7 +173,7 @@ do_mount(char *share_name, unsigned int flags, struct smb_mount_data *data)
        char *mount_point, *share_name = NULL;
        FILE *mtab;
        int fd;
-       unsigned int flags;
+       uint_t flags;
        struct smb_mount_data data;
        struct mntent ment;