svn commit: samba r17511 - in branches/SOC/mkhl: ldb-map/common ldb-map/include ldb-map/tests/schema-tests samdb-map/ldb_modules

[mkhl at samba.org]

Author: mkhl
Date: 2006-08-13 00:01:26 +0000 (Sun, 13 Aug 2006)
New Revision: 17511

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17511

Log:
Merge from mainline, r17510
Modified:
   branches/SOC/mkhl/ldb-map/common/ldb_msg.c
   branches/SOC/mkhl/ldb-map/include/ldb.h
   branches/SOC/mkhl/ldb-map/tests/schema-tests/schema.ldif
   branches/SOC/mkhl/samdb-map/ldb_modules/password_hash.c


Changeset:
Modified: branches/SOC/mkhl/ldb-map/common/ldb_msg.c
===================================================================
--- branches/SOC/mkhl/ldb-map/common/ldb_msg.c	2006-08-12 23:56:53 UTC (rev 17510)
+++ branches/SOC/mkhl/ldb-map/common/ldb_msg.c	2006-08-13 00:01:26 UTC (rev 17511)
@@ -377,6 +377,19 @@
 	return (const char *)v->data;
 }
 
+struct ldb_dn *ldb_msg_find_dn(void *mem_ctx,
+				const struct ldb_message *msg,
+				const char *attr_name)
+{
+	const struct ldb_val *v;
+
+	v = ldb_msg_find_ldb_val(msg, attr_name);
+	if (!v || !v->data) {
+		return NULL;
+	}
+	return ldb_dn_explode(mem_ctx, (const char *)v->data);
+}
+
 /*
   sort the elements of a message by name
 */

Modified: branches/SOC/mkhl/ldb-map/include/ldb.h
===================================================================
--- branches/SOC/mkhl/ldb-map/include/ldb.h	2006-08-12 23:56:53 UTC (rev 17510)
+++ branches/SOC/mkhl/ldb-map/include/ldb.h	2006-08-13 00:01:26 UTC (rev 17511)
@@ -1269,6 +1269,10 @@
 				const char *attr_name,
 				const char *default_value);
 
+struct ldb_dn *ldb_msg_find_dn(void *mem_ctx,
+				   const struct ldb_message *msg,
+				   const char *attr_name);
+
 void ldb_msg_sort_elements(struct ldb_message *msg);
 
 struct ldb_message *ldb_msg_copy_shallow(void *mem_ctx, 

Modified: branches/SOC/mkhl/ldb-map/tests/schema-tests/schema.ldif
===================================================================
--- branches/SOC/mkhl/ldb-map/tests/schema-tests/schema.ldif	2006-08-12 23:56:53 UTC (rev 17510)
+++ branches/SOC/mkhl/ldb-map/tests/schema-tests/schema.ldif	2006-08-13 00:01:26 UTC (rev 17511)
@@ -4,7 +4,8 @@
 @IDXATTR: objectSid
 @IDXATTR: objectClass
 @IDXATTR: member
- at IDXATTR: unixID
+ at IDXATTR: uidNumber
+ at IDXATTR: gidNumber
 @IDXATTR: unixName
 @IDXATTR: privilege
 @IDXATTR: lDAPDisplayName

Modified: branches/SOC/mkhl/samdb-map/ldb_modules/password_hash.c
===================================================================
--- branches/SOC/mkhl/samdb-map/ldb_modules/password_hash.c	2006-08-12 23:56:53 UTC (rev 17510)
+++ branches/SOC/mkhl/samdb-map/ldb_modules/password_hash.c	2006-08-13 00:01:26 UTC (rev 17511)
@@ -512,7 +512,6 @@
 	ac->dom_req->controls = NULL;
 	ac->dom_req->context = ac;
 	ac->dom_req->callback = get_domain_data_callback;
-	ac->dom_req->timeout = ac->orig_req->timeout;
 	ldb_set_timeout_from_prev_req(ac->module->ldb, ac->orig_req, ac->dom_req);
 
 	return LDB_SUCCESS;