3 files changed, 9 insertions, 16 deletions
diff --git a/examples/VFS/Makefile b/examples/VFS/Makefile
index f93cd0cb2d..716e48da88 100644
--- a/examples/VFS/Makefile
+++ b/examples/VFS/Makefile
@@ -10,11 +10,10 @@ LIBTOOL = libtool
 
 SAMBA_SRC = ../../source
 SAMBA_INCL = ../../source/include
-POPT_INCL = ../../source/popt
 UBIQX_SRC = ../../source/ubiqx
 SMBWR_SRC = ../../source/smbwrapper
 KRB5_SRC = /usr/kerberos/include
-CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(POPT_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(KRB5_SRC) -Wall -g
+CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(KRB5_SRC) -Wall -g
 VFS_OBJS = audit.so skel.so recycle.so
 
 # Default target
diff --git a/examples/VFS/block/Makefile b/examples/VFS/block/Makefile
index 44b08681d6..dcc7c07793 100644
--- a/examples/VFS/block/Makefile
+++ b/examples/VFS/block/Makefile
@@ -8,7 +8,7 @@
 CC = gcc
 LIBTOOL = libtool
 
-SAMBA_SRC = ../../../source
+SAMBA_SRC = /usr/local/src/samba/samba-2.2.0-ron/source
 SAMBA_INCL = ${SAMBA_SRC}/include
 UBIQX_SRC = ${SAMBA_SRC}/ubiqx
 SMBWR_SRC = ${SAMBA_SRC}/smbwrapper
diff --git a/examples/VFS/recycle.c b/examples/VFS/recycle.c
index 6a1c98ce54..74d3657895 100644
--- a/examples/VFS/recycle.c
+++ b/examples/VFS/recycle.c
@@ -238,18 +238,15 @@ static int recycle_unlink(connection_struct *conn, const char *inname)
 		return default_vfs_ops.unlink(conn,fname);
 	}
 
-	base = strrchr(fname, '/');
-	pstrcpy(bin, recycle_bin);
-	pstrcat(bin, "/");
-
-	if(base == NULL) {
+	base = strrchr(fname, '/') + 1;
+	if(base == (char*)1)
 		ext = strrchr(fname, '.');
-		pstrcat(bin, fname);
-	} else {
+	else
 		ext = strrchr(base, '.');
-		pstrcat(bin, base+1);
-	}
-	DEBUG(3, ("recycle bin: base %s, ext %s, fname %s, bin %s\n", base, ext, fname, bin));
+
+	pstrcpy(bin, recycle_bin);
+	pstrcat(bin, "/");
+	pstrcat(bin, base);
 
 	if(strcmp(fname,bin) == 0) {
 		DEBUG(3, ("recycle bin: file %s exists, purging...\n", fname));
@@ -257,9 +254,6 @@ static int recycle_unlink(connection_struct *conn, const char *inname)
 	}
 
 	len = strlen(bin);
-	if ( ext != NULL)
-		len = len - strlen(ext);
-
 	addlen = sizeof(pstring)-len-1;
 	while(recycle_file_exist(conn,bin)) {
 		slprintf(bin+len, addlen, " (Copy #%d)", i++);