diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-06-24 16:26:23 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-24 16:26:23 +1000 |
| commit | 6da26870e0ae5acd6ff49a30ec2f6886b44d095e (patch) | |
| tree | 850c71039563c16a5d563c47e7ba2ab645baf198 /source3/torture/vfstest.c | |
| parent | 6925a799d04c6fa59dd2ddef1f5510f9bb7d17d1 (diff) | |
| parent | 2610c05b5b95cc7036b3d6dfb894c6cfbdb68483 (diff) | |
| download | samba-4.0.0alpha16.tar.gz samba-4.0.0alpha16.tar.xz samba-4.0.0alpha16.zip | |
Merge 2610c05b5b95cc7036b3d6dfb894c6cfbdb68483 as Samba-4.0alpha16samba-4.0.0alpha16
Diffstat (limited to 'source3/torture/vfstest.c')
| -rw-r--r-- | source3/torture/vfstest.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/source3/torture/vfstest.c b/source3/torture/vfstest.c index 584f6e30ef3..490dd2bd529 100644 --- a/source3/torture/vfstest.c +++ b/source3/torture/vfstest.c @@ -414,16 +414,6 @@ void exit_server_cleanly(const char *const reason) int last_message = -1; -struct event_context *smbd_event_context(void) -{ - static struct event_context *ctx; - - if (!ctx && !(ctx = event_context_init(NULL))) { - smb_panic("Could not init smbd event context\n"); - } - return ctx; -} - /* Main function */ int main(int argc, char *argv[]) @@ -479,8 +469,8 @@ int main(int argc, char *argv[]) /* some basic initialization stuff */ sec_init(); - vfs.conn = TALLOC_ZERO_P(NULL, connection_struct); - vfs.conn->params = TALLOC_P(vfs.conn, struct share_params); + vfs.conn = talloc_zero(NULL, connection_struct); + vfs.conn->params = talloc(vfs.conn, struct share_params); for (i=0; i < 1024; i++) vfs.files[i] = NULL; |