[SCM] Samba Shared Repository - branch master updated

[Gary Lockyer]

The branch, master has been updated
       via  bb912a48279 OID: Reserve 1.3.6.1.4.1.7165.777.x for use on the wiki
       via  d279cf7bede lib/util: Allow gdb to be started by samba_start_debugger() under the default Ubuntu restrictions
      from  7754a557d49 s3: VFS: cap. Fixup mistake using the wrong parameter to capencode.

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


- Log -----------------------------------------------------------------
commit bb912a482796f496aaca597c04f864f45ca2e41c
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue May 26 22:35:40 2020 +1200

    OID: Reserve 1.3.6.1.4.1.7165.777.x for use on the wiki
    
    This allows us to handle some OIDs more freely and use them in example schema
    without patching the main git repo each time.
    
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
    
    Autobuild-User(master): Gary Lockyer <gary at samba.org>
    Autobuild-Date(master): Wed May 27 22:17:10 UTC 2020 on sn-devel-184

commit d279cf7bede639314cb2b9ba52d44218dc2fc353
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Sat May 23 21:24:07 2020 +1200

    lib/util: Allow gdb to be started by samba_start_debugger() under the default Ubuntu restrictions
    
    Ubuntu (in particular) restricts ptrace by default for security reasons
    but the processe to be traced can allow tracing by a child process
    using prctl().  This matches what is done for panic action =
    
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>

-----------------------------------------------------------------------

Summary of changes:
 examples/LDAP/samba.schema |  7 ++++++-
 lib/util/util.c            | 10 ++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/examples/LDAP/samba.schema b/examples/LDAP/samba.schema
index 081731197e4..58d7a82b7bf 100644
--- a/examples/LDAP/samba.schema
+++ b/examples/LDAP/samba.schema
@@ -14,13 +14,18 @@
 ## 1.3.6.1.4.1.7165.2.3.1.x - attributetypes
 ## 1.3.6.1.4.1.7165.2.3.2.x - objectclasses
 ##
-## Samba4
+## Samba4 - see source4/setup/schema_samba4.ldif
 ## 1.3.6.1.4.1.7165.4.1.x - attributetypes
 ## 1.3.6.1.4.1.7165.4.2.x - objectclasses
 ## 1.3.6.1.4.1.7165.4.3.x - LDB/LDAP Controls
 ## 1.3.6.1.4.1.7165.4.4.x - LDB/LDAP Extended Operations
+## 1.3.6.1.4.1.7165.4.5.x - ldap extended matches
+## 1.3.6.1.4.1.7165.4.6.1.x - SELFTEST random attributes
 ## 1.3.6.1.4.1.7165.4.255.x - mapped OIDs due to conflicts between AD and standards-track
 ##
+## Out of tree use allocated in the wiki
+## 1.3.6.1.4.1.7165.777.x - https://wiki.samba.org/index.php/Samba_AD_schema_extensions#OID
+##
 ## External projects
 ## 1.3.6.1.4.1.7165.655.x
 ## 1.3.6.1.4.1.7165.655.1.x - GSS-NTLMSSP
diff --git a/lib/util/util.c b/lib/util/util.c
index 0d9ffe5cb7b..a90d48f6f1b 100644
--- a/lib/util/util.c
+++ b/lib/util/util.c
@@ -36,6 +36,10 @@
 #include "samba_util.h"
 #include "lib/util/select.h"
 
+#ifdef HAVE_SYS_PRCTL_H
+#include <sys/prctl.h>
+#endif
+
 #undef malloc
 #undef strcasecmp
 #undef strncasecmp
@@ -1282,6 +1286,12 @@ void anonymous_shared_free(void *ptr)
 void samba_start_debugger(void)
 {
 	char *cmd = NULL;
+#if defined(HAVE_PRCTL) && defined(PR_SET_PTRACER)
+	/*
+	 * Make sure all children can attach a debugger.
+	 */
+	prctl(PR_SET_PTRACER, getpid(), 0, 0, 0);
+#endif
 	if (asprintf(&cmd, "xterm -e \"gdb --pid %u\"&", getpid()) == -1) {
 		return;
 	}


-- 
Samba Shared Repository