date:20210311

[SCM] Samba Website Repository - branch master updated

2021-03-11 Thread Karolin Seeger

The branch, master has been updated
   via  9bd5846 history/samba-4.12.12.html: Fix typo.
  from  b4126ea Add Samba 4.12.12.

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


- Log -
commit 9bd5846b53254b1ef41c57c6bf19d42a7e923f43
Author: Karolin Seeger 
Date:   Fri Mar 12 08:38:29 2021 +0100

history/samba-4.12.12.html: Fix typo.

Signed-off-by: Karolin Seeger 

---

Summary of changes:
 history/samba-4.12.12.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/history/samba-4.12.12.html b/history/samba-4.12.12.html
index 5001430..81e608a 100644
--- a/history/samba-4.12.12.html
+++ b/history/samba-4.12.12.html
@@ -51,7 +51,7 @@ o  Björn Jacke 
* BUG 14624: classicupgrade: Treat old never expires value right.
 
 o  Volker Lendecke 
-   * BUG 1463: g_lock: Fix uninitalized variable reads.
+   * BUG 14636: g_lock: Fix uninitalized variable reads.
 
 o  Stefan Metzmacher 
* BUG 13898: s3:pysmbd: Fix fd leak in py_smbd_create_file().


-- 
Samba Website Repository

[SCM] Samba Shared Repository - branch master updated

2021-03-11 Thread Jeremy Allison

The branch, master has been updated
   via  16a1aefb72f smbd: call set_current_user_info() in 
smbd_become_authenticated_pipe_user()
   via  7662a77c4cb selftest: add a test for %U variable expansion in 
spoolssd
  from  11f3c852c75 s4:libnet_rpc: avoid reusing the assoc_group_id of the 
lsa connection

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


- Log -
commit 16a1aefb72f3cf2093f2cffe1bd0e2483b761e6f
Author: Ralph Boehme 
Date:   Thu Mar 11 11:20:52 2021 +0100

smbd: call set_current_user_info() in smbd_become_authenticated_pipe_user()

The current_user_info is updated at the SMB level, but currently not at the 
RPC
level in the RPC impersonation function 
smbd_become_authenticated_pipe_user().

For RPC services running embedded this is not an issue as the SMB level
impersonation has already taken care of current_user_info, but for RPC 
services
running as external daemons, eg spoolssd, the omission of updating
current_user_info results in variable expansion of eg %U (username) to be
broken.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14668
MR: https://gitlab.com/samba-team/samba/-/merge_requests/1834
RN: %U variable expansion not working in spoolsd

Signed-off-by: Ralph Boehme 
Reviewed-by: Björn Baumbach 
Reviewed-by: Jeremy Allison 

Autobuild-User(master): Jeremy Allison 
Autobuild-Date(master): Fri Mar 12 00:54:01 UTC 2021 on sn-devel-184

commit 7662a77c4cb473c431386c9b8014e846bc5e5882
Author: Ralph Boehme 
Date:   Thu Mar 11 14:46:28 2021 +0100

selftest: add a test for %U variable expansion in spoolssd

This targets the nt4_dc testenv which luckily already runs with spoolssd
enabled.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14668
MR: https://gitlab.com/samba-team/samba/-/merge_requests/1834

Signed-off-by: Ralph Boehme 
Reviewed-by: Björn Baumbach 
Reviewed-by: Jeremy Allison 

---

Summary of changes:
 selftest/target/Samba3.pm  |  5 +++
 .../tests/printing/printing_var_exp_lpr_cmd.sh |  7 
 source3/script/tests/test_printing_var_exp.sh  | 40 ++
 source3/selftest/tests.py  |  2 ++
 source3/smbd/uid.c |  4 +++
 5 files changed, 58 insertions(+)
 create mode 100755 source3/script/tests/printing/printing_var_exp_lpr_cmd.sh
 create mode 100755 source3/script/tests/test_printing_var_exp.sh


Changeset truncated at 500 lines:

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index a0c43aa842e..48ca3bf4688 100755
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -2490,6 +2490,11 @@ sub provision($$)
 [print3]
copy = print1
default devmode = no
+
+[print_var_exp]
+   copy = print1
+   print command = 
$self->{srcdir}/source3/script/tests/printing/printing_var_exp_lpr_cmd.sh 
\"Windows user: %U\" \"UNIX user: %u\" \"Domain: %D\"
+
 [lp]
copy = print1
 
diff --git a/source3/script/tests/printing/printing_var_exp_lpr_cmd.sh 
b/source3/script/tests/printing/printing_var_exp_lpr_cmd.sh
new file mode 100755
index 000..4a56a15eb94
--- /dev/null
+++ b/source3/script/tests/printing/printing_var_exp_lpr_cmd.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+rm -f /tmp/printing_var_exp.log
+
+for i in $(seq 1 $#) ; do
+eval echo "arg $i: \$$i" >> /tmp/printing_var_exp.log
+done
diff --git a/source3/script/tests/test_printing_var_exp.sh 
b/source3/script/tests/test_printing_var_exp.sh
new file mode 100755
index 000..6cfd6c00f29
--- /dev/null
+++ b/source3/script/tests/test_printing_var_exp.sh
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+if [ $# -lt 4 ]; then
+cat sanitized_username,
+ session_info->unix_info->unix_name,
+ session_info->info->domain_name);
+
set_sec_ctx(session_info->unix_token->uid, 
session_info->unix_token->gid,
session_info->unix_token->ngroups, 
session_info->unix_token->groups,
session_info->security_token);


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2021-03-11 Thread Jeremy Allison

The branch, master has been updated
   via  11f3c852c75 s4:libnet_rpc: avoid reusing the assoc_group_id of the 
lsa connection
   via  46e6f6ef843 ldb: correct comments in attrib_handers val_to_int64
   via  f67f95f009a util:str_sub: talloc_free on error
   via  c45e0896107 util: don't mark impure functions as pure
  from  6686db1132b samba-tool gpo: add missing newline to admxload warning

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


- Log -
commit 11f3c852c75035986de745a91686e83c1d36bb3e
Author: Stefan Metzmacher 
Date:   Thu Mar 11 15:27:01 2021 +0100

s4:libnet_rpc: avoid reusing the assoc_group_id of the lsa connection

This was an unexpected side effect introduced in commit
1b17d9a587bf3600d449c2481fe1191793479e32.

Signed-off-by: Stefan Metzmacher 
Reviewed-by: Jeremy Allison 

Autobuild-User(master): Jeremy Allison 
Autobuild-Date(master): Thu Mar 11 22:50:02 UTC 2021 on sn-devel-184

commit 46e6f6ef8436df7e083f34556c25f66f65ea1ce5
Author: Douglas Bagnall 
Date:   Sat Mar 6 09:57:44 2021 +1300

ldb: correct comments in attrib_handers val_to_int64

c.f. the identical static function in lib/ldb-samba/ldif_handlers.c

Signed-off-by: Douglas Bagnall 
Reviewed-by: Jeremy Allison 

commit f67f95f009a417aca2c636e4a6d17fa87325813e
Author: Douglas Bagnall 
Date:   Wed Mar 10 22:13:48 2021 +1300

util:str_sub: talloc_free on error

Signed-off-by: Douglas Bagnall 
Reviewed-by: Jeremy Allison 

commit c45e0896107ad1097b5cf76d8a60968320a7a737
Author: Douglas Bagnall 
Date:   Wed Mar 10 22:05:37 2021 +1300

util: don't mark impure functions as pure

nothing that allocates memory can be pure, unless it guarantees to
allocate exactly the same pointer very time (which it does not).

Signed-off-by: Douglas Bagnall 
Reviewed-by: Jeremy Allison 

---

Summary of changes:
 lib/ldb/common/attrib_handlers.c | 4 +---
 lib/util/samba_util.h| 4 ++--
 lib/util/substitute.c| 1 +
 lib/util/util.c  | 4 ++--
 source4/libnet/libnet_rpc.c  | 6 ++
 5 files changed, 12 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/ldb/common/attrib_handlers.c b/lib/ldb/common/attrib_handlers.c
index b5212b73159..11921ca429c 100644
--- a/lib/ldb/common/attrib_handlers.c
+++ b/lib/ldb/common/attrib_handlers.c
@@ -100,7 +100,7 @@ int ldb_handler_fold(struct ldb_context *ldb, void *mem_ctx,
return 0;
 }
 
-/* length limited conversion of a ldb_val to a int32_t */
+/* length limited conversion of a ldb_val to an int64_t */
 static int val_to_int64(const struct ldb_val *in, int64_t *v)
 {
char *end;
@@ -113,8 +113,6 @@ static int val_to_int64(const struct ldb_val *in, int64_t 
*v)
strncpy(buf, (char *)in->data, in->length);
buf[in->length] = 0;
 
-   /* We've to use "strtoll" here to have the intended overflows.
-* Otherwise we may get "LONG_MAX" and the conversion is wrong. */
*v = (int64_t) strtoll(buf, &end, 0);
if (*end != 0) {
return LDB_ERR_INVALID_ATTRIBUTE_SYNTAX;
diff --git a/lib/util/samba_util.h b/lib/util/samba_util.h
index f0bfa809d7b..4e279b72df1 100644
--- a/lib/util/samba_util.h
+++ b/lib/util/samba_util.h
@@ -237,12 +237,12 @@ _PUBLIC_ size_t strhex_to_str(char *p, size_t p_len, 
const char *strhex, size_t
 /** 
  * Parse a hex string and return a data blob. 
  */
-_PUBLIC_ _PURE_ DATA_BLOB strhex_to_data_blob(TALLOC_CTX *mem_ctx, const char 
*strhex) ;
+_PUBLIC_ DATA_BLOB strhex_to_data_blob(TALLOC_CTX *mem_ctx, const char 
*strhex) ;
 
 /**
  * Parse a hex dump and return a data blob
  */
-_PUBLIC_ _PURE_ DATA_BLOB hexdump_to_data_blob(TALLOC_CTX *mem_ctx, const char 
*hexdump, size_t len);
+_PUBLIC_ DATA_BLOB hexdump_to_data_blob(TALLOC_CTX *mem_ctx, const char 
*hexdump, size_t len);
 
 /**
  * Print a buf in hex. Assumes dst is at least (srclen*2)+1 large.
diff --git a/lib/util/substitute.c b/lib/util/substitute.c
index 3ca53d912c4..b7b5588da86 100644
--- a/lib/util/substitute.c
+++ b/lib/util/substitute.c
@@ -194,6 +194,7 @@ char *talloc_string_sub2(TALLOC_CTX *mem_ctx, const char 
*src,
in = talloc_strdup(mem_ctx, insert);
if (!in) {
DEBUG(0, ("talloc_string_sub2: ENOMEM\n"));
+   talloc_free(string);
return NULL;
}
ls = (ssize_t)strlen(s);
diff --git a/lib/util/util.c b/lib/util/util.c
index 57f19aaa1a1..7d7fb91e875 100644
--- a/lib/util/util.c
+++ b/lib/util/util.c
@@ -900,7 +900,7 @@ _PUBLIC_ size_t strhex_to_str(char *p, size_t p_len, const 
char *strhex, size_t
 /**
  * Parse a hex string and return a data blob.
  */
-_PUBLIC_ _PURE_ DATA_BLOB strhex_to_data_blob(TALLOC_CTX *mem_ctx, const char 
*strhex) 
+_PUBLIC_ DATA_BLOB s

[SCM] Samba Shared Repository - branch master updated

2021-03-11 Thread Björn Baumbach

The branch, master has been updated
   via  6686db1132b samba-tool gpo: add missing newline to admxload warning
   via  2d6bed495e1 samba-gpupdate: Check sysvol download paths in 
case-insensitive way
   via  554f2134a9f samba-gpupdate: Test that sysvol paths download in 
case-insensitive way
   via  6054564d4f2 samba-gpupdate: Enable the Startup Scripts Extension
   via  88c9c291b0b samba-tool: gpo manage sudoers handle missing and 
dispersed principal names
   via  bba91c462e6 samba-tool: Ensure that gpo manage sudoers handles 
missing/dispersed principal names
  from  9c682d794e6 Update status of SMB_VFS_SETXATTR

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


- Log -
commit 6686db1132b3a61c5b6bbbc80b9c8107f53b994b
Author: Björn Baumbach 
Date:   Tue Mar 9 13:11:08 2021 +0100

samba-tool gpo: add missing newline to admxload warning

Signed-off-by: Björn Baumbach 
Reviewed-by: David Mulder 

Autobuild-User(master): Björn Baumbach 
Autobuild-Date(master): Thu Mar 11 21:41:04 UTC 2021 on sn-devel-184

commit 2d6bed495e14349e19ba680bd72c3f110f1c397b
Author: David Mulder 
Date:   Tue Mar 9 11:13:40 2021 -0700

samba-gpupdate: Check sysvol download paths in case-insensitive way

https://bugzilla.samba.org/show_bug.cgi?id=14665

Signed-off-by: David Mulder 
Reviewed-by: Björn Baumbach 

commit 554f2134a9f9638ebd8ac2500e5b6c94b74c27d5
Author: David Mulder 
Date:   Tue Mar 9 12:30:14 2021 -0700

samba-gpupdate: Test that sysvol paths download in case-insensitive way

Bug: https://bugzilla.samba.org/show_bug.cgi?id=14665

Signed-off-by: David Mulder 
Reviewed-by: Björn Baumbach 

commit 6054564d4f2fa8b14e24d72f1655c559ad1ce016
Author: David Mulder 
Date:   Tue Mar 9 09:28:15 2021 -0700

samba-gpupdate: Enable the Startup Scripts Extension

Signed-off-by: David Mulder 
Reviewed-by: Björn Baumbach 

commit 88c9c291b0b928fc404d9f19eb55c5fa62266f93
Author: David Mulder 
Date:   Tue Mar 9 09:16:27 2021 -0700

samba-tool: gpo manage sudoers handle missing and dispersed principal names

If we don't anticipate a missing principal name,
samba-tool crashes. Also, principal names could
be in dispersed listelements.

Signed-off-by: David Mulder 
Reviewed-by: Björn Baumbach 

commit bba91c462e697d91496e7d7f31d85b46422db6fa
Author: David Mulder 
Date:   Tue Mar 9 14:14:24 2021 -0700

samba-tool: Ensure that gpo manage sudoers handles missing/dispersed 
principal names

Signed-off-by: David Mulder 
Reviewed-by: Björn Baumbach 

---

Summary of changes:
 python/samba/gpclass.py  |  5 +--
 python/samba/netcmd/gpo.py   | 12 ++--
 python/samba/tests/gpo.py| 10 ++
 python/samba/tests/samba_tool/gpo.py | 59 
 source4/scripting/bin/samba-gpupdate |  2 ++
 5 files changed, 83 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/python/samba/gpclass.py b/python/samba/gpclass.py
index 51b006f7f7f..7d3841ba8da 100644
--- a/python/samba/gpclass.py
+++ b/python/samba/gpclass.py
@@ -393,8 +393,9 @@ def cache_gpo_dir(conn, cache, sub_dir):
 
 def check_safe_path(path):
 dirs = re.split('/|', path)
-if 'sysvol' in path:
-dirs = dirs[dirs.index('sysvol') + 1:]
+if 'sysvol' in path.lower():
+ldirs = re.split('/|', path.lower())
+dirs = dirs[ldirs.index('sysvol') + 1:]
 if '..' not in dirs:
 return os.path.join(*dirs)
 raise OSError(path)
diff --git a/python/samba/netcmd/gpo.py b/python/samba/netcmd/gpo.py
index cb70367509e..1b4159c4c0c 100644
--- a/python/samba/netcmd/gpo.py
+++ b/python/samba/netcmd/gpo.py
@@ -1674,7 +1674,7 @@ class cmd_admxload(Command):
 'in the Group Policy Management Console. You will '
 'need to install these templates '
 'from https://www.microsoft.com/en-us/download/102157 '
-'to continue using Windows Administrative Templates. ')
+'to continue using Windows Administrative 
Templates.\n')
 
 class cmd_add_sudoers(Command):
 """Adds a Samba Sudoers Group Policy to the sysvol
@@ -1859,7 +1859,10 @@ samba-tool gpo manage sudoers list 
{31B2F340-016D-11D2-945F-00C04FB984F9}
 for entry in data.findall('sudoers_entry'):
 command = entry.find('command').text
 user = entry.find('user').text
-principals = entry.find('listelement').findall('principal')
+listelements = entry.findall('listelement')
+principals = []
+for listelement in listelements:
+principals.extend(listelement.findall('principal'))
 if len(principals) > 0:

[SCM] Samba Shared Repository - branch master updated

2021-03-11 Thread Jeremy Allison

The branch, master has been updated
   via  9c682d794e6 Update status of SMB_VFS_SETXATTR
   via  82e14026360 VFS: Remove SMB_VFS_SETXATTR, no longer used
   via  48d18f451ec s3/modules: snapper: Add missing fsetxattr_fn impl
   via  fabfe6fbe58 s3/modules: shadow_copy2: Add new fsetxattr_fn 
implementation
   via  a7d81d8e279 s3/modules: ceph_snapshots: Add missing fsetxattr_fn 
implementation
   via  a7e2ecca855 s2/modules: nfs4acl_smb4acl_set_fn 
SMB_VFS_NEXT_SETXATTR -> SMB_VFS_NEXT_FFSETXATTR
   via  b9efb0a5947 s3/modules: fake_acls_lchown use SMB_VFS_NEXT_FSET
   via  40a376e1881 s3/modules: fake_acls: SMB_VFS_NEXT_SETXATTR -> 
SMB_VFS_NEXT_FSETXATTR
   via  e592cb8dcb5 s3/lib: SMB_VFS_NEXT_SETXATTR -> SMB_VFS_NEXT_FSETXATTR
   via  1a8b3844403 s3/torture: SMB_VFS_SETXATTR -> SMB_VFS_FSETXATTR
   via  1fd550f2b4c s3/modules: stream_dir make sure mark_file_valid is 
called with fsp
   via  055e87233e2 s3/modules: streams_xattr_renameat SMB_VFS_SETXATTR -> 
SMB_VFS_FSETXATTR
   via  86d645a71b0 s3/modules: streams_xattr: Fix fname passed to SETXATTR
   via  ee4afd5955c s3/modules: streams_xattr_ftruncate SMB_VFS_SETXATTR -> 
SMB_VFS_FSETXATTR
   via  c02cdcd5fb9 s3/modules: streams_xattr_pwrite SMB_VFS_SETXATTR -> 
SMB_VFS_FSETXATTR
   via  147183e24a6 streams_xattr_openat SMB_VFS_SETXATTR -> 
SMB_VFS_FSETXATTR
   via  17054bfa9f7 s3/modules: vfs_acl_xattr SMB_VFS_SETXATTR -> 
SMB_VFS_FSETXATTR
   via  6427753864b s3/smbd: Detect and fail attempt to 
set_ea_dos_attribute on link
   via  221573de213 s3/smbd: SMB_VFS_SETXATTR => SMB_VFS_FSETXATTR
   via  4031206478e s3/smbd: set_create_timespec_ea should create smb_fname 
with valid fsp
   via  b05b13ccec8 s3/smb3: ensure file_set_dosmode is passed valid 
smb_fname->fsp
   via  470b6223e72 s3/smb3: ensure file_set_dosmode is passed valid 
smb_fname->fsp
   via  73a46ac9f34 s3/smb3: ensure file_set_dosmode is passed valid 
smb_fname->fsp
   via  14564477d55 s3/modules: ensure catia_set_dos_attributes passes on 
pathref
   via  0f0b945c1aa s3/smbd: posix_acls SMB_VFS_SETXATTR -> 
SMB_VFS_FSETXATTR
   via  a241e9b3d43 s3/modules: posixacl convert from SMB_VFS_SETXATTR -> 
SMB_VFS_FSETXATTR
   via  6b725386992 s3/lib: adouble SMB_VFS_SETXATTR => SMB_VFS_FSETXATTR
   via  ecd83a5877e s3/smbd: set_ea SMB_VFS_FSETXATTR => SMB_VFS_FSETXATTR
  from  0e789ba1802 idmap_nss: Do not return SID from unixids_to_sids on 
type mismatch

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


- Log -
commit 9c682d794e6cf678991a5de1a671764462ea458e
Author: Noel Power 
Date:   Mon Mar 1 15:22:32 2021 +

Update status of SMB_VFS_SETXATTR

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

Autobuild-User(master): Jeremy Allison 
Autobuild-Date(master): Thu Mar 11 18:58:46 UTC 2021 on sn-devel-184

commit 82e1402636015f5109aedda41318e5d67b988941
Author: Noel Power 
Date:   Fri Feb 19 10:39:49 2021 +

VFS: Remove SMB_VFS_SETXATTR, no longer used

   ---
  /   \
 /  REST   \
/IN \
   /PEACE\
  /   \
  |   |
  |   SMB_VFS_SETXATTR|
  |   |
  |   |
  |   19 February |
  |  2021 |
  |   |
  |   |
 *| *  *  *   | *
_)/\\_//(\/(/\)/\//\/\|_)___

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

Signed-off-by: Noel Power 

commit 48d18f451ec2521b8af9883feff965b6c523438e
Author: Noel Power 
Date:   Wed Mar 10 09:24:04 2021 +

s3/modules: snapper: Add missing fsetxattr_fn impl

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

commit fabfe6fbe58dc2c3d8c7615165ec7c7933e4e9cd
Author: Noel Power 
Date:   Fri Feb 19 15:03:01 2021 +

s3/modules: shadow_copy2: Add new fsetxattr_fn implementation

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

commit a7d81d8e27900a93f56b76e95063b998bdda9bc6
Author: Noel Power 
Date:   Fri Feb 19 14:51:14 2021 +

s3/modules: ceph_snapshots: Add missing fsetxattr_fn implementation

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

commit a7e2ecca8559eac524f32f4306859a2773da3b61
Au

[SCM] Samba Website Repository - branch master updated

2021-03-11 Thread Karolin Seeger

The branch, master has been updated
   via  b4126ea Add Samba 4.12.12.
   via  7610e1f NEWS[4.12.12]: Samba 4.12.12 Available for Download
  from  51f2c9e Add Samba 4.14.0.

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


- Log -
commit b4126ea096b7b40c8d2143517151a2450ce37b5e
Author: Karolin Seeger 
Date:   Thu Mar 11 12:48:13 2021 +0100

Add Samba 4.12.12.

Signed-off-by: Karolin Seeger 

commit 7610e1f64b783e1d72c48e9688ec33567b0eed9e
Author: Karolin Seeger 
Date:   Thu Mar 11 12:45:36 2021 +0100

NEWS[4.12.12]: Samba 4.12.12 Available for Download

Signed-off-by: Karolin Seeger 

---

Summary of changes:
 history/header_history.html   |  1 +
 history/samba-4.12.12.html| 71 +++
 posted_news/20210311-114752.4.12.12.body.html | 13 +
 posted_news/20210311-114752.4.12.12.headline.html |  3 +
 4 files changed, 88 insertions(+)
 create mode 100644 history/samba-4.12.12.html
 create mode 100644 posted_news/20210311-114752.4.12.12.body.html
 create mode 100644 posted_news/20210311-114752.4.12.12.headline.html


Changeset truncated at 500 lines:

diff --git a/history/header_history.html b/history/header_history.html
index 44b0570..f079984 100755
--- a/history/header_history.html
+++ b/history/header_history.html
@@ -16,6 +16,7 @@
samba-4.13.2
samba-4.13.1
samba-4.13.0
+   samba-4.12.12
samba-4.12.11
samba-4.12.10
samba-4.12.9
diff --git a/history/samba-4.12.12.html b/history/samba-4.12.12.html
new file mode 100644
index 000..5001430
--- /dev/null
+++ b/history/samba-4.12.12.html
@@ -0,0 +1,71 @@
+http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+http://www.w3.org/1999/xhtml";>
+
+Samba 4.12.12 - Release Notes
+
+
+Samba 4.12.12 Available for Download
+
+https://download.samba.org/pub/samba/stable/samba-4.12.12.tar.gz";>Samba 
4.12.12 (gzipped)
+https://download.samba.org/pub/samba/stable/samba-4.12.12.tar.asc";>Signature
+
+
+https://download.samba.org/pub/samba/patches/samba-4.12.11-4.12.12.diffs.gz";>Patch
 (gzipped) against Samba 4.12.11
+https://download.samba.org/pub/samba/patches/samba-4.12.11-4.12.12.diffs.asc";>Signature
+
+
+
+   ===
+   Release Notes for Samba 4.12.12
+   March 11, 2021
+   ===
+
+
+This is the latest stable release of the Samba 4.12 release series.
+Please note that this will be the last bugfix release of the Samba 4.12 release
+series. There will be Security Releases only beyond this point.
+
+
+Changes since 4.12.11
+-
+
+o  Trever L. Adams <trever.ad...@gmail.com>
+   * BUG 14634: s3:modules:vfs_virusfilter: Recent talloc changes cause 
infinite
+ start-up failure.
+
+o  Jeremy Allison <j...@samba.org>
+   * BUG 13992: SAMBA RPC share error.
+   * BUG 14612: s3: smbd: Add call to conn_setup_case_options() to
+ create_conn_struct_as_root().
+
+o  Ralph Boehme <s...@samba.org>
+   * BUG 14602: s3/auth: Implement "winbind:ignore domains".
+   * BUG 14612: build: Remove smbd_conn private library.
+
+o  Peter Eriksson <p...@lysator.liu.se>
+   * BUG 14648: s3: VFS: nfs4_acls. Add missing TALLOC_FREE(frame) in error
+ path.
+
+o  Björn Jacke <b...@sernet.de>
+   * BUG 14624: classicupgrade: Treat old never expires value right.
+
+o  Volker Lendecke <v...@samba.org>
+   * BUG 1463: g_lock: Fix uninitalized variable reads.
+
+o  Stefan Metzmacher <me...@samba.org>
+   * BUG 13898: s3:pysmbd: Fix fd leak in py_smbd_create_file().
+   * BUG 14607: Work around special SMB2 IOCTL response behavior of NetApp
+ Ontap 7.3.7.
+
+o  Andreas Schneider <a...@samba.org>
+   * BUG 14625: Fix smbd share mode double free crash.
+
+o  Paul Wise <pa...@bonedaddy.net>
+   * BUG 12505: HEIMDAL: krb5_storage_free(NULL) should work.
+
+
+
+
+
+
diff --git a/posted_news/20210311-114752.4.12.12.body.html 
b/posted_news/20210311-114752.4.12.12.body.html
new file mode 100644
index 000..94ca1dc
--- /dev/null
+++ b/posted_news/20210311-114752.4.12.12.body.html
@@ -0,0 +1,13 @@
+
+11 March 2021
+Samba 4.12.12 Available for Download
+
+This is the latest stable release of the Samba 4.12 release series.
+
+
+The uncompressed tarball has been signed using GnuPG (ID AA99442FB680B620).
+The source code can be https://download.samba.org/pub/samba/stable/samba-4.12.12.tar.gz";>downloaded
 now.
+A https://download.samba.org/pub/samba/patches/samba-4.12.11-4.12.12.diffs.gz";>patch
 against Samba 4.12.11 is

[SCM] Samba Shared Repository - branch v4-12-stable updated

2021-03-11 Thread Karolin Seeger

The branch, v4-12-stable has been updated
   via  f8b775d9620 VERSION: Disable GIT_SNAPSHOT for the 4.12.12 release.
   via  f0aa59ea0a9 WHATSNEW: Add release notes for Samba 4.12.12.
   via  8e1fe1eba3a Revert "wscript: use --as-needed only if tested 
successfully"
   via  5dd17586cd6 g_lock: Fix uninitalized variable reads
   via  df832cb62c0 locking: Fix an uninitialized variable read
   via  88ee4160e88 s3:modules:vfs_virusfilter: Recent talloc changes cause 
infinite start-up failure
   via  c63f00801ca wscript: use --as-needed only if tested successfully
   via  1c37606163e s3: VFS: nfs4_acls. Add missing TALLOC_FREE(frame) in 
error path.
   via  bebe69c3525 script/autobuild.py: let cleanup() ignore errors from 
rmdir_force() by default
   via  00df0473da5 script/autobuild.py: split out a rmdir_force() helper 
function
   via  f31f1e75d7f script/autobuild.py: allow write_system_info commands 
to fail
   via  a4ab7d474f2 script/autobuild.py: use more portable 'cp -R -a -l'
   via  833739c1e8f script/autobuild.py: add support git worktree
   via  237a51d926e classicupgrade: treat old never expires value right
   via  6382ca85682 s3:pysmbd: fix fd leak in py_smbd_create_file()
   via  e80ef35f935 HEIMDAL: krb5_storage_free(NULL) should work
   via  40e503732dc lib:util: Avoid free'ing our own pointer
   via  65b3648c553 lib:util: Add cache oversize test for memcache
   via  a658dd19627 lib:util: Add basic memcache unit test
   via  6e6aa90b87b s3: libsmb: cli_state_save_tcon(). Don't deepcopy tcon 
struct when temporarily swapping out a connection on a cli_state.
   via  bab7f2ae28e s3: torture: Change the SMB1-only UID-REGRESSION-TEST 
to do an explicit copy of the tcon struct in use.
   via  a19f94c644d s3: smbtorture3: Ensure run_tcon_test() always replaces 
any saved tcon and shuts down correctly even in error paths.
   via  80d2c3e4725 s3: smbtorture3: Ensure we *always* replace the saved 
saved_tcon even in an error condition.
   via  a00ff434515 s3: tests: Add regression test for bug 13992.
   via  8c846741a45 s3/auth: implement "winbind:ignore domains"
   via  7362b5b31cd winbind: check for allowed domains in 
winbindd_pam_auth_pac_verify()
   via  3505998d0a7 winbind: check for allowed domains in 
winbindd_dual_pam_chauthtok()
   via  cf410814e25 winbind: check for allowed domains in 
winbindd_dual_pam_chng_pswd_auth_crap()
   via  2a73dfcf27a winbind: check for allowed domains in 
winbindd_dual_pam_auth_crap()
   via  56d9705ca76 winbind: check for allowed domains in 
winbindd_dual_pam_auth()
   via  f3c47cdc1d3 winbind: move "winbind:ignore domain" logic to a 
seperate function
   via  6b9669863b8 winbind: handle MSG_SMB_CONF_UPDATED in the winbinds 
children
   via  32c2b3cf610 winbind: set logfile after reloading config
   via  aaa8dac1550 winbind: move config-reloading code to winbindd_dual.c
   via  e9700e67719 script/release.sh: always select the GPG key by it's ID
   via  baea20039ab ReleaseKey: add GnuPG key transition statement for the 
Samba release key
   via  9d4a5c8fe97 script/release.sh: Use new GPG key.
   via  50c2ea410b4 s3: smbd: Add call to conn_setup_case_options() to 
create_conn_struct_as_root().
   via  d89ccfc1c7d s3: smbd: Factor out setting up case parameters for a 
share to a function - conn_setup_case_options().
   via  7ec45672a30 build: remove smbd_conn private library
   via  552548ff00e libcli/smb: allow unexpected padding in SMB2 IOCTL 
responses
   via  c0a7b8c7bd2 libcli/smb: split out smb2cli_ioctl_parse_buffer()
   via  a5efe544353 libcli/smb: Allow 
smb2cli_validate_negotiate_info_done() to ignore NT_STATUS_INVALID_PARAMETER.
   via  2f8b1fb8aec libcli/smb: Change some checks to SMB_ASSERTS
   via  f972e3a70c2 WHATSNEW: Remove superfluous line.
   via  5d5ab7c50ed VERSION: Bump version up to 4.12.12...
  from  34813fdbf9a VERSION: Disable GIT_SNAPSHOT for the 4.12.11 release.

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-12-stable


- Log -
---

Summary of changes:
 GPG_AA99442FB680B620_replaces_6F33915B6568B7EA.txt |  27 +++
 VERSION|   2 +-
 WHATSNEW.txt   |  77 +++-
 lib/util/memcache.c|  19 +-
 lib/util/tests/test_memcache.c | 161 
 lib/util/wscript_build |   8 +-
 libcli/smb/smb2_signing.c  |   9 +-
 libcli/smb/smb2cli_ioctl.c | 207 +
 libcli/smb/smbXcli_base.c  |  25 +++
 python/samba/upgrade.py|   2 +-
 script/autobuild.py

[SCM] Samba Shared Repository - annotated tag samba-4.12.12 created

2021-03-11 Thread Karolin Seeger

The annotated tag, samba-4.12.12 has been created
at  fc28a87e039de77804764e3f184a8833e3151a7d (tag)
   tagging  f8b775d962040cb9d39fdbf27b4187624c020cd3 (commit)
  replaces  samba-4.12.11
 tagged by  Karolin Seeger
on  Thu Mar 11 12:45:09 2021 +0100

- Log -
samba: tag release samba-4.12.12
-BEGIN PGP SIGNATURE-

iQIzBAABCgAdFiEEgfXigyvSVFoYl7cTqplEL7aAtiAFAmBKAsUACgkQqplEL7aA
tiCDVBAAiX/WW9tYF2GEuZ10qKpTDOwR2mafuMD+/o67mEGvFxr1wyzuVRZJaOPH
CddDCSH5lDOaR6kon6JA/12J0wEmplecvKf1GJvGtnqqKWhB+UU2EdR7X+IIoIOd
f5F3hyk3FFUGiScbNBnONZ66a0SLpihzhTzZ6/HUEc/1OCCqRP+/MrKvPD7qDtJx
dEHBZDIrfHbCW3musubS/vTvgd0vwiG1jbGAHJx92p9FK8pOMT5BGvrhIxI2Y25M
CCgmOdXFWXQT8F3/tlL8C6iDJ34kXjPCzFYKMpjCXDcv3zWGj3milIMqMWfvCaLM
CbQoff7WaWDaAGhge0UK2k+w5SQ8XAZnq1WJGGzNWxYrJ1QXP1HlmKEwQFSQ0rZ+
ZhXkjkvw1x1yRo5Cij6349mOTtCqgcMT0i7tGQn8OxOalzfwTkT5fck8WOBXx8jY
PuVO5LzkLqCYmZ5AUsRW6py8J5xkI+CGu9soYznOk/thO80Nd22LPWlrWpSbkI9B
WYLGLKxDxXXW+5y4aUMeiOfivbjQqHnh1mDA2VExrdhk0nw5/PScWW3ig1/ijOkX
yGeNmKBpg1j88EElAOl2XCBp8lZA8Nd6WuO3CCQKCrvwunyIkXGmABrw+/yWkMsD
+vnrrcwpti+fvawSR/dzXc6CoINasKbUk2JJZ+gbrbhxAzD9+UM=
=CqXz
-END PGP SIGNATURE-

Andreas Schneider (3):
  lib:util: Add basic memcache unit test
  lib:util: Add cache oversize test for memcache
  lib:util: Avoid free'ing our own pointer

Björn Jacke (2):
  classicupgrade: treat old never expires value right
  wscript: use --as-needed only if tested successfully

Jeremy Allison (8):
  libcli/smb: Allow smb2cli_validate_negotiate_info_done() to ignore 
NT_STATUS_INVALID_PARAMETER.
  s3: smbd: Factor out setting up case parameters for a share to a function 
- conn_setup_case_options().
  s3: smbd: Add call to conn_setup_case_options() to 
create_conn_struct_as_root().
  s3: tests: Add regression test for bug 13992.
  s3: smbtorture3: Ensure we *always* replace the saved saved_tcon even in 
an error condition.
  s3: smbtorture3: Ensure run_tcon_test() always replaces any saved tcon 
and shuts down correctly even in error paths.
  s3: torture: Change the SMB1-only UID-REGRESSION-TEST to do an explicit 
copy of the tcon struct in use.
  s3: libsmb: cli_state_save_tcon(). Don't deepcopy tcon struct when 
temporarily swapping out a connection on a cli_state.

Karolin Seeger (8):
  VERSION: Bump version up to 4.12.12...
  WHATSNEW: Remove superfluous line.
  script/release.sh: Use new GPG key.
  ReleaseKey: add GnuPG key transition statement for the Samba release key
  script/release.sh: always select the GPG key by it's ID
  Revert "wscript: use --as-needed only if tested successfully"
  WHATSNEW: Add release notes for Samba 4.12.12.
  VERSION: Disable GIT_SNAPSHOT for the 4.12.12 release.

Paul Wise (1):
  HEIMDAL: krb5_storage_free(NULL) should work

Peter Eriksson (1):
  s3: VFS: nfs4_acls. Add missing TALLOC_FREE(frame) in error path.

Ralph Boehme (11):
  build: remove smbd_conn private library
  winbind: move config-reloading code to winbindd_dual.c
  winbind: set logfile after reloading config
  winbind: handle MSG_SMB_CONF_UPDATED in the winbinds children
  winbind: move "winbind:ignore domain" logic to a seperate function
  winbind: check for allowed domains in winbindd_dual_pam_auth()
  winbind: check for allowed domains in winbindd_dual_pam_auth_crap()
  winbind: check for allowed domains in 
winbindd_dual_pam_chng_pswd_auth_crap()
  winbind: check for allowed domains in winbindd_dual_pam_chauthtok()
  winbind: check for allowed domains in winbindd_pam_auth_pac_verify()
  s3/auth: implement "winbind:ignore domains"

Stefan Metzmacher (9):
  libcli/smb: Change some checks to SMB_ASSERTS
  libcli/smb: split out smb2cli_ioctl_parse_buffer()
  libcli/smb: allow unexpected padding in SMB2 IOCTL responses
  s3:pysmbd: fix fd leak in py_smbd_create_file()
  script/autobuild.py: add support git worktree
  script/autobuild.py: use more portable 'cp -R -a -l'
  script/autobuild.py: allow write_system_info commands to fail
  script/autobuild.py: split out a rmdir_force() helper function
  script/autobuild.py: let cleanup() ignore errors from rmdir_force() by 
default

Trever L. Adams (1):
  s3:modules:vfs_virusfilter: Recent talloc changes cause infinite start-up 
failure

Volker Lendecke (2):
  locking: Fix an uninitialized variable read
  g_lock: Fix uninitalized variable reads

---


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v4-12-test updated

2021-03-11 Thread Karolin Seeger

The branch, v4-12-test has been updated
   via  538a0a39a80 VERSION: Bump version up to 4.12.13...
  from  f8b775d9620 VERSION: Disable GIT_SNAPSHOT for the 4.12.12 release.

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-12-test


- Log -
commit 538a0a39a8027f35a625eb130309b864e70e35f1
Author: Karolin Seeger 
Date:   Thu Mar 11 11:28:47 2021 +0100

VERSION: Bump version up to 4.12.13...

and re-enable GIT_SNAPSHOT.

Signed-off-by: Karolin Seeger 

---

Summary of changes:
 VERSION | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/VERSION b/VERSION
index 01759472dfc..f10a52e188b 100644
--- a/VERSION
+++ b/VERSION
@@ -25,7 +25,7 @@
 
 SAMBA_VERSION_MAJOR=4
 SAMBA_VERSION_MINOR=12
-SAMBA_VERSION_RELEASE=12
+SAMBA_VERSION_RELEASE=13
 
 
 # If a official release has a serious bug  #
@@ -99,7 +99,7 @@ SAMBA_VERSION_RC_RELEASE=
 # e.g. SAMBA_VERSION_IS_SVN_SNAPSHOT=yes   #
 #  ->  "3.0.0-SVN-build-199"   #
 
-SAMBA_VERSION_IS_GIT_SNAPSHOT=no
+SAMBA_VERSION_IS_GIT_SNAPSHOT=yes
 
 
 # This is for specifying a release nickname#


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v4-12-test updated

2021-03-11 Thread Karolin Seeger

The branch, v4-12-test has been updated
   via  f8b775d9620 VERSION: Disable GIT_SNAPSHOT for the 4.12.12 release.
   via  f0aa59ea0a9 WHATSNEW: Add release notes for Samba 4.12.12.
   via  8e1fe1eba3a Revert "wscript: use --as-needed only if tested 
successfully"
  from  5dd17586cd6 g_lock: Fix uninitalized variable reads

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-12-test


- Log -
commit f8b775d962040cb9d39fdbf27b4187624c020cd3
Author: Karolin Seeger 
Date:   Thu Mar 11 11:23:24 2021 +0100

VERSION: Disable GIT_SNAPSHOT for the 4.12.12 release.

Signed-off-by: Karolin Seeger 

commit f0aa59ea0a9e4e7cd9b7f369c4c5c166b3818d35
Author: Karolin Seeger 
Date:   Thu Mar 11 11:19:51 2021 +0100

WHATSNEW: Add release notes for Samba 4.12.12.

Signed-off-by: Karolin Seeger 

commit 8e1fe1eba3a2d0c42174f4f01e8299d17daabc10
Author: Karolin Seeger 
Date:   Thu Mar 11 10:47:14 2021 +0100

Revert "wscript: use --as-needed only if tested successfully"

This reverts commit c63f00801cae16a855aa5283fa0cc449e84577ce.

---

Summary of changes:
 VERSION  |  2 +-
 WHATSNEW.txt | 76 ++--
 wscript  |  3 +--
 3 files changed, 76 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/VERSION b/VERSION
index 27f449b74a2..01759472dfc 100644
--- a/VERSION
+++ b/VERSION
@@ -99,7 +99,7 @@ SAMBA_VERSION_RC_RELEASE=
 # e.g. SAMBA_VERSION_IS_SVN_SNAPSHOT=yes   #
 #  ->  "3.0.0-SVN-build-199"   #
 
-SAMBA_VERSION_IS_GIT_SNAPSHOT=yes
+SAMBA_VERSION_IS_GIT_SNAPSHOT=no
 
 
 # This is for specifying a release nickname#
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index c8559260371..b1d8d0b411f 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,3 +1,76 @@
+   ===
+   Release Notes for Samba 4.12.12
+   March 11, 2021
+   ===
+
+
+This is the latest stable release of the Samba 4.12 release series.
+Please note that this will be the last bugfix release of the Samba 4.12 release
+series. There will be Security Releases only beyond this point.
+
+
+Changes since 4.12.11
+-
+
+o  Trever L. Adams 
+   * BUG 14634: s3:modules:vfs_virusfilter: Recent talloc changes cause 
infinite
+ start-up failure.
+
+o  Jeremy Allison 
+   * BUG 13992: SAMBA RPC share error.
+   * BUG 14612: s3: smbd: Add call to conn_setup_case_options() to
+ create_conn_struct_as_root().
+
+o  Ralph Boehme 
+   * BUG 14602: s3/auth: Implement "winbind:ignore domains".
+   * BUG 14612: build: Remove smbd_conn private library.
+
+o  Peter Eriksson 
+   * BUG 14648: s3: VFS: nfs4_acls. Add missing TALLOC_FREE(frame) in error
+ path.
+
+o  Björn Jacke 
+   * BUG 14624: classicupgrade: Treat old never expires value right.
+
+o  Volker Lendecke 
+   * BUG 1463: g_lock: Fix uninitalized variable reads.
+
+o  Stefan Metzmacher 
+   * BUG 13898: s3:pysmbd: Fix fd leak in py_smbd_create_file().
+   * BUG 14607: Work around special SMB2 IOCTL response behavior of NetApp
+ Ontap 7.3.7.
+
+o  Andreas Schneider 
+   * BUG 14625: Fix smbd share mode double free crash.
+
+o  Paul Wise 
+   * BUG 12505: HEIMDAL: krb5_storage_free(NULL) should work.
+
+
+###
+Reporting bugs & Development Discussion
+###
+
+Please discuss this release on the samba-technical mailing list or by
+joining the #samba-technical IRC channel on irc.freenode.net.
+
+If you do report problems then please try to send high quality
+feedback. If you don't provide vital information to help us track down
+the problem then you will probably be ignored.  All bug reports should
+be filed under the Samba 4.1 and newer product in the project's Bugzilla
+database (https://bugzilla.samba.org/).
+
+
+==
+== Our Code, Our Bugs, Our Responsibility.
+== The Samba Team
+==
+
+
+Release notes for older releases follow:
+
+
+
===
Release Notes for Samba 4.12.11
   January 14, 2021
@@ -80,8 +153,7 @@ database (https://bugzilla.samba.org/).
 ==
 
 
-Release notes for older releases follow:
-
+--
 
 
===

[SCM] Samba Shared Repository - branch master updated

2021-03-11 Thread Volker Lendecke

The branch, master has been updated
   via  0e789ba1802 idmap_nss: Do not return SID from unixids_to_sids on 
type mismatch
   via  79dd4b133c3 idmap_rfc2307: Do not return SID from unixids_to_sids 
on type mismatch
   via  db2afa57e4a winbind: Only use unixid2sid mapping when module 
reports ID_MAPPED
  from  65510204d41 smbd: Ensure errno is preserved across fsp destructor

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


- Log -
commit 0e789ba1802ca22e5a01abd6e93ef66cd45566a7
Author: Christof Schmitt 
Date:   Fri Mar 5 16:07:54 2021 -0700

idmap_nss: Do not return SID from unixids_to_sids on type mismatch

The call to winbind_lookup_name already wrote the result in the id_map
array. The later check for the type detected a mismatch, but that did
not remove the SID from the result struct.

Change this by first assigning the SID to a temporary variable and only
write it to the id_map array after the type checks.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14663

Signed-off-by: Christof Schmitt 
Reviewed-by: Volker Lendecke 

Autobuild-User(master): Volker Lendecke 
Autobuild-Date(master): Thu Mar 11 08:38:41 UTC 2021 on sn-devel-184

commit 79dd4b133c37451c98fe7f7c45da881e89e91ffc
Author: Christof Schmitt 
Date:   Fri Mar 5 16:01:13 2021 -0700

idmap_rfc2307: Do not return SID from unixids_to_sids on type mismatch

The call to winbind_lookup_name already wrote the result in the id_map
array. The later check for the type detected a mismatch, but that did
not remove the SID from the result struct.

Change this by first assigning the SID to a temporary variable and only
write it to the id_map array after the type checks.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14663

Signed-off-by: Christof Schmitt 

commit db2afa57e4aa926b478db1be4d693edbdf4d2a23
Author: Christof Schmitt 
Date:   Fri Mar 5 15:48:29 2021 -0700

winbind: Only use unixid2sid mapping when module reports ID_MAPPED

Only consider a mapping to be valid when the idmap module reports
ID_MAPPED. Otherwise return the null SID.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14663

Signed-off-by: Christof Schmitt 
Reviewed-by: Volker Lendecke 

---

Summary of changes:
 source3/winbindd/idmap_nss.c | 6 +-
 source3/winbindd/idmap_rfc2307.c | 4 +++-
 source3/winbindd/winbindd_dual_srv.c | 8 ++--
 3 files changed, 14 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/idmap_nss.c b/source3/winbindd/idmap_nss.c
index 9e1efefeb24..da50e2b4aa7 100644
--- a/source3/winbindd/idmap_nss.c
+++ b/source3/winbindd/idmap_nss.c
@@ -25,6 +25,7 @@
 #include "nsswitch/winbind_client.h"
 #include "idmap.h"
 #include "lib/winbind_util.h"
+#include "libcli/security/dom_sid.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_IDMAP
@@ -55,6 +56,7 @@ static NTSTATUS idmap_nss_unixids_to_sids(struct idmap_domain 
*dom, struct id_ma
struct passwd *pw;
struct group *gr;
const char *name;
+   struct dom_sid sid;
enum lsa_SidType type;
bool ret;
 
@@ -86,7 +88,7 @@ static NTSTATUS idmap_nss_unixids_to_sids(struct idmap_domain 
*dom, struct id_ma
   the following call will not recurse so this is safe */
(void)winbind_on();
/* Lookup name from PDC using lsa_lookup_names() */
-   ret = winbind_lookup_name(dom->name, name, ids[i]->sid, &type);
+   ret = winbind_lookup_name(dom->name, name, &sid, &type);
(void)winbind_off();
 
if (!ret) {
@@ -99,6 +101,7 @@ static NTSTATUS idmap_nss_unixids_to_sids(struct 
idmap_domain *dom, struct id_ma
switch (type) {
case SID_NAME_USER:
if (ids[i]->xid.type == ID_TYPE_UID) {
+   sid_copy(ids[i]->sid, &sid);
ids[i]->status = ID_MAPPED;
}
break;
@@ -107,6 +110,7 @@ static NTSTATUS idmap_nss_unixids_to_sids(struct 
idmap_domain *dom, struct id_ma
case SID_NAME_ALIAS:
case SID_NAME_WKN_GRP:
if (ids[i]->xid.type == ID_TYPE_GID) {
+   sid_copy(ids[i]->sid, &sid);
ids[i]->status = ID_MAPPED;
}
break;
diff --git a/source3/winbindd/idmap_rfc2307.c b/source3/winbindd/idmap_rfc2307.c
index 05259bf8344..4870ca30485 100644
--- a/source3/winbindd/idmap_rfc2307.c
+++ b/source3/winbindd/idmap_rfc2307.c
@@ -229,6 +229,7 @@ static void idmap_rfc2307_map_sid_results(struct 
idmap_r

[SCM] Samba Website Repository - branch master updated

[SCM] Samba Shared Repository - branch master updated

[SCM] Samba Shared Repository - branch master updated

[SCM] Samba Shared Repository - branch master updated

[SCM] Samba Shared Repository - branch master updated

[SCM] Samba Website Repository - branch master updated

[SCM] Samba Shared Repository - branch v4-12-stable updated

[SCM] Samba Shared Repository - annotated tag samba-4.12.12 created

[SCM] Samba Shared Repository - branch v4-12-test updated

[SCM] Samba Shared Repository - branch v4-12-test updated

[SCM] Samba Shared Repository - branch master updated

11 matches

Site Navigation

Mail list logo

Footer information