Author: jra Date: 2007-09-14 17:42:10 +0000 (Fri, 14 Sep 2007) New Revision: 25165
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25165 Log: Use talloc_asprintf_append_buffer with an unmodified string. Jeremy. Modified: branches/SAMBA_3_2/source/libads/ldap_schema.c branches/SAMBA_3_2/source/libgpo/gpo_fetch.c branches/SAMBA_3_2/source/passdb/pdb_ldap.c branches/SAMBA_3_2/source/winbindd/idmap_ad.c branches/SAMBA_3_2/source/winbindd/idmap_ldap.c branches/SAMBA_3_2/source/winbindd/winbindd_dual.c branches/SAMBA_3_2_0/source/libads/ldap_schema.c branches/SAMBA_3_2_0/source/libgpo/gpo_fetch.c branches/SAMBA_3_2_0/source/passdb/pdb_ldap.c branches/SAMBA_3_2_0/source/winbindd/idmap_ad.c branches/SAMBA_3_2_0/source/winbindd/idmap_ldap.c branches/SAMBA_3_2_0/source/winbindd/winbindd_dual.c Changeset: Modified: branches/SAMBA_3_2/source/libads/ldap_schema.c =================================================================== --- branches/SAMBA_3_2/source/libads/ldap_schema.c 2007-09-14 17:40:58 UTC (rev 25164) +++ branches/SAMBA_3_2/source/libads/ldap_schema.c 2007-09-14 17:42:10 UTC (rev 25165) @@ -48,13 +48,13 @@ for (i=0; i<num_OIDs; i++) { - if ((expr = talloc_asprintf_append(expr, "(attributeId=%s)", + if ((expr = talloc_asprintf_append_buffer(expr, "(attributeId=%s)", OIDs[i])) == NULL) { return ADS_ERROR(LDAP_NO_MEMORY); } } - if ((expr = talloc_asprintf_append(expr, ")")) == NULL) { + if ((expr = talloc_asprintf_append_buffer(expr, ")")) == NULL) { return ADS_ERROR(LDAP_NO_MEMORY); } Modified: branches/SAMBA_3_2/source/libgpo/gpo_fetch.c =================================================================== --- branches/SAMBA_3_2/source/libgpo/gpo_fetch.c 2007-09-14 17:40:58 UTC (rev 25164) +++ branches/SAMBA_3_2/source/libgpo/gpo_fetch.c 2007-09-14 17:42:10 UTC (rev 25165) @@ -102,7 +102,7 @@ while (next_token(&unix_path, tok, "/", sizeof(tok))) { - current_dir = talloc_asprintf_append(current_dir, "/%s", tok); + current_dir = talloc_asprintf_append_buffer(current_dir, "/%s", tok); NT_STATUS_HAVE_NO_MEMORY(current_dir); if ((mkdir(current_dir, 0644)) < 0 && errno != EEXIST) { Modified: branches/SAMBA_3_2/source/passdb/pdb_ldap.c =================================================================== --- branches/SAMBA_3_2/source/passdb/pdb_ldap.c 2007-09-14 17:40:58 UTC (rev 25164) +++ branches/SAMBA_3_2/source/passdb/pdb_ldap.c 2007-09-14 17:42:10 UTC (rev 25165) @@ -2437,7 +2437,7 @@ goto done; } - filter = talloc_asprintf_append(filter, "(uid=%s)", escape_memberuid); + filter = talloc_asprintf_append_buffer(filter, "(uid=%s)", escape_memberuid); if (filter == NULL) { SAFE_FREE(escape_memberuid); ret = NT_STATUS_NO_MEMORY; @@ -2447,7 +2447,7 @@ SAFE_FREE(escape_memberuid); } - filter = talloc_asprintf_append(filter, "))"); + filter = talloc_asprintf_append_buffer(filter, "))"); if (filter == NULL) { ret = NT_STATUS_NO_MEMORY; goto done; @@ -3726,7 +3726,7 @@ for (i=0; i<num_rids; i++) { DOM_SID sid; sid_compose(&sid, domain_sid, rids[i]); - allsids = talloc_asprintf_append(allsids, "(sambaSid=%s)", + allsids = talloc_asprintf_append_buffer(allsids, "(sambaSid=%s)", sid_string_static(&sid)); if (allsids == NULL) { goto done; Modified: branches/SAMBA_3_2/source/winbindd/idmap_ad.c =================================================================== --- branches/SAMBA_3_2/source/winbindd/idmap_ad.c 2007-09-14 17:40:58 UTC (rev 25164) +++ branches/SAMBA_3_2/source/winbindd/idmap_ad.c 2007-09-14 17:42:10 UTC (rev 25165) @@ -315,7 +315,7 @@ ATYPE_WORKSTATION_TRUST, ATYPE_INTERDOMAIN_TRUST); } - u_filter = talloc_asprintf_append(u_filter, "(%s=%lu)", + u_filter = talloc_asprintf_append_buffer(u_filter, "(%s=%lu)", ad_schema->posix_uidnumber_attr, (unsigned long)ids[idx]->xid.id); CHECK_ALLOC_DONE(u_filter); @@ -329,7 +329,7 @@ ATYPE_SECURITY_GLOBAL_GROUP, ATYPE_SECURITY_LOCAL_GROUP); } - g_filter = talloc_asprintf_append(g_filter, "(%s=%lu)", + g_filter = talloc_asprintf_append_buffer(g_filter, "(%s=%lu)", ad_schema->posix_gidnumber_attr, (unsigned long)ids[idx]->xid.id); CHECK_ALLOC_DONE(g_filter); @@ -344,16 +344,16 @@ filter = talloc_asprintf(memctx, "(|"); CHECK_ALLOC_DONE(filter); if ( u_filter) { - filter = talloc_asprintf_append(filter, "%s))", u_filter); + filter = talloc_asprintf_append_buffer(filter, "%s))", u_filter); CHECK_ALLOC_DONE(filter); TALLOC_FREE(u_filter); } if ( g_filter) { - filter = talloc_asprintf_append(filter, "%s))", g_filter); + filter = talloc_asprintf_append_buffer(filter, "%s))", g_filter); CHECK_ALLOC_DONE(filter); TALLOC_FREE(g_filter); } - filter = talloc_asprintf_append(filter, ")"); + filter = talloc_asprintf_append_buffer(filter, ")"); CHECK_ALLOC_DONE(filter); rc = ads_search_retry(ads, &res, filter, attrs); @@ -535,12 +535,12 @@ for (i = 0; (i < IDMAP_AD_MAX_IDS) && ids[idx]; i++, idx++) { sidstr = sid_binstring(ids[idx]->sid); - filter = talloc_asprintf_append(filter, "(objectSid=%s)", sidstr); + filter = talloc_asprintf_append_buffer(filter, "(objectSid=%s)", sidstr); free(sidstr); CHECK_ALLOC_DONE(filter); } - filter = talloc_asprintf_append(filter, "))"); + filter = talloc_asprintf_append_buffer(filter, "))"); CHECK_ALLOC_DONE(filter); DEBUG(10, ("Filter: [%s]\n", filter)); Modified: branches/SAMBA_3_2/source/winbindd/idmap_ldap.c =================================================================== --- branches/SAMBA_3_2/source/winbindd/idmap_ldap.c 2007-09-14 17:40:58 UTC (rev 25164) +++ branches/SAMBA_3_2/source/winbindd/idmap_ldap.c 2007-09-14 17:42:10 UTC (rev 25165) @@ -955,12 +955,12 @@ bidx = idx; for (i = 0; (i < IDMAP_LDAP_MAX_IDS) && ids[idx]; i++, idx++) { - filter = talloc_asprintf_append(filter, "(%s=%lu)", + filter = talloc_asprintf_append_buffer(filter, "(%s=%lu)", (ids[idx]->xid.type==ID_TYPE_UID)?uidNumber:gidNumber, (unsigned long)ids[idx]->xid.id); CHECK_ALLOC_DONE(filter); } - filter = talloc_asprintf_append(filter, "))"); + filter = talloc_asprintf_append_buffer(filter, "))"); CHECK_ALLOC_DONE(filter); DEBUG(10, ("Filter: [%s]\n", filter)); } else { @@ -1185,12 +1185,12 @@ bidx = idx; for (i = 0; (i < IDMAP_LDAP_MAX_IDS) && ids[idx]; i++, idx++) { - filter = talloc_asprintf_append(filter, "(%s=%s)", + filter = talloc_asprintf_append_buffer(filter, "(%s=%s)", LDAP_ATTRIBUTE_SID, sid_string_static(ids[idx]->sid)); CHECK_ALLOC_DONE(filter); } - filter = talloc_asprintf_append(filter, "))"); + filter = talloc_asprintf_append_buffer(filter, "))"); CHECK_ALLOC_DONE(filter); DEBUG(10, ("Filter: [%s]", filter)); } else { Modified: branches/SAMBA_3_2/source/winbindd/winbindd_dual.c =================================================================== --- branches/SAMBA_3_2/source/winbindd/winbindd_dual.c 2007-09-14 17:40:58 UTC (rev 25164) +++ branches/SAMBA_3_2/source/winbindd/winbindd_dual.c 2007-09-14 17:42:10 UTC (rev 25165) @@ -858,7 +858,7 @@ } for (domain = domain_list(); domain; domain = domain->next) { - if ((buf = talloc_asprintf_append(buf, "%s:%s ", + if ((buf = talloc_asprintf_append_buffer(buf, "%s:%s ", domain->name, domain->online ? "Online":"Offline")) == NULL) { @@ -866,7 +866,7 @@ } } - buf = talloc_asprintf_append(buf, "\n"); + buf = talloc_asprintf_append_buffer(buf, "\n"); DEBUG(5,("collect_onlinestatus: %s", buf)); Modified: branches/SAMBA_3_2_0/source/libads/ldap_schema.c =================================================================== --- branches/SAMBA_3_2_0/source/libads/ldap_schema.c 2007-09-14 17:40:58 UTC (rev 25164) +++ branches/SAMBA_3_2_0/source/libads/ldap_schema.c 2007-09-14 17:42:10 UTC (rev 25165) @@ -48,13 +48,13 @@ for (i=0; i<num_OIDs; i++) { - if ((expr = talloc_asprintf_append(expr, "(attributeId=%s)", + if ((expr = talloc_asprintf_append_buffer(expr, "(attributeId=%s)", OIDs[i])) == NULL) { return ADS_ERROR(LDAP_NO_MEMORY); } } - if ((expr = talloc_asprintf_append(expr, ")")) == NULL) { + if ((expr = talloc_asprintf_append_buffer(expr, ")")) == NULL) { return ADS_ERROR(LDAP_NO_MEMORY); } Modified: branches/SAMBA_3_2_0/source/libgpo/gpo_fetch.c =================================================================== --- branches/SAMBA_3_2_0/source/libgpo/gpo_fetch.c 2007-09-14 17:40:58 UTC (rev 25164) +++ branches/SAMBA_3_2_0/source/libgpo/gpo_fetch.c 2007-09-14 17:42:10 UTC (rev 25165) @@ -102,7 +102,7 @@ while (next_token(&unix_path, tok, "/", sizeof(tok))) { - current_dir = talloc_asprintf_append(current_dir, "/%s", tok); + current_dir = talloc_asprintf_append_buffer(current_dir, "/%s", tok); NT_STATUS_HAVE_NO_MEMORY(current_dir); if ((mkdir(current_dir, 0644)) < 0 && errno != EEXIST) { Modified: branches/SAMBA_3_2_0/source/passdb/pdb_ldap.c =================================================================== --- branches/SAMBA_3_2_0/source/passdb/pdb_ldap.c 2007-09-14 17:40:58 UTC (rev 25164) +++ branches/SAMBA_3_2_0/source/passdb/pdb_ldap.c 2007-09-14 17:42:10 UTC (rev 25165) @@ -2437,7 +2437,7 @@ goto done; } - filter = talloc_asprintf_append(filter, "(uid=%s)", escape_memberuid); + filter = talloc_asprintf_append_buffer(filter, "(uid=%s)", escape_memberuid); if (filter == NULL) { SAFE_FREE(escape_memberuid); ret = NT_STATUS_NO_MEMORY; @@ -2447,7 +2447,7 @@ SAFE_FREE(escape_memberuid); } - filter = talloc_asprintf_append(filter, "))"); + filter = talloc_asprintf_append_buffer(filter, "))"); if (filter == NULL) { ret = NT_STATUS_NO_MEMORY; goto done; @@ -3726,7 +3726,7 @@ for (i=0; i<num_rids; i++) { DOM_SID sid; sid_compose(&sid, domain_sid, rids[i]); - allsids = talloc_asprintf_append(allsids, "(sambaSid=%s)", + allsids = talloc_asprintf_append_buffer(allsids, "(sambaSid=%s)", sid_string_static(&sid)); if (allsids == NULL) { goto done; Modified: branches/SAMBA_3_2_0/source/winbindd/idmap_ad.c =================================================================== --- branches/SAMBA_3_2_0/source/winbindd/idmap_ad.c 2007-09-14 17:40:58 UTC (rev 25164) +++ branches/SAMBA_3_2_0/source/winbindd/idmap_ad.c 2007-09-14 17:42:10 UTC (rev 25165) @@ -315,7 +315,7 @@ ATYPE_WORKSTATION_TRUST, ATYPE_INTERDOMAIN_TRUST); } - u_filter = talloc_asprintf_append(u_filter, "(%s=%lu)", + u_filter = talloc_asprintf_append_buffer(u_filter, "(%s=%lu)", ad_schema->posix_uidnumber_attr, (unsigned long)ids[idx]->xid.id); CHECK_ALLOC_DONE(u_filter); @@ -329,7 +329,7 @@ ATYPE_SECURITY_GLOBAL_GROUP, ATYPE_SECURITY_LOCAL_GROUP); } - g_filter = talloc_asprintf_append(g_filter, "(%s=%lu)", + g_filter = talloc_asprintf_append_buffer(g_filter, "(%s=%lu)", ad_schema->posix_gidnumber_attr, (unsigned long)ids[idx]->xid.id); CHECK_ALLOC_DONE(g_filter); @@ -344,16 +344,16 @@ filter = talloc_asprintf(memctx, "(|"); CHECK_ALLOC_DONE(filter); if ( u_filter) { - filter = talloc_asprintf_append(filter, "%s))", u_filter); + filter = talloc_asprintf_append_buffer(filter, "%s))", u_filter); CHECK_ALLOC_DONE(filter); TALLOC_FREE(u_filter); } if ( g_filter) { - filter = talloc_asprintf_append(filter, "%s))", g_filter); + filter = talloc_asprintf_append_buffer(filter, "%s))", g_filter); CHECK_ALLOC_DONE(filter); TALLOC_FREE(g_filter); } - filter = talloc_asprintf_append(filter, ")"); + filter = talloc_asprintf_append_buffer(filter, ")"); CHECK_ALLOC_DONE(filter); rc = ads_search_retry(ads, &res, filter, attrs); @@ -535,12 +535,12 @@ for (i = 0; (i < IDMAP_AD_MAX_IDS) && ids[idx]; i++, idx++) { sidstr = sid_binstring(ids[idx]->sid); - filter = talloc_asprintf_append(filter, "(objectSid=%s)", sidstr); + filter = talloc_asprintf_append_buffer(filter, "(objectSid=%s)", sidstr); free(sidstr); CHECK_ALLOC_DONE(filter); } - filter = talloc_asprintf_append(filter, "))"); + filter = talloc_asprintf_append_buffer(filter, "))"); CHECK_ALLOC_DONE(filter); DEBUG(10, ("Filter: [%s]\n", filter)); Modified: branches/SAMBA_3_2_0/source/winbindd/idmap_ldap.c =================================================================== --- branches/SAMBA_3_2_0/source/winbindd/idmap_ldap.c 2007-09-14 17:40:58 UTC (rev 25164) +++ branches/SAMBA_3_2_0/source/winbindd/idmap_ldap.c 2007-09-14 17:42:10 UTC (rev 25165) @@ -955,12 +955,12 @@ bidx = idx; for (i = 0; (i < IDMAP_LDAP_MAX_IDS) && ids[idx]; i++, idx++) { - filter = talloc_asprintf_append(filter, "(%s=%lu)", + filter = talloc_asprintf_append_buffer(filter, "(%s=%lu)", (ids[idx]->xid.type==ID_TYPE_UID)?uidNumber:gidNumber, (unsigned long)ids[idx]->xid.id); CHECK_ALLOC_DONE(filter); } - filter = talloc_asprintf_append(filter, "))"); + filter = talloc_asprintf_append_buffer(filter, "))"); CHECK_ALLOC_DONE(filter); DEBUG(10, ("Filter: [%s]\n", filter)); } else { @@ -1185,12 +1185,12 @@ bidx = idx; for (i = 0; (i < IDMAP_LDAP_MAX_IDS) && ids[idx]; i++, idx++) { - filter = talloc_asprintf_append(filter, "(%s=%s)", + filter = talloc_asprintf_append_buffer(filter, "(%s=%s)", LDAP_ATTRIBUTE_SID, sid_string_static(ids[idx]->sid)); CHECK_ALLOC_DONE(filter); } - filter = talloc_asprintf_append(filter, "))"); + filter = talloc_asprintf_append_buffer(filter, "))"); CHECK_ALLOC_DONE(filter); DEBUG(10, ("Filter: [%s]", filter)); } else { Modified: branches/SAMBA_3_2_0/source/winbindd/winbindd_dual.c =================================================================== --- branches/SAMBA_3_2_0/source/winbindd/winbindd_dual.c 2007-09-14 17:40:58 UTC (rev 25164) +++ branches/SAMBA_3_2_0/source/winbindd/winbindd_dual.c 2007-09-14 17:42:10 UTC (rev 25165) @@ -858,7 +858,7 @@ } for (domain = domain_list(); domain; domain = domain->next) { - if ((buf = talloc_asprintf_append(buf, "%s:%s ", + if ((buf = talloc_asprintf_append_buffer(buf, "%s:%s ", domain->name, domain->online ? "Online":"Offline")) == NULL) { @@ -866,7 +866,7 @@ } } - buf = talloc_asprintf_append(buf, "\n"); + buf = talloc_asprintf_append_buffer(buf, "\n"); DEBUG(5,("collect_onlinestatus: %s", buf));
