Author: vlendec Date: 2006-09-04 19:47:48 +0000 (Mon, 04 Sep 2006) New Revision: 18047
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18047 Log: More C++ stuff Modified: branches/SAMBA_3_0/source/client/clitar.c branches/SAMBA_3_0/source/libads/kerberos_verify.c branches/SAMBA_3_0/source/libads/sasl.c branches/SAMBA_3_0/source/libsmb/smbdes.c branches/SAMBA_3_0/source/nsswitch/winbindd_async.c branches/SAMBA_3_0/source/printing/print_iprint.c branches/SAMBA_3_0/source/rpc_parse/parse_dfs.c branches/SAMBA_3_0/source/utils/net_lookup.c Changeset: Modified: branches/SAMBA_3_0/source/client/clitar.c =================================================================== --- branches/SAMBA_3_0/source/client/clitar.c 2006-09-04 16:30:40 UTC (rev 18046) +++ branches/SAMBA_3_0/source/client/clitar.c 2006-09-04 19:47:48 UTC (rev 18047) @@ -1075,7 +1075,7 @@ /* finfo.size here is the length of the filename as written by the "/./@LongLink" name * header call. */ int namesize = finfo.size + strlen(cur_dir) + 2; - char *longname = SMB_MALLOC(namesize); + char *longname = (char *)SMB_MALLOC(namesize); int offset = 0, left = finfo.size; BOOL first = True; @@ -1523,7 +1523,7 @@ while ((! error) && (x_fgets(buf, sizeof(buf)-1, inclusion))) { if (inclusion_buffer == NULL) { inclusion_buffer_size = 1024; - if ((inclusion_buffer = SMB_MALLOC(inclusion_buffer_size)) == NULL) { + if ((inclusion_buffer = (char *)SMB_MALLOC(inclusion_buffer_size)) == NULL) { DEBUG(0,("failure allocating buffer to read inclusion file\n")); error = 1; break; @@ -1536,7 +1536,7 @@ if ((strlen(buf) + 1 + inclusion_buffer_sofar) >= inclusion_buffer_size) { inclusion_buffer_size *= 2; - inclusion_buffer = SMB_REALLOC(inclusion_buffer,inclusion_buffer_size); + inclusion_buffer = (char *)SMB_REALLOC(inclusion_buffer,inclusion_buffer_size); if (!inclusion_buffer) { DEBUG(0,("failure enlarging inclusion buffer to %d bytes\n", inclusion_buffer_size)); Modified: branches/SAMBA_3_0/source/libads/kerberos_verify.c =================================================================== --- branches/SAMBA_3_0/source/libads/kerberos_verify.c 2006-09-04 16:30:40 UTC (rev 18046) +++ branches/SAMBA_3_0/source/libads/kerberos_verify.c 2006-09-04 19:47:48 UTC (rev 18047) @@ -101,7 +101,7 @@ if (strequal(entry_princ_s, valid_princ_formats[i])) { number_matched_principals++; p_packet->length = ticket->length; - p_packet->data = (krb5_pointer)ticket->data; + p_packet->data = (char *)ticket->data; *pp_tkt = NULL; ret = krb5_rd_req_return_keyblock_from_keytab(context, &auth_context, p_packet, @@ -228,7 +228,7 @@ /* CIFS doesn't use addresses in tickets. This would break NAT. JRA */ p_packet->length = ticket->length; - p_packet->data = (krb5_pointer)ticket->data; + p_packet->data = (char *)ticket->data; /* We need to setup a auth context with each possible encoding type in turn. */ for (i=0;enctypes[i];i++) { Modified: branches/SAMBA_3_0/source/libads/sasl.c =================================================================== --- branches/SAMBA_3_0/source/libads/sasl.c 2006-09-04 16:30:40 UTC (rev 18046) +++ branches/SAMBA_3_0/source/libads/sasl.c 2006-09-04 19:47:48 UTC (rev 18047) @@ -348,7 +348,7 @@ goto failed; } - cred.bv_val = output_token.value; + cred.bv_val = (char *)output_token.value; cred.bv_len = output_token.length; rc = ldap_sasl_bind_s(ads->ld, NULL, "GSSAPI", &cred, NULL, NULL, @@ -397,7 +397,7 @@ gss_release_buffer(&minor_status, &output_token); output_token.value = SMB_MALLOC(strlen(ads->config.bind_path) + 8); - p = output_token.value; + p = (uint8 *)output_token.value; *p++ = 1; /* no sign & seal selection */ /* choose the same size as the server gave us */ @@ -419,7 +419,7 @@ free(output_token.value); - cred.bv_val = input_token.value; + cred.bv_val = (char *)input_token.value; cred.bv_len = input_token.length; rc = ldap_sasl_bind_s(ads->ld, NULL, "GSSAPI", &cred, NULL, NULL, Modified: branches/SAMBA_3_0/source/libsmb/smbdes.c =================================================================== --- branches/SAMBA_3_0/source/libsmb/smbdes.c 2006-09-04 16:30:40 UTC (rev 18046) +++ branches/SAMBA_3_0/source/libsmb/smbdes.c 2006-09-04 19:47:48 UTC (rev 18047) @@ -172,7 +172,7 @@ *out++ = *in2++; } -static void xor(char *out, char *in1, char *in2, int n) +static void x_or(char *out, char *in1, char *in2, int n) { int i; for (i=0;i<n;i++) @@ -223,7 +223,7 @@ permute(er, r, perm4, 48); - xor(erk, er, ki[forw ? i : 15 - i], 48); + x_or(erk, er, ki[forw ? i : 15 - i], 48); for (j=0;j<8;j++) for (k=0;k<6;k++) @@ -244,7 +244,7 @@ cb[j*4+k] = b[j][k]; permute(pcb, cb, perm5, 32); - xor(r2, l, pcb, 32); + x_or(r2, l, pcb, 32); for (j=0;j<32;j++) l[j] = r[j]; Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_async.c =================================================================== --- branches/SAMBA_3_0/source/nsswitch/winbindd_async.c 2006-09-04 16:30:40 UTC (rev 18046) +++ branches/SAMBA_3_0/source/nsswitch/winbindd_async.c 2006-09-04 19:47:48 UTC (rev 18047) @@ -169,8 +169,9 @@ else id.gid = state->request.data.dual_idmapset.gid; - result = idmap_set_mapping(&sid, id, - state->request.data.dual_idmapset.type); + result = idmap_set_mapping( + &sid, id, + (enum idmap_type)state->request.data.dual_idmapset.type); return NT_STATUS_IS_OK(result) ? WINBINDD_OK : WINBINDD_ERROR; } @@ -1559,7 +1560,8 @@ ZERO_STRUCT(request); request.cmd = WINBINDD_DUAL_UID2SID; request.data.uid = uid; - do_async(mem_ctx, idmap_child(), &request, winbindd_uid2sid_recv, cont, private_data); + do_async(mem_ctx, idmap_child(), &request, winbindd_uid2sid_recv, + (void *)cont, private_data); } enum winbindd_result winbindd_dual_uid2sid(struct winbindd_domain *domain, @@ -1615,7 +1617,8 @@ ZERO_STRUCT(request); request.cmd = WINBINDD_DUAL_GID2SID; request.data.gid = gid; - do_async(mem_ctx, idmap_child(), &request, winbindd_gid2sid_recv, cont, private_data); + do_async(mem_ctx, idmap_child(), &request, winbindd_gid2sid_recv, + (void *)cont, private_data); } enum winbindd_result winbindd_dual_gid2sid(struct winbindd_domain *domain, Modified: branches/SAMBA_3_0/source/printing/print_iprint.c =================================================================== --- branches/SAMBA_3_0/source/printing/print_iprint.c 2006-09-04 16:30:40 UTC (rev 18046) +++ branches/SAMBA_3_0/source/printing/print_iprint.c 2006-09-04 19:47:48 UTC (rev 18047) @@ -92,7 +92,7 @@ request = ippNew(); - request->request.op.operation_id = OPERATION_NOVELL_MGMT; + request->request.op.operation_id = (ipp_op_t)OPERATION_NOVELL_MGMT; request->request.op.request_id = 1; language = cupsLangDefault(); @@ -343,7 +343,8 @@ request = ippNew(); - request->request.op.operation_id = OPERATION_NOVELL_LIST_PRINTERS; + request->request.op.operation_id = + (ipp_op_t)OPERATION_NOVELL_LIST_PRINTERS; request->request.op.request_id = 1; language = cupsLangDefault(); Modified: branches/SAMBA_3_0/source/rpc_parse/parse_dfs.c =================================================================== --- branches/SAMBA_3_0/source/rpc_parse/parse_dfs.c 2006-09-04 16:30:40 UTC (rev 18046) +++ branches/SAMBA_3_0/source/rpc_parse/parse_dfs.c 2006-09-04 19:47:48 UTC (rev 18047) @@ -2576,7 +2576,7 @@ if (!dfs_name) return False; - init_unistr2(&v->dfs_name, dfs_name, UNI_FLAGS_NONE|UNI_STR_TERMINATE); + init_unistr2(&v->dfs_name, dfs_name, UNI_STR_TERMINATE); v->level = level; Modified: branches/SAMBA_3_0/source/utils/net_lookup.c =================================================================== --- branches/SAMBA_3_0/source/utils/net_lookup.c 2006-09-04 16:30:40 UTC (rev 18046) +++ branches/SAMBA_3_0/source/utils/net_lookup.c 2006-09-04 19:47:48 UTC (rev 18047) @@ -211,10 +211,10 @@ } if (argc>0) { - realm.data = CONST_DISCARD(krb5_pointer, argv[0]); + realm.data = CONST_DISCARD(char *, argv[0]); realm.length = strlen(argv[0]); } else if (lp_realm() && *lp_realm()) { - realm.data = (krb5_pointer) lp_realm(); + realm.data = lp_realm(); realm.length = strlen(realm.data); } else { rc = krb5_get_host_realm(ctx, NULL, &realms); @@ -223,7 +223,7 @@ error_message(rc))); return -1; } - realm.data = (krb5_pointer) *realms; + realm.data = (char *) *realms; realm.length = strlen(realm.data); }
