[SCM] Samba Shared Repository - branch master updated
Andreas Schneider
asn at samba.org
Tue Feb 17 10:10:03 MST 2015
The branch, master has been updated
via 4bbfc54 lib: texpect. Fix the build on Solaris.
via 16a526b group.py: Fix wrong example option, remove wrong comment line
via a0cbce6 buildtools: Use separate storage for each function in runonce
via fcf4a89 Force rebuild of ldb if pyldb-util is not available.
via 92e2116 wscript: Expand tabs.
via bee48ac rpc_talloc: Update instructions to use standard unittest runner.
via 21c04ae Remove documentation for testsuite-count subunit extension, which is no longer used.
via f1f49e8 Update selftest README to point at upstream subunit repository for protocol description.
via bcbdc74 rpcclient: Fix and enhance rpcclient output
from 76c7918 lib/crypto: Document what crypto code is used for, and if GnuTLS supports it
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 4bbfc54d09d813d1fb827de5855ce40e8eab1095
Author: Tom Schulz <schulz at adi.com>
Date: Fri Feb 13 13:47:14 2015 -0800
lib: texpect. Fix the build on Solaris.
Bug 11092 - texpect requires routines err and errx
https://bugzilla.samba.org/show_bug.cgi?id=11092
Signed-off-by: Tom Schulz <schulz at adi.com>
Reviewed-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
Autobuild-Date(master): Tue Feb 17 18:09:52 CET 2015 on sn-devel-104
commit 16a526be4fa1ad2731abaec3906bc55099649269
Author: Marc Muehlfeld <mmuehlfeld at samba.org>
Date: Sat Jan 24 15:59:40 2015 +0100
group.py: Fix wrong example option, remove wrong comment line
Replaced "--gid" with the correct "--gid-number" in Example 3.
Additionally removed the first comment line in group.py, which
was wrong in that file.
Signed-off-by: Marc Muehlfeld <mmuehlfeld at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit a0cbce60f4dac2ef1086758299a48f2390e2e2ea
Author: Petr Viktorin <pviktori at redhat.com>
Date: Fri Jan 16 15:24:03 2015 +0100
buildtools: Use separate storage for each function in runonce
The runonce decorator used shared storage for all functions, and
dispatched only on arguments, so a call would be eliminated if
a different runonce function had already been called with the same
arguments.
Use separate storage for each decorated function.
Signed-off-by: Petr Viktorin <pviktori at redhat.com>
Reviewed-by: Simo Sorce <simo at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit fcf4a891945b22dc6eccdc71fd441f1a879f556a
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Jan 21 02:58:49 2015 +0100
Force rebuild of ldb if pyldb-util is not available.
This is necessary since pyldb-util uses ldb_private.h, so we want to
build against the same source ldb.
Change-Id: I802974b9eef7deb102fea15b67ec5f87e8e353bd
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 92e21167c32bb67f0a3c97b1e64e4372cb069e06
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Jan 21 02:58:48 2015 +0100
wscript: Expand tabs.
Change-Id: I2746f775accceeb2eeb02679f2c91b02085560b6
Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit bee48acad09ed85d8023eea910744cffef720dc3
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Jan 21 02:58:47 2015 +0100
rpc_talloc: Update instructions to use standard unittest runner.
Change-Id: Id90541b01073f1156ccba562ba750245aad091c2
Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 21c04ae404e8d21323c2e79060301e1174b11f7a
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Jan 21 02:58:46 2015 +0100
Remove documentation for testsuite-count subunit extension, which is no longer used.
Change-Id: Ie7f671fdac4f878e1eea157ee7e300977a68deb0
Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit f1f49e807c4b7f33cba2db4007e9445da2168cb4
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Jan 21 02:58:45 2015 +0100
Update selftest README to point at upstream subunit repository for protocol description.
Change-Id: I50c2a5e9847d269486cb5157357592004779704a
Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit bcbdc74b2618bdddb920feecf3e8bd7d11f12441
Author: Robin Hack <hack.robin at gmail.com>
Date: Fri Jan 30 13:18:20 2015 +0100
rpcclient: Fix and enhance rpcclient output
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11085
When rpcclient is called like:
$ rpcclient -c "getdata . Osversion"
at end of output is added one nonsense line
OsVersion: Osversion:
This patch removes this line and adds more human friendly ouput:
OsMajor: num
OsMinor: num
OsBuild: num
for OsVersion query.
For OsVersionEx two more lines are added:
OsMajor: num
OsMinor: num
OsBuild: num
ServicePackMajor: num
ServicePackMinor: num
Signed-off-by: Robin Hack <hack.robin at gmail.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
Signed-off-by: David Disseldorp <ddiss at samba.org>
Reviewed-by: Guenther Deschner <gd at samba.org>
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/samba_utils.py | 2 +-
lib/ldb/wscript | 10 ++++-----
lib/texpect/texpect.c | 5 +++++
lib/texpect/wscript | 2 +-
python/samba/netcmd/group.py | 3 +--
python/samba/tests/dcerpc/rpc_talloc.py | 2 +-
selftest/README | 39 ++++++++++++++-------------------
source3/rpcclient/cmd_spoolss.c | 12 ++++++++--
8 files changed, 41 insertions(+), 34 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py
index 9ac1066..df4a552 100644
--- a/buildtools/wafsamba/samba_utils.py
+++ b/buildtools/wafsamba/samba_utils.py
@@ -39,8 +39,8 @@ def GET_TARGET_TYPE(ctx, target):
# this is used as a decorator to make functions only
# run once. Based on the idea from
# http://stackoverflow.com/questions/815110/is-there-a-decorator-to-simply-cache-function-return-values
-runonce_ret = {}
def runonce(function):
+ runonce_ret = {}
def runonce_wrapper(*args):
if args in runonce_ret:
return runonce_ret[args]
diff --git a/lib/ldb/wscript b/lib/ldb/wscript
index 6391e74..1067a00 100755
--- a/lib/ldb/wscript
+++ b/lib/ldb/wscript
@@ -17,7 +17,7 @@ import wafsamba, samba_dist, Options, Utils
samba_dist.DIST_DIRS('''lib/ldb:. lib/replace:lib/replace lib/talloc:lib/talloc
lib/tdb:lib/tdb lib/tdb:lib/tdb lib/tevent:lib/tevent
- third_party/popt:third_party/popt
+ third_party/popt:third_party/popt
buildtools:buildtools''')
@@ -55,14 +55,14 @@ def configure(conf):
conf.env.standalone_ldb = conf.IN_LAUNCH_DIR()
if not conf.env.standalone_ldb:
- if conf.CHECK_BUNDLED_SYSTEM_PKG('ldb', minversion=VERSION,
- onlyif='talloc tdb tevent',
- implied_deps='replace talloc tdb tevent'):
- conf.define('USING_SYSTEM_LDB', 1)
if conf.CHECK_BUNDLED_SYSTEM_PKG('pyldb-util', minversion=VERSION,
onlyif='talloc tdb tevent ldb',
implied_deps='replace talloc tdb tevent ldb'):
conf.define('USING_SYSTEM_PYLDB_UTIL', 1)
+ if conf.CHECK_BUNDLED_SYSTEM_PKG('ldb', minversion=VERSION,
+ onlyif='talloc tdb tevent',
+ implied_deps='replace talloc tdb tevent'):
+ conf.define('USING_SYSTEM_LDB', 1)
if conf.env.standalone_ldb:
conf.CHECK_XSLTPROC_MANPAGES()
diff --git a/lib/texpect/texpect.c b/lib/texpect/texpect.c
index 75a32f4..9256b5e 100644
--- a/lib/texpect/texpect.c
+++ b/lib/texpect/texpect.c
@@ -52,7 +52,12 @@
#endif /* STREAMPTY */
#include <popt.h>
+
+#ifdef HAVE_ERR_H
#include <err.h>
+#else
+#include <ccan/err/err.h>
+#endif
struct command {
enum { CMD_EXPECT = 0, CMD_SEND, CMD_PASSWORD } type;
diff --git a/lib/texpect/wscript b/lib/texpect/wscript
index 62a1d4d..3dd4740 100644
--- a/lib/texpect/wscript
+++ b/lib/texpect/wscript
@@ -4,4 +4,4 @@ def configure(conf):
conf.CHECK_FUNCS_IN('openpty', 'util', checklibc=True, headers='pty.h util.h bsd/libutil.h libutil.h')
def build(bld):
- bld.SAMBA_BINARY('texpect', 'texpect.c', deps='popt util', install=False)
+ bld.SAMBA_BINARY('texpect', 'texpect.c', deps='popt util ccan', install=False)
diff --git a/python/samba/netcmd/group.py b/python/samba/netcmd/group.py
index 4b5fd27..722bcc4 100644
--- a/python/samba/netcmd/group.py
+++ b/python/samba/netcmd/group.py
@@ -1,4 +1,3 @@
-# Adds a new user to a Samba4 server
# Copyright Jelmer Vernooij 2008
#
# Based on the original in EJS:
@@ -72,7 +71,7 @@ sudo samba-tool group add Group2 --group-type=Distribution
Example2 adds a new distribution group to the local server. The command is run under root using the sudo command.
Example3:
-samba-tool group add Group3 --nis-domain=samdom --gid=12345
+samba-tool group add Group3 --nis-domain=samdom --gid-number=12345
Example3 adds a new RFC2307 enabled group for NIS domain samdom and GID 12345 (both options are required to enable this feature).
"""
diff --git a/python/samba/tests/dcerpc/rpc_talloc.py b/python/samba/tests/dcerpc/rpc_talloc.py
index c091f26..b1e2741 100644
--- a/python/samba/tests/dcerpc/rpc_talloc.py
+++ b/python/samba/tests/dcerpc/rpc_talloc.py
@@ -17,7 +17,7 @@
#
# to run this test, use one of these:
#
-# python -m testtools.run samba.tests.dcerpc.rpc_talloc
+# python -m unittest samba.tests.dcerpc.rpc_talloc
#
# or if you have trial installed (from twisted), use
#
diff --git a/selftest/README b/selftest/README
index d9ad020..c898c3c 100644
--- a/selftest/README
+++ b/selftest/README
@@ -1,22 +1,22 @@
# vim: ft=rst
This directory contains test scripts that are useful for running a
-bunch of tests all at once.
+bunch of tests all at once.
-There are two parts to this:
+There are two parts to this:
* The test runner (selftest/selftest.pl)
* The test formatter
-selftest.pl simply outputs subunit, which can then be formatted or analyzed
-by tools that understand the subunit protocol. One of these tools is
+selftest.pl simply outputs subunit, which can then be formatted or analyzed
+by tools that understand the subunit protocol. One of these tools is
format-subunit, which is used by default as part of "make test".
Available testsuites
====================
-The available testsuites are obtained from a script, usually
+The available testsuites are obtained from a script, usually
source{3,4}/selftest/tests.py. This script should for each testsuite output
-the name of the test, the command to run and the environment that should be
+the name of the test, the command to run and the environment that should be
provided. Use the included "plantest" function to generate the required output.
Testsuite behaviour
@@ -24,29 +24,24 @@ Testsuite behaviour
Exit code
------------
-The testsuites should exit with a non-zero exit code if at least one
+The testsuites should exit with a non-zero exit code if at least one
test failed. Skipped tests should not influence the exit code.
Output format
-------------
-Testsuites can simply use the exit code to indicate whether all of their
-tests have succeeded or one or more have failed. It is also possible to
-provide more granular information using the Subunit protocol.
+Testsuites can simply use the exit code to indicate whether all of their
+tests have succeeded or one or more have failed. It is also possible to
+provide more granular information using the Subunit protocol.
-This protocol works by writing simple messages to standard output. Any
-messages that can not be interpreted by this protocol are considered comments
+This protocol works by writing simple messages to standard output. Any
+messages that can not be interpreted by this protocol are considered comments
for the last announced test.
-For a full description of the subunit protocol, see ../lib/subunit/README.
+For a full description of the subunit protocol, see the README file in the subunit
+repository at http://github.com/testing-cabal/subunit.
The following commands are Samba extensions to Subunit:
-testsuite-count
-~~~~~~~~~~~~~~~
-testsuite-count: number
-
-Announce the number of tests that is going to be run.
-
start-testsuite
~~~~~~~~~~~~~~~
start-testsuite: name
@@ -73,8 +68,8 @@ Indicate that a testsuite has failed.
Environments
============
-Tests often need to run against a server with particular things set up,
-a "environment". This environment is provided by the test "target": Samba 3,
+Tests often need to run against a server with particular things set up,
+a "environment". This environment is provided by the test "target": Samba 3,
Samba 4 or Windows.
The environments are currently available include
@@ -87,7 +82,7 @@ The environments are currently available include
* PASSWORD: Administrator password
* DOMAIN: Domain name
* REALM: Realm name
- * SERVER: DC host name
+ * SERVER: DC host name
* SERVER_IP: DC IPv4 address
* SERVER_IPV6: DC IPv6 address
* NETBIOSNAME: DC NetBIOS name
diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c
index c2b1e3d..e2b9fc4 100644
--- a/source3/rpcclient/cmd_spoolss.c
+++ b/source3/rpcclient/cmd_spoolss.c
@@ -863,13 +863,17 @@ static void display_printer_data(const char *v,
}
TALLOC_FREE(hex);
putchar('\n');
+ putchar('\n');
if (strequal(v, "OsVersion")) {
struct spoolss_OSVersion os;
ndr_err = ndr_pull_struct_blob(&blob, talloc_tos(), &os,
(ndr_pull_flags_fn_t)ndr_pull_spoolss_OSVersion);
if (NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
- printf("%s: OsVersion:\n", v);
+ // add output here;
+ printf("OsMajor: %u\n", os.major);
+ printf("OsMinor: %u\n", os.minor);
+ printf("OsBuild: %u\n", os.build);
NDR_PRINT_DEBUG(spoolss_OSVersion, &os);
}
}
@@ -878,7 +882,11 @@ static void display_printer_data(const char *v,
ndr_err = ndr_pull_struct_blob(&blob, talloc_tos(), &os,
(ndr_pull_flags_fn_t)ndr_pull_spoolss_OSVersionEx);
if (NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
- printf("%s: OsVersionEx:\n", v);
+ printf("OsMajor: %u\n", os.major);
+ printf("OsMinor: %u\n", os.minor);
+ printf("OsBuild: %u\n", os.build);
+ printf("ServicePackMajor: %u\n", os.service_pack_major);
+ printf("ServicePackMinor: %u\n", os.service_pack_minor);
NDR_PRINT_DEBUG(spoolss_OSVersionEx, &os);
}
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list