[SCM] Samba Shared Repository - branch master updated

2021-06-15 Thread Andrew Bartlett
The branch, master has been updated
   via  d37462d79a4 lib:ldb-samba: Migrate samba extensions to new cmdline 
option parser
   via  1d3af5d3363 lib:ldb-samba: Use talloc_zero_array() and use ldb as 
the mem context
   via  c2c7c1f50a8 lib:ldb-samba: Improve calculate_popt_array_length()
   via  a593065c7f2 lib:ldb: Use C99 initializers for builtin_popt_options[]
   via  ba32b542cdc s4:torture: Migrate masktest to new cmdline option 
parser
   via  caafb3cd4a2 s4:torture: Migrate locktest to new cmdline option 
parser
   via  c0034d309e1 s4:torture: Change -U|--user to --user1 and --user2
   via  b4c1f438455 s4:torture: Migrate gentest to new cmdline option parser
   via  2a0471df01f s4:torture: Change -U|--user to --user1 and --user2
   via  4b4fd5340a3 testprogs: Add smbtorture tests with new options
   via  a40bc1d0eec s4:torture: Migrate smbtorture to new cmdline option 
parser
   via  092d26af6ad s4:torture: Pass the pkinit ccache via a torture 
variable
   via  10caa8590c7 s4:torture: For NTLM make sure we have 
CRED_USE_KERBEROS_DESIRED
   via  59c97b09a82 s4:torture: Write better error on invalid cmdline option
   via  30fb11dafde s4:torture: Remove unused include
   via  48a5f934bbd s4:client: Migrate cifsdd to new cmdline option parser
   via  c01213471fe testprogs: Use new kerberos options for smbclient(4) 
tests
   via  b49a8605563 s4:client: Migrate smbclient4 to new cmdline option 
parser
   via  ea6c2fbfa97 s4:client: Use a creds helper variable
   via  db876e95b52 testprogs: Remove --debuglevel from 
test_kinit_trusts_mit.sh
  from  1f724a9f9bb heimdal_build: Use lib/asn1/rfc2459.opt rather than 
hard-coded

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit d37462d79a4063ac06d2f5e6514b7c082cc26b21
Author: Andreas Schneider 
Date:   Wed Dec 2 18:06:24 2020 +0100

lib:ldb-samba: Migrate samba extensions to new cmdline option parser

Signed-off-by: Andreas Schneider 
Reviewed-by: Andrew Bartlett 

Autobuild-User(master): Andrew Bartlett 
Autobuild-Date(master): Wed Jun 16 01:25:28 UTC 2021 on sn-devel-184

commit 1d3af5d336383a7511c50542f4262764309d8230
Author: Andreas Schneider 
Date:   Fri Dec 18 08:38:22 2020 +0100

lib:ldb-samba: Use talloc_zero_array() and use ldb as the mem context

Signed-off-by: Andreas Schneider 
Reviewed-by: Andrew Bartlett 

commit c2c7c1f50a8acb3169e19ba4329aa78839b66def
Author: Andreas Schneider 
Date:   Thu Dec 17 19:16:13 2020 +0100

lib:ldb-samba: Improve calculate_popt_array_length()

Note that memcmp() doesn't work well with padding bytes. So avoid it!

(gdb) ptype/o struct poptOption
/* offset|  size */  type = struct poptOption {
/*0  | 8 */const char *longName;
/*8  | 1 */char shortName;
/* XXX  3-byte hole  */
/*   12  | 4 */unsigned int argInfo;
/*   16  | 8 */void *arg;
/*   24  | 4 */int val;
/* XXX  4-byte hole  */
/*   32  | 8 */const char *descrip;
/*   40  | 8 */const char *argDescrip;

   /* total size (bytes):   48 */

Signed-off-by: Andreas Schneider 
Reviewed-by: Andrew Bartlett 

commit a593065c7f22e17434f33d0132cc6a7073acf414
Author: Andreas Schneider 
Date:   Thu Dec 17 11:56:08 2020 +0100

lib:ldb: Use C99 initializers for builtin_popt_options[]

Signed-off-by: Andreas Schneider 
Reviewed-by: Andrew Bartlett 

commit ba32b542cdc0a8f4164012e002e519c370ba2ff2
Author: Andreas Schneider 
Date:   Thu Dec 17 17:12:10 2020 +0100

s4:torture: Migrate masktest to new cmdline option parser

Signed-off-by: Andreas Schneider 
Reviewed-by: Andrew Bartlett 

commit caafb3cd4a229974a88d1b355890e31b65e15e8d
Author: Andreas Schneider 
Date:   Thu Dec 17 17:05:51 2020 +0100

s4:torture: Migrate locktest to new cmdline option parser

Signed-off-by: Andreas Schneider 
Reviewed-by: Andrew Bartlett 

commit c0034d309e18a888a93f0c42dcd0d95c35ce8bad
Author: Andreas Schneider 
Date:   Thu Dec 17 16:55:02 2020 +0100

s4:torture: Change -U|--user to --user1 and --user2

The '-U' option is already defined by the default cmdline parser!

Signed-off-by: Andreas Schneider 
Reviewed-by: Andrew Bartlett 

commit b4c1f438455c91f19957ab9b69c32947c55bdf79
Author: Andreas Schneider 
Date:   Thu Dec 17 16:25:08 2020 +0100

s4:torture: Migrate gentest to new cmdline option parser

Signed-off-by: Andreas Schneider 
Reviewed-by: Andrew Bartlett 

commit 2a0471df01fc81b638aa4b9c61714a6181f5e980
Author: Andreas Schneider 
Date:   Thu Dec 17 16:24:48 2020 +0100

s4:torture: Change -U|--user to --user1 and --user2

The '-U' option is already defined by the default cmdline 

[SCM] Samba Shared Repository - branch master updated

2021-06-15 Thread Andrew Bartlett
The branch, master has been updated
   via  1f724a9f9bb heimdal_build: Use lib/asn1/rfc2459.opt rather than 
hard-coded
   via  d84c4f68f00 heimdal_build: Add C99 struct initializer in 
source4/heimdal_build/krb5-glue.c
   via  59eac15a4ff build: in SAMBA_BINARY use TO_LIST(cflags)
   via  d62917d3d7e heimdal_build: Provide C defines showing which Kerberos 
library is in use
   via  7b4aef782cd gse_krb5: Provide keytab name in 
fill_mem_keytab_from_dedicated_keytab() error strings.
   via  a1fa1f695f9 heimdal_build: check for secure_getenv
   via  f810e9119f3 heimdal_build: Set up new build groups for the Heimdal 
hostcc components
   via  4be71c7a059 heimdal_build: Rework Heimdal warning handling
  from  7d0b6904cc4 docs: Improve wording, fix a typo

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 1f724a9f9bb5cf133bb21222cdc23eaad57eed85
Author: Andrew Bartlett 
Date:   Tue Jun 15 15:24:17 2021 +1200

heimdal_build: Use lib/asn1/rfc2459.opt rather than hard-coded

Based on patch by Stefan Metzmacher in his Heimdal upgrade branch

lib/asn1/rfc2459.opt imported from
lorikeet-heimdal-abartlet/lorikeet-heimdal-201107241840-plus-recent-changes
which is the closest tree I could find, and matches the options being
removed from the wscript_build file.

Signed-off-by: Andrew Bartlett 
Reviewed-by: Stefan Metzmacher 

Autobuild-User(master): Andrew Bartlett 
Autobuild-Date(master): Tue Jun 15 23:25:27 UTC 2021 on sn-devel-184

commit d84c4f68f00d4f2b941531235d3d5ba6da73ca6f
Author: Stefan Metzmacher 
Date:   Fri Nov 22 16:01:07 2019 +0100

heimdal_build: Add C99 struct initializer in 
source4/heimdal_build/krb5-glue.c

This avoids uninitiliased structure members in this dummy
structure we include to avoid including more of Heimdal.

Signed-off-by: Stefan Metzmacher 
Reviewed-by: Andrew Bartlett 

commit 59eac15a4ff17cdb52b2b28b120e3fee4b085b68
Author: Stefan Metzmacher 
Date:   Fri Nov 22 16:11:41 2019 +0100

build: in SAMBA_BINARY use TO_LIST(cflags)

This avoids unfortunate issues when the cflags is
already a list, as then -fPIC becomes ['-f', 'P', 'I', 'C'].

Signed-off-by: Stefan Metzmacher 
Reviewed-by: Andrew Bartlett 

commit d62917d3d7eeb9c5782d7230a4012b5a9235154f
Author: Stefan Metzmacher 
Date:   Thu Apr 2 07:31:33 2020 +

heimdal_build: Provide C defines showing which Kerberos library is in use

Squashed from patches by Stefan Metzmacher as part of his Heimdal update 
branch

Signed-off-by: Andrew Bartlett 
Signed-off-by: Stefan Metzmacher 
Reviewed-by: Stefan Metzmacher 

commit 7b4aef782cdc8d801b91a2538a942a4e5bab4f94
Author: Andrew Bartlett 
Date:   Mon Sep 25 15:18:34 2017 +1300

gse_krb5: Provide keytab name in fill_mem_keytab_from_dedicated_keytab() 
error strings.

Signed-off-by: Andrew Bartlett 
Reviewed-by: Stefan Metzmacher 

commit a1fa1f695f9387880218440b5787fd98396f107d
Author: Andrew Bartlett 
Date:   Tue Sep 26 12:01:37 2017 +1300

heimdal_build: check for secure_getenv

Signed-off-by: Andrew Bartlett 
Reviewed-by: Stefan Metzmacher 

commit f810e9119f3862bf238297f82940420c5bd2df4a
Author: Andrew Bartlett 
Date:   Tue Jun 15 13:50:48 2021 +1200

heimdal_build: Set up new build groups for the Heimdal hostcc components

This is based on various patches by Stefan Metzmacher in the patch set for
the Heimdal upgrade.

Signed-off-by: Andrew Bartlett 
Reviewed-by: Stefan Metzmacher 

commit 4be71c7a0594fd54fbf6949df49973cd4f9eabe8
Author: Andrew Bartlett 
Date:   Mon Jun 14 11:14:06 2021 +1200

heimdal_build: Rework Heimdal warning handling

If we have all the right -Wno-error flags then we can enable warnings
more generally, otherwise just set -Wno-strict-overflow (if available)

Adapted from patches by Stefan Metzmacher  in his
branch to update Heimdal.

Signed-off-by: Andrew Bartlett 
Reviewed-by: Stefan Metzmacher 

---

Summary of changes:
 buildtools/wafsamba/wafsamba.py | 14 +++---
 lib/replace/wscript |  2 +-
 source3/librpc/crypto/gse_krb5.c|  7 ++-
 source4/heimdal/lib/asn1/rfc2459.opt|  6 +++
 source4/heimdal_build/krb5-glue.c   | 18 +---
 source4/heimdal_build/wscript_build | 80 -
 source4/heimdal_build/wscript_configure | 13 --
 wscript_configure_embedded_heimdal  |  1 +
 wscript_configure_system_heimdal|  2 +
 wscript_configure_system_mitkrb5|  1 +
 10 files changed, 74 insertions(+), 70 deletions(-)
 create mode 100644 source4/heimdal/lib/asn1/rfc2459.opt


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/wafsamba.py 

[SCM] Samba Shared Repository - branch master updated

2021-06-15 Thread Jeremy Allison
The branch, master has been updated
   via  7d0b6904cc4 docs: Improve wording, fix a typo
   via  5f5c45a12d3 libsmbclient: Avoid a call to SMBC_errno() in 
SMBC_mkdir_ctx()
   via  f877d832095 libsmb: Factor out cli_status_to_errno() from 
cli_errno()
   via  35a43de18d5 rpc_server: Make get_domain_userlist() independent of 
errno
   via  76c1b77e79c rpc_server: Make errno return of get_logged_on_userlist 
explicit
   via  aa147153c10 rpc_server: Don't rely on TCP-bind() to return 
EADDRINUSE
  from  582030bae25 s3: torture: Add POSIX-SYMLINK-GETPATHINFO regression 
test.

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 7d0b6904cc4d5e66860f0f851ca1ccf539423c9d
Author: Volker Lendecke 
Date:   Sat Jun 12 08:33:42 2021 +0200

docs: Improve wording, fix a typo

Signed-off-by: Volker Lendecke 
Reviewed-by: Jeremy Allison 

Autobuild-User(master): Jeremy Allison 
Autobuild-Date(master): Tue Jun 15 19:02:18 UTC 2021 on sn-devel-184

commit 5f5c45a12d3f8a083bd6ee4e832b33d3518b05b3
Author: Volker Lendecke 
Date:   Tue Dec 15 17:15:21 2020 +0100

libsmbclient: Avoid a call to SMBC_errno() in SMBC_mkdir_ctx()

Signed-off-by: Volker Lendecke 
Reviewed-by: Jeremy Allison 

commit f877d832095fdaacd3b871966b9189faf8420f5f
Author: Volker Lendecke 
Date:   Tue Dec 15 17:05:34 2020 +0100

libsmb: Factor out cli_status_to_errno() from cli_errno()

cli_errno() calls far too many trivial but subtle functions, all
referencing cli->raw_status. This might be the first step towards
getting rid of that.

Signed-off-by: Volker Lendecke 
Reviewed-by: Jeremy Allison 

commit 35a43de18d541968a5a0de721b4ec429e61ad23b
Author: Volker Lendecke 
Date:   Sat Jun 12 20:46:20 2021 +0200

rpc_server: Make get_domain_userlist() independent of errno

In the "num_users==0" case (previously just return NULL) we depended
on errno==0 implicitly. When list_sessions() above in this routine had
to open smbXsrv_session_global, it could however happen that errno was
set. If then there were no users, get_domain_userlist() returned NULL
with errno set, which the callers interpreted then as a real error.

Signed-off-by: Volker Lendecke 
Reviewed-by: Jeremy Allison 

commit 76c1b77e79c273db4c768a899fa8383e9630dc59
Author: Volker Lendecke 
Date:   Sat Jun 12 20:39:49 2021 +0200

rpc_server: Make errno return of get_logged_on_userlist explicit

Signed-off-by: Volker Lendecke 
Reviewed-by: Jeremy Allison 

commit aa147153c10b94e2db40d772677efacd5d0b31ee
Author: Volker Lendecke 
Date:   Sat Jun 12 12:45:30 2021 +0200

rpc_server: Don't rely on TCP-bind() to return EADDRINUSE

socket_wrapper can't do EADDRINUSE because unix domain sockets don't
do it.

This currently works correctly because right now all RPC servers
either use explicit ports or all listen on the same socket.

The new code uses a static variable, so it only helps if a single
process listens for multiple RPC sockets. It won't work if multiple
processes start listening. But in case samba-dcerpcd goes in this will
be exactly the right thing to do.

Signed-off-by: Volker Lendecke 
Reviewed-by: Jeremy Allison 

---

Summary of changes:
 .../domain/dnszonetransferclientsallow.xml |  2 +-
 .../domain/dnszonetransferclientsdeny.xml  |  4 +-
 source3/libsmb/clierror.c  | 57 ++---
 source3/libsmb/libsmb_dir.c|  5 +-
 source3/libsmb/proto.h |  1 +
 source3/rpc_server/rpc_sock_helper.c   |  8 ++-
 source3/rpc_server/wkssvc/srv_wkssvc_nt.c  | 74 ++
 7 files changed, 94 insertions(+), 57 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/smbdotconf/domain/dnszonetransferclientsallow.xml 
b/docs-xml/smbdotconf/domain/dnszonetransferclientsallow.xml
index 902b6082379..cf017428c16 100644
--- a/docs-xml/smbdotconf/domain/dnszonetransferclientsallow.xml
+++ b/docs-xml/smbdotconf/domain/dnszonetransferclientsallow.xml
@@ -3,7 +3,7 @@
  type="cmdlist"
  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc;>
 
-   This option specifies the list IPs authorized to ask for dns zone
+   This option specifies the list of IPs authorized to ask for dns 
zone
transfer from bind DLZ module.

 
diff --git a/docs-xml/smbdotconf/domain/dnszonetransferclientsdeny.xml 
b/docs-xml/smbdotconf/domain/dnszonetransferclientsdeny.xml
index f88b15bf1ca..8ff8531e977 100644
--- a/docs-xml/smbdotconf/domain/dnszonetransferclientsdeny.xml
+++ b/docs-xml/smbdotconf/domain/dnszonetransferclientsdeny.xml
@@ -3,7 +3,7 @@
  type="cmdlist"
  

[SCM] Samba Shared Repository - branch master updated

2021-06-15 Thread Noel Power
The branch, master has been updated
   via  582030bae25 s3: torture: Add POSIX-SYMLINK-GETPATHINFO regression 
test.
  from  0ec865d9795 Fix for https://bugzilla.samba.org/show_bug.cgi?id=9634

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 582030bae25c65b2ae7176d427923c24b7e54220
Author: Jeremy Allison 
Date:   Mon Jun 14 16:34:14 2021 -0700

s3: torture: Add POSIX-SYMLINK-GETPATHINFO regression test.

This ensure we never blunder into indirecting a NULL fsp pointer
in the server. We already pass this, but this test will ensure
we continue to do so as we make fileserver changes.

Signed-off-by: Jeremy Allison 
Reviewed-by: Noel Power

Autobuild-User(master): Noel Power 
Autobuild-Date(master): Tue Jun 15 11:06:23 UTC 2021 on sn-devel-184

---

Summary of changes:
 source3/selftest/tests.py|   1 +
 source3/torture/proto.h  |   1 +
 source3/torture/test_posix.c | 251 +++
 source3/torture/torture.c|   4 +
 4 files changed, 257 insertions(+)


Changeset truncated at 500 lines:

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 4f82123c8f0..f79f4ac54fd 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -266,6 +266,7 @@ posix_tests = ["POSIX", "POSIX-APPEND", 
"POSIX-SYMLINK-ACL", "POSIX-SYMLINK-EA",
"POSIX-SYMLINK-CHMOD",
"POSIX-DIR-DEFAULT-ACL",
"POSIX-SYMLINK-RENAME",
+   "POSIX-SYMLINK-GETPATHINFO",
   ]
 
 for t in posix_tests:
diff --git a/source3/torture/proto.h b/source3/torture/proto.h
index 4e813c473b1..471609d2837 100644
--- a/source3/torture/proto.h
+++ b/source3/torture/proto.h
@@ -94,6 +94,7 @@ bool run_posix_symlink_chmod_test(int dummy);
 bool run_posix_dir_default_acl_test(int dummy);
 bool run_case_insensitive_create(int dummy);
 bool run_posix_symlink_rename_test(int dummy);
+bool run_posix_symlink_getpathinfo_test(int dummy);
 
 bool run_nbench2(int dummy);
 bool run_async_echo(int dummy);
diff --git a/source3/torture/test_posix.c b/source3/torture/test_posix.c
index dc25db4c985..85e4e6c510f 100644
--- a/source3/torture/test_posix.c
+++ b/source3/torture/test_posix.c
@@ -24,6 +24,7 @@
 #include "libsmb/proto.h"
 #include "../libcli/smb/smbXcli_base.h"
 #include "util_sd.h"
+#include "trans2.h"
 
 extern struct cli_credentials *torture_creds;
 extern fstring host, workgroup, share, password, username, myname;
@@ -1443,3 +1444,253 @@ out:
TALLOC_FREE(frame);
return correct;
 }
+
+/* List of info levels to try with a POSIX symlink path. */
+
+static struct {
+   uint32_t level;
+   const char *name;
+} posix_smb1_qpath_array[] = {
+  { SMB_INFO_STANDARD, "SMB_INFO_STANDARD"},
+  { SMB_INFO_QUERY_EA_SIZE,"SMB_INFO_QUERY_EA_SIZE"},
+  { SMB_INFO_IS_NAME_VALID,"SMB_INFO_IS_NAME_VALID"},
+  { SMB_INFO_QUERY_EAS_FROM_LIST,  "SMB_INFO_QUERY_EAS_FROM_LIST"},
+  { SMB_INFO_QUERY_ALL_EAS,"SMB_INFO_QUERY_ALL_EAS"},
+  { SMB_FILE_BASIC_INFORMATION,"SMB_FILE_BASIC_INFORMATION"},
+  { SMB_FILE_STANDARD_INFORMATION, "SMB_FILE_STANDARD_INFORMATION"},
+  { SMB_FILE_EA_INFORMATION,   "SMB_FILE_EA_INFORMATION"},
+  { SMB_FILE_ALTERNATE_NAME_INFORMATION,"SMB_FILE_ALTERNATE_NAME_INFORMATION"},
+  { SMB_QUERY_FILE_NAME_INFO,  "SMB_QUERY_FILE_NAME_INFO"},
+  { 
SMB_FILE_NORMALIZED_NAME_INFORMATION,"SMB_FILE_NORMALIZED_NAME_INFORMATION"},
+  { SMB_FILE_ALLOCATION_INFORMATION,   "SMB_FILE_ALLOCATION_INFORMATION"},
+  { SMB_FILE_END_OF_FILE_INFORMATION,  "SMB_FILE_END_OF_FILE_INFORMATION"},
+  { SMB_FILE_ALL_INFORMATION,  "SMB_FILE_ALL_INFORMATION"},
+  { SMB_FILE_INTERNAL_INFORMATION, "SMB_FILE_INTERNAL_INFORMATION"},
+  { SMB_FILE_ACCESS_INFORMATION,   "SMB_FILE_ACCESS_INFORMATION"},
+  { SMB_FILE_NAME_INFORMATION, "SMB_FILE_NAME_INFORMATION"},
+  { SMB_FILE_DISPOSITION_INFORMATION,  "SMB_FILE_DISPOSITION_INFORMATION"},
+  { SMB_FILE_POSITION_INFORMATION, "SMB_FILE_POSITION_INFORMATION"},
+  { SMB_FILE_MODE_INFORMATION, "SMB_FILE_MODE_INFORMATION"},
+  { SMB_FILE_ALIGNMENT_INFORMATION,"SMB_FILE_ALIGNMENT_INFORMATION"},
+  { SMB_FILE_STREAM_INFORMATION,   "SMB_FILE_STREAM_INFORMATION"},
+  { SMB_FILE_COMPRESSION_INFORMATION,  "SMB_FILE_COMPRESSION_INFORMATION"},
+  { SMB_FILE_NETWORK_OPEN_INFORMATION, "SMB_FILE_NETWORK_OPEN_INFORMATION"},
+  { SMB_FILE_ATTRIBUTE_TAG_INFORMATION, "SMB_FILE_ATTRIBUTE_TAG_INFORMATION"},
+  { SMB_QUERY_FILE_UNIX_BASIC, "SMB_QUERY_FILE_UNIX_BASIC"},
+  { SMB_QUERY_FILE_UNIX_INFO2, "SMB_QUERY_FILE_UNIX_INFO2"},
+  { SMB_QUERY_FILE_UNIX_LINK,  "SMB_QUERY_FILE_UNIX_LINK"},
+  { SMB_QUERY_POSIX_ACL,   "SMB_QUERY_POSIX_ACL"},
+