From 218f482fbfe96b2cddec8c05f6b8f174481d2e27 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 12 Oct 2008 00:56:56 +0200 Subject: Use common strlist implementation in Samba 3 and Samba 4. --- source4/auth/sam.c | 2 +- source4/client/client.c | 2 +- source4/dsdb/common/util.c | 2 +- source4/libcli/resolve/wins.c | 2 +- source4/libnet/libnet_lookup.c | 2 +- source4/nbt_server/wins/winsclient.c | 2 +- source4/param/generic.c | 2 +- source4/param/loadparm.c | 6 +++--- source4/rpc_server/remote/dcesrv_remote.c | 2 +- source4/torture/nbt/wins.c | 8 ++++---- source4/winbind/wb_samba3_cmd.c | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) (limited to 'source4') diff --git a/source4/auth/sam.c b/source4/auth/sam.c index 19ddc7cb74..d04a254d6c 100644 --- a/source4/auth/sam.c +++ b/source4/auth/sam.c @@ -207,7 +207,7 @@ _PUBLIC_ NTSTATUS authsam_account_ok(TALLOC_CTX *mem_ctx, if (logon_workstation && workstation_list && *workstation_list) { bool invalid_ws = true; int i; - const char **workstations = str_list_make(mem_ctx, workstation_list, ","); + const char **workstations = (const char **)str_list_make(mem_ctx, workstation_list, ","); for (i = 0; workstations && workstations[i]; i++) { DEBUG(10,("sam_account_ok: checking for workstation match '%s' and '%s'\n", diff --git a/source4/client/client.c b/source4/client/client.c index 3523c4d274..3213c8931f 100644 --- a/source4/client/client.c +++ b/source4/client/client.c @@ -2754,7 +2754,7 @@ process a -c command string ****************************************************************************/ static int process_command_string(struct smbclient_context *ctx, const char *cmd) { - const char **lines; + char **lines; int i, rc = 0; lines = str_list_make(NULL, cmd, ";"); diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c index 21e6781d79..5b93efb316 100644 --- a/source4/dsdb/common/util.c +++ b/source4/dsdb/common/util.c @@ -1912,7 +1912,7 @@ struct ldb_dn *samdb_dns_domain_to_dn(struct ldb_context *ldb, TALLOC_CTX *mem_c return NULL; } - split_realm = str_list_make(tmp_ctx, dns_domain, "."); + split_realm = (const char **)str_list_make(tmp_ctx, dns_domain, "."); if (!split_realm) { talloc_free(tmp_ctx); return NULL; diff --git a/source4/libcli/resolve/wins.c b/source4/libcli/resolve/wins.c index ebce9b98bd..f787d52d31 100644 --- a/source4/libcli/resolve/wins.c +++ b/source4/libcli/resolve/wins.c @@ -79,7 +79,7 @@ NTSTATUS resolve_name_wins(struct nbt_name *name, bool resolve_context_add_wins_method(struct resolve_context *ctx, const char **address_list, struct interface *ifaces, uint16_t nbt_port, int nbt_timeout) { struct resolve_wins_data *wins_data = talloc(ctx, struct resolve_wins_data); - wins_data->address_list = str_list_copy(wins_data, address_list); + wins_data->address_list = (const char **)str_list_copy(wins_data, address_list); wins_data->ifaces = talloc_reference(wins_data, ifaces); wins_data->nbt_port = nbt_port; wins_data->nbt_timeout = nbt_timeout; diff --git a/source4/libnet/libnet_lookup.c b/source4/libnet/libnet_lookup.c index cab4d9e73f..dc54ec3cf1 100644 --- a/source4/libnet/libnet_lookup.c +++ b/source4/libnet/libnet_lookup.c @@ -129,7 +129,7 @@ NTSTATUS libnet_Lookup_recv(struct composite_context *c, TALLOC_CTX *mem_ctx, if (NT_STATUS_IS_OK(status)) { s = talloc_get_type(c->private_data, struct lookup_state); - io->out.address = str_list_make(mem_ctx, s->address, NULL); + io->out.address = (const char **)str_list_make(mem_ctx, s->address, NULL); NT_STATUS_HAVE_NO_MEMORY(io->out.address); } diff --git a/source4/nbt_server/wins/winsclient.c b/source4/nbt_server/wins/winsclient.c index 1d07f4a60a..133592f1fd 100644 --- a/source4/nbt_server/wins/winsclient.c +++ b/source4/nbt_server/wins/winsclient.c @@ -140,7 +140,7 @@ static void nbtd_wins_refresh(struct event_context *ev, struct timed_event *te, /* setup a wins name refresh request */ io.in.name = iname->name; - io.in.wins_servers = str_list_make(tmp_ctx, iname->wins_server, NULL); + io.in.wins_servers = (const char **)str_list_make(tmp_ctx, iname->wins_server, NULL); io.in.wins_port = lp_nbt_port(iface->nbtsrv->task->lp_ctx); io.in.addresses = nbtd_address_list(iface, tmp_ctx); io.in.nb_flags = iname->nb_flags; diff --git a/source4/param/generic.c b/source4/param/generic.c index 80735d2a33..ed3045605d 100644 --- a/source4/param/generic.c +++ b/source4/param/generic.c @@ -130,7 +130,7 @@ const char **param_get_string_list(struct param_context *ctx, const char *param, if (separator == NULL) separator = LIST_SEP; - return str_list_make(ctx, p->value, separator); + return (const char **)str_list_make(ctx, p->value, separator); } int param_set_string_list(struct param_context *ctx, const char *param, const char **list, const char *section) diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index dbc4776bd8..e626cdf5dd 100644 --- a/source4/param/loadparm.c +++ b/source4/param/loadparm.c @@ -885,7 +885,7 @@ const char **lp_parm_string_list(TALLOC_CTX *mem_ctx, const char *value = lp_get_parametric(lp_ctx, service, type, option); if (value != NULL) - return str_list_make(mem_ctx, value, separator); + return (const char **)str_list_make(mem_ctx, value, separator); return NULL; } @@ -1299,7 +1299,7 @@ static void copy_service(struct loadparm_service *pserviceDest, strupper(*(char **)dest_ptr); break; case P_LIST: - *(const char ***)dest_ptr = str_list_copy(pserviceDest, + *(const char ***)dest_ptr = (const char **)str_list_copy(pserviceDest, *(const char ***)src_ptr); break; default: @@ -1653,7 +1653,7 @@ static bool set_variable(TALLOC_CTX *mem_ctx, int parmnum, void *parm_ptr, } case P_LIST: - *(const char ***)parm_ptr = str_list_make(mem_ctx, + *(const char ***)parm_ptr = (const char **)str_list_make(mem_ctx, pszParmValue, NULL); break; diff --git a/source4/rpc_server/remote/dcesrv_remote.c b/source4/rpc_server/remote/dcesrv_remote.c index cd32160d88..3cf8fbe8fb 100644 --- a/source4/rpc_server/remote/dcesrv_remote.c +++ b/source4/rpc_server/remote/dcesrv_remote.c @@ -225,7 +225,7 @@ static NTSTATUS remote_register_one_iface(struct dcesrv_context *dce_ctx, const static NTSTATUS remote_op_init_server(struct dcesrv_context *dce_ctx, const struct dcesrv_endpoint_server *ep_server) { int i; - const char **ifaces = str_list_make(dce_ctx, lp_parm_string(dce_ctx->lp_ctx, NULL, "dcerpc_remote", "interfaces"),NULL); + const char **ifaces = (const char **)str_list_make(dce_ctx, lp_parm_string(dce_ctx->lp_ctx, NULL, "dcerpc_remote", "interfaces"),NULL); if (!ifaces) { DEBUG(3,("remote_op_init_server: no interfaces configured\n")); 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; diff --git a/source4/winbind/wb_samba3_cmd.c b/source4/winbind/wb_samba3_cmd.c index c2ba55ff18..03b59f56e9 100644 --- a/source4/winbind/wb_samba3_cmd.c +++ b/source4/winbind/wb_samba3_cmd.c @@ -113,7 +113,7 @@ NTSTATUS wbsrv_samba3_netbios_name(struct wbsrv_samba3_call *s3call) NTSTATUS wbsrv_samba3_priv_pipe_dir(struct wbsrv_samba3_call *s3call) { - char *path = s3call->wbconn->listen_socket->service->priv_socket_path; + const char *path = s3call->wbconn->listen_socket->service->priv_socket_path; s3call->response.result = WINBINDD_OK; s3call->response.extra_data.data = path; -- cgit