summaryrefslogtreecommitdiff
path: root/source3/lib
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2019-03-11 17:11:06 +0100
committerAndrew Bartlett <abartlet@samba.org>2019-03-12 00:42:19 +0000
commitd7de2f77485bf623f8ca0edc5c0fb823ed9bc1e2 (patch)
treeff15bfe7169989dc068f1750752983aa902be25c /source3/lib
parente18610a197aab80a32cae8c1e09b96496679bbad (diff)
downloadsamba-d7de2f77485bf623f8ca0edc5c0fb823ed9bc1e2.tar.gz
lib: Remove "struct sid_parse_ret" again
Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source3/lib')
-rw-r--r--source3/lib/smbldap.c4
-rw-r--r--source3/lib/tldap_util.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/source3/lib/smbldap.c b/source3/lib/smbldap.c
index cdd350fffa1..7a96714ad1a 100644
--- a/source3/lib/smbldap.c
+++ b/source3/lib/smbldap.c
@@ -278,7 +278,7 @@ void smbldap_set_bind_callback(struct smbldap_state *state,
struct dom_sid *sid)
{
DATA_BLOB blob;
- struct sid_parse_ret ret;
+ ssize_t ret;
if (!smbldap_talloc_single_blob(talloc_tos(), ld, msg, attrib,
&blob)) {
@@ -286,7 +286,7 @@ void smbldap_set_bind_callback(struct smbldap_state *state,
}
ret = sid_parse(blob.data, blob.length, sid);
TALLOC_FREE(blob.data);
- return (ret.len != -1);
+ return (ret != -1);
}
static int ldapmsg_destructor(LDAPMessage **result) {
diff --git a/source3/lib/tldap_util.c b/source3/lib/tldap_util.c
index efc37e48e7c..78ed42be179 100644
--- a/source3/lib/tldap_util.c
+++ b/source3/lib/tldap_util.c
@@ -88,13 +88,13 @@ bool tldap_pull_binsid(struct tldap_message *msg, const char *attribute,
struct dom_sid *sid)
{
DATA_BLOB val;
- struct sid_parse_ret ret;
+ ssize_t ret;
if (!tldap_get_single_valueblob(msg, attribute, &val)) {
return false;
}
ret = sid_parse(val.data, val.length, sid);
- return (ret.len != -1);
+ return (ret != -1);
}
bool tldap_pull_guid(struct tldap_message *msg, const char *attribute,