The branch, master has been updated
via faad888... Ñ3: fix domain trust documentation confusion
from 9000b7b... s4:provision.py - simplify the "realm" variable handling
a bit
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit faad888e1a3bfd339df92d8d749e95034f64c80a
Author: Björn Jacke <[email protected]>
Date: Mon Oct 12 22:37:34 2009 +0200
Ñ3: fix domain trust documentation confusion
fix some trusted/trusting mixups, make documentation more precise
and man page more verbose.
-----------------------------------------------------------------------
Summary of changes:
docs-xml/manpages-3/net.8.xml | 12 ++++++++++--
source3/utils/net_rpc.c | 22 +++++++++++-----------
2 files changed, 21 insertions(+), 13 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/manpages-3/net.8.xml b/docs-xml/manpages-3/net.8.xml
index af037e0..8ab33d5 100644
--- a/docs-xml/manpages-3/net.8.xml
+++ b/docs-xml/manpages-3/net.8.xml
@@ -748,6 +748,9 @@ such as domain name, domain sid and number of users and
groups.
<para>Add a interdomain trust account for <replaceable>DOMAIN</replaceable>.
This is in fact a Samba account named <replaceable>DOMAIN$</replaceable>
with the account flag <constant>'I'</constant> (interdomain trust account).
+This is required for incoming trusts to work. It makes Samba be a
+trusted domain of the foreign (trusting) domain.
+Users of the Samba domain will be made available in the foreign domain.
If the command is used against localhost it has the same effect as
<command>smbpasswd -a -i DOMAIN</command>. Please note that both commands
expect a appropriate UNIX account.
@@ -769,8 +772,13 @@ it has the same effect as <command>smbpasswd -x
DOMAIN$</command>.
<title>RPC TRUSTDOM ESTABLISH <replaceable>DOMAIN</replaceable></title>
<para>
-Establish a trust relationship to a trusting domain.
+Establish a trust relationship to a trusted domain.
Interdomain account must already be created on the remote PDC.
+This is required for outgoing trusts to work. It makes Samba be a
+trusting domain of a foreign (trusted) domain.
+Users of the foreign domain will be made available in our domain.
+You'll need winbind and a working idmap config to make them
+appear in your system.
</para>
</refsect3>
@@ -784,7 +792,7 @@ Interdomain account must already be created on the remote
PDC.
<refsect3>
<title>RPC TRUSTDOM LIST</title>
-<para>List all current interdomain trust relationships.</para>
+<para>List all interdomain trust relationships.</para>
</refsect3>
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index be971d8..c3d002c 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -6029,7 +6029,7 @@ static int rpc_trustdom_list(struct net_context *c, int
argc, const char **argv)
if (c->display_usage) {
d_printf(_("Usage:\n"
"net rpc trustdom list\n"
- " List trust relationships\n"));
+ " List in- and outgoing trust relationships\n"));
return 0;
}
@@ -6300,41 +6300,41 @@ static int rpc_trustdom(struct net_context *c, int
argc, const char **argv)
"add",
rpc_trustdom_add,
NET_TRANSPORT_RPC,
- N_("Add trusted domain's account"),
+ N_("Add trusting domain's account"),
N_("net rpc trustdom add\n"
- " Add trusted domain's account")
+ " Add trusting domain's account")
},
{
"del",
rpc_trustdom_del,
NET_TRANSPORT_RPC,
- N_("Remove trusted domain's account"),
+ N_("Remove trusting domain's account"),
N_("net rpc trustdom del\n"
- " Remove trusted domain's account")
+ " Remove trusting domain's account")
},
{
"establish",
rpc_trustdom_establish,
NET_TRANSPORT_RPC,
- N_("Establish trust relationship"),
+ N_("Establish outgoing trust relationship"),
N_("net rpc trustdom establish\n"
- " Establish trust relationship")
+ " Establish outgoing trust relationship")
},
{
"revoke",
rpc_trustdom_revoke,
NET_TRANSPORT_RPC,
- N_("Revoke trust relationship"),
+ N_("Revoke outgoing trust relationship"),
N_("net rpc trustdom revoke\n"
- " Revoke trust relationship")
+ " Revoke outgoing trust relationship")
},
{
"list",
rpc_trustdom_list,
NET_TRANSPORT_RPC,
- N_("List domain trusts"),
+ N_("List in- and outgoing domain trusts"),
N_("net rpc trustdom list\n"
- " List domain trusts")
+ " List in- and outgoing domain trusts")
},
{
"vampire",
--
Samba Shared Repository
