diff options
27 files changed, 72 insertions, 71 deletions
diff --git a/source4/client/client.c b/source4/client/client.c index 3fa819c8e7..c1292a2bef 100644 --- a/source4/client/client.c +++ b/source4/client/client.c @@ -264,9 +264,9 @@ static int do_cd(struct smbclient_context *ctx, const char *newdir) /* Save the current directory in case the new directory is invalid */ if (newdir[0] == '\\') - dname = talloc_strdup(NULL, newdir); + dname = talloc_strdup(ctx, newdir); else - dname = talloc_asprintf(NULL, "%s\\%s", ctx->remote_cur_dir, newdir); + dname = talloc_asprintf(ctx, "%s\\%s", ctx->remote_cur_dir, newdir); dos_format(dname); @@ -685,7 +685,7 @@ static int cmd_du(struct smbclient_context *ctx, const char **args) /**************************************************************************** get a file from rname to lname ****************************************************************************/ -static int do_get(struct smbclient_context *ctx, char *rname, const char *lname, bool reget) +static int do_get(struct smbclient_context *ctx, char *rname, const char *p_lname, bool reget) { int handle = 0, fnum; bool newhandle = false; @@ -697,11 +697,14 @@ static int do_get(struct smbclient_context *ctx, char *rname, const char *lname, off_t start = 0; off_t nread = 0; int rc = 0; + char *lname; + + lname = talloc_strdup(ctx, p_lname); GetTimeOfDay(&tp_start); if (ctx->lowercase) { - strlower(discard_const_p(char, lname)); + strlower(lname); } fnum = smbcli_open(ctx->cli->tree, rname, O_RDONLY, DENY_NONE); @@ -858,6 +861,7 @@ static void do_mget(struct smbclient_context *ctx, struct clilist_file_info *fin char *quest; char *mget_mask; char *saved_curdir; + char *l_fname; if (ISDOT(finfo->name) || ISDOTDOT(finfo->name)) return; @@ -879,27 +883,29 @@ static void do_mget(struct smbclient_context *ctx, struct clilist_file_info *fin } /* handle directories */ - saved_curdir = talloc_strdup(NULL, ctx->remote_cur_dir); + saved_curdir = talloc_strdup(ctx, ctx->remote_cur_dir); ctx->remote_cur_dir = talloc_asprintf_append_buffer(NULL, "%s\\", finfo->name); - string_replace(discard_const_p(char, finfo->name), '\\', '/'); + l_fname = talloc_strdup(ctx, finfo->name); + + string_replace(l_fname, '\\', '/'); if (ctx->lowercase) { - strlower(discard_const_p(char, finfo->name)); + strlower(l_fname); } - if (!directory_exist(finfo->name) && - mkdir(finfo->name,0777) != 0) { - d_printf("failed to create directory %s\n",finfo->name); + if (!directory_exist(l_fname) && + mkdir(l_fname, 0777) != 0) { + d_printf("failed to create directory %s\n", l_fname); return; } - if (chdir(finfo->name) != 0) { - d_printf("failed to chdir to directory %s\n",finfo->name); + if (chdir(l_fname) != 0) { + d_printf("failed to chdir to directory %s\n", l_fname); return; } - mget_mask = talloc_asprintf(NULL, "%s*", ctx->remote_cur_dir); + mget_mask = talloc_asprintf(ctx, "%s*", ctx->remote_cur_dir); do_list(ctx, mget_mask, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_DIRECTORY,do_mget,false, true); chdir(".."); @@ -963,7 +969,7 @@ static int cmd_mget(struct smbclient_context *ctx, const char **args) attribute |= FILE_ATTRIBUTE_DIRECTORY; for (i = 1; args[i]; i++) { - mget_mask = talloc_strdup(ctx,ctx->remote_cur_dir); + mget_mask = talloc_strdup(ctx, ctx->remote_cur_dir); if(mget_mask[strlen(mget_mask)-1]!='\\') mget_mask = talloc_append_string(ctx, mget_mask, "\\"); @@ -1292,7 +1298,7 @@ static bool seek_list(struct file_list *list, char *name) static int cmd_select(struct smbclient_context *ctx, const char **args) { talloc_free(ctx->fileselection); - ctx->fileselection = talloc_strdup(NULL, args[1]); + ctx->fileselection = talloc_strdup(ctx, args[1]); return 0; } @@ -1533,7 +1539,7 @@ static int cmd_del(struct smbclient_context *ctx, const char **args) d_printf("del <filename>\n"); return 1; } - mask = talloc_asprintf(ctx,"%s%s", ctx->remote_cur_dir, args[1]); + mask = talloc_asprintf(ctx, "%s%s", ctx->remote_cur_dir, args[1]); if (NT_STATUS_IS_ERR(smbcli_unlink(ctx->cli->tree, mask))) { d_printf("%s deleting remote file %s\n",smbcli_errstr(ctx->cli->tree),mask); @@ -2994,7 +3000,7 @@ static int process_line(struct smbclient_context *ctx, const char *cline) int i; /* and get the first part of the command */ - args = str_list_make_shell(ctx, cline, NULL); + args = (const char **) str_list_make_shell(ctx, cline, NULL); if (!args || !args[0]) return 0; @@ -3151,12 +3157,12 @@ static int do_message_op(const char *netbios_name, const char *desthost, ****************************************************************************/ int main(int argc,char *argv[]) { - const char *base_directory = NULL; + char *base_directory = NULL; const char *dest_ip = NULL; int opt; const char *query_host = NULL; bool message = false; - const char *desthost = NULL; + char *desthost = NULL; poptContext pc; const char *service = NULL; int port = 0; diff --git a/source4/dsdb/samdb/ldb_modules/anr.c b/source4/dsdb/samdb/ldb_modules/anr.c index deeccac072..a5220b3f91 100644 --- a/source4/dsdb/samdb/ldb_modules/anr.c +++ b/source4/dsdb/samdb/ldb_modules/anr.c @@ -67,8 +67,10 @@ static struct ldb_parse_tree *make_parse_list(struct ldb_module *module, * Make an equality or prefix match tree, from the attribute, operation and matching value supplied */ static struct ldb_parse_tree *make_match_tree(struct ldb_module *module, - TALLOC_CTX *mem_ctx, enum ldb_parse_op op, - const char *attr, const DATA_BLOB *match) + TALLOC_CTX *mem_ctx, + enum ldb_parse_op op, + const char *attr, + struct ldb_val *match) { struct ldb_context *ldb; struct ldb_parse_tree *match_tree; @@ -123,7 +125,7 @@ struct anr_context { */ static int anr_replace_value(struct anr_context *ac, TALLOC_CTX *mem_ctx, - const struct ldb_val *match, + struct ldb_val *match, struct ldb_parse_tree **ntree) { struct ldb_parse_tree *tree = NULL; @@ -146,7 +148,7 @@ static int anr_replace_value(struct anr_context *ac, ac->found_anr = true; if (match->length > 1 && match->data[0] == '=') { - DATA_BLOB *match2 = talloc(mem_ctx, DATA_BLOB); + struct ldb_val *match2 = talloc(mem_ctx, struct ldb_val); *match2 = data_blob_const(match->data+1, match->length - 1); if (match2 == NULL){ ldb_oom(ldb); @@ -181,8 +183,8 @@ static int anr_replace_value(struct anr_context *ac, if (p) { struct ldb_parse_tree *first_split_filter, *second_split_filter, *split_filters, *match_tree_1, *match_tree_2; - DATA_BLOB *first_match = talloc(tree, DATA_BLOB); - DATA_BLOB *second_match = talloc(tree, DATA_BLOB); + struct ldb_val *first_match = talloc(tree, struct ldb_val); + struct ldb_val *second_match = talloc(tree, struct ldb_val); if (!first_match || !second_match) { ldb_oom(ldb); return LDB_ERR_OPERATIONS_ERROR; diff --git a/source4/lib/com/main.c b/source4/lib/com/main.c index 062d1360ac..487ed5b712 100644 --- a/source4/lib/com/main.c +++ b/source4/lib/com/main.c @@ -52,7 +52,7 @@ WERROR com_create_object(struct com_context *ctx, struct GUID *clsid, int num_if } /* Run IClassFactory::CreateInstance() */ - error = IClassFactory_CreateInstance(factory, ctx, NULL, &classfact_iid, &iunk); + error = IClassFactory_CreateInstance(factory, ctx, NULL, &classfact_iid, (struct MInterfacePointer *) &iunk); if (!W_ERROR_IS_OK(error)) { DEBUG(3, ("Error while calling IClassFactory::CreateInstance : %s\n", win_errstr(error))); return error; diff --git a/source4/lib/socket/socket.h b/source4/lib/socket/socket.h index 0f469e5ceb..02872457b5 100644 --- a/source4/lib/socket/socket.h +++ b/source4/lib/socket/socket.h @@ -206,7 +206,7 @@ NTSTATUS socket_connect_multi(TALLOC_CTX *mem_ctx, const char *server_address, struct socket_context **result, uint16_t *port); void set_socket_options(int fd, const char *options); -void socket_set_flags(struct socket_context *socket, unsigned flags); +void socket_set_flags(struct socket_context *sock, unsigned flags); void socket_tevent_fd_close_fn(struct tevent_context *ev, struct tevent_fd *fde, diff --git a/source4/libcli/ldap/ldap_client.c b/source4/libcli/ldap/ldap_client.c index d278f407dc..3c78a7c7e2 100644 --- a/source4/libcli/ldap/ldap_client.c +++ b/source4/libcli/ldap/ldap_client.c @@ -403,7 +403,6 @@ static void ldap_connect_got_sock(struct composite_context *ctx, talloc_steal(conn, conn->sock); if (conn->ldaps) { struct socket_context *tls_socket; - struct socket_context *tmp_socket; char *cafile = lp_tls_cafile(conn->sock, conn->lp_ctx); if (!cafile || !*cafile) { diff --git a/source4/libcli/ldap/ldap_controls.c b/source4/libcli/ldap/ldap_controls.c index aef775fab5..86493c81da 100644 --- a/source4/libcli/ldap/ldap_controls.c +++ b/source4/libcli/ldap/ldap_controls.c @@ -214,7 +214,7 @@ static bool decode_sd_flags_request(void *mem_ctx, DATA_BLOB in, void *_out) return false; } - if (!asn1_read_Integer(data, &(lsdfc->secinfo_flags))) { + if (!asn1_read_Integer(data, (int *) &(lsdfc->secinfo_flags))) { return false; } @@ -248,7 +248,7 @@ static bool decode_search_options_request(void *mem_ctx, DATA_BLOB in, void *_ou return false; } - if (!asn1_read_Integer(data, &(lsoc->search_options))) { + if (!asn1_read_Integer(data, (int *) &(lsoc->search_options))) { return false; } diff --git a/source4/libcli/security/object_tree.c b/source4/libcli/security/object_tree.c index 8a90019a59..85b407913c 100644 --- a/source4/libcli/security/object_tree.c +++ b/source4/libcli/security/object_tree.c @@ -94,13 +94,13 @@ struct object_tree * get_object_tree_by_GUID(struct object_tree *root, /* Change the granted access per each ACE */ void object_tree_modify_access(struct object_tree *root, - uint32_t access) + uint32_t access_mask) { struct object_tree *p; if (root){ - root->remaining_access &= ~access; + root->remaining_access &= ~access_mask; } for (p = root->children; p != NULL; p = p->next) - object_tree_modify_access(p, access); + object_tree_modify_access(p, access_mask); } diff --git a/source4/libnet/libnet_samsync.c b/source4/libnet/libnet_samsync.c index 1d5e41de05..bdfb46dfd9 100644 --- a/source4/libnet/libnet_samsync.c +++ b/source4/libnet/libnet_samsync.c @@ -26,7 +26,7 @@ #include "../libcli/samsync/samsync.h" #include "auth/gensec/gensec.h" #include "auth/credentials/credentials.h" -#include "auth/gensec/schannel_proto.h" +#include "libcli/auth/schannel.h" #include "librpc/gen_ndr/ndr_netlogon.h" #include "librpc/gen_ndr/ndr_netlogon_c.h" #include "param/param.h" diff --git a/source4/librpc/rpc/pyrpc.h b/source4/librpc/rpc/pyrpc.h index ae622b562c..efbcac688c 100644 --- a/source4/librpc/rpc/pyrpc.h +++ b/source4/librpc/rpc/pyrpc.h @@ -53,7 +53,7 @@ PyAPI_DATA(PyTypeObject) dcerpc_InterfaceType; #define PyErr_SetNdrError(err) \ PyErr_SetObject(PyExc_RuntimeError, PyErr_FromNdrError(err)) -void PyErr_SetDCERPCStatus(struct dcerpc_pipe *pipe, NTSTATUS status); +void PyErr_SetDCERPCStatus(struct dcerpc_pipe *p, NTSTATUS status); typedef bool (*py_data_pack_fn) (PyObject *args, PyObject *kwargs, void *r); typedef PyObject *(*py_data_unpack_fn) (void *r); diff --git a/source4/ntvfs/simple/vfs_simple.c b/source4/ntvfs/simple/vfs_simple.c index aabaa3c47f..9577e8673a 100644 --- a/source4/ntvfs/simple/vfs_simple.c +++ b/source4/ntvfs/simple/vfs_simple.c @@ -70,9 +70,9 @@ static NTSTATUS svfs_connect(struct ntvfs_module_context *ntvfs, } if (strncmp(sharename, "\\\\", 2) == 0) { - char *p = strchr(sharename+2, '\\'); - if (p) { - sharename = p + 1; + char *p2 = strchr(sharename+2, '\\'); + if (p2) { + sharename = p2 + 1; } } diff --git a/source4/rpc_server/common/common.h b/source4/rpc_server/common/common.h index 17c2a7db02..ba023e1fd8 100644 --- a/source4/rpc_server/common/common.h +++ b/source4/rpc_server/common/common.h @@ -26,6 +26,8 @@ struct share_config; struct dcesrv_context; struct dcesrv_context; +struct dcesrv_call_state; +struct ndr_interface_table; struct dcerpc_server_info { const char *domain_name; @@ -34,8 +36,6 @@ struct dcerpc_server_info { uint32_t version_build; }; -struct ndr_interface_table; -struct dcesrv_call_state; #include "rpc_server/common/proto.h" #endif /* _DCERPC_SERVER_COMMON_H_ */ diff --git a/source4/torture/raw/notify.c b/source4/torture/raw/notify.c index c92170cf61..33d8c86570 100644 --- a/source4/torture/raw/notify.c +++ b/source4/torture/raw/notify.c @@ -1293,7 +1293,7 @@ static bool test_notify_overflow(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) NTSTATUS status; union smb_notify notify; union smb_open io; - int fnum, fnum2; + int fnum; int count = 100; struct smbcli_request *req1; int i; @@ -1371,10 +1371,8 @@ static bool test_notify_basedir(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) NTSTATUS status; union smb_notify notify; union smb_open io; - int fnum, fnum2; - int count = 100; + int fnum; struct smbcli_request *req1; - int i; printf("TESTING CHANGE NOTIFY BASEDIR EVENTS\n"); diff --git a/source4/torture/rpc/lsa_lookup.c b/source4/torture/rpc/lsa_lookup.c index 0a4c9904d7..b1a348ce8a 100644 --- a/source4/torture/rpc/lsa_lookup.c +++ b/source4/torture/rpc/lsa_lookup.c @@ -227,8 +227,8 @@ bool torture_rpc_lsa_lookup(struct torture_context *torture) struct dcerpc_pipe *p; bool ret = true; struct policy_handle *handle; - struct dom_sid *dom_sid; - struct dom_sid *trusted_sid; + struct dom_sid *dom_sid = NULL; + struct dom_sid *trusted_sid = NULL; struct dom_sid *sids[NUM_SIDS]; status = torture_rpc_connection(torture, &p, &ndr_table_lsarpc); diff --git a/source4/torture/rpc/samba3rpc.c b/source4/torture/rpc/samba3rpc.c index 65d251013b..4a529d38f6 100644 --- a/source4/torture/rpc/samba3rpc.c +++ b/source4/torture/rpc/samba3rpc.c @@ -2616,7 +2616,7 @@ static NTSTATUS find_printers(TALLOC_CTX *ctx, struct loadparm_context *lp_ctx, return NT_STATUS_OK; } -static bool enumprinters(TALLOC_CTX *mem_ctx, struct dcerpc_pipe *pipe, +static bool enumprinters(TALLOC_CTX *mem_ctx, struct dcerpc_pipe *p, const char *servername, int level, int *num_printers) { struct spoolss_EnumPrinters r; @@ -2635,7 +2635,7 @@ static bool enumprinters(TALLOC_CTX *mem_ctx, struct dcerpc_pipe *pipe, r.out.count = &count; r.out.info = &info; - status = dcerpc_spoolss_EnumPrinters(pipe, mem_ctx, &r); + status = dcerpc_spoolss_EnumPrinters(p, mem_ctx, &r); if (!NT_STATUS_IS_OK(status)) { d_printf("(%s) dcerpc_spoolss_EnumPrinters failed: %s\n", __location__, nt_errstr(status)); @@ -2658,7 +2658,7 @@ static bool enumprinters(TALLOC_CTX *mem_ctx, struct dcerpc_pipe *pipe, r.in.buffer = &blob; r.in.offered = needed; - status = dcerpc_spoolss_EnumPrinters(pipe, mem_ctx, &r); + status = dcerpc_spoolss_EnumPrinters(p, mem_ctx, &r); if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(r.out.result)) { d_printf("(%s) dcerpc_spoolss_EnumPrinters failed: %s, " "%s\n", __location__, nt_errstr(status), @@ -2671,7 +2671,7 @@ static bool enumprinters(TALLOC_CTX *mem_ctx, struct dcerpc_pipe *pipe, return true; } -static NTSTATUS getprinterinfo(TALLOC_CTX *ctx, struct dcerpc_pipe *pipe, +static NTSTATUS getprinterinfo(TALLOC_CTX *ctx, struct dcerpc_pipe *p, struct policy_handle *handle, int level, union spoolss_PrinterInfo **res) { @@ -2692,7 +2692,7 @@ static NTSTATUS getprinterinfo(TALLOC_CTX *ctx, struct dcerpc_pipe *pipe, r.in.offered = 0; r.out.needed = &needed; - status = dcerpc_spoolss_GetPrinter(pipe, mem_ctx, &r); + status = dcerpc_spoolss_GetPrinter(p, mem_ctx, &r); if (!NT_STATUS_IS_OK(status)) { d_printf("(%s) dcerpc_spoolss_GetPrinter failed: %s\n", __location__, nt_errstr(status)); @@ -2719,7 +2719,7 @@ static NTSTATUS getprinterinfo(TALLOC_CTX *ctx, struct dcerpc_pipe *pipe, r.in.buffer = &blob; r.in.offered = needed; - status = dcerpc_spoolss_GetPrinter(pipe, mem_ctx, &r); + status = dcerpc_spoolss_GetPrinter(p, mem_ctx, &r); if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(r.out.result)) { d_printf("(%s) dcerpc_spoolss_GetPrinter failed: %s, " "%s\n", __location__, nt_errstr(status), diff --git a/source4/torture/rpc/samlogon.c b/source4/torture/rpc/samlogon.c index 8318930989..8e6c88425c 100644 --- a/source4/torture/rpc/samlogon.c +++ b/source4/torture/rpc/samlogon.c @@ -29,7 +29,7 @@ #include "../lib/crypto/crypto.h" #include "lib/cmdline/popt_common.h" #include "torture/rpc/rpc.h" -#include "auth/gensec/schannel_proto.h" +#include "../libcli/auth/schannel.h" #include "auth/gensec/gensec.h" #include "libcli/auth/libcli_auth.h" #include "param/param.h" diff --git a/source4/torture/rpc/samsync.c b/source4/torture/rpc/samsync.c index 4cecab4017..2ee8e59e5a 100644 --- a/source4/torture/rpc/samsync.c +++ b/source4/torture/rpc/samsync.c @@ -28,7 +28,7 @@ #include "../lib/crypto/crypto.h" #include "system/time.h" #include "torture/rpc/rpc.h" -#include "auth/gensec/schannel_proto.h" +#include "../libcli/auth/schannel.h" #include "auth/gensec/gensec.h" #include "libcli/auth/libcli_auth.h" #include "libcli/samsync/samsync.h" diff --git a/source4/torture/rpc/schannel.c b/source4/torture/rpc/schannel.c index 6c539b6117..0ada20d888 100644 --- a/source4/torture/rpc/schannel.c +++ b/source4/torture/rpc/schannel.c @@ -26,7 +26,7 @@ #include "auth/credentials/credentials.h" #include "torture/rpc/rpc.h" #include "lib/cmdline/popt_common.h" -#include "auth/gensec/schannel_proto.h" +#include "../libcli/auth/schannel.h" #include "libcli/auth/libcli_auth.h" #include "libcli/security/security.h" #include "system/filesys.h" diff --git a/source4/torture/smb2/compound.c b/source4/torture/smb2/compound.c index 00f6f3340f..e9b5ee9408 100644 --- a/source4/torture/smb2/compound.c +++ b/source4/torture/smb2/compound.c @@ -44,7 +44,6 @@ static bool test_compound_related1(struct torture_context *tctx, struct smb2_close cl; bool ret = true; struct smb2_request *req[2]; - DATA_BLOB data; smb2_transport_credits_ask_num(tree->session->transport, 2); @@ -170,8 +169,6 @@ static bool test_compound_unrelated1(struct torture_context *tctx, struct smb2_close cl; bool ret = true; struct smb2_request *req[5]; - uint64_t uid; - uint32_t tid; smb2_transport_credits_ask_num(tree->session->transport, 5); @@ -237,7 +234,6 @@ static bool test_compound_invalid1(struct torture_context *tctx, struct smb2_close cl; bool ret = true; struct smb2_request *req[2]; - DATA_BLOB data; smb2_transport_credits_ask_num(tree->session->transport, 2); diff --git a/source4/torture/smb2/dir.c b/source4/torture/smb2/dir.c index 3551f9718f..4af6900a81 100644 --- a/source4/torture/smb2/dir.c +++ b/source4/torture/smb2/dir.c @@ -1105,7 +1105,7 @@ static bool test_file_index(struct torture_context *tctx, struct smb2_find f; struct smb2_handle h; union smb_search_data *d; - int count; + unsigned count; smb2_deltree(tree, DNAME); @@ -1223,9 +1223,9 @@ static bool test_large_files(struct torture_context *tctx, struct smb2_find f; struct smb2_handle h; union smb_search_data *d; - int count, file_count = 0; + int i, j, file_count = 0; char **strs = NULL; - int i, j; + unsigned count; torture_comment(tctx, "Testing directory enumeration in a directory with >1000 files\n"); diff --git a/source4/winbind/wb_cmd_getgrgid.c b/source4/winbind/wb_cmd_getgrgid.c index 80f4e9cfc3..010fa220b1 100644 --- a/source4/winbind/wb_cmd_getgrgid.c +++ b/source4/winbind/wb_cmd_getgrgid.c @@ -27,7 +27,7 @@ #include "smbd/service_task.h" #include "libnet/libnet_proto.h" #include "param/param.h" -#include "libcli/security/proto.h" +#include "libcli/security/security.h" #include "auth/credentials/credentials.h" struct cmd_getgrgid_state { diff --git a/source4/winbind/wb_cmd_getgrnam.c b/source4/winbind/wb_cmd_getgrnam.c index bfc30fc7a6..0e498811f9 100644 --- a/source4/winbind/wb_cmd_getgrnam.c +++ b/source4/winbind/wb_cmd_getgrnam.c @@ -27,7 +27,7 @@ #include "winbind/wb_helper.h" #include "smbd/service_task.h" #include "libnet/libnet_proto.h" -#include "libcli/security/proto.h" +#include "libcli/security/security.h" struct cmd_getgrnam_state { struct composite_context *ctx; diff --git a/source4/winbind/wb_cmd_getpwuid.c b/source4/winbind/wb_cmd_getpwuid.c index b4e3d972f8..488af561e2 100644 --- a/source4/winbind/wb_cmd_getpwuid.c +++ b/source4/winbind/wb_cmd_getpwuid.c @@ -27,7 +27,7 @@ #include "smbd/service_task.h" #include "libnet/libnet_proto.h" #include "param/param.h" -#include "libcli/security/proto.h" +#include "libcli/security/security.h" #include "auth/credentials/credentials.h" struct cmd_getpwuid_state { diff --git a/source4/winbind/wb_gid2sid.c b/source4/winbind/wb_gid2sid.c index 834d869845..7fb77bfc35 100644 --- a/source4/winbind/wb_gid2sid.c +++ b/source4/winbind/wb_gid2sid.c @@ -24,7 +24,7 @@ #include "winbind/wb_server.h" #include "smbd/service_task.h" #include "winbind/wb_helper.h" -#include "libcli/security/proto.h" +#include "libcli/security/security.h" #include "winbind/idmap.h" struct gid2sid_state { diff --git a/source4/winbind/wb_irpc.c b/source4/winbind/wb_irpc.c index 801c2e7dfa..efbc310b68 100644 --- a/source4/winbind/wb_irpc.c +++ b/source4/winbind/wb_irpc.c @@ -22,7 +22,7 @@ #include "winbind/wb_server.h" #include "lib/messaging/irpc.h" #include "libcli/composite/composite.h" -#include "libcli/security/proto.h" +#include "libcli/security/security.h" #include "librpc/gen_ndr/ndr_winbind.h" #include "smbd/service_task.h" @@ -86,7 +86,7 @@ static NTSTATUS wb_irpc_get_idmap(struct irpc_message *msg, struct wbsrv_service *service = talloc_get_type(msg->private_data, struct wbsrv_service); struct wb_irpc_get_idmap_state *s; - struct composite_context *ctx; + struct composite_context *ctx = NULL; DEBUG(5, ("wb_irpc_get_idmap called\n")); diff --git a/source4/winbind/wb_sids2xids.c b/source4/winbind/wb_sids2xids.c index 6b89caf465..d31ac08cf7 100644 --- a/source4/winbind/wb_sids2xids.c +++ b/source4/winbind/wb_sids2xids.c @@ -24,7 +24,7 @@ #include "winbind/wb_server.h" #include "smbd/service_task.h" #include "winbind/wb_helper.h" -#include "libcli/security/proto.h" +#include "libcli/security/security.h" #include "winbind/idmap.h" struct sids2xids_state { diff --git a/source4/winbind/wb_uid2sid.c b/source4/winbind/wb_uid2sid.c index fd43dd64b9..d626f58eb6 100644 --- a/source4/winbind/wb_uid2sid.c +++ b/source4/winbind/wb_uid2sid.c @@ -24,7 +24,7 @@ #include "winbind/wb_server.h" #include "smbd/service_task.h" #include "winbind/wb_helper.h" -#include "libcli/security/proto.h" +#include "libcli/security/security.h" #include "winbind/idmap.h" struct uid2sid_state { diff --git a/source4/winbind/wb_xids2sids.c b/source4/winbind/wb_xids2sids.c index a1cf2667ff..dfad51943b 100644 --- a/source4/winbind/wb_xids2sids.c +++ b/source4/winbind/wb_xids2sids.c @@ -24,7 +24,7 @@ #include "winbind/wb_server.h" #include "smbd/service_task.h" #include "winbind/wb_helper.h" -#include "libcli/security/proto.h" +#include "libcli/security/security.h" #include "winbind/idmap.h" struct xids2sids_state { |