[SCM] Samba Shared Repository - branch master updated
Jeremy Allison
jra at samba.org
Sat Sep 4 00:56:01 UTC 2021
The branch, master has been updated
via 02b18730336 Fix Python docstrings
via b59fc43523f python: Fix usage strings
via ad3498ab164 libcli/smb: Don't call memcpy() with a NULL pointer
via 3d490c225b5 s4/dnsserver: Fix NULL check
via 15f0d34d349 s4/dnsserver: Don't call memcpy() with a NULL pointer
via efcd1af17b4 dsdb/samdb/ldb_modules: Use correct member of union
from 59ed0992854 third_party: Update waf to version 2.0.22
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 02b187303369d3ce0c19dfb72ffa78f86a3911f0
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Wed Apr 28 16:48:55 2021 +1200
Fix Python docstrings
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
Autobuild-User(master): Jeremy Allison <jra at samba.org>
Autobuild-Date(master): Sat Sep 4 00:55:32 UTC 2021 on sn-devel-184
commit b59fc43523fb795bfab6846c266474873a15fdb9
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Tue May 11 11:21:21 2021 +1200
python: Fix usage strings
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit ad3498ab1643459719cdef24903379245ee9cefe
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Wed Jul 14 16:06:31 2021 +1200
libcli/smb: Don't call memcpy() with a NULL pointer
Doing so is undefined behaviour.
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 3d490c225b5beff668ec8be714d1f197b794dc9b
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Thu Sep 2 17:14:44 2021 +1200
s4/dnsserver: Fix NULL check
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 15f0d34d34926f576dc179f65ba397ad137baf46
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Wed Jul 14 16:09:01 2021 +1200
s4/dnsserver: Don't call memcpy() with a NULL pointer
Doing so is undefined behaviour.
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit efcd1af17b4dde0a075cef135ef6bf73a56a1bcc
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Wed Jul 14 16:10:09 2021 +1200
dsdb/samdb/ldb_modules: Use correct member of union
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
-----------------------------------------------------------------------
Summary of changes:
auth/credentials/tests/bind.py | 2 +-
lib/ldb/pyldb.c | 2 +-
lib/tdb/pytdb.c | 2 +-
lib/tevent/pytevent.c | 2 +-
libcli/smb/smb2_signing.c | 16 ++++++++++------
python/samba/tests/dns_tkey.py | 2 +-
source4/dns_server/dnsserver_common.c | 8 +++++---
source4/dsdb/samdb/ldb_modules/objectguid.c | 2 +-
source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 2 +-
source4/dsdb/tests/python/ad_dc_medley_performance.py | 2 +-
source4/dsdb/tests/python/ad_dc_multi_bind.py | 2 +-
source4/dsdb/tests/python/ad_dc_search_performance.py | 2 +-
source4/dsdb/tests/python/asq.py | 2 +-
source4/dsdb/tests/python/login_basics.py | 2 +-
source4/dsdb/tests/python/subtree_rename.py | 2 +-
source4/librpc/ndr/py_security.c | 2 +-
source4/scripting/bin/findprovisionusnranges | 2 +-
source4/scripting/bin/get-descriptors | 2 +-
source4/scripting/bin/rebuildextendeddn | 2 +-
source4/scripting/bin/renamedc | 2 +-
source4/scripting/bin/samba_downgrade_db | 2 +-
source4/scripting/bin/samba_upgradedns | 2 +-
source4/scripting/bin/samba_upgradeprovision | 2 +-
source4/scripting/devel/addlotscontacts | 2 +-
source4/scripting/devel/demodirsync.py | 2 +-
25 files changed, 38 insertions(+), 32 deletions(-)
Changeset truncated at 500 lines:
diff --git a/auth/credentials/tests/bind.py b/auth/credentials/tests/bind.py
index a256a930a8a..a38021b5ded 100755
--- a/auth/credentials/tests/bind.py
+++ b/auth/credentials/tests/bind.py
@@ -26,7 +26,7 @@ def create_credential(lp, other):
c.set_gensec_features(other.get_gensec_features())
return c
-parser = optparse.OptionParser("ldap [options] <host>")
+parser = optparse.OptionParser("bind [options] <host>")
sambaopts = options.SambaOptions(parser)
parser.add_option_group(sambaopts)
diff --git a/lib/ldb/pyldb.c b/lib/ldb/pyldb.c
index dadea2a7d6e..f849e7eb8e6 100644
--- a/lib/ldb/pyldb.c
+++ b/lib/ldb/pyldb.c
@@ -839,7 +839,7 @@ static PyMethodDef py_ldb_dn_methods[] = {
"S.get_component_value(num) -> string\n"
"get the attribute value of the specified component as a binary string" },
{ "set_component", (PyCFunction)py_ldb_dn_set_component, METH_VARARGS,
- "S.get_component_value(num, name, value) -> None\n"
+ "S.set_component(num, name, value) -> None\n"
"set the attribute name and value of the specified component" },
{ "get_rdn_name", (PyCFunction)py_ldb_dn_get_rdn_name, METH_NOARGS,
"S.get_rdn_name() -> string\n"
diff --git a/lib/tdb/pytdb.c b/lib/tdb/pytdb.c
index 2ea2042c1e5..e2f8ace227f 100644
--- a/lib/tdb/pytdb.c
+++ b/lib/tdb/pytdb.c
@@ -577,7 +577,7 @@ static PyMethodDef tdb_object_methods[] = {
{ "add_flags", (PyCFunction)obj_add_flags, METH_VARARGS, "S.add_flags(flags) -> None" },
{ "remove_flags", (PyCFunction)obj_remove_flags, METH_VARARGS, "S.remove_flags(flags) -> None" },
#if PY_MAJOR_VERSION >= 3
- { "keys", (PyCFunction)tdb_object_iter, METH_NOARGS, "S.iterkeys() -> iterator" },
+ { "keys", (PyCFunction)tdb_object_iter, METH_NOARGS, "S.keys() -> iterator" },
#else
{ "iterkeys", (PyCFunction)tdb_object_iter, METH_NOARGS, "S.iterkeys() -> iterator" },
#endif
diff --git a/lib/tevent/pytevent.c b/lib/tevent/pytevent.c
index 93375f71868..62dfe2419ff 100644
--- a/lib/tevent/pytevent.c
+++ b/lib/tevent/pytevent.c
@@ -573,7 +573,7 @@ static PyMethodDef py_tevent_context_methods[] = {
{ "add_timer", (PyCFunction)py_tevent_context_add_timer,
METH_VARARGS, "S.add_timer(next_event, handler) -> timer" },
{ "add_timer_offset", (PyCFunction)py_tevent_context_add_timer_offset,
- METH_VARARGS, "S.add_timer(offset_seconds, handler) -> timer" },
+ METH_VARARGS, "S.add_timer_offset(offset_seconds, handler) -> timer" },
{ "add_fd", (PyCFunction)py_tevent_context_add_fd,
METH_VARARGS, "S.add_fd(fd, flags, handler) -> fd" },
{0},
diff --git a/libcli/smb/smb2_signing.c b/libcli/smb/smb2_signing.c
index fdb69e90a07..fdb223aec64 100644
--- a/libcli/smb/smb2_signing.c
+++ b/libcli/smb/smb2_signing.c
@@ -978,9 +978,11 @@ NTSTATUS smb2_signing_encrypt_pdu(struct smb2_signing_key *encryption_key,
}
for (i = 1; i < count; i++) {
- memcpy(ptext + len,
- vector[i].iov_base,
- vector[i].iov_len);
+ if (vector[i].iov_base != NULL) {
+ memcpy(ptext + len,
+ vector[i].iov_base,
+ vector[i].iov_len);
+ }
len += vector[i].iov_len;
if (len > ptext_size) {
@@ -1010,9 +1012,11 @@ NTSTATUS smb2_signing_encrypt_pdu(struct smb2_signing_key *encryption_key,
len = 0;
for (i = 1; i < count; i++) {
- memcpy(vector[i].iov_base,
- ctext + len,
- vector[i].iov_len);
+ if (vector[i].iov_base != NULL) {
+ memcpy(vector[i].iov_base,
+ ctext + len,
+ vector[i].iov_len);
+ }
len += vector[i].iov_len;
}
diff --git a/python/samba/tests/dns_tkey.py b/python/samba/tests/dns_tkey.py
index 07316271d56..42f73ba2921 100644
--- a/python/samba/tests/dns_tkey.py
+++ b/python/samba/tests/dns_tkey.py
@@ -23,7 +23,7 @@ from samba.dcerpc import dns
from samba.tests.subunitrun import SubunitOptions, TestProgram
from samba.tests.dns_base import DNSTKeyTest
-parser = optparse.OptionParser("dns.py <server name> <server ip> [options]")
+parser = optparse.OptionParser("dns_tkey.py <server name> <server ip> [options]")
sambaopts = options.SambaOptions(parser)
parser.add_option_group(sambaopts)
diff --git a/source4/dns_server/dnsserver_common.c b/source4/dns_server/dnsserver_common.c
index d1f896d6755..71aeee8169d 100644
--- a/source4/dns_server/dnsserver_common.c
+++ b/source4/dns_server/dnsserver_common.c
@@ -283,7 +283,7 @@ static struct ldb_parse_tree *build_equality_operation(
value = &el->u.equality.value;
length = (add_asterix) ? size + 2 : size + 1;
value->data = talloc_zero_array(el, uint8_t, length);
- if (el == NULL) {
+ if (value->data == NULL) {
DBG_ERR("Unable to allocate value->data\n");
TALLOC_FREE(el);
return NULL;
@@ -292,8 +292,10 @@ static struct ldb_parse_tree *build_equality_operation(
value->length = length;
if (add_asterix) {
value->data[0] = '*';
- memcpy(&value->data[1], name, size);
- } else {
+ if (name != NULL) {
+ memcpy(&value->data[1], name, size);
+ }
+ } else if (name != NULL) {
memcpy(value->data, name, size);
}
return el;
diff --git a/source4/dsdb/samdb/ldb_modules/objectguid.c b/source4/dsdb/samdb/ldb_modules/objectguid.c
index bc3260cf0d8..093d6ed74ca 100644
--- a/source4/dsdb/samdb/ldb_modules/objectguid.c
+++ b/source4/dsdb/samdb/ldb_modules/objectguid.c
@@ -196,7 +196,7 @@ static int objectguid_modify(struct ldb_module *module, struct ldb_request *req)
ldb_debug(ldb, LDB_DEBUG_TRACE, "objectguid_modify_record\n");
/* do not manipulate our control entries */
- if (ldb_dn_is_special(req->op.add.message->dn)) {
+ if (ldb_dn_is_special(req->op.mod.message->dn)) {
return ldb_next_request(module, req);
}
diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
index fbeab0b1825..599cb79c1fd 100644
--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -3781,7 +3781,7 @@ static int replmd_rename(struct ldb_module *module, struct ldb_request *req)
struct ldb_request *down_req;
/* do not manipulate our control entries */
- if (ldb_dn_is_special(req->op.mod.message->dn)) {
+ if (ldb_dn_is_special(req->op.rename.olddn)) {
return ldb_next_request(module, req);
}
diff --git a/source4/dsdb/tests/python/ad_dc_medley_performance.py b/source4/dsdb/tests/python/ad_dc_medley_performance.py
index ebd63136639..010790d0a1a 100644
--- a/source4/dsdb/tests/python/ad_dc_medley_performance.py
+++ b/source4/dsdb/tests/python/ad_dc_medley_performance.py
@@ -39,7 +39,7 @@ from ldb import FLAG_MOD_ADD, FLAG_MOD_REPLACE, FLAG_MOD_DELETE
from ldb import SCOPE_BASE, SCOPE_SUBTREE, SCOPE_ONELEVEL
from ldb import ERR_NO_SUCH_OBJECT
-parser = optparse.OptionParser("ad_dc_performance.py [options] <host>")
+parser = optparse.OptionParser("ad_dc_medley_performance.py [options] <host>")
sambaopts = options.SambaOptions(parser)
sambaopts.add_option("-p", "--use-paged-search", action="store_true",
help="Use paged search module")
diff --git a/source4/dsdb/tests/python/ad_dc_multi_bind.py b/source4/dsdb/tests/python/ad_dc_multi_bind.py
index 73e1a6b9ba7..564fb9e0a85 100644
--- a/source4/dsdb/tests/python/ad_dc_multi_bind.py
+++ b/source4/dsdb/tests/python/ad_dc_multi_bind.py
@@ -36,7 +36,7 @@ from ldb import Message, MessageElement, Dn, LdbError
from ldb import FLAG_MOD_ADD, FLAG_MOD_REPLACE, FLAG_MOD_DELETE
from ldb import SCOPE_BASE, SCOPE_SUBTREE, SCOPE_ONELEVEL
-parser = optparse.OptionParser("ad_dc_mulit_bind.py [options] <host>")
+parser = optparse.OptionParser("ad_dc_multi_bind.py [options] <host>")
sambaopts = options.SambaOptions(parser)
parser.add_option_group(sambaopts)
parser.add_option_group(options.VersionOptions(parser))
diff --git a/source4/dsdb/tests/python/ad_dc_search_performance.py b/source4/dsdb/tests/python/ad_dc_search_performance.py
index 27f6cb3545c..0afd7a2582e 100644
--- a/source4/dsdb/tests/python/ad_dc_search_performance.py
+++ b/source4/dsdb/tests/python/ad_dc_search_performance.py
@@ -38,7 +38,7 @@ from ldb import Message, MessageElement, Dn, LdbError
from ldb import FLAG_MOD_ADD, FLAG_MOD_REPLACE, FLAG_MOD_DELETE
from ldb import SCOPE_BASE, SCOPE_SUBTREE, SCOPE_ONELEVEL
-parser = optparse.OptionParser("ad_dc_performance.py [options] <host>")
+parser = optparse.OptionParser("ad_dc_search_performance.py [options] <host>")
sambaopts = options.SambaOptions(parser)
parser.add_option_group(sambaopts)
parser.add_option_group(options.VersionOptions(parser))
diff --git a/source4/dsdb/tests/python/asq.py b/source4/dsdb/tests/python/asq.py
index 33973d66c37..72fa8bb9615 100644
--- a/source4/dsdb/tests/python/asq.py
+++ b/source4/dsdb/tests/python/asq.py
@@ -42,7 +42,7 @@ from ldb import SCOPE_SUBTREE, SCOPE_ONELEVEL, SCOPE_BASE, LdbError
from ldb import ERR_TIME_LIMIT_EXCEEDED, ERR_ADMIN_LIMIT_EXCEEDED, ERR_UNWILLING_TO_PERFORM
from ldb import Message
-parser = optparse.OptionParser("large_ldap.py [options] <host>")
+parser = optparse.OptionParser("asq.py [options] <host>")
sambaopts = options.SambaOptions(parser)
parser.add_option_group(sambaopts)
parser.add_option_group(options.VersionOptions(parser))
diff --git a/source4/dsdb/tests/python/login_basics.py b/source4/dsdb/tests/python/login_basics.py
index 09f8ea36ec8..91cc3c928f7 100755
--- a/source4/dsdb/tests/python/login_basics.py
+++ b/source4/dsdb/tests/python/login_basics.py
@@ -19,7 +19,7 @@ from password_lockout_base import BasePasswordTestCase
sys.path.insert(0, "bin/python")
-parser = optparse.OptionParser("password_lockout.py [options] <host>")
+parser = optparse.OptionParser("login_basics.py [options] <host>")
sambaopts = options.SambaOptions(parser)
parser.add_option_group(sambaopts)
parser.add_option_group(options.VersionOptions(parser))
diff --git a/source4/dsdb/tests/python/subtree_rename.py b/source4/dsdb/tests/python/subtree_rename.py
index df85d05eb4b..cace780a958 100644
--- a/source4/dsdb/tests/python/subtree_rename.py
+++ b/source4/dsdb/tests/python/subtree_rename.py
@@ -20,7 +20,7 @@ from samba.samdb import SamDB
from samba.dcerpc import misc
from samba import colour
-parser = optparse.OptionParser("linked_attributes.py [options] <host>")
+parser = optparse.OptionParser("subtree_rename.py [options] <host>")
sambaopts = options.SambaOptions(parser)
parser.add_option_group(sambaopts)
parser.add_option_group(options.VersionOptions(parser))
diff --git a/source4/librpc/ndr/py_security.c b/source4/librpc/ndr/py_security.c
index b5531d58304..e79e7170812 100644
--- a/source4/librpc/ndr/py_security.c
+++ b/source4/librpc/ndr/py_security.c
@@ -447,7 +447,7 @@ static PyMethodDef py_token_extra_methods[] = {
{ "has_sid", (PyCFunction)py_token_has_sid, METH_VARARGS,
NULL },
{ "is_anonymous", (PyCFunction)py_token_is_anonymous, METH_NOARGS,
- "S.is_anonymus() -> bool\n"
+ "S.is_anonymous() -> bool\n"
"Check whether this is an anonymous token." },
{ "is_system", (PyCFunction)py_token_is_system, METH_NOARGS,
NULL },
diff --git a/source4/scripting/bin/findprovisionusnranges b/source4/scripting/bin/findprovisionusnranges
index 909c9a1d8fc..b05b5cee3e8 100755
--- a/source4/scripting/bin/findprovisionusnranges
+++ b/source4/scripting/bin/findprovisionusnranges
@@ -33,7 +33,7 @@ from samba.upgradehelpers import get_paths, print_provision_ranges, findprovisio
from samba.ndr import ndr_unpack
from samba.dcerpc import misc
-parser = optparse.OptionParser("provision [options]")
+parser = optparse.OptionParser("findprovisionusnranges [options]")
sambaopts = options.SambaOptions(parser)
parser.add_option_group(sambaopts)
parser.add_option_group(options.VersionOptions(parser))
diff --git a/source4/scripting/bin/get-descriptors b/source4/scripting/bin/get-descriptors
index f9b9cd7d170..6e6922282f6 100755
--- a/source4/scripting/bin/get-descriptors
+++ b/source4/scripting/bin/get-descriptors
@@ -42,7 +42,7 @@ from samba import Ldb
from samba.samdb import SamDB
from ldb import SCOPE_SUBTREE, SCOPE_BASE
-parser = optparse.OptionParser("get-descriptor [options]")
+parser = optparse.OptionParser("get-descriptors [options]")
sambaopts = options.SambaOptions(parser)
credopts = options.CredentialsOptions(parser)
parser.add_option_group(credopts)
diff --git a/source4/scripting/bin/rebuildextendeddn b/source4/scripting/bin/rebuildextendeddn
index f5137f979d6..d5c0ecb7aa1 100755
--- a/source4/scripting/bin/rebuildextendeddn
+++ b/source4/scripting/bin/rebuildextendeddn
@@ -38,7 +38,7 @@ from samba import param
from samba.provision import ProvisionNames, provision_paths_from_lp
from samba.schema import get_dnsyntax_attributes, get_linked_attributes
-parser = optparse.OptionParser("provision [options]")
+parser = optparse.OptionParser("rebuildextendeddn [options]")
sambaopts = options.SambaOptions(parser)
parser.add_option_group(sambaopts)
parser.add_option_group(options.VersionOptions(parser))
diff --git a/source4/scripting/bin/renamedc b/source4/scripting/bin/renamedc
index ef3aa75db76..90618810039 100755
--- a/source4/scripting/bin/renamedc
+++ b/source4/scripting/bin/renamedc
@@ -36,7 +36,7 @@ from samba.upgradehelpers import get_ldbs, get_paths
__docformat__ = "restructuredText"
-parser = optparse.OptionParser("provision [options]")
+parser = optparse.OptionParser("renamedc [options]")
sambaopts = options.SambaOptions(parser)
parser.add_option_group(sambaopts)
parser.add_option_group(options.VersionOptions(parser))
diff --git a/source4/scripting/bin/samba_downgrade_db b/source4/scripting/bin/samba_downgrade_db
index 43a803c4e82..b9a09098a8a 100755
--- a/source4/scripting/bin/samba_downgrade_db
+++ b/source4/scripting/bin/samba_downgrade_db
@@ -34,7 +34,7 @@ from samba import getopt as options
from samba.samdb import SamDB
from samba.dbchecker import dbcheck
from samba.credentials import Credentials
-parser = optparse.OptionParser("sambaundoguididx")
+parser = optparse.OptionParser("samba_downgrade_db")
sambaopts = options.SambaOptions(parser)
parser.add_option_group(options.VersionOptions(parser))
parser.add_option("-H", "--URL", help="LDB URL for database",
diff --git a/source4/scripting/bin/samba_upgradedns b/source4/scripting/bin/samba_upgradedns
index 72e6a52e76e..ac2fdfca5ef 100755
--- a/source4/scripting/bin/samba_upgradedns
+++ b/source4/scripting/bin/samba_upgradedns
@@ -248,7 +248,7 @@ def cleanup_obsolete_dns_files(paths):
if __name__ == '__main__':
# Setup command line parser
- parser = optparse.OptionParser("upgradedns [options]")
+ parser = optparse.OptionParser("samba_upgradedns [options]")
sambaopts = options.SambaOptions(parser)
credopts = options.CredentialsOptions(parser)
diff --git a/source4/scripting/bin/samba_upgradeprovision b/source4/scripting/bin/samba_upgradeprovision
index da3f85c4ae9..c918462083d 100755
--- a/source4/scripting/bin/samba_upgradeprovision
+++ b/source4/scripting/bin/samba_upgradeprovision
@@ -153,7 +153,7 @@ def define_what_to_log(opts):
return what
-parser = optparse.OptionParser("provision [options]")
+parser = optparse.OptionParser("samba_upgradeprovision [options]")
sambaopts = options.SambaOptions(parser)
parser.add_option_group(sambaopts)
parser.add_option_group(options.VersionOptions(parser))
diff --git a/source4/scripting/devel/addlotscontacts b/source4/scripting/devel/addlotscontacts
index 8e6b27802ce..9ecd16b94ba 100644
--- a/source4/scripting/devel/addlotscontacts
+++ b/source4/scripting/devel/addlotscontacts
@@ -32,7 +32,7 @@ from samba.provision import find_provision_key_parameters
from samba.upgradehelpers import (get_paths, get_ldbs)
from ldb import SCOPE_BASE, Message, MessageElement, Dn, FLAG_MOD_ADD
-parser = optparse.OptionParser("chgtdcpass [options]")
+parser = optparse.OptionParser("addlotscontacts [options]")
sambaopts = options.SambaOptions(parser)
parser.add_option_group(sambaopts)
parser.add_option_group(options.VersionOptions(parser))
diff --git a/source4/scripting/devel/demodirsync.py b/source4/scripting/devel/demodirsync.py
index ec548ae2147..06eacf335a5 100755
--- a/source4/scripting/devel/demodirsync.py
+++ b/source4/scripting/devel/demodirsync.py
@@ -11,7 +11,7 @@ from samba.dcerpc import drsblobs, misc
from samba.ndr import ndr_pack, ndr_unpack
from samba import Ldb
-parser = optparse.OptionParser("get-descriptor [options]")
+parser = optparse.OptionParser("demodirsync [options]")
sambaopts = options.SambaOptions(parser)
credopts = options.CredentialsOptions(parser)
parser.add_option_group(credopts)
--
Samba Shared Repository
More information about the samba-cvs
mailing list