The branch, master has been updated
via 1e0df57 libwbclient: add WBC_SID_NAME_LABEL
via ac2622e libcli/security: add SID_NAME_LABEL to sid_type_lookup()
via 1161e11 lsa.idl: add SID_NAME_LABEL
via 3a5d76f netlogon.idl: make netr_LogonInfoClass public
from 2901fe8 net: Don't crash if lsa_LookupPrivDisplayName returns NULL
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 1e0df575bc32499f5249fe3fc78745bffdaff5a6
Author: Stefan Metzmacher <me...@samba.org>
Date: Mon Mar 20 13:56:03 2017 +0100
libwbclient: add WBC_SID_NAME_LABEL
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
Autobuild-User(master): Stefan Metzmacher <me...@samba.org>
Autobuild-Date(master): Thu Mar 23 12:55:26 CET 2017 on sn-devel-144
commit ac2622ee86eb1acab7e2d6e14fe5f277d5f52e1a
Author: Stefan Metzmacher <me...@samba.org>
Date: Mon Mar 20 13:50:59 2017 +0100
libcli/security: add SID_NAME_LABEL to sid_type_lookup()
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 1161e11d48f41e21720d3ba88dca2ef4321f29c5
Author: Stefan Metzmacher <me...@samba.org>
Date: Mon Mar 20 13:50:36 2017 +0100
lsa.idl: add SID_NAME_LABEL
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 3a5d76f092bbacc2b5eee2de509761670c95531f
Author: Stefan Metzmacher <me...@samba.org>
Date: Fri Mar 17 19:28:16 2017 +0100
netlogon.idl: make netr_LogonInfoClass public
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
libcli/security/util_sid.c | 3 ++-
librpc/idl/lsa.idl | 3 ++-
librpc/idl/netlogon.idl | 2 +-
nsswitch/libwbclient/tests/wbclient.c | 2 ++
nsswitch/libwbclient/wbc_sid.c | 1 +
nsswitch/libwbclient/wbclient.h | 4 +++-
6 files changed, 11 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/libcli/security/util_sid.c b/libcli/security/util_sid.c
index ac44876..0709a7a 100644
--- a/libcli/security/util_sid.c
+++ b/libcli/security/util_sid.c
@@ -189,7 +189,8 @@ static const struct {
{SID_NAME_DELETED, "Deleted Account"},
{SID_NAME_INVALID, "Invalid Account"},
{SID_NAME_UNKNOWN, "UNKNOWN"},
- {SID_NAME_COMPUTER, "Computer"}
+ {SID_NAME_COMPUTER, "Computer"},
+ {SID_NAME_LABEL, "Mandatory Label"}
};
const char *sid_type_lookup(uint32_t sid_type)
diff --git a/librpc/idl/lsa.idl b/librpc/idl/lsa.idl
index 66a07e5..68569db 100644
--- a/librpc/idl/lsa.idl
+++ b/librpc/idl/lsa.idl
@@ -505,7 +505,8 @@ import "misc.idl", "security.idl";
SID_NAME_DELETED = 6, /* deleted account: needed for c2 rating
*/
SID_NAME_INVALID = 7, /* invalid account */
SID_NAME_UNKNOWN = 8, /* oops. */
- SID_NAME_COMPUTER = 9 /* machine */
+ SID_NAME_COMPUTER = 9, /* machine */
+ SID_NAME_LABEL = 10 /* Mandatory Label */
} lsa_SidType;
typedef struct {
diff --git a/librpc/idl/netlogon.idl b/librpc/idl/netlogon.idl
index 621d537..e4b499f 100644
--- a/librpc/idl/netlogon.idl
+++ b/librpc/idl/netlogon.idl
@@ -168,7 +168,7 @@ interface netlogon
[size_is(length)] uint8 *data;
} netr_GenericInfo;
- typedef enum {
+ typedef [public] enum {
NetlogonInteractiveInformation = 1,
NetlogonNetworkInformation = 2,
NetlogonServiceInformation = 3,
diff --git a/nsswitch/libwbclient/tests/wbclient.c
b/nsswitch/libwbclient/tests/wbclient.c
index 0412bed..b3c93a1 100644
--- a/nsswitch/libwbclient/tests/wbclient.c
+++ b/nsswitch/libwbclient/tests/wbclient.c
@@ -216,6 +216,8 @@ static bool test_wbc_sidtypestring(struct torture_context
*tctx)
"SID_UNKNOWN", "SID_UNKNOWN failed");
torture_assert_str_equal(tctx, wbcSidTypeString(WBC_SID_NAME_COMPUTER),
"SID_COMPUTER", "SID_COMPUTER failed");
+ torture_assert_str_equal(tctx, wbcSidTypeString(WBC_SID_NAME_LABEL),
+ "SID_LABEL", "SID_LABEL failed");
return true;
}
diff --git a/nsswitch/libwbclient/wbc_sid.c b/nsswitch/libwbclient/wbc_sid.c
index cc71b9e..baaeb60 100644
--- a/nsswitch/libwbclient/wbc_sid.c
+++ b/nsswitch/libwbclient/wbc_sid.c
@@ -1081,6 +1081,7 @@ const char* wbcSidTypeString(enum wbcSidType type)
case WBC_SID_NAME_INVALID: return "SID_INVALID";
case WBC_SID_NAME_UNKNOWN: return "SID_UNKNOWN";
case WBC_SID_NAME_COMPUTER: return "SID_COMPUTER";
+ case WBC_SID_NAME_LABEL: return "SID_LABEL";
default: return "Unknown type";
}
}
diff --git a/nsswitch/libwbclient/wbclient.h b/nsswitch/libwbclient/wbclient.h
index 77915b9..ed97a67 100644
--- a/nsswitch/libwbclient/wbclient.h
+++ b/nsswitch/libwbclient/wbclient.h
@@ -75,6 +75,7 @@ const char *wbcErrorString(wbcErr error);
* 0.12: Added wbcCtxCreate and friends
* 0.13: Added wbcCtxUnixIdsToSids and wbcUnixIdsToSids
* 0.14: Added "authoritative" to wbcAuthErrorInfo
+ * Added WBC_SID_NAME_LABEL
**/
#define WBCLIENT_MAJOR_VERSION 0
#define WBCLIENT_MINOR_VERSION 14
@@ -139,7 +140,8 @@ enum wbcSidType {
WBC_SID_NAME_DELETED=6,
WBC_SID_NAME_INVALID=7,
WBC_SID_NAME_UNKNOWN=8,
- WBC_SID_NAME_COMPUTER=9
+ WBC_SID_NAME_COMPUTER=9,
+ WBC_SID_NAME_LABEL=10
};
/**
--
Samba Shared Repository
