Sync with devel

diff --git a/clients/maildap/main.c b/clients/maildap/main.c
index f45d3fe9491a987254023bc89937dde498b357de..6233497d45217a87ad3b8c961b06e177f302c3c7 100644 (file)
--- a/clients/maildap/main.c
+++ b/clients/maildap/main.c
@@ -218,6 +218,11 @@ main ( int argc, char **argv )
 
                case 'f':       /* who it's from & where errors should go */
                        mailfrom = strdup( optarg );
+                       /* Deal with <> */
+                       if ( mailfrom[0] == '\0' ) {
+                               free( mailfrom );
+                               mailfrom = strdup( "<>" );
+                       }
                        for ( j = 0; sendmailargs[j] != NULL; j++ ) {
                                if ( strcmp( sendmailargs[j], "-f" ) == 0 ) {
                                        sendmailargs[j+1] = mailfrom;