File 0010-library-add-lookup_domain_sid.patch of Package adcli.16659

Overview Repositories Revisions Requests Users Attributes Meta

File 0010-library-add-lookup_domain_sid.patch of Package adcli.16659

From d70a19b0f5f80b5c1d3b7f6a8f241b0e8605668b Mon Sep 17 00:00:00 2001
From: Sumit Bose <sbose@redhat.com>
Date: Tue, 30 Jan 2018 14:40:46 +0100
Subject: [PATCH 10/25] library: add lookup_domain_sid()

Read the domain SID from the default naming context AD object and store
it in adcli_conn.

https://bugs.freedesktop.org/show_bug.cgi?id=100118
https://gitlab.freedesktop.org/realmd/adcli/issues/6

Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
---
 library/adconn.c | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/library/adconn.c b/library/adconn.c
index 0786ed4..efba351 100644
--- a/library/adconn.c
+++ b/library/adconn.c
@@ -72,6 +72,7 @@ struct _adcli_conn_ctx {
 	char *domain_controller;
 	char *canonical_host;
 	char *domain_short;
+	char *domain_sid;
 	adcli_disco *domain_disco;
 	char *default_naming_context;
 	char *configuration_naming_context;
@@ -1068,6 +1069,32 @@ lookup_short_name (adcli_conn *conn)
 	}
 }
 
+static void
+lookup_domain_sid (adcli_conn *conn)
+{
+	char *attrs[] = { "objectSid", NULL, };
+	LDAPMessage *results;
+	int ret;
+
+	free (conn->domain_sid);
+	conn->domain_sid = NULL;
+
+	ret = ldap_search_ext_s (conn->ldap, conn->default_naming_context, LDAP_SCOPE_BASE,
+	                         NULL, attrs, 0, NULL, NULL, NULL, -1, &results);
+	if (ret == LDAP_SUCCESS) {
+		conn->domain_sid = _adcli_ldap_parse_sid (conn->ldap, results, "objectSid");
+		ldap_msgfree (results);
+
+		if (conn->domain_sid)
+			_adcli_info ("Looked up domain SID: %s", conn->domain_sid);
+		else
+			_adcli_err ("No domain SID found");
+	} else {
+		_adcli_ldap_handle_failure (conn->ldap, ADCLI_ERR_DIRECTORY,
+		                            "Couldn't lookup domain SID");
+	}
+}
+
 static void
 conn_clear_state (adcli_conn *conn)
 {
@@ -1148,6 +1175,7 @@ adcli_conn_connect (adcli_conn *conn)
 		return res;
 
 	lookup_short_name (conn);
+	lookup_domain_sid (conn);
 	return ADCLI_SUCCESS;
 }
 
-- 
2.16.4

Places

File 0010-library-add-lookup_domain_sid.patch of Package adcli.16659

Places