The branch, master has been updated
via 1620697 s4:local_password LDB module - fix typos
via 2c0a9e9 s4:resolve_oids LDB module - fix counter types
via 45ee4e9 s4:partition_init LDB module - fix counter type
via 5ab8e4f s4:extended_dn_store LDB module - fix counter types
from dc0000e provision: when deriving netbiosname from hostname force
the netbiosname to be compliant
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 16206974e6557e71cd0e3595c3fe0538bfef956d
Author: Matthias Dieter Wallnöfer <m...@samba.org>
Date: Sat Oct 30 16:58:34 2010 +0200
s4:local_password LDB module - fix typos
Autobuild-User: Matthias Dieter Wallnöfer <m...@samba.org>
Autobuild-Date: Sat Oct 30 15:41:46 UTC 2010 on sn-devel-104
commit 2c0a9e9f2118d36c7d8af5caa72346581c2197c1
Author: Matthias Dieter Wallnöfer <m...@samba.org>
Date: Sat Oct 30 16:46:13 2010 +0200
s4:resolve_oids LDB module - fix counter types
commit 45ee4e9a6b3847dc54b3c6bec8b4ebccbbac93da
Author: Matthias Dieter Wallnöfer <m...@samba.org>
Date: Sat Oct 30 16:41:52 2010 +0200
s4:partition_init LDB module - fix counter type
commit 5ab8e4f7e190c40f3da675c295e2580c92a86d39
Author: Matthias Dieter Wallnöfer <m...@samba.org>
Date: Sat Oct 30 16:35:12 2010 +0200
s4:extended_dn_store LDB module - fix counter types
-----------------------------------------------------------------------
Summary of changes:
source4/dsdb/samdb/ldb_modules/extended_dn_store.c | 4 ++--
source4/dsdb/samdb/ldb_modules/local_password.c | 12 ++++++------
source4/dsdb/samdb/ldb_modules/partition_init.c | 6 ++++--
source4/dsdb/samdb/ldb_modules/resolve_oids.c | 4 ++--
4 files changed, 14 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/dsdb/samdb/ldb_modules/extended_dn_store.c
b/source4/dsdb/samdb/ldb_modules/extended_dn_store.c
index fafe511..7338944 100644
--- a/source4/dsdb/samdb/ldb_modules/extended_dn_store.c
+++ b/source4/dsdb/samdb/ldb_modules/extended_dn_store.c
@@ -298,7 +298,7 @@ static int extended_dn_add(struct ldb_module *module,
struct ldb_request *req)
{
struct extended_dn_context *ac;
int ret;
- int i, j;
+ unsigned int i, j;
if (ldb_dn_is_special(req->op.add.message->dn)) {
/* do not manipulate our control entries */
@@ -371,7 +371,7 @@ static int extended_dn_modify(struct ldb_module *module,
struct ldb_request *req
/* Determine the effect of the modification */
/* Apply the modify to the linked entry */
- int i, j;
+ unsigned int i, j;
struct extended_dn_context *ac;
int ret;
diff --git a/source4/dsdb/samdb/ldb_modules/local_password.c
b/source4/dsdb/samdb/ldb_modules/local_password.c
index 359a3d0..1a7b19d 100644
--- a/source4/dsdb/samdb/ldb_modules/local_password.c
+++ b/source4/dsdb/samdb/ldb_modules/local_password.c
@@ -301,7 +301,7 @@ static int lpdb_add_callback(struct ldb_request *req,
* MODIFY
****************************************************************************/
-static int lpdb_modify_callabck(struct ldb_request *req,
+static int lpdb_modify_callback(struct ldb_request *req,
struct ldb_reply *ares);
static int lpdb_mod_search_callback(struct ldb_request *req,
struct ldb_reply *ares);
@@ -369,7 +369,7 @@ static int local_password_modify(struct ldb_module *module,
struct ldb_request *
ret = ldb_build_mod_req(&remote_req, ldb, ac,
remote_message,
req->controls,
- ac, lpdb_modify_callabck,
+ ac, lpdb_modify_callback,
req);
LDB_REQ_SET_LOCATION(remote_req);
if (ret != LDB_SUCCESS) {
@@ -381,7 +381,7 @@ static int local_password_modify(struct ldb_module *module,
struct ldb_request *
/* On a modify, we don't have the objectGUID handy, so we need to
* search our DN for it */
-static int lpdb_modify_callabck(struct ldb_request *req,
+static int lpdb_modify_callback(struct ldb_request *req,
struct ldb_reply *ares)
{
struct ldb_context *ldb;
@@ -546,7 +546,7 @@ static int lpdb_mod_search_callback(struct ldb_request *req,
* DELETE
****************************************************************************/
-static int lpdb_delete_callabck(struct ldb_request *req,
+static int lpdb_delete_callback(struct ldb_request *req,
struct ldb_reply *ares);
static int lpdb_del_search_callback(struct ldb_request *req,
struct ldb_reply *ares);
@@ -583,7 +583,7 @@ static int local_password_delete(struct ldb_module *module,
ret = ldb_build_del_req(&remote_req, ldb, ac,
req->op.del.dn,
req->controls,
- ac, lpdb_delete_callabck,
+ ac, lpdb_delete_callback,
req);
LDB_REQ_SET_LOCATION(remote_req);
if (ret != LDB_SUCCESS) {
@@ -595,7 +595,7 @@ static int local_password_delete(struct ldb_module *module,
/* On a modify, we don't have the objectGUID handy, so we need to
* search our DN for it */
-static int lpdb_delete_callabck(struct ldb_request *req,
+static int lpdb_delete_callback(struct ldb_request *req,
struct ldb_reply *ares)
{
struct ldb_context *ldb;
diff --git a/source4/dsdb/samdb/ldb_modules/partition_init.c
b/source4/dsdb/samdb/ldb_modules/partition_init.c
index 775e566..7118fa0 100644
--- a/source4/dsdb/samdb/ldb_modules/partition_init.c
+++ b/source4/dsdb/samdb/ldb_modules/partition_init.c
@@ -45,7 +45,9 @@ static int partition_sort_compare(const void *v1, const void
*v2)
}
/* Load the list of DNs that we must replicate to all partitions */
-static int partition_load_replicate_dns(struct ldb_context *ldb, struct
partition_private_data *data, struct ldb_message *msg)
+static int partition_load_replicate_dns(struct ldb_context *ldb,
+ struct partition_private_data *data,
+ struct ldb_message *msg)
{
struct ldb_message_element *replicate_attributes =
ldb_msg_find_element(msg, "replicateEntries");
@@ -53,7 +55,7 @@ static int partition_load_replicate_dns(struct ldb_context
*ldb, struct partitio
if (!replicate_attributes) {
data->replicate = NULL;
} else {
- int i;
+ unsigned int i;
data->replicate = talloc_array(data, struct ldb_dn *,
replicate_attributes->num_values + 1);
if (!data->replicate) {
return ldb_oom(ldb);
diff --git a/source4/dsdb/samdb/ldb_modules/resolve_oids.c
b/source4/dsdb/samdb/ldb_modules/resolve_oids.c
index 4f5c35e..c18cd2f 100644
--- a/source4/dsdb/samdb/ldb_modules/resolve_oids.c
+++ b/source4/dsdb/samdb/ldb_modules/resolve_oids.c
@@ -194,7 +194,7 @@ static int resolve_oids_message_need(struct ldb_context
*ldb,
struct dsdb_schema *schema,
const struct ldb_message *msg)
{
- int i;
+ unsigned int i;
for (i=0; i < msg->num_elements; i++) {
int ret;
@@ -453,7 +453,7 @@ static int resolve_oids_search(struct ldb_module *module,
struct ldb_request *re
bool needed = false;
const char * const *attrs1;
const char **attrs2;
- uint32_t i;
+ unsigned int i;
ldb = ldb_module_get_ctx(module);
schema = dsdb_get_schema(ldb, NULL);
--
Samba Shared Repository
