diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2011-02-28 22:04:29 +0100 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2011-02-28 23:30:06 +0100 |
commit | 59a077d8f5b4ec78e90d6c4dabbc65375598c431 (patch) | |
tree | abbb6cdfa35b2a53f2202fa8c9a8856dbef67876 /source4/dsdb | |
parent | f7b4209f999d9c5310865381b1598668f9bcb98f (diff) | |
download | samba-59a077d8f5b4ec78e90d6c4dabbc65375598c431.tar.gz samba-59a077d8f5b4ec78e90d6c4dabbc65375598c431.tar.bz2 samba-59a077d8f5b4ec78e90d6c4dabbc65375598c431.zip |
Fix some types
Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Mon Feb 28 23:30:06 CET 2011 on sn-devel-104
Diffstat (limited to 'source4/dsdb')
-rw-r--r-- | source4/dsdb/common/util.c | 4 | ||||
-rw-r--r-- | source4/dsdb/samdb/ldb_modules/acl.c | 2 | ||||
-rw-r--r-- | source4/dsdb/samdb/ldb_modules/objectclass.c | 8 | ||||
-rw-r--r-- | source4/dsdb/samdb/ldb_modules/objectclass_attrs.c | 2 | ||||
-rw-r--r-- | source4/dsdb/samdb/ldb_modules/samldb.c | 10 |
5 files changed, 13 insertions, 13 deletions
diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c index 67328c65c4..21318cba33 100644 --- a/source4/dsdb/common/util.c +++ b/source4/dsdb/common/util.c @@ -2021,7 +2021,7 @@ int samdb_set_password_callback(struct ldb_request *req, struct ldb_reply *ares) * Sets the user password using plaintext UTF16 (attribute "new_password") or * LM (attribute "lmNewHash") or NT (attribute "ntNewHash") hash. Also pass * the old LM and/or NT hash (attributes "lmOldHash"/"ntOldHash") if it is a - * user change or not. The "rejectReason" gives some more informations if the + * user change or not. The "rejectReason" gives some more information if the * change failed. * * Results: NT_STATUS_OK, NT_STATUS_INVALID_PARAMETER, NT_STATUS_UNSUCCESSFUL, @@ -2203,7 +2203,7 @@ NTSTATUS samdb_set_password(struct ldb_context *ldb, TALLOC_CTX *mem_ctx, * Sets the user password using plaintext UTF16 (attribute "new_password") or * LM (attribute "lmNewHash") or NT (attribute "ntNewHash") hash. Also pass * the old LM and/or NT hash (attributes "lmOldHash"/"ntOldHash") if it is a - * user change or not. The "rejectReason" gives some more informations if the + * user change or not. The "rejectReason" gives some more information if the * change failed. * * This wrapper function for "samdb_set_password" takes a SID as input rather diff --git a/source4/dsdb/samdb/ldb_modules/acl.c b/source4/dsdb/samdb/ldb_modules/acl.c index 20f09a57f8..b6eb56376c 100644 --- a/source4/dsdb/samdb/ldb_modules/acl.c +++ b/source4/dsdb/samdb/ldb_modules/acl.c @@ -996,7 +996,7 @@ static int acl_modify(struct ldb_module *module, struct ldb_request *req) /* This basic attribute existence check with the right errorcode * is needed since this module is the first one which requests - * schema attribute informations. + * schema attribute information. * The complete attribute checking is done in the * "objectclass_attrs" module behind this one. */ diff --git a/source4/dsdb/samdb/ldb_modules/objectclass.c b/source4/dsdb/samdb/ldb_modules/objectclass.c index 39f456dcca..f48917c5fd 100644 --- a/source4/dsdb/samdb/ldb_modules/objectclass.c +++ b/source4/dsdb/samdb/ldb_modules/objectclass.c @@ -903,7 +903,7 @@ static int oc_modify_callback(struct ldb_request *req, struct ldb_reply *ares) talloc_free(ares); /* this looks up the real existing object for fetching some important - * informations (objectclasses) */ + * information (objectclasses) */ ret = ldb_build_search_req(&search_req, ldb, ac, ac->req->op.mod.message->dn, LDB_SCOPE_BASE, @@ -1220,7 +1220,7 @@ static int objectclass_rename(struct ldb_module *module, struct ldb_request *req } /* this looks up the parent object for fetching some important - * informations (objectclasses, DN normalisation...) */ + * information (objectclasses, DN normalisation...) */ ret = ldb_build_search_req(&search_req, ldb, ac, parent_dn, LDB_SCOPE_BASE, "(objectClass=*)", @@ -1272,7 +1272,7 @@ static int objectclass_do_rename(struct oc_context *ac) ac->search_res = NULL; /* this looks up the real existing object for fetching some important - * informations (objectclasses) */ + * information (objectclasses) */ ret = ldb_build_search_req(&search_req, ldb, ac, ac->req->op.rename.olddn, LDB_SCOPE_BASE, @@ -1451,7 +1451,7 @@ static int objectclass_delete(struct ldb_module *module, struct ldb_request *req } /* this looks up the entry object for fetching some important - * informations (object classes, system flags...) */ + * information (object classes, system flags...) */ ret = ldb_build_search_req(&search_req, ldb, ac, req->op.del.dn, LDB_SCOPE_BASE, "(objectClass=*)", diff --git a/source4/dsdb/samdb/ldb_modules/objectclass_attrs.c b/source4/dsdb/samdb/ldb_modules/objectclass_attrs.c index e0efd4ccaf..8f6cc669ba 100644 --- a/source4/dsdb/samdb/ldb_modules/objectclass_attrs.c +++ b/source4/dsdb/samdb/ldb_modules/objectclass_attrs.c @@ -299,7 +299,7 @@ static int attr_handler2(struct oc_context *ac) } /* We can use "str_list_check" with "strcmp" here since the - * attribute informations from the schema are always equal + * attribute information from the schema are always equal * up-down-cased. */ found = str_list_check(must_contain, attr->lDAPDisplayName); if (found) { diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c index b11fc554b5..d9b4a49918 100644 --- a/source4/dsdb/samdb/ldb_modules/samldb.c +++ b/source4/dsdb/samdb/ldb_modules/samldb.c @@ -556,7 +556,7 @@ static int samldb_fill_object(struct samldb_ctx *ac) struct ldb_context *ldb = ldb_module_get_ctx(ac->module); int ret; - /* Add informations for the different account types */ + /* Add information for the different account types */ if (strcmp(ac->type, "user") == 0) { struct ldb_control *rodc_control = ldb_request_get_control(ac->req, LDB_CONTROL_RODC_DCPROMO_OID); @@ -1074,7 +1074,7 @@ static int samldb_prim_group_change(struct samldb_ctx *ac) return LDB_SUCCESS; } - /* Fetch informations from the existing object */ + /* Fetch information from the existing object */ ret = dsdb_module_search(ac->module, ac, &res, ac->msg->dn, LDB_SCOPE_BASE, attrs, DSDB_FLAG_NEXT_MODULE, ac->req, NULL); @@ -1467,7 +1467,7 @@ static int samldb_member_check(struct samldb_ctx *ac) int cnt; int ret; - /* Fetch informations from the existing object */ + /* Fetch information from the existing object */ ret = dsdb_module_search(ac->module, ac, &res, ac->msg->dn, LDB_SCOPE_BASE, attrs, DSDB_FLAG_NEXT_MODULE, ac->req, NULL); @@ -1581,7 +1581,7 @@ static int samldb_description_check(struct samldb_ctx *ac, bool *modified) unsigned int i; int ret; - /* Fetch informations from the existing object */ + /* Fetch information from the existing object */ ret = dsdb_module_search(ac->module, ac, &res, ac->msg->dn, LDB_SCOPE_BASE, attrs, DSDB_FLAG_NEXT_MODULE | DSDB_SEARCH_SHOW_DELETED, ac->req, "(|(objectclass=user)(objectclass=group)(objectclass=samDomain)(objectclass=samServer))"); @@ -1717,7 +1717,7 @@ static int samldb_service_principal_names_change(struct samldb_ctx *ac) } if ((dns_hostname == NULL) && (sam_accountname == NULL)) { - /* Well, there are informations missing (old name(s)) or the + /* Well, there are information missing (old name(s)) or the * names didn't change. We've nothing to do and can exit here */ return LDB_SUCCESS; } |