Author: mkhl Date: 2006-07-15 18:28:27 +0000 (Sat, 15 Jul 2006) New Revision: 17067
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17067 Log: When merging search results and the remote result contains an unmapped attribute, assume it was auto-generated and skip it. Martin Modified: branches/SOC/mkhl/ldb-map/modules/ldb_map.c Changeset: Modified: branches/SOC/mkhl/ldb-map/modules/ldb_map.c =================================================================== --- branches/SOC/mkhl/ldb-map/modules/ldb_map.c 2006-07-15 18:26:12 UTC (rev 17066) +++ branches/SOC/mkhl/ldb-map/modules/ldb_map.c 2006-07-15 18:28:27 UTC (rev 17067) @@ -1687,12 +1687,13 @@ { struct ldb_message_element *el; - /* no mapping: fail */ + /* unmapped attribute in remote message: + skip, attribute was probably auto-generated */ if (map == NULL) { ldb_debug(module->ldb, LDB_DEBUG_WARNING, "ldb_map: " "Not mapping attribute '%s': no mapping found\n", old->name); - goto failed; + goto unmapped; } switch (map->type) {
