summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-10-12 18:29:36 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-10-12 18:29:36 +0200
commitcbe4f1b4fae72a54e610725d3304fefd37aa4495 (patch)
tree78d0a044db455c70d7e2ded00ddc0b06651dd339 /source3
parent45b340dd19ebc0a5531844030594c4de596ed80f (diff)
downloadsamba-cbe4f1b4fae72a54e610725d3304fefd37aa4495.tar.gz
samba-cbe4f1b4fae72a54e610725d3304fefd37aa4495.tar.bz2
samba-cbe4f1b4fae72a54e610725d3304fefd37aa4495.zip
Move zlib to top-level root.
Diffstat (limited to 'source3')
-rw-r--r--source3/samba4.mk2
-rw-r--r--source3/torture/torture.c15
2 files changed, 4 insertions, 13 deletions
diff --git a/source3/samba4.mk b/source3/samba4.mk
index d3804a5d94..15774d9a94 100644
--- a/source3/samba4.mk
+++ b/source3/samba4.mk
@@ -62,7 +62,7 @@ include $(pidldir)/config.mk
include samba4-config.mk
include samba4-templates.mk
-zlibsrcdir := $(samba4srcdir)/lib/zlib
+zlibsrcdir := $(samba4srcdir)/../lib/zlib
dynconfigsrcdir := $(samba4srcdir)/dynconfig
heimdalsrcdir := $(samba4srcdir)/heimdal
dsdbsrcdir := $(samba4srcdir)/dsdb
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index d8942e42b9..25b042177d 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -294,15 +294,6 @@ static bool torture_open_connection_share(struct cli_state **c,
return True;
}
-void torture_open_connection_free_unclist(char **unc_list)
-{
- if (unc_list!=NULL)
- {
- SAFE_FREE(unc_list[0]);
- SAFE_FREE(unc_list);
- }
-}
-
bool torture_open_connection(struct cli_state **c, int conn_index)
{
char **unc_list = NULL;
@@ -311,7 +302,7 @@ bool torture_open_connection(struct cli_state **c, int conn_index)
if (use_multishare_conn==True) {
char *h, *s;
- unc_list = file_lines_load(multishare_conn_fname, &num_unc_names, 0);
+ unc_list = file_lines_load(multishare_conn_fname, &num_unc_names, 0, NULL);
if (!unc_list || num_unc_names <= 0) {
printf("Failed to load unc names list from '%s'\n", multishare_conn_fname);
exit(1);
@@ -321,14 +312,14 @@ bool torture_open_connection(struct cli_state **c, int conn_index)
NULL, &h, &s)) {
printf("Failed to parse UNC name %s\n",
unc_list[conn_index % num_unc_names]);
- torture_open_connection_free_unclist(unc_list);
+ TALLOC_FREE(unc_list);
exit(1);
}
result = torture_open_connection_share(c, h, s);
/* h, s were copied earlier */
- torture_open_connection_free_unclist(unc_list);
+ TALLOC_FREE(unc_list);
return result;
}