X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=filter.c;h=520d4ceddd5b1f248505667274dec44503145c28;hb=cd6241eed4fe11f496a88a665acbafba81d5ec51;hp=fd81174bcf102ed6e10db7d81aecf82303dca8f5;hpb=6a914ed14df9e9bca28eaca566ed7894f5491894;p=pkg%2Fabook.git

diff --git a/filter.c b/filter.c
index fd81174..520d4ce 100644
--- a/filter.c
+++ b/filter.c
@@ -29,7 +29,7 @@
 #include "xmalloc.h"
 #include <assert.h>
 
-#ifdef VFORMAT
+#ifdef HAVE_VFORMAT
 #include "vcard.h"
 #endif
 
@@ -297,7 +297,7 @@ import_file(char filtname[FILTNAME_LEN], char *filename)
 	if(i < 0)
 		return -1;
 
-#ifdef VFORMAT
+#ifdef HAVE_VFORMAT
 	// this is a special case for
 	// libvformat whose API expects a filename
 	if(!strcmp(filtname, "vcard")) {
@@ -630,16 +630,10 @@ ldif_convert(ldif_item item, char *type, char *value)
 		return;
 	}
 
-	for(i=0; i < LDIF_ITEM_FIELDS; i++) {
-		if(!safe_strcmp(ldif_field_names[i], type) && *value) {
-			if(i == LDIF_ITEM_FIELDS - 1) /* this is a dirty hack */
-				if(safe_strcmp("person", value))
-					break;
-
-			if(item_fget(item, i))
-				free(item_fget(item, i));
-
+	for(i=0; i < LDIF_ITEM_FIELDS - 1; i++) {
+                if(!strcasecmp(ldif_field_names[i], type) && *value) {
 			item_fput(item, i, xstrdup(value));
+			break;
 		}
 	}
 }