summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorSamba Release Account <samba-bugs@samba.org>1997-07-06 14:07:00 +0000
committerSamba Release Account <samba-bugs@samba.org>1997-07-06 14:07:00 +0000
commitbc4d8cb3068425c0f4b84020b856d80fba7ce81f (patch)
tree5979ba738dd257ca256bbeee3afc41464835aaef /source3
parent1fe89d0b716ccd9fca4abe4daf89df063b38f4b3 (diff)
downloadsamba-bc4d8cb3068425c0f4b84020b856d80fba7ce81f.tar.gz
samba-bc4d8cb3068425c0f4b84020b856d80fba7ce81f.tar.bz2
samba-bc4d8cb3068425c0f4b84020b856d80fba7ce81f.zip
missed one OpenDir() and two is_vetoed_name() calls, both of which take
a service number as a parameter, in the rmdir code, when doing a recompile. lkcl (This used to be commit e095e339e62471a0b172918d2d3213f8a34b2108)
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/reply.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index af980943ca..8f650cb994 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -2452,7 +2452,7 @@ int reply_rmdir(char *inbuf,char *outbuf)
dptr_closepath(directory,SVAL(inbuf,smb_pid));
ok = (sys_rmdir(directory) == 0);
- if(!ok && (errno == ENOTEMPTY) && lp_veto_files())
+ if(!ok && (errno == ENOTEMPTY) && lp_veto_files(SNUM(cnum)))
{
/* Check to see if the only thing in this directory are
vetoed files/directories. If so then delete them and
@@ -2460,7 +2460,7 @@ int reply_rmdir(char *inbuf,char *outbuf)
do a recursive delete) then fail the rmdir. */
BOOL all_veto_files = True;
char *dname;
- void *dirptr = OpenDir(directory, False);
+ void *dirptr = OpenDir(SNUM(cnum), directory, False);
if(dirptr != NULL)
{
@@ -2469,7 +2469,7 @@ int reply_rmdir(char *inbuf,char *outbuf)
{
if((strcmp(dname, ".") == 0) || (strcmp(dname, "..")==0))
continue;
- if(!is_vetoed_name(dname))
+ if(!is_vetoed_name(SNUM(cnum), dname))
{
all_veto_files = False;
break;