1
0
mirror of https://github.com/samba-team/samba.git synced 2025-08-03 04:22:09 +03:00

Fix the developer O3 build

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>

Autobuild-User(master): Alexander Bokovoy <ab@samba.org>
Autobuild-Date(master): Wed Feb 25 16:32:29 CET 2015 on sn-devel-104
This commit is contained in:
Volker Lendecke
2015-02-25 12:19:44 +00:00
committed by Alexander Bokovoy
parent b72cc326f6
commit a99a5a34a5
23 changed files with 38 additions and 34 deletions

View File

@ -21,7 +21,7 @@ enum acl_mode
int main(int argc, const char *argv[]) int main(int argc, const char *argv[])
{ {
int opt; int opt;
int flags; int flags = 0;
int debug = 0; int debug = 0;
int numeric = 0; int numeric = 0;
int stat_and_retry = 0; int stat_and_retry = 0;

View File

@ -161,7 +161,7 @@ static void add_reg_key(struct regedit *regedit, struct tree_node *node,
if (name) { if (name) {
WERROR rv; WERROR rv;
struct registry_key *new_key; struct registry_key *new_key;
struct tree_node *new_node; struct tree_node *new_node = NULL;
struct tree_node *list; struct tree_node *list;
struct tree_node *parent; struct tree_node *parent;

View File

@ -491,7 +491,7 @@ void multilist_refresh(struct multilist *list)
void multilist_driver(struct multilist *list, int c) void multilist_driver(struct multilist *list, int c)
{ {
unsigned page; unsigned page;
const void *tmp; const void *tmp = NULL;
if (list->nrows == 0) { if (list->nrows == 0) {
return; return;

View File

@ -85,7 +85,8 @@ static void filter_request(char *buf, size_t buf_len)
int type = CVAL(buf,smb_com); int type = CVAL(buf,smb_com);
unsigned x; unsigned x;
fstring name1,name2; fstring name1,name2;
int name_len1, name_len2; int name_len1 = 0;
int name_len2;
int name_type1, name_type2; int name_type1, name_type2;
if (msg_type) { if (msg_type) {

View File

@ -557,7 +557,7 @@ static NTSTATUS gensec_gssapi_update(struct gensec_security *gensec_security,
return NT_STATUS_MORE_PROCESSING_REQUIRED; return NT_STATUS_MORE_PROCESSING_REQUIRED;
} else if (maj_stat == GSS_S_CONTEXT_EXPIRED) { } else if (maj_stat == GSS_S_CONTEXT_EXPIRED) {
gss_cred_id_t creds; gss_cred_id_t creds = NULL;
gss_name_t name; gss_name_t name;
gss_buffer_desc buffer; gss_buffer_desc buffer;
OM_uint32 lifetime = 0; OM_uint32 lifetime = 0;
@ -584,7 +584,7 @@ static NTSTATUS gensec_gssapi_update(struct gensec_security *gensec_security,
&name, &lifetime, &usage, NULL); &name, &lifetime, &usage, NULL);
if (maj_stat == GSS_S_COMPLETE) { if (maj_stat == GSS_S_COMPLETE) {
const char *usage_string; const char *usage_string = NULL;
switch (usage) { switch (usage) {
case GSS_C_BOTH: case GSS_C_BOTH:
usage_string = "GSS_C_BOTH"; usage_string = "GSS_C_BOTH";

View File

@ -456,7 +456,8 @@ static NTSTATUS dnsupdate_dnsupdate_RODC(struct irpc_message *msg,
struct tevent_req *req; struct tevent_req *req;
int i, ret; int i, ret;
struct GUID ntds_guid; struct GUID ntds_guid;
const char *site, *dnsdomain, *dnsforest, *ntdsguid, *hostname; const char *site, *dnsdomain, *dnsforest, *ntdsguid;
const char *hostname = NULL;
struct ldb_dn *sid_dn; struct ldb_dn *sid_dn;
const char *attrs[] = { "dNSHostName", NULL }; const char *attrs[] = { "dNSHostName", NULL };
struct ldb_result *res; struct ldb_result *res;

View File

@ -214,7 +214,7 @@ static WERROR kccdrs_replica_get_info_obj_metadata2(TALLOC_CTX *mem_ctx,
const struct dsdb_attribute *schema_attr; const struct dsdb_attribute *schema_attr;
uint32_t attr_version; uint32_t attr_version;
NTTIME attr_change_time; NTTIME attr_change_time;
uint32_t attr_originating_usn; uint32_t attr_originating_usn = 0;
/* /*
attr := attrsSeq[i] attr := attrsSeq[i]

View File

@ -565,7 +565,7 @@ static void dreplsrv_op_pull_source_get_changes_done(struct tevent_req *subreq)
uint32_t ctr_level = 0; uint32_t ctr_level = 0;
struct drsuapi_DsGetNCChangesCtr1 *ctr1 = NULL; struct drsuapi_DsGetNCChangesCtr1 *ctr1 = NULL;
struct drsuapi_DsGetNCChangesCtr6 *ctr6 = NULL; struct drsuapi_DsGetNCChangesCtr6 *ctr6 = NULL;
enum drsuapi_DsExtendedError extended_ret; enum drsuapi_DsExtendedError extended_ret = DRSUAPI_EXOP_ERR_NONE;
state->ndr_struct_ptr = NULL; state->ndr_struct_ptr = NULL;
status = dcerpc_drsuapi_DsGetNCChanges_r_recv(subreq, r); status = dcerpc_drsuapi_DsGetNCChanges_r_recv(subreq, r);

View File

@ -143,7 +143,7 @@ static int construct_generic_token_groups(struct ldb_module *module,
TALLOC_CTX *tmp_ctx = talloc_new(msg); TALLOC_CTX *tmp_ctx = talloc_new(msg);
unsigned int i; unsigned int i;
int ret; int ret;
const char *filter; const char *filter = NULL;
NTSTATUS status; NTSTATUS status;

View File

@ -2498,7 +2498,8 @@ static int samldb_service_principal_names_change(struct samldb_ctx *ac)
} }
for (i = 0; i < res->msgs[0]->elements[0].num_values; i++) { for (i = 0; i < res->msgs[0]->elements[0].num_values; i++) {
char *old_str, *new_str, *pos; char *old_str, *new_str;
char *pos = NULL;
const char *tok; const char *tok;
struct ldb_val *vals; struct ldb_val *vals;
bool found = false; bool found = false;

View File

@ -143,7 +143,7 @@ int dsdb_module_schema_info_blob_write(struct ldb_module *ldb_module,
struct ldb_request *parent) struct ldb_request *parent)
{ {
int ldb_err; int ldb_err;
struct ldb_message *msg; struct ldb_message *msg = NULL;
TALLOC_CTX *temp_ctx; TALLOC_CTX *temp_ctx;
temp_ctx = talloc_new(ldb_module); temp_ctx = talloc_new(ldb_module);

View File

@ -235,8 +235,8 @@ _PUBLIC_ WERROR reg_dotreg_diff_load(int fd,
DATA_BLOB data; DATA_BLOB data;
bool result; bool result;
char *type_str = NULL; char *type_str = NULL;
char *data_str; char *data_str = NULL;
char *value; char *value = NULL;
bool continue_next_line = 0; bool continue_next_line = 0;
line = afdgets(fd, mem_ctx, 0); line = afdgets(fd, mem_ctx, 0);

View File

@ -253,7 +253,7 @@ static DATA_BLOB hbin_alloc(struct regf_data *data, uint32_t size,
ret.data = hbin->data + rel_offset + 0x4; /* Skip past length */ ret.data = hbin->data + rel_offset + 0x4; /* Skip past length */
ret.length = size - 0x4; ret.length = size - 0x4;
if (offset) { if (offset) {
uint32_t new_rel_offset; uint32_t new_rel_offset = 0;
*offset = hbin->offset_from_first + rel_offset + 0x20; *offset = hbin->offset_from_first + rel_offset + 0x20;
SMB_ASSERT(hbin_by_offset(data, *offset, &new_rel_offset) == hbin); SMB_ASSERT(hbin_by_offset(data, *offset, &new_rel_offset) == hbin);
SMB_ASSERT(new_rel_offset == rel_offset); SMB_ASSERT(new_rel_offset == rel_offset);
@ -1871,7 +1871,7 @@ static WERROR regf_set_value(struct hive_key *key, const char *name,
struct vk_block vk; struct vk_block vk;
uint32_t i; uint32_t i;
uint32_t tmp_vk_offset, vk_offset, old_vk_offset = (uint32_t) -1; uint32_t tmp_vk_offset, vk_offset, old_vk_offset = (uint32_t) -1;
DATA_BLOB values; DATA_BLOB values = {0};
ZERO_STRUCT(vk); ZERO_STRUCT(vk);

View File

@ -255,6 +255,8 @@ static NTSTATUS _rap_netshareenum(struct rap_call *call)
{ {
struct rap_NetShareEnum r; struct rap_NetShareEnum r;
NTSTATUS result; NTSTATUS result;
uint32_t offset_save = 0;
struct rap_heap_save heap_save = {0};
RAP_GOTO(rap_srv_pull_word(call, &r.in.level)); RAP_GOTO(rap_srv_pull_word(call, &r.in.level));
RAP_GOTO(rap_srv_pull_bufsize(call, &r.in.bufsize)); RAP_GOTO(rap_srv_pull_bufsize(call, &r.in.bufsize));
@ -282,8 +284,6 @@ static NTSTATUS _rap_netshareenum(struct rap_call *call)
for (r.out.count = 0; r.out.count < r.out.available; r.out.count++) { for (r.out.count = 0; r.out.count < r.out.available; r.out.count++) {
int i = r.out.count; int i = r.out.count;
uint32_t offset_save;
struct rap_heap_save heap_save;
offset_save = call->ndr_push_data->offset; offset_save = call->ndr_push_data->offset;
rap_heap_save(call->heap, &heap_save); rap_heap_save(call->heap, &heap_save);
@ -335,6 +335,8 @@ static NTSTATUS _rap_netserverenum2(struct rap_call *call)
{ {
struct rap_NetServerEnum2 r; struct rap_NetServerEnum2 r;
NTSTATUS result; NTSTATUS result;
uint32_t offset_save = 0;
struct rap_heap_save heap_save = {0};
RAP_GOTO(rap_srv_pull_word(call, &r.in.level)); RAP_GOTO(rap_srv_pull_word(call, &r.in.level));
RAP_GOTO(rap_srv_pull_bufsize(call, &r.in.bufsize)); RAP_GOTO(rap_srv_pull_bufsize(call, &r.in.bufsize));
@ -364,8 +366,6 @@ static NTSTATUS _rap_netserverenum2(struct rap_call *call)
for (r.out.count = 0; r.out.count < r.out.available; r.out.count++) { for (r.out.count = 0; r.out.count < r.out.available; r.out.count++) {
int i = r.out.count; int i = r.out.count;
uint32_t offset_save;
struct rap_heap_save heap_save;
offset_save = call->ndr_push_data->offset; offset_save = call->ndr_push_data->offset;
rap_heap_save(call->heap, &heap_save); rap_heap_save(call->heap, &heap_save);

View File

@ -569,7 +569,7 @@ static WERROR bkrp_client_wrap_decrypt_data(struct dcesrv_call_state *dce_call,
char *guid_string; char *guid_string;
char *cert_secret_name; char *cert_secret_name;
DATA_BLOB lsa_secret; DATA_BLOB lsa_secret;
DATA_BLOB *uncrypted_data; DATA_BLOB *uncrypted_data = NULL;
NTSTATUS status; NTSTATUS status;
uint32_t requested_version; uint32_t requested_version;

View File

@ -936,7 +936,8 @@ static WERROR getncchanges_repl_secret(struct drsuapi_bind_state *b_state,
bool has_get_all_changes) bool has_get_all_changes)
{ {
struct drsuapi_DsReplicaObjectIdentifier *ncRoot = req10->naming_context; struct drsuapi_DsReplicaObjectIdentifier *ncRoot = req10->naming_context;
struct ldb_dn *obj_dn, *rodc_dn, *krbtgt_link_dn; struct ldb_dn *obj_dn = NULL;
struct ldb_dn *rodc_dn, *krbtgt_link_dn;
int ret; int ret;
const char *rodc_attrs[] = { "msDS-KrbTgtLink", "msDS-NeverRevealGroup", "msDS-RevealOnDemandGroup", NULL }; const char *rodc_attrs[] = { "msDS-KrbTgtLink", "msDS-NeverRevealGroup", "msDS-RevealOnDemandGroup", NULL };
const char *obj_attrs[] = { "tokenGroups", "objectSid", "UserAccountControl", "msDS-KrbTgtLinkBL", NULL }; const char *obj_attrs[] = { "tokenGroups", "objectSid", "UserAccountControl", "msDS-KrbTgtLinkBL", NULL };

View File

@ -4211,10 +4211,10 @@ static NTSTATUS check_ft_info(TALLOC_CTX *mem_ctx,
struct ForestTrustInfoRecord *trec; struct ForestTrustInfoRecord *trec;
const char *dns_name; const char *dns_name;
const char *nb_name; const char *nb_name;
struct dom_sid *sid; struct dom_sid *sid = NULL;
const char *tname; const char *tname = NULL;
size_t dns_len; size_t dns_len;
size_t tlen; size_t tlen = 0;
NTSTATUS nt_status = NT_STATUS_OK; NTSTATUS nt_status = NT_STATUS_OK;
uint32_t new_fti_idx; uint32_t new_fti_idx;
uint32_t i; uint32_t i;
@ -4224,7 +4224,7 @@ static NTSTATUS check_ft_info(TALLOC_CTX *mem_ctx,
bool sid_conflict; bool sid_conflict;
bool nb_conflict; bool nb_conflict;
bool exclusion; bool exclusion;
bool ex_rule; bool ex_rule = false;
int ret; int ret;
for (new_fti_idx = 0; new_fti_idx < new_fti->count; new_fti_idx++) { for (new_fti_idx = 0; new_fti_idx < new_fti->count; new_fti_idx++) {

View File

@ -569,8 +569,8 @@ static struct bkrp_BackupKey *createRestoreGUIDStruct(struct torture_context *tc
struct bkrp_client_side_wrapped data; struct bkrp_client_side_wrapped data;
DATA_BLOB *xs; DATA_BLOB *xs;
DATA_BLOB *sec; DATA_BLOB *sec;
DATA_BLOB *enc_sec; DATA_BLOB *enc_sec = NULL;
DATA_BLOB *enc_xs; DATA_BLOB *enc_xs = NULL;
DATA_BLOB *blob2; DATA_BLOB *blob2;
DATA_BLOB enc_sec_reverted; DATA_BLOB enc_sec_reverted;
DATA_BLOB des3_key; DATA_BLOB des3_key;

View File

@ -2804,8 +2804,8 @@ static bool test_CreateTrustedDomainEx_common(struct dcerpc_pipe *p,
struct lsa_CreateTrustedDomainEx r; struct lsa_CreateTrustedDomainEx r;
struct lsa_CreateTrustedDomainEx2 r2; struct lsa_CreateTrustedDomainEx2 r2;
struct lsa_TrustDomainInfoInfoEx trustinfo; struct lsa_TrustDomainInfoInfoEx trustinfo;
struct lsa_TrustDomainInfoAuthInfoInternal *authinfo_internal; struct lsa_TrustDomainInfoAuthInfoInternal *authinfo_internal = NULL;
struct lsa_TrustDomainInfoAuthInfo *authinfo; struct lsa_TrustDomainInfoAuthInfo *authinfo = NULL;
struct dom_sid **domsid; struct dom_sid **domsid;
struct policy_handle *trustdom_handle; struct policy_handle *trustdom_handle;
struct lsa_QueryTrustedDomainInfo q; struct lsa_QueryTrustedDomainInfo q;

View File

@ -59,7 +59,7 @@ bool test_netlogon_ex_ops(struct dcerpc_pipe *p, struct torture_context *tctx,
struct netr_UserSessionKey key; struct netr_UserSessionKey key;
struct netr_LMSessionKey LMSessKey; struct netr_LMSessionKey LMSessKey;
uint32_t validation_levels[] = { 2, 3 }; uint32_t validation_levels[] = { 2, 3 };
struct netr_SamBaseInfo *base; struct netr_SamBaseInfo *base = NULL;
const char *crypto_alg = ""; const char *crypto_alg = "";
bool can_do_validation_6 = true; bool can_do_validation_6 = true;

View File

@ -278,7 +278,7 @@ static bool test_QueryServiceObjectSecurity(struct torture_context *tctx,
struct policy_handle h, s; struct policy_handle h, s;
struct dcerpc_binding_handle *b = p->binding_handle; struct dcerpc_binding_handle *b = p->binding_handle;
uint8_t *buffer; uint8_t *buffer = NULL;
uint32_t needed; uint32_t needed;
enum ndr_err_code ndr_err; enum ndr_err_code ndr_err;

View File

@ -991,7 +991,7 @@ static bool torture_winbind_struct_lookup_name_sid(struct torture_context *tortu
struct winbindd_request req; struct winbindd_request req;
struct winbindd_response rep; struct winbindd_response rep;
const char *invalid_sid = "S-0-0-7"; const char *invalid_sid = "S-0-0-7";
char *domain; char *domain = NULL;
const char *invalid_user = "noone"; const char *invalid_user = "noone";
char *invalid_name; char *invalid_name;
bool strict = torture_setting_bool(torture, "strict mode", false); bool strict = torture_setting_bool(torture, "strict mode", false);

View File

@ -247,7 +247,7 @@ static void winbind_task_init(struct task_server *task)
struct wbsrv_service *service; struct wbsrv_service *service;
struct wbsrv_listen_socket *listen_socket; struct wbsrv_listen_socket *listen_socket;
char *errstring; char *errstring;
struct dom_sid *primary_sid; struct dom_sid *primary_sid = NULL;
bool ok; bool ok;
task_server_set_title(task, "task[winbind]"); task_server_set_title(task, "task[winbind]");