From 59a077d8f5b4ec78e90d6c4dabbc65375598c431 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 28 Feb 2011 22:04:29 +0100 Subject: Fix some types Autobuild-User: Jelmer Vernooij Autobuild-Date: Mon Feb 28 23:30:06 CET 2011 on sn-devel-104 --- docs-xml/manpages-3/ntlm_auth.1.xml | 2 +- docs-xml/manpages-3/smbget.1.xml | 2 +- libds/common/flag_mapping.c | 2 +- source3/modules/vfs_smb_traffic_analyzer.c | 2 +- source3/passdb/pdb_ldap.c | 4 ++-- source3/printing/nt_printing.c | 2 +- source3/rpc_server/spoolss/srv_spoolss_nt.c | 2 +- source3/rpcclient/cmd_spoolss.c | 4 ++-- source3/rpcclient/rpcclient.c | 2 +- source3/utils/net_ads.c | 4 ++-- source3/utils/net_rpc_printer.c | 4 ++-- source4/auth/credentials/credentials_krb5.c | 2 +- source4/cldap_server/netlogon.c | 2 +- source4/dsdb/common/util.c | 4 ++-- source4/dsdb/samdb/ldb_modules/acl.c | 2 +- source4/dsdb/samdb/ldb_modules/objectclass.c | 8 ++++---- source4/dsdb/samdb/ldb_modules/objectclass_attrs.c | 2 +- source4/dsdb/samdb/ldb_modules/samldb.c | 10 +++++----- source4/rpc_server/netlogon/dcerpc_netlogon.c | 6 +++--- source4/torture/ldap/basic.c | 2 +- source4/torture/rpc/forest_trust.c | 2 +- source4/torture/rpc/lsa.c | 4 ++-- source4/torture/rpc/netlogon.c | 2 +- source4/torture/winbind/struct_based.c | 2 +- 24 files changed, 39 insertions(+), 39 deletions(-) diff --git a/docs-xml/manpages-3/ntlm_auth.1.xml b/docs-xml/manpages-3/ntlm_auth.1.xml index 78ac69c6b4..69264d7ec6 100644 --- a/docs-xml/manpages-3/ntlm_auth.1.xml +++ b/docs-xml/manpages-3/ntlm_auth.1.xml @@ -156,7 +156,7 @@ could cause the helper to authenticate the user). - Curently implemented parameters from the + Currently implemented parameters from the external program to the helper are: diff --git a/docs-xml/manpages-3/smbget.1.xml b/docs-xml/manpages-3/smbget.1.xml index e4094ab096..99ff5c69c0 100644 --- a/docs-xml/manpages-3/smbget.1.xml +++ b/docs-xml/manpages-3/smbget.1.xml @@ -123,7 +123,7 @@ -f, --rcfile - Use specified rcfile. This will be loaded in the order it was specified - e.g. if you specify any options before this one, they might get overriden by the contents of the rcfile. + Use specified rcfile. This will be loaded in the order it was specified - e.g. if you specify any options before this one, they might get overridden by the contents of the rcfile. diff --git a/libds/common/flag_mapping.c b/libds/common/flag_mapping.c index 471afd06f9..ddc8ec5c19 100644 --- a/libds/common/flag_mapping.c +++ b/libds/common/flag_mapping.c @@ -152,7 +152,7 @@ enum lsa_SidType ds_atype_map(uint32_t atype) } /* get the default primary group RID for a given userAccountControl - * (informations according to MS-SAMR 3.1.1.8.1) */ + * (information according to MS-SAMR 3.1.1.8.1) */ uint32_t ds_uf2prim_group_rid(uint32_t uf) { uint32_t prim_group_rid = DOMAIN_RID_USERS; diff --git a/source3/modules/vfs_smb_traffic_analyzer.c b/source3/modules/vfs_smb_traffic_analyzer.c index c4f2c390d5..f3d68ddee9 100644 --- a/source3/modules/vfs_smb_traffic_analyzer.c +++ b/source3/modules/vfs_smb_traffic_analyzer.c @@ -557,7 +557,7 @@ static void smb_traffic_analyzer_send_data(vfs_handle_struct *handle, } else { DEBUG(1, ("smb_traffic_analyzer_send_data_socket: " - "error, unkown protocol given!\n")); + "error, unknown protocol given!\n")); return; } diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c index 5b34f6e026..7eb2fef49a 100644 --- a/source3/passdb/pdb_ldap.c +++ b/source3/passdb/pdb_ldap.c @@ -4814,7 +4814,7 @@ static bool ldapgroup2displayentry(struct ldap_search_state *state, break; default: - DEBUG(0,("unkown group type: %d\n", group_type)); + DEBUG(0,("unknown group type: %d\n", group_type)); return False; } @@ -6625,7 +6625,7 @@ NTSTATUS pdb_init_ldapsam(struct pdb_methods **pdb_method, const char *location) "info, nor add one to the domain\n")); DEBUGADD(2, ("pdb_init_ldapsam: Continuing on regardless, " "will be unable to allocate new users/groups, " - "and will risk BDCs having inconsistant SIDs\n")); + "and will risk BDCs having inconsistent SIDs\n")); sid_copy(&ldap_state->domain_sid, get_global_sam_sid()); return NT_STATUS_OK; } diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c index 68b53c747c..869fcad23d 100644 --- a/source3/printing/nt_printing.c +++ b/source3/printing/nt_printing.c @@ -144,7 +144,7 @@ const char *get_short_archi(const char *long_archi) { int i=-1; - DEBUG(107,("Getting architecture dependant directory\n")); + DEBUG(107,("Getting architecture dependent directory\n")); do { i++; } while ( (archi_table[i].long_archi!=NULL ) && diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c index 1db652210c..828d06aa1e 100644 --- a/source3/rpc_server/spoolss/srv_spoolss_nt.c +++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c @@ -3743,7 +3743,7 @@ WERROR _spoolss_RouterRefreshPrinterChangeNotify(struct pipes_struct *p, * We are now using the change value, and * I should check for PRINTER_NOTIFY_OPTIONS_REFRESH but as * I don't have a global notification system, I'm sending back all the - * informations even when _NOTHING_ has changed. + * information even when _NOTHING_ has changed. */ /* We need to keep track of the change value to send back in diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c index 02c3162d89..4eda9951b9 100644 --- a/source3/rpcclient/cmd_spoolss.c +++ b/source3/rpcclient/cmd_spoolss.c @@ -77,7 +77,7 @@ static const char *cmd_spoolss_get_short_archi(const char *long_archi) { int i=-1; - DEBUG(107,("Getting architecture dependant directory\n")); + DEBUG(107,("Getting architecture dependent directory\n")); do { i++; } while ( (archi_table[i].long_archi!=NULL ) && @@ -1722,7 +1722,7 @@ static WERROR cmd_spoolss_addprinterdriver(struct rpc_pipe_client *cli, arch = cmd_spoolss_get_short_archi(argv[1]); if (!arch) { - printf ("Error Unknown architechture [%s]\n", argv[1]); + printf ("Error Unknown architecture [%s]\n", argv[1]); return WERR_INVALID_PARAM; } diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c index 119b9b7c4a..4693b1dc16 100644 --- a/source3/rpcclient/rpcclient.c +++ b/source3/rpcclient/rpcclient.c @@ -586,7 +586,7 @@ static struct cmd_set rpcclient_commands[] = { { "seal", RPC_RTYPE_NTSTATUS, cmd_seal, NULL, NULL, NULL, "Force RPC pipe connections to be sealed", "" }, { "schannel", RPC_RTYPE_NTSTATUS, cmd_schannel, NULL, NULL, NULL, "Force RPC pipe connections to be sealed with 'schannel'. Assumes valid machine account to this domain controller.", "" }, { "schannelsign", RPC_RTYPE_NTSTATUS, cmd_schannel_sign, NULL, NULL, NULL, "Force RPC pipe connections to be signed (not sealed) with 'schannel'. Assumes valid machine account to this domain controller.", "" }, - { "timeout", RPC_RTYPE_NTSTATUS, cmd_timeout, NULL, NULL, NULL, "Set timeout (in milliseonds) for RPC operations", "" }, + { "timeout", RPC_RTYPE_NTSTATUS, cmd_timeout, NULL, NULL, NULL, "Set timeout (in milliseconds) for RPC operations", "" }, { "transport", RPC_RTYPE_NTSTATUS, cmd_choose_transport, NULL, NULL, NULL, "Choose ncacn transport for RPC operations", "" }, { "none", RPC_RTYPE_NTSTATUS, cmd_none, NULL, NULL, NULL, "Force RPC pipe connections to have no special properties", "" }, diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c index 45238049a6..3ee47b3e60 100644 --- a/source3/utils/net_ads.c +++ b/source3/utils/net_ads.c @@ -1830,7 +1830,7 @@ static int net_ads_printer_publish(struct net_context *c, int argc, const char * Undefined); if (NT_STATUS_IS_ERR(nt_status)) { - d_fprintf(stderr, _("Unable to open a connnection to %s to " + d_fprintf(stderr, _("Unable to open a connection to %s to " "obtain data for %s\n"), servername, printername); ads_destroy(&ads); @@ -1879,7 +1879,7 @@ static int net_ads_printer_publish(struct net_context *c, int argc, const char * nt_status = cli_rpc_pipe_open_noauth(cli, &ndr_table_spoolss.syntax_id, &pipe_hnd); if (!NT_STATUS_IS_OK(nt_status)) { - d_fprintf(stderr, _("Unable to open a connnection to the spoolss pipe on %s\n"), + d_fprintf(stderr, _("Unable to open a connection to the spoolss pipe on %s\n"), servername); SAFE_FREE(prt_dn); ads_destroy(&ads); diff --git a/source3/utils/net_rpc_printer.c b/source3/utils/net_rpc_printer.c index 0375490a56..6de0d4084b 100644 --- a/source3/utils/net_rpc_printer.c +++ b/source3/utils/net_rpc_printer.c @@ -1333,7 +1333,7 @@ static NTSTATUS rpc_printer_publish_internals_args(struct rpc_pipe_client *pipe_ break; default: action_str = N_("unknown action"); - printf(_("unkown action: %d\n"), action); + printf(_("unknown action: %d\n"), action); break; } @@ -1498,7 +1498,7 @@ NTSTATUS rpc_printer_publish_list_internals(struct net_context *c, sharename); break; default: - printf(_("unkown state: %d\n"), state); + printf(_("unknown state: %d\n"), state); break; } } diff --git a/source4/auth/credentials/credentials_krb5.c b/source4/auth/credentials/credentials_krb5.c index 97b18140af..ce0ae7e323 100644 --- a/source4/auth/credentials/credentials_krb5.c +++ b/source4/auth/credentials/credentials_krb5.c @@ -706,7 +706,7 @@ _PUBLIC_ int cli_credentials_get_server_gss_creds(struct cli_credentials *cred, ret = principal_from_credentials(mem_ctx, cred, smb_krb5_context, &princ, &obtained, &error_string); if (ret) { - DEBUG(1,("cli_credentials_get_server_gss_creds: makeing krb5 principal failed (%s)\n", + DEBUG(1,("cli_credentials_get_server_gss_creds: making krb5 principal failed (%s)\n", error_string)); talloc_free(mem_ctx); return ret; diff --git a/source4/cldap_server/netlogon.c b/source4/cldap_server/netlogon.c index baac3c8dff..6e455e46bd 100644 --- a/source4/cldap_server/netlogon.c +++ b/source4/cldap_server/netlogon.c @@ -189,7 +189,7 @@ NTSTATUS fill_netlogon_samlogon_response(struct ldb_context *sam_ctx, } if (dom_res == NULL) { - DEBUG(2,(__location__ ": Unable to get domain informations with no inputs\n")); + DEBUG(2,(__location__ ": Unable to get domain information with no inputs\n")); return NT_STATUS_NO_SUCH_DOMAIN; } 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; } diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c index 4d5382f37e..3e0000cdb2 100644 --- a/source4/rpc_server/netlogon/dcerpc_netlogon.c +++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c @@ -1470,7 +1470,7 @@ static NTSTATUS dcesrv_netr_LogonGetDomainInfo(struct dcesrv_call_state *dce_cal update_dns_hostname = false; } - /* Gets host informations and put them into our directory */ + /* Gets host information and put them into our directory */ new_msg = ldb_msg_new(mem_ctx); NT_STATUS_HAVE_NO_MEMORY(new_msg); @@ -1486,7 +1486,7 @@ static NTSTATUS dcesrv_netr_LogonGetDomainInfo(struct dcesrv_call_state *dce_cal } /* - * Sets informations from "os_version". On an empty structure + * Sets information from "os_version". On an empty structure * the values are cleared. */ if (r->in.query->workstation_info->os_version.os != NULL) { @@ -1620,7 +1620,7 @@ static NTSTATUS dcesrv_netr_LogonGetDomainInfo(struct dcesrv_call_state *dce_cal "msDS-SupportedEncryptionTypes", default_supported_enc_types); - /* Other host domain informations */ + /* Other host domain information */ lsa_policy_info = talloc(mem_ctx, struct netr_LsaPolicyInformation); diff --git a/source4/torture/ldap/basic.c b/source4/torture/ldap/basic.c index 1efdc06a8c..8a9a57f819 100644 --- a/source4/torture/ldap/basic.c +++ b/source4/torture/ldap/basic.c @@ -63,7 +63,7 @@ static bool test_multibind(struct ldap_connection *conn, const char *userdn, con { bool ret = true; - printf("Testing multiple binds on a single connnection as anonymous and user\n"); + printf("Testing multiple binds on a single connection as anonymous and user\n"); ret = test_bind_simple(conn, NULL, NULL); if (!ret) { diff --git a/source4/torture/rpc/forest_trust.c b/source4/torture/rpc/forest_trust.c index 2abb489eb4..3ef3f1d819 100644 --- a/source4/torture/rpc/forest_trust.c +++ b/source4/torture/rpc/forest_trust.c @@ -156,7 +156,7 @@ static bool test_create_trust_and_set_info(struct dcerpc_pipe *p, } else { if (strcmp(info->info_ex.netbios_name.string, trustinfo.netbios_name.string) != 0) { torture_comment(tctx, - "QueryTrustedDomainInfo returned inconsistant short name: %s != %s\n", + "QueryTrustedDomainInfo returned inconsistent short name: %s != %s\n", info->info_ex.netbios_name.string, trustinfo.netbios_name.string); ret = false; diff --git a/source4/torture/rpc/lsa.c b/source4/torture/rpc/lsa.c index 7bfd80f74c..aee0264210 100644 --- a/source4/torture/rpc/lsa.c +++ b/source4/torture/rpc/lsa.c @@ -2353,7 +2353,7 @@ static bool test_CreateTrustedDomain(struct dcerpc_binding_handle *b, ret = false; } else { if (strcmp(info->info_ex.netbios_name.string, trustinfo.name.string) != 0) { - torture_comment(tctx, "QueryTrustedDomainInfo returned inconsistant short name: %s != %s\n", + torture_comment(tctx, "QueryTrustedDomainInfo returned inconsistent short name: %s != %s\n", info->info_ex.netbios_name.string, trustinfo.name.string); ret = false; } @@ -2509,7 +2509,7 @@ static bool test_CreateTrustedDomainEx2(struct dcerpc_pipe *p, ret = false; } else { if (strcmp(info->info_ex.netbios_name.string, trustinfo.netbios_name.string) != 0) { - torture_comment(tctx, "QueryTrustedDomainInfo returned inconsistant short name: %s != %s\n", + torture_comment(tctx, "QueryTrustedDomainInfo returned inconsistent short name: %s != %s\n", info->info_ex.netbios_name.string, trustinfo.netbios_name.string); ret = false; } diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c index e05fe9bc67..70e1fd9ebb 100644 --- a/source4/torture/rpc/netlogon.c +++ b/source4/torture/rpc/netlogon.c @@ -590,7 +590,7 @@ static bool test_SetPassword2(struct torture_context *tctx, new_password.length = IVAL(password_buf.data, 512); torture_comment(tctx, - "Testing a third ServerPasswordSet2 on machine account, with a compleatly random password\n"); + "Testing a third ServerPasswordSet2 on machine account, with a completely random password\n"); netlogon_creds_client_authenticator(creds, &credential); diff --git a/source4/torture/winbind/struct_based.c b/source4/torture/winbind/struct_based.c index cb353158d4..e15c3b5bd8 100644 --- a/source4/torture/winbind/struct_based.c +++ b/source4/torture/winbind/struct_based.c @@ -782,7 +782,7 @@ static bool torture_winbind_struct_show_sequence(struct torture_context *torture uint32_t seq; torture_assert(torture, s[i].netbios_name, - "more domains recieved in second run"); + "more domains received in second run"); torture_assert_str_equal(torture, domlist[i].netbios_name, s[i].netbios_name, "inconsistent order of domain lists"); -- cgit