diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2012-03-24 20:17:08 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2012-03-24 21:55:40 +0100 |
| commit | c0288e0612187ecbfc4a81d071fd504ea8737b7a (patch) | |
| tree | d9928183d4eeca7c9aa55e4aabb91465fb72f09a /source3/smbd/negprot.c | |
| parent | 55bd27935fe0bf31945d0137a1673499e7fcb1ad (diff) | |
| download | samba-c0288e0612187ecbfc4a81d071fd504ea8737b7a.tar.gz samba-c0288e0612187ecbfc4a81d071fd504ea8737b7a.tar.bz2 samba-c0288e0612187ecbfc4a81d071fd504ea8737b7a.zip | |
lib/util: Remove obsolete sys_getpid() and sys_fork().
The performance of these is minimal (these days) and they can return
invalid results when used as part of applications that do not use
sys_fork().
Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Sat Mar 24 21:55:41 CET 2012 on sn-devel-104
Diffstat (limited to 'source3/smbd/negprot.c')
| -rw-r--r-- | source3/smbd/negprot.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c index e44ac5cb75..9ddafee657 100644 --- a/source3/smbd/negprot.c +++ b/source3/smbd/negprot.c @@ -121,13 +121,13 @@ static void reply_lanman1(struct smb_request *req, uint16 choice) set_Protocol(PROTOCOL_LANMAN1); /* Reply, SMBlockread, SMBwritelock supported. */ - SCVAL(req->outbuf,smb_flg,FLAG_REPLY|FLAG_SUPPORT_LOCKREAD); - SSVAL(req->outbuf,smb_vwv2,sconn->smb1.negprot.max_recv); - SSVAL(req->outbuf,smb_vwv3,lp_maxmux()); /* maxmux */ - SSVAL(req->outbuf,smb_vwv4,1); - SSVAL(req->outbuf,smb_vwv5,raw); /* tell redirector we support + SCVAL(req->outbuf,smb_flg, FLAG_REPLY|FLAG_SUPPORT_LOCKREAD); + SSVAL(req->outbuf,smb_vwv2, sconn->smb1.negprot.max_recv); + SSVAL(req->outbuf,smb_vwv3, lp_maxmux()); /* maxmux */ + SSVAL(req->outbuf,smb_vwv4, 1); + SSVAL(req->outbuf,smb_vwv5, raw); /* tell redirector we support readbraw writebraw (possibly) */ - SIVAL(req->outbuf,smb_vwv6,sys_getpid()); + SIVAL(req->outbuf,smb_vwv6, getpid()); SSVAL(req->outbuf,smb_vwv10, set_server_zone_offset(t)/60); srv_put_dos_date((char *)req->outbuf,smb_vwv8,t); @@ -157,9 +157,9 @@ static void reply_lanman2(struct smb_request *req, uint16 choice) reply_outbuf(req, 13, sconn->smb1.negprot.encrypted_passwords?8:0); - SSVAL(req->outbuf,smb_vwv0,choice); - SSVAL(req->outbuf,smb_vwv1,secword); - SIVAL(req->outbuf,smb_vwv6,sys_getpid()); + SSVAL(req->outbuf,smb_vwv0, choice); + SSVAL(req->outbuf,smb_vwv1, secword); + SIVAL(req->outbuf,smb_vwv6, getpid()); /* Create a token value and add it to the outgoing packet. */ if (sconn->smb1.negprot.encrypted_passwords) { @@ -362,13 +362,13 @@ static void reply_nt1(struct smb_request *req, uint16 choice) set_Protocol(PROTOCOL_NT1); - SSVAL(req->outbuf,smb_vwv1+1,lp_maxmux()); /* maxmpx */ - SSVAL(req->outbuf,smb_vwv2+1,1); /* num vcs */ + SSVAL(req->outbuf,smb_vwv1+1, lp_maxmux()); /* maxmpx */ + SSVAL(req->outbuf,smb_vwv2+1, 1); /* num vcs */ SIVAL(req->outbuf,smb_vwv3+1, sconn->smb1.negprot.max_recv); /* max buffer. LOTS! */ - SIVAL(req->outbuf,smb_vwv5+1,0x10000); /* raw size. full 64k */ - SIVAL(req->outbuf,smb_vwv7+1,sys_getpid()); /* session key */ - SIVAL(req->outbuf,smb_vwv9+1,capabilities); /* capabilities */ + SIVAL(req->outbuf,smb_vwv5+1, 0x10000); /* raw size. full 64k */ + SIVAL(req->outbuf,smb_vwv7+1, getpid()); /* session key */ + SIVAL(req->outbuf,smb_vwv9+1, capabilities); /* capabilities */ clock_gettime(CLOCK_REALTIME,&ts); put_long_date_timespec(TIMESTAMP_SET_NT_OR_BETTER,(char *)req->outbuf+smb_vwv11+1,ts); SSVALS(req->outbuf,smb_vwv15+1,set_server_zone_offset(ts.tv_sec)/60); |