open_without_symlink: Don't SYSERROR on something else than ELOOP

The open_without_symlink routine has been specifically created to prevent
mounts with synlinks as source or destination. Keep SYSERROR'ing in that
particular scenario, but leave error handling to calling functions for the
other ones - e.g. optional bind mount when the source dir doesn't exist
throws a nasty error.

Signed-off-by: Bogdan Purcareata <bogdan.purcareata@nxp.com>

diff --git a/src/lxc/utils.c b/src/lxc/utils.c
index 6bee698745c22adb0450a19fcfa52a78604dc293..8e7ebbc0dbff67e940ebb6f2f38c2808ef9cc534 100644 (file)
--- a/src/lxc/utils.c
+++ b/src/lxc/utils.c
@@ -1621,8 +1621,6 @@ static int open_without_symlink(const char *target, const char *prefix_skip)
                        errno = saved_errno;
                        if (errno == ELOOP)
                                SYSERROR("%s in %s was a symbolic link!", nextpath, target);
-                       else
-                               SYSERROR("Error examining %s in %s", nextpath, target);
                        goto out;
                }
        }
@@ -1667,8 +1665,11 @@ int safe_mount(const char *src, const char *dest, const char *fstype,
 
        destfd = open_without_symlink(dest, rootfs);
        if (destfd < 0) {
-               if (srcfd != -1)
+               if (srcfd != -1) {
+                       saved_errno = errno;
                        close(srcfd);
+                       errno = saved_errno;
+               }
                return destfd;
        }