diff options
| -rw-r--r-- | source3/smbd/nttrans.c | 5 | ||||
| -rw-r--r-- | source3/smbd/reply.c | 6 | ||||
| -rw-r--r-- | source3/smbd/trans2.c | 33 |
3 files changed, 29 insertions, 15 deletions
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c index faa3e25bae..da24e4084d 100644 --- a/source3/smbd/nttrans.c +++ b/source3/smbd/nttrans.c @@ -639,7 +639,8 @@ int reply_ntcreate_and_X(connection_struct *conn, if (!check_name(fname,conn)) { restore_case_semantics(conn, file_attributes); END_PROFILE(SMBntcreateX); - return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRbadpath); + return set_bad_path_error(errno, False, outbuf, + ERRDOS,ERRbadpath); } #if 0 @@ -1265,7 +1266,7 @@ static int call_nt_transact_create(connection_struct *conn, char *inbuf, char *o /* All file access must go through check_name() */ if (!check_name(fname,conn)) { restore_case_semantics(conn, file_attributes); - return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRbadpath); + return set_bad_path_error(errno, False, outbuf, ERRDOS,ERRbadpath); } #if 0 diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index e00d8d99a5..63a1889390 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -948,7 +948,8 @@ int reply_getatr(connection_struct *conn, char *inbuf,char *outbuf, int dum_size if (!ok) { END_PROFILE(SMBgetatr); - return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRbadfile); + return set_bad_path_error(errno, False, outbuf, + ERRDOS,ERRbadfile); } outsize = set_message(outbuf,10,0,True); @@ -4006,7 +4007,8 @@ int reply_rmdir(connection_struct *conn, char *inbuf,char *outbuf, int dum_size, if (!ok) { END_PROFILE(SMBrmdir); - return set_bad_path_error(errno, bad_path, outbuf, ERRDOS, ERRbadpath); + return set_bad_path_error(errno, False, outbuf, + ERRDOS, ERRbadpath); } outsize = set_message(outbuf,0,0,False); diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index e85d3c0c5b..7d25b09e1f 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -807,7 +807,8 @@ static int call_trans2open(connection_struct *conn, char *inbuf, char *outbuf, i } if (!check_name(fname,conn)) { - return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRnoaccess); + return set_bad_path_error(errno, False, outbuf, + ERRDOS, ERRnoaccess); } if (open_ofun == 0) { @@ -1725,7 +1726,8 @@ close_if_end = %d requires_resume_key = %d level = 0x%x, max_data_bytes = %d\n", return ERROR_NT(NT_STATUS_OBJECT_PATH_NOT_FOUND); } if(!check_name(directory,conn)) { - return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRbadpath); + return set_bad_path_error(errno, False, outbuf, + ERRDOS,ERRbadpath); } p = strrchr_m(directory,'/'); @@ -2906,11 +2908,14 @@ static int call_trans2qfilepathinfo(connection_struct *conn, char *inbuf, char * /* Always do lstat for UNIX calls. */ if (SMB_VFS_LSTAT(conn,fname,&sbuf)) { DEBUG(3,("call_trans2qfilepathinfo: SMB_VFS_LSTAT of %s failed (%s)\n",fname,strerror(errno))); - return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRbadpath); + return set_bad_path_error( + errno, False, outbuf, + ERRDOS,ERRbadpath); } } else if (SMB_VFS_STAT(conn,fname,&sbuf)) { DEBUG(3,("call_trans2qfilepathinfo: SMB_VFS_STAT of %s failed (%s)\n",fname,strerror(errno))); - return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRbadpath); + return set_bad_path_error(errno, False, outbuf, + ERRDOS,ERRbadpath); } delete_pending = get_delete_on_close_flag(sbuf.st_dev, sbuf.st_ino); @@ -2954,18 +2959,21 @@ static int call_trans2qfilepathinfo(connection_struct *conn, char *inbuf, char * } if (!check_name(fname,conn)) { DEBUG(3,("call_trans2qfilepathinfo: fileinfo of %s failed (%s)\n",fname,strerror(errno))); - return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRbadpath); + return set_bad_path_error(errno, False, outbuf, + ERRDOS,ERRbadpath); } if (INFO_LEVEL_IS_UNIX(info_level)) { /* Always do lstat for UNIX calls. */ if (SMB_VFS_LSTAT(conn,fname,&sbuf)) { DEBUG(3,("call_trans2qfilepathinfo: SMB_VFS_LSTAT of %s failed (%s)\n",fname,strerror(errno))); - return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRbadpath); + return set_bad_path_error(errno, False, outbuf, + ERRDOS,ERRbadpath); } } else if (!VALID_STAT(sbuf) && SMB_VFS_STAT(conn,fname,&sbuf) && (info_level != SMB_INFO_IS_NAME_VALID)) { DEBUG(3,("call_trans2qfilepathinfo: SMB_VFS_STAT of %s failed (%s)\n",fname,strerror(errno))); - return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRbadpath); + return set_bad_path_error(errno, False, outbuf, + ERRDOS,ERRbadpath); } delete_pending = get_delete_on_close_flag(sbuf.st_dev, sbuf.st_ino); @@ -3811,7 +3819,8 @@ static int call_trans2setfilepathinfo(connection_struct *conn, char *inbuf, char pstrcpy(fname, fsp->fsp_name); if (SMB_VFS_STAT(conn,fname,&sbuf) != 0) { DEBUG(3,("call_trans2setfilepathinfo: fileinfo of %s failed (%s)\n",fname,strerror(errno))); - return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRbadpath); + return set_bad_path_error(errno, False, outbuf, + ERRDOS,ERRbadpath); } } else if (fsp && fsp->print_file) { /* @@ -3863,11 +3872,13 @@ static int call_trans2setfilepathinfo(connection_struct *conn, char *inbuf, char if(!VALID_STAT(sbuf) && !INFO_LEVEL_IS_UNIX(info_level)) { DEBUG(3,("call_trans2setfilepathinfo: stat of %s failed (%s)\n", fname, strerror(errno))); - return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRbadpath); + return set_bad_path_error(errno, False, outbuf, + ERRDOS,ERRbadpath); } if(!check_name(fname, conn)) { - return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRbadpath); + return set_bad_path_error(errno, False, outbuf, + ERRDOS,ERRbadpath); } } @@ -4860,7 +4871,7 @@ static int call_trans2mkdir(connection_struct *conn, char *inbuf, char *outbuf, if (!check_name(directory,conn)) { DEBUG(5,("call_trans2mkdir error (%s)\n", strerror(errno))); - return set_bad_path_error(errno, bad_path, outbuf, ERRDOS, + return set_bad_path_error(errno, False, outbuf, ERRDOS, ERRnoaccess); } |