sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-09 08:58:35 +03:00
Code

Remove unneeded second open for filename ending in '.' now we know it's

Browse Source 
a mangled name. Added const. Fix inspired by Andrew Bartlett ideas.
Jeremy.
(This used to be commit 87eb336d659dfa5e92b495dd76a0f2e534931293)
This commit is contained in:
Jeremy Allison 2003-11-18 02:06:41 +00:00
parent 7b39861342
commit 013a051103
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/lib/util.c
View File

@ -2234,7 +2234,7 @@ char *parent_dirname(const char *path)
Determine if a pattern contains any Microsoft wildcard characters.
*******************************************************************/
BOOL ms_has_wild(char *s)
BOOL ms_has_wild(const char *s)
{
char c;
while ((c = *s++)) {

16
source3/smbd/open.c
View File

@ -30,7 +30,7 @@ extern BOOL global_client_failed_oplock_break;
fd support routines - attempt to do a dos_open.
****************************************************************************/
static int fd_open(struct connection_struct *conn, char *fname,
static int fd_open(struct connection_struct *conn, const char *fname,
int flags, mode_t mode)
{
int fd;
@ -41,13 +41,6 @@ static int fd_open(struct connection_struct *conn, char *fname,
fd = SMB_VFS_OPEN(conn,fname,flags,mode);
/* Fix for files ending in '.' */
if((fd == -1) && (errno == ENOENT) &&
(strchr_m(fname,'.')==NULL)) {
pstrcat(fname,".");
fd = SMB_VFS_OPEN(conn,fname,flags,mode);
}
DEBUG(10,("fd_open: name %s, flags = 0%o mode = 0%o, fd = %d. %s\n", fname,
flags, (int)mode, fd, (fd == -1) ? strerror(errno) : "" ));
@ -70,7 +63,7 @@ int fd_close(struct connection_struct *conn, files_struct *fsp)
Check a filename for the pipe string.
****************************************************************************/
static void check_for_pipe(char *fname)
static void check_for_pipe(const char *fname)
{
/* special case of pipe opens */
char s[10];
@ -89,10 +82,9 @@ static void check_for_pipe(char *fname)
****************************************************************************/
static BOOL open_file(files_struct *fsp,connection_struct *conn,
const char *fname1,SMB_STRUCT_STAT *psbuf,int flags,mode_t mode, uint32 desired_access)
const char *fname,SMB_STRUCT_STAT *psbuf,int flags,mode_t mode, uint32 desired_access)
{
extern struct current_user current_user;
pstring fname;
int accmode = (flags & O_ACCMODE);
int local_flags = flags;
@ -100,8 +92,6 @@ static BOOL open_file(files_struct *fsp,connection_struct *conn,
fsp->oplock_type = NO_OPLOCK;
errno = EPERM;
pstrcpy(fname,fname1);
/* Check permissions */
/*