File alt_addresses_domain.patch of Package alpine

Overview Repositories Revisions Requests Users Attributes Meta

File alt_addresses_domain.patch of Package alpine (Revision 5da7dd23b459b9e62db8726a9f17aa34)

Currently displaying revision 5da7dd23b459b9e62db8726a9f17aa34 , Show latest

diff -ur alpine-0.9999/pith/ablookup.c alpine-0.9999mod/pith/ablookup.c
--- alpine-0.9999/pith/ablookup.c	2007-08-17 00:25:10.000000000 +0200
+++ alpine-0.9999mod/pith/ablookup.c	2007-09-19 18:47:04.000000000 +0200
@@ -770,7 +770,7 @@
 	    if(alt)
 	      fs_give((void **)&alt);
 
-	    if(address_is_same(a, alt_addr)){
+	    if(address_is_same_domain(a, alt_addr)){
 		if(alt_addr)
 		  mail_free_address(&alt_addr);
 
@@ -804,6 +804,25 @@
            && strucmp(a->host, b->host) == 0);
 }
 
+/*
+ * Compare the two addresses, and return true if they're the same,
+ * false otherwise
+ * second address may have '*' as mailbox part 
+ *
+ * Args: a -- First address for comparison
+ *       b -- Second address for comparison
+ *
+ * Result: returns 1 if it matches, 0 otherwise.
+ */
+int
+address_is_same_domain(struct mail_address *a, struct mail_address *b)
+{
+    return(a && b && a->mailbox && b->mailbox && a->host && b->host
+	   && (strucmp(a->mailbox, b->mailbox) == 0
+           || strucmp("*", b->mailbox) == 0)
+           && strucmp(a->host, b->host) == 0);
+}
+
 
 /*
  * Returns nonzero if the two address book entries are equal.
diff -ur alpine-0.9999/pith/ablookup.h alpine-0.9999mod/pith/ablookup.h
--- alpine-0.9999/pith/ablookup.h	2007-01-31 01:36:05.000000000 +0100
+++ alpine-0.9999mod/pith/ablookup.h	2007-09-19 17:58:26.000000000 +0200
@@ -34,6 +34,7 @@
 char          *abe_to_nick_or_addr_string(AdrBk_Entry *, AddrScrn_Disp *, int);
 int            address_is_us(ADDRESS *, struct pine *);
 int            address_is_same(ADDRESS *, ADDRESS *);
+int            address_is_same_domain(ADDRESS *, ADDRESS *);
 int            abes_are_equal(AdrBk_Entry *, AdrBk_Entry *);
 char          *addr_lookup(char *, int *, int);
 int            adrbk_nick_complete(char *, char **, unsigned);

Places

File alt_addresses_domain.patch of Package alpine (Revision 5da7dd23b459b9e62db8726a9f17aa34)

Places