The branch, master has been updated via 55838a8... s4-heimdal: Fix typo in comment. via b0a9e5b... s3-winbindd: Fix typo in comment. via fce533e... examples: Fix typo in comment. via 6389fac... s3-docs: Fix typo in man idmap_ad. from a68eb37... s4:librpc/rpc: the python bindings should use !NT_STATUS_IS_OK instead of NT_STATUS_IS_ERR
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 55838a8c021020c057b514cc97d5196eaa313764 Author: Karolin Seeger <ksee...@samba.org> Date: Tue Apr 13 20:09:13 2010 +0200 s4-heimdal: Fix typo in comment. Karolin commit b0a9e5ba77ad56ba32a912acb288431c52aefcad Author: Karolin Seeger <ksee...@samba.org> Date: Tue Apr 13 20:08:22 2010 +0200 s3-winbindd: Fix typo in comment. Karolin commit fce533e3bed54e8b6255142f97d6b2a5ecf5f18d Author: Karolin Seeger <ksee...@samba.org> Date: Tue Apr 13 20:07:11 2010 +0200 examples: Fix typo in comment. Karolin commit 6389fac6db2f54d148222009b5e209cef5c6bdd7 Author: Karolin Seeger <ksee...@samba.org> Date: Tue Apr 13 20:06:14 2010 +0200 s3-docs: Fix typo in man idmap_ad. Karolin ----------------------------------------------------------------------- Summary of changes: docs-xml/manpages-3/idmap_ad.8.xml | 2 +- examples/libsmbclient/teststat2.c | 2 +- source3/winbindd/wb_group_members.c | 2 +- source4/heimdal/lib/hdb/hdb.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/manpages-3/idmap_ad.8.xml b/docs-xml/manpages-3/idmap_ad.8.xml index 8465b10..9b445df 100644 --- a/docs-xml/manpages-3/idmap_ad.8.xml +++ b/docs-xml/manpages-3/idmap_ad.8.xml @@ -58,7 +58,7 @@ <title>EXAMPLES</title> <para> The following example shows how to retrieve idmappings from our principal and - and trusted AD domains. If trusted domains are present id conflicts must be + trusted AD domains. If trusted domains are present id conflicts must be resolved beforehand, there is no guarantee on the order conflicting mappings would be resolved at this point. diff --git a/examples/libsmbclient/teststat2.c b/examples/libsmbclient/teststat2.c index d1cdf28..b5e6b43 100644 --- a/examples/libsmbclient/teststat2.c +++ b/examples/libsmbclient/teststat2.c @@ -8,7 +8,7 @@ /* * This test is intended to ensure that the timestamps returned by * libsmbclient are the same as timestamps returned by the local system. To - * test this, we assume a working Samba environment, and and access the same + * test this, we assume a working Samba environment, and access the same * file via SMB and locally (or NFS). * */ diff --git a/source3/winbindd/wb_group_members.c b/source3/winbindd/wb_group_members.c index a7eb9ba..3ab3cb2 100644 --- a/source3/winbindd/wb_group_members.c +++ b/source3/winbindd/wb_group_members.c @@ -269,7 +269,7 @@ static NTSTATUS wb_groups_members_recv(struct tevent_req *req, /* * This is the routine expanding a list of groups up to a certain level. We * collect the users in a talloc_dict: We have to add them without duplicates, - * and and talloc_dict is an indexed (here indexed by SID) data structure. + * and talloc_dict is an indexed (here indexed by SID) data structure. */ struct wb_group_members_state { diff --git a/source4/heimdal/lib/hdb/hdb.h b/source4/heimdal/lib/hdb/hdb.h index ad32a14..469a330 100644 --- a/source4/heimdal/lib/hdb/hdb.h +++ b/source4/heimdal/lib/hdb/hdb.h @@ -206,7 +206,7 @@ typedef struct HDB{ * Change password. * * Will update keys for the entry when given password. The new - * keys must be written into the entry and and will then later be + * keys must be written into the entry and will then later be * ->hdb_store() into the database. The backend will still perform * all other operations, increasing the kvno, and update * modification timestamp. -- Samba Shared Repository