diff options
| author | Jeremy Allison <jra@samba.org> | 2007-01-16 20:49:51 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2007-01-16 20:49:51 +0000 |
| commit | 3ce89f456edb16e6afdf61845ab65fd3f4b9df07 (patch) | |
| tree | b1a01c25e89f97fe18ffab44e81058292a1886c2 /source/smbd/reply.c | |
| parent | 8f3b1cc0a55b151574a41cec73250f6fc75a0164 (diff) | |
| download | samba-3ce89f456edb16e6afdf61845ab65fd3f4b9df07.tar.gz samba-3ce89f456edb16e6afdf61845ab65fd3f4b9df07.tar.xz samba-3ce89f456edb16e6afdf61845ab65fd3f4b9df07.zip | |
r20841: Remove more BOOL ok.
Jeremy.
Diffstat (limited to 'source/smbd/reply.c')
| -rw-r--r-- | source/smbd/reply.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/smbd/reply.c b/source/smbd/reply.c index d48c081e217..f633be37402 100644 --- a/source/smbd/reply.c +++ b/source/smbd/reply.c @@ -3770,7 +3770,6 @@ int reply_rmdir(connection_struct *conn, char *inbuf,char *outbuf, int dum_size, { pstring directory; int outsize = 0; - BOOL ok = False; SMB_STRUCT_STAT sbuf; NTSTATUS status; START_PROFILE(SMBrmdir); @@ -3789,12 +3788,13 @@ int reply_rmdir(connection_struct *conn, char *inbuf,char *outbuf, int dum_size, return ERROR_NT(status); } - if (check_name(directory,conn)) { - dptr_closepath(directory,SVAL(inbuf,smb_pid)); - ok = rmdir_internals(conn, directory); + if (!check_name(directory,conn)) { + END_PROFILE(SMBrmdir); + return UNIXERROR(ERRDOS, ERRbadpath); } - - if (!ok) { + + dptr_closepath(directory,SVAL(inbuf,smb_pid)); + if (!rmdir_internals(conn, directory)) { END_PROFILE(SMBrmdir); return UNIXERROR(ERRDOS, ERRbadpath); } |