diff options
| author | Volker Lendecke <vl@samba.org> | 2010-08-28 17:25:22 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-08-29 21:55:25 +0200 |
| commit | e466bb4af45175a3fe1d6dff54c10d81c4e68257 (patch) | |
| tree | 321bf40efe545ddc5215f4e147b754d5e6d63bd6 /source3/smbd | |
| parent | e784e160ec899a32b673dfaa77fa12c8f27d296c (diff) | |
| download | samba-e466bb4af45175a3fe1d6dff54c10d81c4e68257.tar.gz samba-e466bb4af45175a3fe1d6dff54c10d81c4e68257.tar.bz2 samba-e466bb4af45175a3fe1d6dff54c10d81c4e68257.zip | |
s3: Remove smbd_server_fd()
This breaks the perfcol_onefs() build.
Tim, Steve, this use of smbd_server_fd is replacable by calls into
substitute.c. I don't have a onefs environment around to build a fix, so I've
decided to insert an #error, making it not compile. The fix should be pretty
obvious, you can get the socket data via "%I" and "%i" substitutions.
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/globals.h | 2 | ||||
| -rw-r--r-- | source3/smbd/server.c | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h index 759fead1c3..c4d65aa565 100644 --- a/source3/smbd/globals.h +++ b/source3/smbd/globals.h @@ -469,7 +469,7 @@ struct smbd_server_connection { struct { /* - * fd for the fcntl lock mutexing access to smbd_server_fd + * fd for the fcntl lock mutexing access to our sock */ int socket_lock_fd; diff --git a/source3/smbd/server.c b/source3/smbd/server.c index 36b081a3fe..aa0f7e85ab 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -53,19 +53,12 @@ static_decl_rpc; extern int dcelogin_atmost_once; #endif /* WITH_DFS */ -int smbd_server_fd(void) -{ - return server_fd; -} - static void smbd_set_server_fd(int fd) { struct smbd_server_connection *sconn = smbd_server_conn; char addr[INET6_ADDRSTRLEN]; const char *name; - server_fd = fd; - sconn->sock = fd; /* |