summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/server.c6
-rw-r--r--source3/smbd/trans2.c4
2 files changed, 6 insertions, 4 deletions
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index e2fe14b0b8..d4407269f0 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -1532,7 +1532,13 @@ void open_file_shared(int fnum,int cnum,char *fname,int share_mode,int ofun,
if (strstr(fname,".+,;=[]."))
{
unix_ERR_class = ERRDOS;
+ /* OS/2 Workplace shell fix may be main code stream in a later release. */
+#ifdef OS2_WPS_FIX
+ unix_ERR_code = ERRcannotopen;
+#else /* OS2_WPS_FIX */
unix_ERR_code = ERROR_EAS_NOT_SUPPORTED;
+#endif /* OS2_WPS_FIX */
+
return;
}
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 0ef7327d2e..19c1158658 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -1299,11 +1299,7 @@ static int call_trans2setfilepathinfo(char *inbuf, char *outbuf, int length,
if (total_data > 0 && IVAL(pdata,0) == total_data) {
/* uggh, EAs for OS2 */
DEBUG(4,("Rejecting EA request with total_data=%d\n",total_data));
-#ifdef OS2_WPS_FIX /* This may become the main code stream in a later release */
- return(ERROR(ERRDOS,ERRcannotopen));
-#else /* OS2_WPS_FIX */
return(ERROR(ERRDOS,ERROR_EAS_NOT_SUPPORTED));
-#endif /* OS2_WPS_FIX */
}
switch (info_level)