The branch, master has been updated
via c9d97e3 lib: Make sid_linearize take a uint8_t
via de421d8 lib: Remove unused sid_blob_parse
via aa38175 lib: Convert callers of sid_blob_parse to sid_parse
via 4a442e2 lib: Make sid_parse take a uint8_t
from dba9e63 Prevent a crash in Python modules that try to authenticate
by ensuring we reject cases where credendials fields are not intialized.
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit c9d97e3a2e7d2d9ca6612fdeb5fdf7a84781bbc1
Author: Volker Lendecke
Date: Wed Aug 26 10:52:44 2015 +0200
lib: Make sid_linearize take a uint8_t
We marshall into a binary buffer, uint8_t better reflects that.
Signed-off-by: Volker Lendecke
Reviewed-by: Jeremy Allison
Autobuild-User(master): Jeremy Allison
Autobuild-Date(master): Thu Aug 27 00:40:58 CEST 2015 on sn-devel-104
commit de421d8826e9b0595350e15afa7c8bb1fd18d301
Author: Volker Lendecke
Date: Mon Aug 24 16:50:44 2015 +0200
lib: Remove unused sid_blob_parse
Signed-off-by: Volker Lendecke
Reviewed-by: Jeremy Allison
commit aa38175e00d58e0708e06b7c1e3a1a8690569a0a
Author: Volker Lendecke
Date: Mon Aug 24 16:46:12 2015 +0200
lib: Convert callers of sid_blob_parse to sid_parse
Signed-off-by: Volker Lendecke
Reviewed-by: Jeremy Allison
commit 4a442e2eb7e0b2c62bcc355d461dfd1aaf8c26e8
Author: Volker Lendecke
Date: Mon Aug 24 12:33:28 2015 +0200
lib: Make sid_parse take a uint8_t
sid_parse takes a binary blob, uint8_t reflects this a bit
better than char * does
Signed-off-by: Volker Lendecke
Reviewed-by: Jeremy Allison
---
Summary of changes:
libcli/security/dom_sid.h | 3 +--
libcli/security/util_sid.c| 20 ++--
source3/include/proto.h | 2 +-
source3/lib/smbldap.c | 2 +-
source3/lib/tldap_util.c | 2 +-
source3/lib/util_sid.c| 6 +++---
source3/libads/ldap.c | 8 +---
source3/libsmb/cliquota.c | 6 +++---
source3/modules/vfs_default.c | 2 +-
source3/passdb/pdb_ipa.c | 2 +-
source3/smbd/nttrans.c| 10 ++
source3/smbd/trans2.c | 3 ++-
source3/torture/torture.c | 6 +++---
source4/dsdb/common/util.c| 2 +-
source4/torture/unix/whoami.c | 16 +---
15 files changed, 48 insertions(+), 42 deletions(-)
Changeset truncated at 500 lines:
diff --git a/libcli/security/dom_sid.h b/libcli/security/dom_sid.h
index cf3cedea..990a4c4 100644
--- a/libcli/security/dom_sid.h
+++ b/libcli/security/dom_sid.h
@@ -93,8 +93,7 @@ bool sid_split_rid(struct dom_sid *sid, uint32_t *rid);
bool sid_peek_rid(const struct dom_sid *sid, uint32_t *rid);
bool sid_peek_check_rid(const struct dom_sid *exp_dom_sid, const struct
dom_sid *sid, uint32_t *rid);
void sid_copy(struct dom_sid *dst, const struct dom_sid *src);
-bool sid_blob_parse(DATA_BLOB in, struct dom_sid *sid);
-bool sid_parse(const char *inbuf, size_t len, struct dom_sid *sid);
+bool sid_parse(const uint8_t *inbuf, size_t len, struct dom_sid *sid);
int sid_compare_domain(const struct dom_sid *sid1, const struct dom_sid *sid2);
NTSTATUS add_sid_to_array(TALLOC_CTX *mem_ctx, const struct dom_sid *sid,
struct dom_sid **sids, uint32_t *num);
diff --git a/libcli/security/util_sid.c b/libcli/security/util_sid.c
index 7d72d64..3399801 100644
--- a/libcli/security/util_sid.c
+++ b/libcli/security/util_sid.c
@@ -254,14 +254,16 @@ void sid_copy(struct dom_sid *dst, const struct dom_sid
*src)
}
/*
- Parse a on-the-wire SID (in a DATA_BLOB) to a struct dom_sid.
+ Parse a on-the-wire SID to a struct dom_sid.
*/
-bool sid_blob_parse(DATA_BLOB in, struct dom_sid *sid)
+bool sid_parse(const uint8_t *inbuf, size_t len, struct dom_sid *sid)
{
+ DATA_BLOB in = data_blob_const(inbuf, len);
enum ndr_err_code ndr_err;
- ndr_err = ndr_pull_struct_blob_all(&in, NULL, sid,
-
(ndr_pull_flags_fn_t)ndr_pull_dom_sid);
+
+ ndr_err = ndr_pull_struct_blob_all(
+ &in, NULL, sid, (ndr_pull_flags_fn_t)ndr_pull_dom_sid);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
return false;
}
@@ -269,16 +271,6 @@ bool sid_blob_parse(DATA_BLOB in, struct dom_sid *sid)
}
/*
- Parse a on-the-wire SID to a struct dom_sid.
-*/
-
-bool sid_parse(const char *inbuf, size_t len, struct dom_sid *sid)
-{
- DATA_BLOB in = data_blob_const(inbuf, len);
- return sid_blob_parse(in, sid);
-}
-
-/
