diff options
| author | Samba Release Account <samba-bugs@samba.org> | 1997-08-26 01:28:27 +0000 |
|---|---|---|
| committer | Samba Release Account <samba-bugs@samba.org> | 1997-08-26 01:28:27 +0000 |
| commit | 41bbc5e21fbac555b26bd751dd93d09969715199 (patch) | |
| tree | 136cf71cf42d5909401d0134602b5685c8ce52f3 /source3/smbd | |
| parent | 28429a130bc5fc8d9d21193072f0077d3f6a34d0 (diff) | |
| download | samba-41bbc5e21fbac555b26bd751dd93d09969715199.tar.gz samba-41bbc5e21fbac555b26bd751dd93d09969715199.tar.bz2 samba-41bbc5e21fbac555b26bd751dd93d09969715199.zip | |
smb.h: Added error code used for OS2 WPS.
trans2.c: Added OS2 WPS fix - but ifdefed out for now. Will turn on
after 1.9.17 release.
Jeremy (jallison@whistle.com)
(This used to be commit 9d5d347686ca1c8a25088b882dcc5065b6d9c564)
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/trans2.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 9a48fb3ded..8052924059 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -1094,13 +1094,7 @@ static int call_trans2qfilepathinfo(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)); -#if 0 - SSVAL(params,0,ERROR_EAS_NOT_SUPPORTED); - send_trans2_replies(outbuf, bufsize, params, 2, *ppdata, 0); - return(-1); -#else return(ERROR(ERRDOS,ERROR_EAS_NOT_SUPPORTED)); -#endif } bzero(pdata,data_size); @@ -1307,11 +1301,11 @@ 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)); - SSVAL(params,0,ERROR_EAS_NOT_SUPPORTED); - - send_trans2_replies(outbuf, bufsize, params, 2, *ppdata, 0); - - return(-1); +#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) |