diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-21 14:51:13 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-21 14:51:13 +0200 |
commit | 5209a846a9157e649fcdcb561f7eaf19c8c0e465 (patch) | |
tree | b0a7e52b5646c8eec182dbc391e7934b6804488c /source4/torture/nbt/wins.c | |
parent | 625359b2e266105022309df8985720108ecd6f67 (diff) | |
parent | 2ee8d29d22bcb1c350ab59d71b0aee548489bc9c (diff) | |
download | samba-5209a846a9157e649fcdcb561f7eaf19c8c0e465.tar.gz samba-5209a846a9157e649fcdcb561f7eaf19c8c0e465.tar.bz2 samba-5209a846a9157e649fcdcb561f7eaf19c8c0e465.zip |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into regsrv
Conflicts:
source4/lib/registry/ldb.c
source4/rpc_server/winreg/rpc_winreg.c
Diffstat (limited to 'source4/torture/nbt/wins.c')
-rw-r--r-- | source4/torture/nbt/wins.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/torture/nbt/wins.c b/source4/torture/nbt/wins.c index ad9a97f133..0399daedf0 100644 --- a/source4/torture/nbt/wins.c +++ b/source4/torture/nbt/wins.c @@ -95,8 +95,8 @@ static bool nbt_test_wins_name(struct torture_context *tctx, const char *address torture_comment(tctx, "register the name\n"); io.in.name = *name; io.in.wins_port = lp_nbt_port(tctx->lp_ctx); - io.in.wins_servers = str_list_make(tctx, address, NULL); - io.in.addresses = str_list_make(tctx, myaddress, NULL); + io.in.wins_servers = (const char **)str_list_make(tctx, address, NULL); + io.in.addresses = (const char **)str_list_make(tctx, myaddress, NULL); io.in.nb_flags = nb_flags; io.in.ttl = 300000; @@ -168,8 +168,8 @@ static bool nbt_test_wins_name(struct torture_context *tctx, const char *address torture_comment(tctx, "refresh the name\n"); refresh.in.name = *name; refresh.in.wins_port = lp_nbt_port(tctx->lp_ctx); - refresh.in.wins_servers = str_list_make(tctx, address, NULL); - refresh.in.addresses = str_list_make(tctx, myaddress, NULL); + refresh.in.wins_servers = (const char **)str_list_make(tctx, address, NULL); + refresh.in.addresses = (const char **)str_list_make(tctx, myaddress, NULL); refresh.in.nb_flags = nb_flags; refresh.in.ttl = 12345; |