Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 4187db44 4187db448ac956932bfe3ea115257b395e91d8ba by Wojciech Polak
Options

(_url_smtp_init): Do not reject an URL with user name, password, or auth method specified. 

We will use it in further ESMTP authentication.
1 parent 368eb764
Inline Side-by-side
Showing 1 changed file with 6 additions and 4 deletions
1 /* GNU Mailutils -- a suite of utilities for electronic mail 1 /* GNU Mailutils -- a suite of utilities for electronic mail
2 Copyright (C) 1999, 2000 Free Software Foundation, Inc. 2 Copyright (C) 1999, 2000, 2005 Free Software Foundation, Inc.
3 3
4 This library is free software; you can redistribute it and/or 4 This library is free software; you can redistribute it and/or
5 modify it under the terms of the GNU Lesser General Public 5 modify it under the terms of the GNU Lesser General Public
...@@ -40,7 +40,6 @@ _url_smtp_init (url_t url) ...@@ -40,7 +40,6 @@ _url_smtp_init (url_t url)
40 return EINVAL; 40 return EINVAL;
41 41
42 /* host isn't optional */ 42 /* host isn't optional */
43
44 if(!url->host) 43 if(!url->host)
45 return EINVAL; 44 return EINVAL;
46 45
...@@ -48,11 +47,14 @@ _url_smtp_init (url_t url) ...@@ -48,11 +47,14 @@ _url_smtp_init (url_t url)
48 if(!url->port) 47 if(!url->port)
49 url->port = MU_SMTP_PORT; 48 url->port = MU_SMTP_PORT;
50 49
50 /* accept url->user, pass, and auth
51 for the ESMTP authentication */
52
51 /* all other fields must be NULL */ 53 /* all other fields must be NULL */
52 if(url->user || url->passwd || url->auth || url->path || url->query) 54 if(url->path || url->query)
53 return EINVAL; 55 return EINVAL;
54 56
55 return 0; 57 return 0;
56 } 58 }
57 59
58 #endif 60 #endif /* ENABLE_SMTP */
......