The branch, master has been updated
via f24dfbf... s4:drsuapi RPC - Change also here counters to "unsigned"
via 61ae4be... s4:dsdb/util - Change also here counters to "unsigned"
via 3ec4c64... s4:repl - change also here the counter variables to
"unsigned"
from 6a91bf6... s4:wrepl_server - change also here the counter variables
to "unsigned"
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit f24dfbfb181b1d550d30c6942aa9ca75d164524d
Author: Matthias Dieter Wallnöfer <mwallnoe...@yahoo.de>
Date: Sat Nov 21 18:57:24 2009 +0100
s4:drsuapi RPC - Change also here counters to "unsigned"
No need to have "signed" counters at those places.
commit 61ae4be2567738456be07b36c6ea9012906e3e7d
Author: Matthias Dieter Wallnöfer <mwallnoe...@yahoo.de>
Date: Fri Nov 6 20:14:41 2009 +0100
s4:dsdb/util - Change also here counters to "unsigned"
No need to have "signed" counters at those places.
commit 3ec4c643a4e1d3f2532b68cec816fa3f847eac1c
Author: Matthias Dieter Wallnöfer <mwallnoe...@yahoo.de>
Date: Fri Nov 6 20:14:41 2009 +0100
s4:repl - change also here the counter variables to "unsigned"
I changed also some "uint32_t" to "unsigned" since the LDB interface doesn't
specify the bitlength of the unsigned type.
-----------------------------------------------------------------------
Summary of changes:
source4/dsdb/common/util.c | 29 ++++++++++++++------------
source4/dsdb/repl/drepl_notify.c | 5 ++-
source4/dsdb/repl/drepl_partitions.c | 6 ++--
source4/dsdb/repl/replicated_objects.c | 4 +-
source4/rpc_server/drsuapi/dcesrv_drsuapi.c | 3 +-
source4/rpc_server/drsuapi/getncchanges.c | 8 +++---
source4/rpc_server/drsuapi/updaterefs.c | 4 +-
7 files changed, 32 insertions(+), 27 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c
index faa96e6..f597c41 100644
--- a/source4/dsdb/common/util.c
+++ b/source4/dsdb/common/util.c
@@ -557,7 +557,7 @@ struct samr_Password *samdb_result_hash(TALLOC_CTX
*mem_ctx, const struct ldb_me
}
/*
- pull an array of samr_Password structutres from a result set.
+ pull an array of samr_Password structures from a result set.
*/
unsigned int samdb_result_hashes(TALLOC_CTX *mem_ctx, const struct ldb_message
*msg,
const char *attr, struct samr_Password **hashes)
@@ -591,7 +591,7 @@ NTSTATUS samdb_result_passwords(TALLOC_CTX *mem_ctx, struct
loadparm_context *lp
{
struct samr_Password *lmPwdHash, *ntPwdHash;
if (nt_pwd) {
- int num_nt;
+ unsigned int num_nt;
num_nt = samdb_result_hashes(mem_ctx, msg, "unicodePwd",
&ntPwdHash);
if (num_nt == 0) {
*nt_pwd = NULL;
@@ -606,7 +606,7 @@ NTSTATUS samdb_result_passwords(TALLOC_CTX *mem_ctx, struct
loadparm_context *lp
* authentication, that we never use the LM hash, even
* if we store it */
if (lp_lanman_auth(lp_ctx)) {
- int num_lm;
+ unsigned int num_lm;
num_lm = samdb_result_hashes(mem_ctx, msg, "dBCSPwd",
&lmPwdHash);
if (num_lm == 0) {
*lm_pwd = NULL;
@@ -704,7 +704,7 @@ struct ldb_message_element *samdb_find_attribute(struct
ldb_context *ldb,
const struct ldb_message *msg,
const char *name, const char
*value)
{
- int i;
+ unsigned int i;
struct ldb_message_element *el = ldb_msg_find_element(msg, name);
if (!el) {
@@ -894,10 +894,11 @@ int samdb_msg_add_hash(struct ldb_context *sam_ldb,
TALLOC_CTX *mem_ctx, struct
add a samr_Password array to a message
*/
int samdb_msg_add_hashes(TALLOC_CTX *mem_ctx, struct ldb_message *msg,
- const char *attr_name, struct samr_Password *hashes,
unsigned int count)
+ const char *attr_name, struct samr_Password *hashes,
+ unsigned int count)
{
struct ldb_val val;
- int i;
+ unsigned int i;
val.data = talloc_array_size(mem_ctx, 16, count);
val.length = count*16;
if (!val.data) {
@@ -1759,7 +1760,7 @@ NTSTATUS samdb_set_password(struct ldb_context *ctx,
TALLOC_CTX *mem_ctx,
int count;
time_t now = time(NULL);
NTTIME now_nt;
- int i;
+ unsigned int i;
/* we need to know the time to compute password age */
unix_to_nt_time(&now_nt, now);
@@ -2149,7 +2150,7 @@ NTSTATUS samdb_create_foreign_security_principal(struct
ldb_context *sam_ctx, TA
struct ldb_dn *samdb_dns_domain_to_dn(struct ldb_context *ldb, TALLOC_CTX
*mem_ctx, const char *dns_domain)
{
- int i;
+ unsigned int i;
TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
const char *binary_encoded;
const char **split_realm;
@@ -2390,7 +2391,7 @@ WERROR dsdb_loadreps(struct ldb_context *sam_ctx,
TALLOC_CTX *mem_ctx, struct ld
const char *attrs[] = { attr, NULL };
struct ldb_result *res = NULL;
TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
- int i;
+ unsigned int i;
struct ldb_message_element *el;
*r = NULL;
@@ -2444,7 +2445,7 @@ WERROR dsdb_savereps(struct ldb_context *sam_ctx,
TALLOC_CTX *mem_ctx, struct ld
TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
struct ldb_message *msg;
struct ldb_message_element *el;
- int i;
+ unsigned int i;
msg = ldb_msg_new(tmp_ctx);
msg->dn = dn;
@@ -3136,7 +3137,8 @@ int dsdb_load_udv_v2(struct ldb_context *samdb, struct
ldb_dn *dn, TALLOC_CTX *m
static const char *attrs[] = { "replUpToDateVector", NULL };
struct ldb_result *r;
const struct ldb_val *ouv_value;
- int ret, i;
+ unsigned int i;
+ int ret;
uint64_t highest_usn;
const struct GUID *our_invocation_id;
struct timeval now = timeval_current();
@@ -3220,7 +3222,8 @@ int dsdb_load_udv_v1(struct ldb_context *samdb, struct
ldb_dn *dn, TALLOC_CTX *m
struct drsuapi_DsReplicaCursor **cursors, uint32_t *count)
{
struct drsuapi_DsReplicaCursor2 *v2;
- int ret, i;
+ unsigned int i;
+ int ret;
ret = dsdb_load_udv_v2(samdb, dn, mem_ctx, &v2, count);
if (ret != LDB_SUCCESS) {
@@ -3365,7 +3368,7 @@ int dsdb_modify(struct ldb_context *ldb, const struct
ldb_message *message,
*/
int dsdb_replace(struct ldb_context *ldb, struct ldb_message *msg, uint32_t
dsdb_flags)
{
- int i;
+ unsigned int i;
/* mark all the message elements as LDB_FLAG_MOD_REPLACE */
for (i=0;i<msg->num_elements;i++) {
diff --git a/source4/dsdb/repl/drepl_notify.c b/source4/dsdb/repl/drepl_notify.c
index c3ca5ed..5047da3 100644
--- a/source4/dsdb/repl/drepl_notify.c
+++ b/source4/dsdb/repl/drepl_notify.c
@@ -170,7 +170,7 @@ static void dreplsrv_notify_del_repsTo(struct
dreplsrv_notify_operation *op)
struct repsFromToBlob *reps;
WERROR werr;
struct dreplsrv_service *s = op->service;
- int i;
+ uint32_t i;
werr = dsdb_loadreps(s->samdb, op, op->source_dsa->partition->dn,
"repsTo", &reps, &count);
if (!W_ERROR_IS_OK(werr)) {
@@ -324,7 +324,8 @@ static WERROR dreplsrv_notify_check(struct dreplsrv_service
*s,
WERROR werr;
uint64_t uSNHighest;
uint64_t uSNUrgent;
- int ret, i;
+ uint32_t i;
+ int ret;
werr = dsdb_loadreps(s->samdb, mem_ctx, p->dn, "repsTo", &reps, &count);
if (count == 0) {
diff --git a/source4/dsdb/repl/drepl_partitions.c
b/source4/dsdb/repl/drepl_partitions.c
index b57a5c8..b17a17d 100644
--- a/source4/dsdb/repl/drepl_partitions.c
+++ b/source4/dsdb/repl/drepl_partitions.c
@@ -40,7 +40,7 @@ WERROR dreplsrv_load_partitions(struct dreplsrv_service *s)
struct ldb_result *r;
struct ldb_message_element *el;
static const char *attrs[] = { "hasMasterNCs", NULL };
- uint32_t i;
+ unsigned int i;
int ret;
basedn = samdb_ntds_settings_dn(s->samdb);
@@ -195,7 +195,7 @@ static WERROR udv_convert(TALLOC_CTX *mem_ctx,
const struct replUpToDateVectorCtr2 *udv,
struct drsuapi_DsReplicaCursorCtrEx *udv_ex)
{
- int i;
+ uint32_t i;
udv_ex->version = 2;
udv_ex->reserved1 = 0;
@@ -220,7 +220,7 @@ static WERROR dreplsrv_refresh_partition(struct
dreplsrv_service *s,
struct dom_sid *nc_sid;
struct ldb_message_element *orf_el = NULL;
struct ldb_result *r;
- uint32_t i;
+ unsigned int i;
int ret;
TALLOC_CTX *mem_ctx = talloc_new(p);
static const char *attrs[] = {
diff --git a/source4/dsdb/repl/replicated_objects.c
b/source4/dsdb/repl/replicated_objects.c
index b95bf87..4d500e9 100644
--- a/source4/dsdb/repl/replicated_objects.c
+++ b/source4/dsdb/repl/replicated_objects.c
@@ -115,7 +115,7 @@ static WERROR dsdb_convert_object_ex(struct ldb_context
*ldb,
struct drsuapi_DsReplicaMetaData *d;
struct replPropertyMetaData1 *m;
struct ldb_message_element *e;
- int j;
+ uint32_t j;
a = &in->object.attribute_ctr.attributes[i];
d = &in->meta_data_ctr->meta_data[i];
@@ -342,7 +342,7 @@ static WERROR dsdb_convert_object(struct ldb_context *ldb,
struct ldb_message **_msg)
{
WERROR status;
- uint32_t i;
+ unsigned int i;
struct ldb_message *msg;
if (!in->object.identifier) {
diff --git a/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
b/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
index f94efa0..91a6619 100644
--- a/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
+++ b/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
@@ -497,7 +497,8 @@ static WERROR
dcesrv_drsuapi_DsGetDomainControllerInfo_1(struct drsuapi_bind_sta
struct drsuapi_DsGetDCInfoCtr1 *ctr1;
struct drsuapi_DsGetDCInfoCtr2 *ctr2;
- int ret, i;
+ int ret;
+ unsigned int i;
*r->out.level_out = r->in.req->req1.level;
r->out.ctr = talloc(mem_ctx, union drsuapi_DsGetDCInfoCtr);
diff --git a/source4/rpc_server/drsuapi/getncchanges.c
b/source4/rpc_server/drsuapi/getncchanges.c
index c65d10d..1e40750 100644
--- a/source4/rpc_server/drsuapi/getncchanges.c
+++ b/source4/rpc_server/drsuapi/getncchanges.c
@@ -96,7 +96,7 @@ static WERROR get_nc_changes_build_object(struct
drsuapi_DsReplicaObjectListItem
struct drsuapi_DsReplicaCursorCtrEx
*uptodateness_vector)
{
const struct ldb_val *md_value;
- int i, n;
+ unsigned int i, n;
struct replPropertyMetaDataBlob md;
uint32_t rid = 0;
enum ndr_err_code ndr_err;
@@ -345,14 +345,14 @@ static WERROR get_nc_changes_add_links(struct ldb_context
*sam_ctx,
uint32_t *la_count,
struct drsuapi_DsReplicaCursorCtrEx
*uptodateness_vector)
{
- int i;
+ unsigned int i;
TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
uint64_t uSNChanged = ldb_msg_find_attr_as_int(msg, "uSNChanged", -1);
for (i=0; i<msg->num_elements; i++) {
struct ldb_message_element *el = &msg->elements[i];
const struct dsdb_attribute *sa;
- int j;
+ unsigned int j;
sa = dsdb_attribute_by_lDAPDisplayName(schema, el->name);
@@ -653,7 +653,7 @@ WERROR dcesrv_drsuapi_DsGetNCChanges(struct
dcesrv_call_state *dce_call, TALLOC_
{
struct drsuapi_DsReplicaObjectIdentifier *ncRoot;
int ret;
- int i;
+ unsigned int i;
struct dsdb_schema *schema;
struct drsuapi_DsReplicaOIDMapping_Ctr *ctr;
struct drsuapi_DsReplicaObjectListItemEx **currentObject;
diff --git a/source4/rpc_server/drsuapi/updaterefs.c
b/source4/rpc_server/drsuapi/updaterefs.c
index 2c2a972..dd3a334 100644
--- a/source4/rpc_server/drsuapi/updaterefs.c
+++ b/source4/rpc_server/drsuapi/updaterefs.c
@@ -38,7 +38,7 @@ static WERROR uref_add_dest(struct ldb_context *sam_ctx,
TALLOC_CTX *mem_ctx,
{
struct repsTo reps;
WERROR werr;
- int i;
+ unsigned int i;
werr = dsdb_loadreps(sam_ctx, mem_ctx, dn, "repsTo", &reps.r,
&reps.count);
if (!W_ERROR_IS_OK(werr)) {
@@ -82,7 +82,7 @@ static WERROR uref_del_dest(struct ldb_context *sam_ctx,
TALLOC_CTX *mem_ctx,
{
struct repsTo reps;
WERROR werr;
- int i;
+ unsigned int i;
bool found = false;
werr = dsdb_loadreps(sam_ctx, mem_ctx, dn, "repsTo", &reps.r,
&reps.count);
--
Samba Shared Repository
