Changeset 370 for branches/samba-3.3.x/source/lib

Timestamp:

Jan 15, 2010, 8:23:30 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 to 3.3.10 (source)

Location:

branches/samba-3.3.x/source/lib

Files:

• os2ea.c (modified) (1 diff)
• smbldap.c (modified) (1 diff)

branches/samba-3.3.x/source/lib/os2ea.c

@@ -383 +383 @@
                 if (pfea->oNextEntryOffset > 0x10000)
                 {
-                        DEBUG(0, ("Broken Extended Attributes detected for: %s:%d\n", path ? path : "null", file));
+                        // DEBUG(0, ("Broken Extended Attributes detected for: %s:%d\n", path ? path : "null", file));
+                        DEBUG(0, ("Broken Extended Attributes detected for: %s:%d, Last EA:%s\n", path ? path : "null", file, pfea->szName));
                         break;
                 }

branches/samba-3.3.x/source/lib/smbldap.c

@@ -334 +334 @@
 }
 
+ char * smbldap_talloc_first_attribute(LDAP *ldap_struct, LDAPMessage *entry,
+                                       const char *attribute,
+                                       TALLOC_CTX *mem_ctx)
+{
+        char **values;
+        char *result;
+        size_t converted_size;
+
+        if (attribute == NULL) {
+                return NULL;
+        }
+
+        values = ldap_get_values(ldap_struct, entry, attribute);
+
+        if (values == NULL) {
+                DEBUG(10, ("attribute %s does not exist\n", attribute));
+                return NULL;
+        }
+
+        if (!pull_utf8_talloc(mem_ctx, &result, values[0], &converted_size)) {
+                DEBUG(10, ("pull_utf8_talloc failed\n"));
+                ldap_value_free(values);
+                return NULL;
+        }
+
+        ldap_value_free(values);
+
+#ifdef DEBUG_PASSWORDS
+        DEBUG (100, ("smbldap_get_first_attribute: [%s] = [%s]\n",
+                     attribute, result));
+#endif
+        return result;
+}
+
  char * smbldap_talloc_smallest_attribute(LDAP *ldap_struct, LDAPMessage *entry,
                                           const char *attribute,