Update copyright notices

[openldap] / clients / maildap / main.c

diff --git a/clients/maildap/main.c b/clients/maildap/main.c
index f45d3fe9491a987254023bc89937dde498b357de..36b58576b8439c13ced327235eddad9e1d226296 100644 (file)
--- a/clients/maildap/main.c
+++ b/clients/maildap/main.c
@@ -191,7 +191,7 @@ main ( int argc, char **argv )
        int             i, j;
        char            *conffile = NULL;
 
-       if ( (myname = strrchr( argv[0], '/' )) == NULL )
+       if ( (myname = strrchr( argv[0], *LDAP_DIRSEP )) == NULL )
                myname = strdup( argv[0] );
        else
                myname = strdup( myname + 1 );
@@ -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;
@@ -329,7 +334,7 @@ main ( int argc, char **argv )
                        free( localpart );
                        free( domainpart );
                } else {
-                       sprintf( address, "%s@%s", localpart, domainpart );
+                       sprintf( address, "%s", localpart );
                        free( localpart );
                }
                do_address( address, &tolist, &numto, &togroups, &ngroups,