The branch, master has been updated
via 1f77710 s3:selftest: run the net rpc registry test under "s3dc"
instead "s3dc:local".
via db153f9 s3-net: Fixed a small typo in net conf function table
from 7542d8d s4:pyglue: PyArg_ParseTuple("I") requires an 'unsigned int'
argument
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 1f77710b0165976615ec840a1ca4b0542e3f6ace
Author: Michael Adam <[email protected]>
Date: Mon Aug 8 16:31:31 2011 +0200
s3:selftest: run the net rpc registry test under "s3dc" instead
"s3dc:local".
Autobuild-User: Michael Adam <[email protected]>
Autobuild-Date: Mon Aug 8 19:18:41 CEST 2011 on sn-devel-104
commit db153f96d2135d773735ea3bea5beca5c894dfb8
Author: Vicentiu Ciorbaru <[email protected]>
Date: Thu Jul 28 15:39:34 2011 +0300
s3-net: Fixed a small typo in net conf function table
The description of the function net conf delincludes had a wrong
usage message: "net conf setincludes" instead of "net conf delincludes".
Signed-off-by: Michael Adam <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
source3/selftest/tests.py | 2 +-
source3/utils/net_conf.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index cd0318c..23e4c6e 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -136,7 +136,7 @@ plantestsuite("samba3.blackbox.net.misc", "s3dc:local",
[os.path.join(samba3srcd
scriptdir,
"$SMB_CONF_PATH", configuration])
plantestsuite("samba3.blackbox.net.local.registry", "s3dc:local",
[os.path.join(samba3srcdir, "script/tests/test_net_registry.sh"),
scriptdir,
"$SMB_CONF_PATH", configuration])
-plantestsuite("samba3.blackbox.net.rpc.registry", "s3dc:local",
[os.path.join(samba3srcdir, "script/tests/test_net_registry.sh"),
+plantestsuite("samba3.blackbox.net.rpc.registry", "s3dc",
[os.path.join(samba3srcdir, "script/tests/test_net_registry.sh"),
scriptdir,
"$SMB_CONF_PATH", configuration, 'rpc'])
plantestsuite("samba3.blackbox.net.local.registry.roundtrip", "s3dc:local",
[os.path.join(samba3srcdir, "script/tests/test_net_registry_roundtrip.sh"),
diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index a79b788..b257ce1 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -1300,7 +1300,7 @@ int net_conf(struct net_context *c, int argc, const char
**argv)
net_conf_delincludes,
NET_TRANSPORT_LOCAL,
N_("Delete includes from a share definition."),
- N_("net conf setincludes\n"
+ N_("net conf delincludes\n"
" Delete includes from a share definition.")
},
{NULL, NULL, 0, NULL, NULL}
--
Samba Shared Repository
