summaryrefslogtreecommitdiff
path: root/source3/torture/vfstest.c
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-08-28 17:25:22 +0200
committerVolker Lendecke <vl@samba.org>2010-08-29 21:55:25 +0200
commite466bb4af45175a3fe1d6dff54c10d81c4e68257 (patch)
tree321bf40efe545ddc5215f4e147b754d5e6d63bd6 /source3/torture/vfstest.c
parente784e160ec899a32b673dfaa77fa12c8f27d296c (diff)
downloadsamba-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/torture/vfstest.c')
-rw-r--r--source3/torture/vfstest.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/source3/torture/vfstest.c b/source3/torture/vfstest.c
index 4d537dadcf..923b5479ab 100644
--- a/source3/torture/vfstest.c
+++ b/source3/torture/vfstest.c
@@ -410,14 +410,8 @@ void exit_server_cleanly(const char *const reason)
exit_server("normal exit");
}
-static int server_fd = -1;
int last_message = -1;
-int smbd_server_fd(void)
-{
- return server_fd;
-}
-
struct event_context *smbd_event_context(void)
{
static struct event_context *ctx;
@@ -463,7 +457,7 @@ int main(int argc, char *argv[])
poptFreeContext(pc);
/* TODO: check output */
- reload_services(smbd_messaging_context(), smbd_server_fd(), False);
+ reload_services(smbd_messaging_context(), -1, False);
/* the following functions are part of the Samba debugging
facilities. See lib/debug.c */