diff options
| author | Gerald Carter <jerry@samba.org> | 2005-02-04 00:25:33 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:55:33 -0500 |
| commit | 44be949f28774cae4e79704c1c8f5d624f2bd46c (patch) | |
| tree | 63b8c3ebd08132ecdf555d4e8687726a923afecb /source3/client | |
| parent | 8f87dcdcdab52efb0ef907ede71c0920a25b0d7b (diff) | |
| download | samba-44be949f28774cae4e79704c1c8f5d624f2bd46c.tar.gz samba-44be949f28774cae4e79704c1c8f5d624f2bd46c.tar.bz2 samba-44be949f28774cae4e79704c1c8f5d624f2bd46c.zip | |
r5207: patches from Jay Fenlason @ RedHat (scooped from their Fedora packages)
(This used to be commit 9019a8436162d3606f6b8584701b0832cf5a7439)
Diffstat (limited to 'source3/client')
| -rw-r--r-- | source3/client/smbmnt.c | 4 | ||||
| -rw-r--r-- | source3/client/smbumount.c | 14 |
2 files changed, 11 insertions, 7 deletions
diff --git a/source3/client/smbmnt.c b/source3/client/smbmnt.c index 753a31c313..06dd3e5c02 100644 --- a/source3/client/smbmnt.c +++ b/source3/client/smbmnt.c @@ -162,7 +162,7 @@ do_mount(char *share_name, unsigned int flags, struct smb_mount_data *data) slprintf(opts, sizeof(opts)-1, "version=7,uid=%d,gid=%d,file_mode=0%o,dir_mode=0%o,%s", - data->uid, data->gid, data->file_mode, data->dir_mode,options); + mount_uid, mount_gid, data->file_mode, data->dir_mode,options); if (mount(share_name, ".", "smbfs", flags, data1) == 0) return 0; return mount(share_name, ".", "smbfs", flags, data2); @@ -225,7 +225,7 @@ do_mount(char *share_name, unsigned int flags, struct smb_mount_data *data) return -1; } - data.uid = mount_uid; + data.uid = mount_uid; // truncates to 16-bits here!!! data.gid = mount_gid; data.file_mode = (S_IRWXU|S_IRWXG|S_IRWXO) & mount_fmask; data.dir_mode = (S_IRWXU|S_IRWXG|S_IRWXO) & mount_dmask; diff --git a/source3/client/smbumount.c b/source3/client/smbumount.c index 9ea3083a6f..29a7b5dafc 100644 --- a/source3/client/smbumount.c +++ b/source3/client/smbumount.c @@ -39,7 +39,7 @@ umount_ok(const char *mount_point) /* we set O_NOFOLLOW to prevent users playing games with symlinks to umount filesystems they don't own */ int fid = open(mount_point, O_RDONLY|O_NOFOLLOW, 0); - __kernel_uid_t mount_uid; + __kernel_uid32_t mount_uid; if (fid == -1) { fprintf(stderr, "Could not open %s: %s\n", @@ -47,10 +47,14 @@ umount_ok(const char *mount_point) return -1; } - if (ioctl(fid, SMB_IOC_GETMOUNTUID, &mount_uid) != 0) { - fprintf(stderr, "%s probably not smb-filesystem\n", - mount_point); - return -1; + if (ioctl(fid, SMB_IOC_GETMOUNTUID32, &mount_uid) != 0) { + __kernel_uid_t mount_uid16; + if (ioctl(fid, SMB_IOC_GETMOUNTUID, &mount_uid16) != 0) { + fprintf(stderr, "%s probably not smb-filesystem\n", + mount_point); + return -1; + } + mount_uid = mount_uid16; } if ((getuid() != 0) |