From b80b062d1838b25d653dff0da4dca7f526ea065b Mon Sep 17 00:00:00 2001 From: Shirish Pargaonkar Date: Mon, 27 Jul 2009 12:02:35 -0400 Subject: [PATCH] umount.cifs: do not attempt to update /etc/mtab if it is symbolic link If /etc/mtab is a symbolic link to e.g. /proc/mounts, do not update it. This is a fix for a bug reported in 4675 on samba bugzilla Signed-off-by: Shirish Pargaonkar (cherry picked from commit a869e4253a87f9a5e13dbe87b2799f8683d238d7) Fixes bug #4675. (cherry picked from commit f710535e947008a083b49d8a3faa117208616d7f) --- source3/client/umount.cifs.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/source3/client/umount.cifs.c b/source3/client/umount.cifs.c index 1227e7a2043..b57417f3b3a 100644 --- a/source3/client/umount.cifs.c +++ b/source3/client/umount.cifs.c @@ -146,9 +146,11 @@ static int remove_from_mtab(char * mountpoint) FILE * org_fd; FILE * new_fd; struct mntent * mount_entry; + struct stat statbuf; - /* Do we need to check if it is a symlink to e.g. /proc/mounts - in which case we probably do not want to update it? */ + /* If it is a symlink, e.g. to /proc/mounts, no need to update it. */ + if ((lstat(MOUNTED, &statbuf) == 0) && (S_ISLNK(statbuf.st_mode))) + return 0; /* Do we first need to check if it is writable? */ @@ -162,7 +164,6 @@ static int remove_from_mtab(char * mountpoint) printf("attempting to remove from mtab\n"); org_fd = setmntent(MOUNTED, "r"); - if(org_fd == NULL) { printf("Can not open %s\n",MOUNTED); unlock_mtab(); -- 2.11.4.GIT