diff options
| author | Jacek Masiulaniec <jacekm@cvs.openbsd.org> | 2008-12-13 13:15:39 +0000 |
|---|---|---|
| committer | Jacek Masiulaniec <jacekm@cvs.openbsd.org> | 2008-12-13 13:15:39 +0000 |
| commit | d1450eab668cd94f4acd73c51d40daec20af005d (patch) | |
| tree | 76a54f6312a971f1fe04d74a148d209493d68513 /usr.sbin/smtpd | |
| parent | 134a8d2cef55c4c18613ff2652921c70c24e5394 (diff) | |
Declare alias_parse in smtpd.h, and fix callers that pass it wrong
number of arguments.
ok gilles@
Diffstat (limited to 'usr.sbin/smtpd')
| -rw-r--r-- | usr.sbin/smtpd/aliases.c | 3 | ||||
| -rw-r--r-- | usr.sbin/smtpd/forward.c | 4 | ||||
| -rw-r--r-- | usr.sbin/smtpd/makemap.c | 4 | ||||
| -rw-r--r-- | usr.sbin/smtpd/newaliases.c | 4 | ||||
| -rw-r--r-- | usr.sbin/smtpd/smtpd.h | 3 |
5 files changed, 6 insertions, 12 deletions
diff --git a/usr.sbin/smtpd/aliases.c b/usr.sbin/smtpd/aliases.c index 800dad308bd..49715ab5f47 100644 --- a/usr.sbin/smtpd/aliases.c +++ b/usr.sbin/smtpd/aliases.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aliases.c,v 1.11 2008/12/11 23:04:45 gilles Exp $ */ +/* $OpenBSD: aliases.c,v 1.12 2008/12/13 13:15:38 jacekm Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -40,7 +40,6 @@ #include "smtpd.h" int aliases_expand_include(struct aliaseslist *, char *); -int alias_parse(struct alias *, char *); int alias_is_filter(struct alias *, char *, size_t); int alias_is_username(struct alias *, char *, size_t); int alias_is_address(struct alias *, char *, size_t); diff --git a/usr.sbin/smtpd/forward.c b/usr.sbin/smtpd/forward.c index 641b2e6e840..4d986035065 100644 --- a/usr.sbin/smtpd/forward.c +++ b/usr.sbin/smtpd/forward.c @@ -1,4 +1,4 @@ -/* $OpenBSD: forward.c,v 1.5 2008/12/06 14:30:51 jacekm Exp $ */ +/* $OpenBSD: forward.c,v 1.6 2008/12/13 13:15:38 jacekm Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -40,8 +40,6 @@ #include "smtpd.h" -int alias_parse(struct alias *, char *); - int forwards_get(struct aliaseslist *aliases, char *username) { diff --git a/usr.sbin/smtpd/makemap.c b/usr.sbin/smtpd/makemap.c index 27841b43fa6..a291b805301 100644 --- a/usr.sbin/smtpd/makemap.c +++ b/usr.sbin/smtpd/makemap.c @@ -44,8 +44,6 @@ static int usage(void); int parse_map(const char *); int parse_entry(char *, size_t, size_t); -int alias_parse(struct alias *, char *, size_t); - DB *db; int @@ -199,7 +197,7 @@ parse_entry(char *line, size_t len, size_t lineno) val.size = 0; } - if (! alias_parse(&alias, subrcpt, strlen(subrcpt))) + if (! alias_parse(&alias, subrcpt)) goto bad; if (val.size == 0) { diff --git a/usr.sbin/smtpd/newaliases.c b/usr.sbin/smtpd/newaliases.c index 6cfbe7c4f91..be416a86883 100644 --- a/usr.sbin/smtpd/newaliases.c +++ b/usr.sbin/smtpd/newaliases.c @@ -44,8 +44,6 @@ static int usage(void); int parse_aliases(const char *); int parse_entry(char *, size_t, size_t); -int alias_parse(struct alias *, char *, size_t); - DB *db; static int dflag; @@ -197,7 +195,7 @@ parse_entry(char *line, size_t len, size_t lineno) val.size = 0; } - if (! alias_parse(&alias, subrcpt, strlen(subrcpt))) + if (! alias_parse(&alias, subrcpt)) goto bad; if (val.size == 0) { diff --git a/usr.sbin/smtpd/smtpd.h b/usr.sbin/smtpd/smtpd.h index b5726320601..a490bc11098 100644 --- a/usr.sbin/smtpd/smtpd.h +++ b/usr.sbin/smtpd/smtpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpd.h,v 1.25 2008/12/12 20:19:56 jacekm Exp $ */ +/* $OpenBSD: smtpd.h,v 1.26 2008/12/13 13:15:38 jacekm Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -645,6 +645,7 @@ int aliases_exist(struct smtpd *, char *); int aliases_get(struct smtpd *, struct aliaseslist *, char *); int aliases_virtual_exist(struct smtpd *, struct path *); int aliases_virtual_get(struct smtpd *, struct aliaseslist *, struct path *); +int alias_parse(struct alias *, char *); /* log.c */ |