diff options
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/lib/util.c | 3 | ||||
| -rw-r--r-- | source3/smbd/trans2.c | 32 |
2 files changed, 11 insertions, 24 deletions
diff --git a/source3/lib/util.c b/source3/lib/util.c index 18f1240bbd..58560bd227 100644 --- a/source3/lib/util.c +++ b/source3/lib/util.c @@ -953,10 +953,11 @@ int StrnCaseCmp(char *s, char *t, int n) else #endif /* KANJI_WIN95_COMPATIBILITY */ { - while (n-- && *s && *t && toupper(*s) == toupper(*t)) + while (n && *s && *t && toupper(*s) == toupper(*t)) { s++; t++; + n--; } /* not run out of chars - strings are different lengths */ diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 0ca678b768..ce4a450050 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -646,29 +646,7 @@ static int call_trans2findfirst(char *inbuf, char *outbuf, int bufsize, int cnum dptr_num = dptr_create(cnum,directory, True ,SVAL(inbuf,smb_pid)); if (dptr_num < 0) - { - if(dptr_num == -2) - { - if((errno == ENOENT) && bad_path) - { - unix_ERR_class = ERRDOS; - unix_ERR_code = ERRbadpath; - } - -#if 0 - /* Ugly - NT specific hack - maybe not needed ? (JRA) */ - if((errno == ENOTDIR) && (Protocol >= PROTOCOL_NT1) && - (get_remote_arch() == RA_WINNT)) - { - unix_ERR_class = ERRDOS; - unix_ERR_code = ERRbaddirectory; - } -#endif - - return (UNIXERROR(ERRDOS,ERRbadpath)); - } - return(ERROR(ERRDOS,ERRbadpath)); - } + return(ERROR(ERRDOS,ERRbadfile)); /* convert the formatted masks */ { @@ -748,6 +726,14 @@ static int call_trans2findfirst(char *inbuf, char *outbuf, int bufsize, int cnum dptr_num = -1; } + /* + * If there are no matching entries we must return ERRDOS/ERRbadfile - + * from observation of NT. + */ + + if(numentries == 0) + return(ERROR(ERRDOS,ERRbadfile)); + /* At this point pdata points to numentries directory entries. */ /* Set up the return parameter block */ |