diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-20 00:02:15 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:52:06 +0100 |
| commit | 0500b87092540d300b4e021a0fb95ce16a44fbd2 (patch) | |
| tree | d8ff9774916e84dbc568f77edd4925b1f6b51735 /source4/torture | |
| parent | 3e75f222bcdf114238cc4f2bcc61332dc059135f (diff) | |
| download | samba-0500b87092540d300b4e021a0fb95ce16a44fbd2.tar.gz samba-0500b87092540d300b4e021a0fb95ce16a44fbd2.tar.bz2 samba-0500b87092540d300b4e021a0fb95ce16a44fbd2.zip | |
r26540: Revert my previous commit after concerns raised by Andrew.
(This used to be commit 6ac86f8be7d9a8c5ab396a93e6d1e6819e11f173)
Diffstat (limited to 'source4/torture')
| -rw-r--r-- | source4/torture/ldap/uptodatevector.c | 2 | ||||
| -rw-r--r-- | source4/torture/nbt/winsreplication.c | 2 | ||||
| -rw-r--r-- | source4/torture/smbtorture.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source4/torture/ldap/uptodatevector.c b/source4/torture/ldap/uptodatevector.c index 1f3018fc5e..7bac04caf3 100644 --- a/source4/torture/ldap/uptodatevector.c +++ b/source4/torture/ldap/uptodatevector.c @@ -47,7 +47,7 @@ static bool test_check_uptodatevector(struct torture_context *torture, struct ldb_result *r; const struct ldb_val *utdv_val1; struct replUpToDateVectorBlob utdv1; - const char *attrs[] = { + static const char *attrs[] = { "uSNChanged", "replUpToDateVector", "description", diff --git a/source4/torture/nbt/winsreplication.c b/source4/torture/nbt/winsreplication.c index f0e09c75da..d96ed3e931 100644 --- a/source4/torture/nbt/winsreplication.c +++ b/source4/torture/nbt/winsreplication.c @@ -1008,7 +1008,7 @@ static bool test_wrepl_sgroup_merged(struct torture_context *tctx, static bool test_conflict_same_owner(struct torture_context *tctx, struct test_wrepl_conflict_conn *ctx) { - bool ret = true; + static bool ret = true; struct nbt_name name; struct wrepl_wins_name wins_name1; struct wrepl_wins_name wins_name2; diff --git a/source4/torture/smbtorture.c b/source4/torture/smbtorture.c index 3c8976d8d0..371ddc7297 100644 --- a/source4/torture/smbtorture.c +++ b/source4/torture/smbtorture.c @@ -517,13 +517,13 @@ int main(int argc,char *argv[]) const struct torture_ui_ops *ui_ops; char **argv_new; poptContext pc; - const char *target = "other"; + static const char *target = "other"; NTSTATUS status; int shell = false; - const char *ui_ops_name = "simple"; + static const char *ui_ops_name = "simple"; const char *basedir = NULL; const char *extra_module = NULL; - int list_tests = 0; + static int list_tests = 0; enum {OPT_LOADFILE=1000,OPT_UNCLIST,OPT_TIMELIMIT,OPT_DNS, OPT_LIST, OPT_DANGEROUS,OPT_SMB_PORTS,OPT_ASYNC,OPT_NUMPROGS}; |