diff options
| author | Jeremy Allison <jra@samba.org> | 1997-11-03 19:24:45 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 1997-11-03 19:24:45 +0000 |
| commit | cdc6099647f7a48a8e31f9dfc331fe82dd66acdf (patch) | |
| tree | 94dc6f2206e99647089b49cc6ca638dc90744643 /source3/smbd | |
| parent | 4039df6d4b28064a6e72fbdbcf34cce6f961c4c4 (diff) | |
| download | samba-cdc6099647f7a48a8e31f9dfc331fe82dd66acdf.tar.gz samba-cdc6099647f7a48a8e31f9dfc331fe82dd66acdf.tar.bz2 samba-cdc6099647f7a48a8e31f9dfc331fe82dd66acdf.zip | |
Rolling back the files
loadparm.c : to equivalent to version 1.67
reply.c : to equivalent to version 1.69
server.c : to equivalent to version 1.122
util.c : to equivalent to version 1.98
to remove the incorrect changes.
proto.h: The usual.
rpc_pipes/smbparse.c : Backeting stuff that SHOULD NOT BE IN THE
none-NTDOMAIN build !
Jeremy.
(This used to be commit 6064c9d80fd9fcc3ceec528494ba5e2591610098)
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/reply.c | 4 | ||||
| -rw-r--r-- | source3/smbd/server.c | 23 |
2 files changed, 10 insertions, 17 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 116542ba34..46425861d4 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -1023,9 +1023,7 @@ int reply_search(char *inbuf,char *outbuf) if ((dirtype&0x1F) == aVOLID) { memcpy(p,status,21); - mode = aVOLID; - if(!CAN_WRITE(cnum)) mode |= aRONLY; - make_dir_struct(p,"???????????",volume_label(SNUM(cnum)),0,mode,0); + make_dir_struct(p,"???????????",volume_label(SNUM(cnum)),0,aVOLID,0); dptr_fill(p+12,dptr_num); if (dptr_zero(p+12) && (status_len==0)) numentries = 1; diff --git a/source3/smbd/server.c b/source3/smbd/server.c index 25d24eab53..095bc00e08 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -4356,7 +4356,6 @@ force write permissions on print services. #define TIME_INIT (1<<2) #define CAN_IPC (1<<3) #define AS_GUEST (1<<5) -#define DONT_CHECK_ONLINE (1<<6) /* @@ -4378,15 +4377,15 @@ struct smb_message_struct /* CORE PROTOCOL */ - {SMBnegprot,"SMBnegprot",reply_negprot,DONT_CHECK_ONLINE}, - {SMBtcon,"SMBtcon",reply_tcon,DONT_CHECK_ONLINE}, - {SMBtdis,"SMBtdis",reply_tdis,DONT_CHECK_ONLINE}, - {SMBexit,"SMBexit",reply_exit,DONT_CHECK_ONLINE}, - {SMBioctl,"SMBioctl",reply_ioctl,DONT_CHECK_ONLINE}, - {SMBecho,"SMBecho",reply_echo,DONT_CHECK_ONLINE}, - {SMBsesssetupX,"SMBsesssetupX",reply_sesssetup_and_X,DONT_CHECK_ONLINE}, - {SMBtconX,"SMBtconX",reply_tcon_and_X,DONT_CHECK_ONLINE}, - {SMBulogoffX, "SMBulogoffX", reply_ulogoffX, DONT_CHECK_ONLINE}, /* ulogoff doesn't give a valid TID */ + {SMBnegprot,"SMBnegprot",reply_negprot,0}, + {SMBtcon,"SMBtcon",reply_tcon,0}, + {SMBtdis,"SMBtdis",reply_tdis,0}, + {SMBexit,"SMBexit",reply_exit,0}, + {SMBioctl,"SMBioctl",reply_ioctl,0}, + {SMBecho,"SMBecho",reply_echo,0}, + {SMBsesssetupX,"SMBsesssetupX",reply_sesssetup_and_X,0}, + {SMBtconX,"SMBtconX",reply_tcon_and_X,0}, + {SMBulogoffX, "SMBulogoffX", reply_ulogoffX, 0}, /* ulogoff doesn't give a valid TID */ {SMBgetatr,"SMBgetatr",reply_getatr,AS_USER}, {SMBsetatr,"SMBsetatr",reply_setatr,AS_USER | NEED_WRITE}, {SMBchkpth,"SMBchkpth",reply_chkpth,AS_USER}, @@ -4576,10 +4575,6 @@ static int switch_message(int type,char *inbuf,char *outbuf,int size,int bufsize if ((flags & AS_GUEST) && (!become_guest() || !check_access(-1))) return(ERROR(ERRSRV,ERRaccess)); - /* is this service online? */ - if (! (flags & DONT_CHECK_ONLINE) && ! lp_online(SNUM(cnum))) - return(ERROR(ERRHRD,ERRnotready)); - last_inbuf = inbuf; outsize = smb_messages[match].fn(inbuf,outbuf,size,bufsize); |