Rolled back Lukes changes. Not quite ready for prime time.

Jeremy (jallison@whistle.com)

1 files changed, 4 insertions, 19 deletions

diff --git a/source/lib/util.c b/source/lib/util.c
index 18f22ad6843..9ebfdca88ea 100644
--- a/source/lib/util.c
+++ b/source/lib/util.c
@@ -3427,9 +3427,9 @@ char *readdirname(void *p)
 }
 
 
-BOOL is_vetoed_name(int snum, char *name)
+BOOL is_vetoed_name(char *name)
 {
-  char *namelist = lp_veto_files(snum);
+  char *namelist = lp_veto_files();
   char *nameptr = namelist;
   char *name_end;
 
@@ -3469,8 +3469,9 @@ BOOL is_vetoed_name(int snum, char *name)
   return 0;
 }
 
-static BOOL is_in_path(char *name, char *namelist)
+BOOL is_vetoed_path(char *name)
 {
+  char *namelist = lp_veto_files();
   char *nameptr = namelist;
   char *sub;
   char *name_end;
@@ -3522,22 +3523,6 @@ static BOOL is_in_path(char *name, char *namelist)
 }
 
 /****************************************************************************
-used to make files hidden, but still accessible
-****************************************************************************/
-BOOL is_hidden_path(int cnum, char *path)
-{
-  return is_in_path(path, lp_hide_files(cnum));
-}
-
-/****************************************************************************
-used to make files _completely_ inaccessible
-****************************************************************************/
-BOOL is_vetoed_path(int cnum, char *path)
-{
-  return is_in_path(path, lp_veto_files(cnum));
-}
-
-/****************************************************************************
 routine to do file locking
 ****************************************************************************/
 BOOL fcntl_lock(int fd,int op,uint32 offset,uint32 count,int type)