[SCM] Samba Shared Repository - branch master updated
Volker Lendecke
vlendec at samba.org
Wed Jan 26 12:40:02 UTC 2022
The branch, master has been updated
via 309f1982263 s4/auth/simple_bind: correctly report TLS state
via f3768274789 pytest:auth_log: expect TLS connections when using ldaps
via 891201f154a s3/torture/pdbtest: fix always false condition
via 851fc9d60d0 s4:libnet: Fix uninitialized value "seq_num"
via dbbad4b500a s4:libnet: Fix trailing whitespace in libnet_vampire.c
from d85461c4f5e s3: smbd: Rename "unix extensions" -> "smb1 unix extensions".
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 309f1982263677045d407463eb19a2444c165a63
Author: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Thu Dec 23 14:37:29 2021 +1300
s4/auth/simple_bind: correctly report TLS state
It went wrong in 366f8cf0903e3583fda42696df62a5337f22131f
Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Reviewed-by: Volker Lendecke <vl at samba.org>
Autobuild-User(master): Volker Lendecke <vl at samba.org>
Autobuild-Date(master): Wed Jan 26 12:39:52 UTC 2022 on sn-devel-184
commit f37682747898591b37405f9e96a8135c15638637
Author: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Wed Jan 26 15:53:45 2022 +1300
pytest:auth_log: expect TLS connections when using ldaps
Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 891201f154a2ca05b7fc8ec78492a79ee0bddafe
Author: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Thu Dec 9 18:06:15 2021 +1300
s3/torture/pdbtest: fix always false condition
BUG: https://bugzilla.samba.org/show_bug.cgi?id=9320
Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 851fc9d60d0e5ae3fe68fb22aa755acb3b926d32
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Tue Jan 25 21:05:26 2022 +0100
s4:libnet: Fix uninitialized value "seq_num"
Found by covscan.
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit dbbad4b500acbd684b350ba7065d602acf28a66a
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Tue Jan 25 21:09:54 2022 +0100
s4:libnet: Fix trailing whitespace in libnet_vampire.c
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
-----------------------------------------------------------------------
Summary of changes:
python/samba/tests/auth_log.py | 8 ++++----
source3/torture/pdbtest.c | 2 +-
source4/auth/ntlm/auth_simple.c | 4 ++--
source4/libnet/libnet_vampire.c | 22 +++++++++++-----------
4 files changed, 18 insertions(+), 18 deletions(-)
Changeset truncated at 500 lines:
diff --git a/python/samba/tests/auth_log.py b/python/samba/tests/auth_log.py
index d1e102bdcab..9949b0abe4d 100644
--- a/python/samba/tests/auth_log.py
+++ b/python/samba/tests/auth_log.py
@@ -565,7 +565,7 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase):
self.assertEqual("NT_STATUS_OK", msg["Authentication"]["status"])
self.assertEqual("LDAP",
msg["Authentication"]["serviceDescription"])
- self.assertEqual("simple bind",
+ self.assertEqual("simple bind/TLS",
msg["Authentication"]["authDescription"])
self.assertEqual(
EVT_ID_SUCCESSFUL_LOGON, msg["Authentication"]["eventId"])
@@ -579,7 +579,7 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase):
(msg["Authentication"]["status"] ==
"NT_STATUS_WRONG_PASSWORD") and
(msg["Authentication"]["authDescription"] ==
- "simple bind") and
+ "simple bind/TLS") and
(msg["Authentication"]["eventId"] ==
EVT_ID_UNSUCCESSFUL_LOGON) and
(msg["Authentication"]["logonType"] ==
@@ -611,7 +611,7 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase):
(msg["Authentication"]["status"] ==
"NT_STATUS_NO_SUCH_USER") and
(msg["Authentication"]["authDescription"] ==
- "simple bind") and
+ "simple bind/TLS") and
(msg["Authentication"]["eventId"] ==
EVT_ID_UNSUCCESSFUL_LOGON) and
(msg["Authentication"]["logonType"] ==
@@ -641,7 +641,7 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase):
(msg["Authentication"]["status"] ==
"NT_STATUS_NO_SUCH_USER") and
(msg["Authentication"]["authDescription"] ==
- "simple bind") and
+ "simple bind/TLS") and
(msg["Authentication"]["eventId"] ==
EVT_ID_UNSUCCESSFUL_LOGON) and
(msg["Authentication"]["logonType"] ==
diff --git a/source3/torture/pdbtest.c b/source3/torture/pdbtest.c
index 67a1aa0b2d5..d3895127af2 100644
--- a/source3/torture/pdbtest.c
+++ b/source3/torture/pdbtest.c
@@ -191,7 +191,7 @@ static bool samu_correct(struct samu *s1, struct samu *s2)
} else if (pdb_get_hours_len(s1) != 0) {
d1_buf = pdb_get_hours(s1);
d2_buf = pdb_get_hours(s2);
- if (d2_buf == NULL && d2_buf != NULL) {
+ if (d2_buf == NULL && d1_buf != NULL) {
DEBUG(0, ("Logon hours is not set\n"));
ret = False;
} else if (d1_buf == NULL) {
diff --git a/source4/auth/ntlm/auth_simple.c b/source4/auth/ntlm/auth_simple.c
index 8301aec519c..b2e76381395 100644
--- a/source4/auth/ntlm/auth_simple.c
+++ b/source4/auth/ntlm/auth_simple.c
@@ -88,9 +88,9 @@ _PUBLIC_ struct tevent_req *authenticate_ldap_simple_bind_send(TALLOC_CTX *mem_c
user_info->service_description = "LDAP";
if (using_tls) {
- user_info->auth_description = "simple bind";
- } else {
user_info->auth_description = "simple bind/TLS";
+ } else {
+ user_info->auth_description = "simple bind";
}
user_info->password_state = AUTH_PASSWORD_PLAIN;
diff --git a/source4/libnet/libnet_vampire.c b/source4/libnet/libnet_vampire.c
index 3f07b3f20d6..73adf675080 100644
--- a/source4/libnet/libnet_vampire.c
+++ b/source4/libnet/libnet_vampire.c
@@ -1,22 +1,22 @@
-/*
+/*
Unix SMB/CIFS implementation.
-
+
Extract the user/system database from a remote server
Copyright (C) Stefan Metzmacher 2004-2006
Copyright (C) Brad Henry 2005
Copyright (C) Andrew Bartlett <abartlet at samba.org> 2005-2008
-
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -45,16 +45,16 @@
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_DRS_REPL
-/*
+/*
List of tasks vampire.py must perform:
- Domain Join
- but don't write the secrets.ldb
- results for this should be enough to handle the provision
-- if vampire method is samsync
- - Provision using these results
+- if vampire method is samsync
+ - Provision using these results
- do we still want to support this NT4 technology?
- Start samsync with libnet code
- - provision in the callback
+ - provision in the callback
- Write out the secrets database, using the code from libnet_Join
*/
@@ -211,7 +211,7 @@ NTSTATUS libnet_vampire_cb_check_options(void *private_data,
DEBUG(0,("Options:crossRef behavior_version[%u]\n"
"\tschema object_version[%u]\n"
"\tdomain behavior_version[%u]\n"
- "\tdomain w2k3_update_revision[%u]\n",
+ "\tdomain w2k3_update_revision[%u]\n",
o->forest->crossref_behavior_version,
o->forest->schema_object_version,
o->domain->behavior_version,
@@ -589,7 +589,7 @@ WERROR libnet_vampire_cb_store_chunk(void *private_data,
struct repsFromTo1 *s_dsa;
char *tmp_dns_name;
uint32_t i;
- uint64_t seq_num;
+ uint64_t seq_num = 0;
bool is_exop = false;
struct ldb_dn *partition_dn = NULL;
struct ldb_dn *nc_root = NULL;
--
Samba Shared Repository
More information about the samba-cvs
mailing list