Changeset 745 for trunk/server/source3/libads/ldap.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/libads/ldap.c (modified) (29 diffs)

trunk/server/source3/libads/ldap.c

@@ -23 +23 @@
 
 #include "includes.h"
-#include "lib/ldb/include/ldb.h"
+#include "ads.h"
+#include "libads/sitename_cache.h"
+#include "libads/cldap.h"
+#include "libads/dns.h"
+#include "../libds/common/flags.h"
+#include "smbldap.h"
+#include "../libcli/security/security.h"
 
 #ifdef HAVE_LDAP
@@ -49 +55 @@
 ****************************************************************/
 
-static void gotalarm_sig(void)
+static void gotalarm_sig(int signum)
 {
         gotalarm = 1;
@@ -64 +70 @@
         /* Setup timeout */
         gotalarm = 0;
-        CatchSignal(SIGALRM, SIGNAL_CAST gotalarm_sig);
+        CatchSignal(SIGALRM, gotalarm_sig);
         alarm(to);
         /* End setup timeout. */
@@ -78 +84 @@
 
         /* Teardown timeout. */
-        CatchSignal(SIGALRM, SIGNAL_CAST SIG_IGN);
+        CatchSignal(SIGALRM, SIG_IGN);
         alarm(0);
 
@@ -104 +110 @@
         /* Setup alarm timeout.... Do we need both of these ? JRA. */
         gotalarm = 0;
-        CatchSignal(SIGALRM, SIGNAL_CAST gotalarm_sig);
+        CatchSignal(SIGALRM, gotalarm_sig);
         alarm(lp_ldap_timeout());
         /* End setup timeout. */
@@ -113 +119 @@
 
         /* Teardown timeout. */
-        CatchSignal(SIGALRM, SIGNAL_CAST SIG_IGN);
+        CatchSignal(SIGALRM, SIG_IGN);
         alarm(0);
 
@@ -265 +271 @@
                         SMB_STRDUP(cldap_reply.client_site);
         }
-        ads->server.workgroup          = SMB_STRDUP(cldap_reply.domain);
+        ads->server.workgroup          = SMB_STRDUP(cldap_reply.domain_name);
 
         ads->ldap.port = gc ? LDAP_GC_PORT : LDAP_PORT;
@@ -277 +283 @@
 
         /* Store our site name. */
-        sitename_store( cldap_reply.domain, cldap_reply.client_site);
+        sitename_store( cldap_reply.domain_name, cldap_reply.client_site);
         sitename_store( cldap_reply.dns_domain, cldap_reply.client_site);
 
@@ -593 +599 @@
 
         ZERO_STRUCT(ads->ldap);
-        ads->ldap.last_attempt  = time(NULL);
+        ads->ldap.last_attempt  = time_mono(NULL);
         ads->ldap.wrap_type     = ADS_SASLWRAP_TYPE_PLAIN;
 
@@ -1602 +1608 @@
         if (!org_unit || !*org_unit) {
 
-                ret = ads_default_ou_string(ads, WELL_KNOWN_GUID_COMPUTERS);
+                ret = ads_default_ou_string(ads, DS_GUID_COMPUTERS_CONTAINER);
 
                 /* samba4 might not yet respond to a wellknownobject-query */
@@ -2123 +2129 @@
         int i;
         for (i=0; values[i]; i++) {
-
-                UUID_FLAT guid;
-                struct GUID tmp;
-
-                memcpy(guid.info, values[i]->bv_val, sizeof(guid.info));
-                smb_uuid_unpack(guid, &tmp);
-                printf("%s: %s\n", field, GUID_string(talloc_tos(), &tmp));
+                NTSTATUS status;
+                DATA_BLOB in = data_blob_const(values[i]->bv_val, values[i]->bv_len);
+                struct GUID guid;
+
+                status = GUID_from_ndr_blob(&in, &guid);
+                if (NT_STATUS_IS_OK(status)) {
+                        printf("%s: %s\n", field, GUID_string(talloc_tos(), &guid));
+                } else {
+                        printf("%s: INVALID GUID\n", field);
+                }
         }
 }
@@ -2140 +2149 @@
         int i;
         for (i=0; values[i]; i++) {
-                DOM_SID sid;
+                struct dom_sid sid;
                 fstring tmp;
                 if (!sid_parse(values[i]->bv_val, values[i]->bv_len, &sid)) {
-                        continue;
+                        return;
                 }
                 printf("%s: %s\n", field, sid_to_fstring(tmp, &sid));
@@ -2605 +2614 @@
  bool ads_pull_guid(ADS_STRUCT *ads, LDAPMessage *msg, struct GUID *guid)
 {
-        char **values;
-        UUID_FLAT flat_guid;
-
-        values = ldap_get_values(ads->ldap.ld, msg, "objectGUID");
-        if (!values)
-                return False;
-
-        if (values[0]) {
-                memcpy(&flat_guid.info, values[0], sizeof(UUID_FLAT));
-                smb_uuid_unpack(flat_guid, guid);
-                ldap_value_free(values);
-                return True;
-        }
-        ldap_value_free(values);
-        return False;
-
-}
-
-
-/**
- * pull a single DOM_SID from a ADS result
+        DATA_BLOB blob;
+        NTSTATUS status;
+
+        if (!smbldap_talloc_single_blob(talloc_tos(), ads->ldap.ld, msg, "objectGUID",
+                                        &blob)) {
+                return false;
+        }
+
+        status = GUID_from_ndr_blob(&blob, guid);
+        talloc_free(blob.data);
+        return NT_STATUS_IS_OK(status);
+}
+
+
+/**
+ * pull a single struct dom_sid from a ADS result
  * @param ads connection to ads server
  * @param msg Results of search
@@ -2633 +2637 @@
 */
  bool ads_pull_sid(ADS_STRUCT *ads, LDAPMessage *msg, const char *field,
-                   DOM_SID *sid)
+                   struct dom_sid *sid)
 {
         return smbldap_pull_sid(ads->ldap.ld, msg, field, sid);
@@ -2639 +2643 @@
 
 /**
- * pull an array of DOM_SIDs from a ADS result
+ * pull an array of struct dom_sids from a ADS result
  * @param ads connection to ads server
  * @param mem_ctx TALLOC_CTX for allocating sid array
@@ -2648 +2652 @@
  **/
  int ads_pull_sids(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx,
-                   LDAPMessage *msg, const char *field, DOM_SID **sids)
+                   LDAPMessage *msg, const char *field, struct dom_sid **sids)
 {
         struct berval **values;
@@ -2663 +2667 @@
 
         if (i) {
-                (*sids) = TALLOC_ARRAY(mem_ctx, DOM_SID, i);
+                (*sids) = TALLOC_ARRAY(mem_ctx, struct dom_sid, i);
                 if (!(*sids)) {
                         ldap_value_free_len(values);
@@ -2687 +2691 @@
 
 /**
- * pull a SEC_DESC from a ADS result
+ * pull a struct security_descriptor from a ADS result
  * @param ads connection to ads server
  * @param mem_ctx TALLOC_CTX for allocating sid array
  * @param msg Results of search
  * @param field Attribute to retrieve
- * @param sd Pointer to *SEC_DESC to store result (talloc()ed)
+ * @param sd Pointer to *struct security_descriptor to store result (talloc()ed)
  * @return boolean inidicating success
 */
  bool ads_pull_sd(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx,
-                  LDAPMessage *msg, const char *field, SEC_DESC **sd)
+                  LDAPMessage *msg, const char *field,
+                  struct security_descriptor **sd)
 {
         struct berval **values;
@@ -2928 +2933 @@
  * @return status of search
  **/
-ADS_STATUS ads_domain_sid(ADS_STRUCT *ads, DOM_SID *sid)
+ADS_STATUS ads_domain_sid(ADS_STRUCT *ads, struct dom_sid *sid)
 {
         const char *attrs[] = {"objectSid", NULL};
@@ -3167 +3172 @@
 
 /**
- * pull a DOM_SID from an extended dn string
+ * pull a struct dom_sid from an extended dn string
  * @param mem_ctx TALLOC_CTX
  * @param extended_dn string
  * @param flags string type of extended_dn
- * @param sid pointer to a DOM_SID
+ * @param sid pointer to a struct dom_sid
  * @return NT_STATUS_OK on success,
  *         NT_INVALID_PARAMETER on error,
@@ -3179 +3184 @@
                                         const char *extended_dn,
                                         enum ads_extended_dn_flags flags,
-                                        DOM_SID *sid)
+                                        struct dom_sid *sid)
 {
         char *p, *q, *dn;
@@ -3254 +3259 @@
 
 /**
- * pull an array of DOM_SIDs from a ADS result
+ * pull an array of struct dom_sids from a ADS result
  * @param ads connection to ads server
  * @param mem_ctx TALLOC_CTX for allocating sid array
@@ -3268 +3273 @@
                                    const char *field,
                                    enum ads_extended_dn_flags flags,
-                                   DOM_SID **sids)
+                                   struct dom_sid **sids)
 {
         int i;
@@ -3280 +3285 @@
         }
 
-        (*sids) = TALLOC_ZERO_ARRAY(mem_ctx, DOM_SID, dn_count + 1);
+        (*sids) = TALLOC_ZERO_ARRAY(mem_ctx, struct dom_sid, dn_count + 1);
         if (!(*sids)) {
                 TALLOC_FREE(dn_strings);
@@ -3498 +3503 @@
 
         hostnameDN = ads_get_dn(ads, talloc_tos(), (LDAPMessage *)msg);
+        if (hostnameDN == NULL) {
+                SAFE_FREE(host);
+                return ADS_ERROR_SYSTEM(ENOENT);
+        }
 
         rc = ldap_delete_ext_s(ads->ldap.ld, hostnameDN, pldap_control, NULL);
@@ -3585 +3594 @@
  * @param mem_ctx TALLOC_CTX for allocating sid array
  * @param dn of LDAP object
- * @param user_sid pointer to DOM_SID (objectSid)
- * @param primary_group_sid pointer to DOM_SID (self composed)
+ * @param user_sid pointer to struct dom_sid (objectSid)
+ * @param primary_group_sid pointer to struct dom_sid (self composed)
  * @param sids pointer to sid array to allocate
  * @param num_sids counter of SIDs pulled
@@ -3594 +3603 @@
                               TALLOC_CTX *mem_ctx,
                               const char *dn,
-                              DOM_SID *user_sid,
-                              DOM_SID *primary_group_sid,
-                              DOM_SID **sids,
+                              struct dom_sid *user_sid,
+                              struct dom_sid *primary_group_sid,
+                              struct dom_sid **sids,
                               size_t *num_sids)
 {
@@ -3603 +3612 @@
         int count = 0;
         size_t tmp_num_sids;
-        DOM_SID *tmp_sids;
-        DOM_SID tmp_user_sid;
-        DOM_SID tmp_primary_group_sid;
+        struct dom_sid *tmp_sids;
+        struct dom_sid tmp_user_sid;
+        struct dom_sid tmp_primary_group_sid;
         uint32 pgid;
         const char *attrs[] = {
@@ -3639 +3648 @@
                  * domsid */
 
-                DOM_SID domsid;
-                uint32 dummy_rid;
+                struct dom_sid domsid;
 
                 sid_copy(&domsid, &tmp_user_sid);
 
-                if (!sid_split_rid(&domsid, &dummy_rid)) {
+                if (!sid_split_rid(&domsid, NULL)) {
                         ads_msgfree(ads, res);
                         return ADS_ERROR_LDAP(LDAP_NO_MEMORY);