The branch, master has been updated
via baacc703940 libads: Align integer types
via d629c67dd3c libads: Use dom_sid_string_buf
from fabc3c9d382 source4 smbd prefork: Add code comments
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit baacc7039408e07efcfbade13750cc9f717b2777
Author: Volker Lendecke <v...@samba.org>
Date: Fri Nov 23 08:40:57 2018 +0100
libads: Align integer types
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Andreas Schneider <a...@samba.org>
Autobuild-User(master): Andreas Schneider <a...@cryptomilk.org>
Autobuild-Date(master): Fri Nov 23 20:23:57 CET 2018 on sn-devel-144
commit d629c67dd3c3acaa7329cceff83ad035f696c08a
Author: Volker Lendecke <v...@samba.org>
Date: Fri Nov 23 08:39:02 2018 +0100
libads: Use dom_sid_string_buf
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Andreas Schneider <a...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
source3/libads/disp_sec.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libads/disp_sec.c b/source3/libads/disp_sec.c
index 472741fa1b6..8ec4a32bd7e 100644
--- a/source3/libads/disp_sec.c
+++ b/source3/libads/disp_sec.c
@@ -22,6 +22,7 @@
#include "libads/ldap_schema.h"
#include "../libcli/security/secace.h"
#include "../librpc/ndr/libndr.h"
+#include "libcli/security/dom_sid.h"
/* for ADS */
#define SEC_RIGHTS_FULL_CTRL 0xf01ff
@@ -139,6 +140,7 @@ static void ads_disp_sec_ace_object(ADS_STRUCT *ads,
static void ads_disp_ace(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, struct
security_ace *sec_ace)
{
const char *access_type = "UNKNOWN";
+ struct dom_sid_buf sidbuf;
if (!sec_ace_object(sec_ace->type)) {
printf("------- ACE (type: 0x%02x, flags: 0x%02x, size: 0x%02x,
mask: 0x%x)\n",
@@ -169,8 +171,9 @@ static void ads_disp_ace(ADS_STRUCT *ads, TALLOC_CTX
*mem_ctx, struct security_a
access_type = "AUDIT OBJECT";
}
- printf("access SID: %s\naccess type: %s\n",
- sid_string_talloc(mem_ctx, &sec_ace->trustee), access_type);
+ printf("access SID: %s\naccess type: %s\n",
+ dom_sid_str_buf(&sec_ace->trustee, &sidbuf),
+ access_type);
if (sec_ace_object(sec_ace->type)) {
ads_disp_sec_ace_object(ads, mem_ctx, &sec_ace->object.object);
@@ -196,7 +199,7 @@ static void ads_disp_acl(struct security_acl *sec_acl,
const char *type)
/* display SD */
void ads_disp_sd(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, struct
security_descriptor *sd)
{
- int i;
+ uint32_t i;
char *tmp_path = NULL;
if (!sd) {
--
Samba Shared Repository
