sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-12 20:58:37 +03:00
Code

Ensure we have a talloc stackframe (found by Kukks).

Browse Source 
Jeremy.
(This used to be commit b409f1c3356a72216136411234b345666159c88b)
This commit is contained in:
Jeremy Allison 2007-11-20 17:54:01 -08:00
parent 66298d8080
commit 3c561043dc
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/client/smbmount.c
View File

@ -864,6 +864,7 @@ static void parse_mount_smb(int argc, char **argv)
****************************************************************************/
int main(int argc,char *argv[])
{
TALLOC_CTX *frame = talloc_stackframe();
char *p;
DEBUGLEVEL = 1;
@ -940,5 +941,6 @@ static void parse_mount_smb(int argc, char **argv)
strupper_m(my_netbios_name);
init_mount();
TALLOC_FREE(frame);
return 0;
}

14
source3/client/smbumount.c
View File

@ -44,13 +44,13 @@ umount_ok(const char *mount_point)
umount filesystems they don't own */
int fid = open(mount_point, O_RDONLY|O_NOFOLLOW, 0);
__kernel_uid32_t mount_uid;
if (fid == -1) {
fprintf(stderr, "Could not open %s: %s\n",
mount_point, strerror(errno));
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) {
@ -94,7 +94,7 @@ canonicalize (char *path)
if (path == NULL)
return NULL;
if (realpath (path, canonical))
return canonical;
@ -104,7 +104,7 @@ canonicalize (char *path)
}
int
int
main(int argc, char *argv[])
{
int fd;
@ -112,6 +112,7 @@ main(int argc, char *argv[])
struct mntent *mnt;
FILE* mtab;
FILE* new_mtab;
TALLOC_CTX *frame = talloc_stackframe();
if (argc != 2) {
usage();
@ -146,7 +147,7 @@ main(int argc, char *argv[])
return 1;
}
close(fd);
if ((mtab = setmntent(MOUNTED, "r")) == NULL) {
fprintf(stderr, "Can't open " MOUNTED ": %s\n",
strerror(errno));
@ -190,5 +191,6 @@ main(int argc, char *argv[])
return 1;
}
TALLOC_FREE(frame);
return 0;
}
}