From 4cff5fa462fa54bdd84c310bd9c9bae9eee849d7 Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Fri, 30 Jun 2006 14:24:25 +0000
Subject: [PATCH] Make use of module_dirlen in full_fname().

---
 util.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/util.c b/util.c
index 8dd1b1c3..85b2227e 100644
--- a/util.c
+++ b/util.c
@@ -1021,7 +1021,7 @@ char *full_fname(const char *fn)
 	if (*fn == '/')
 		p1 = p2 = "";
 	else {
-		p1 = curr_dir;
+		p1 = curr_dir + module_dirlen;
 		for (p2 = p1; *p2 == '/'; p2++) {}
 		if (*p2)
 			p2 = "/";
@@ -1030,13 +1030,6 @@ char *full_fname(const char *fn)
 		m1 = " (in ";
 		m2 = lp_name(module_id);
 		m3 = ")";
-		if (p1 == curr_dir) {
-			if (!lp_use_chroot(module_id)) {
-				char *p = lp_path(module_id);
-				if (*p != '/' || p[1])
-					p1 += strlen(p);
-			}
-		}
 	} else
 		m1 = m2 = m3 = "";
 
-- 
2.34.1