diff options
| author |   gilles <gilles@openbsd.org> | 2008-12-11 22:59:14 +0000 |
|---|---|---|
| committer | gilles <gilles@openbsd.org> | 2008-12-11 22:59:14 +0000 |
| commit | fedcac8d4a073340ef6c0d25842989cf9d19f609 (patch) | |
| tree | 596c848bc93bff96f954374a7b39151bdee39f9a | |
| parent | - fix a bug that would cause the runner to hit a fatal() when running out (diff) | |
| download | wireguard-openbsd-fedcac8d4a073340ef6c0d25842989cf9d19f609.tar.xz wireguard-openbsd-fedcac8d4a073340ef6c0d25842989cf9d19f609.zip | |
- snprintf -> bsnprintf
| -rw-r--r-- | usr.sbin/smtpd/runner.c | 21 | ||||
| -rw-r--r-- | usr.sbin/smtpd/ssl.c | 13 |
2 files changed, 12 insertions, 22 deletions
diff --git a/usr.sbin/smtpd/runner.c b/usr.sbin/smtpd/runner.c index 6f75aee3b5f..969945e556a 100644 --- a/usr.sbin/smtpd/runner.c +++ b/usr.sbin/smtpd/runner.c @@ -1,4 +1,4 @@ -/* $OpenBSD: runner.c,v 1.5 2008/12/11 22:32:27 gilles Exp $ */ +/* $OpenBSD: runner.c,v 1.6 2008/12/11 22:59:14 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -465,13 +465,11 @@ runner_process_queue(struct smtpd *env) void runner_process_bucket(struct smtpd *env, u_int16_t bucket) { - int spret; DIR *dirp = NULL; struct dirent *dp; char bucketpath[MAXPATHLEN]; - spret = snprintf(bucketpath, MAXPATHLEN, "%s/%d", PATH_QUEUE, bucket); - if (spret == -1 || spret >= MAXPATHLEN) + if (! bsnprintf(bucketpath, MAXPATHLEN, "%s/%d", PATH_QUEUE, bucket)) fatal("queue_process_bucket: snprintf"); dirp = opendir(bucketpath); @@ -493,7 +491,6 @@ runner_process_bucket(struct smtpd *env, u_int16_t bucket) void runner_process_message(struct smtpd *env, char *messageid) { - int spret; DIR *dirp = NULL; struct dirent *dp; char evppath[MAXPATHLEN]; @@ -501,9 +498,8 @@ runner_process_message(struct smtpd *env, char *messageid) hval = hash(messageid, strlen(messageid)) % DIRHASH_BUCKETS; - spret = snprintf(evppath, MAXPATHLEN, "%s/%d/%s%s", PATH_QUEUE, hval, - messageid, PATH_ENVELOPES); - if (spret == -1 || spret >= MAXPATHLEN) + if (! bsnprintf(evppath, MAXPATHLEN, "%s/%d/%s%s", PATH_QUEUE, hval, + messageid, PATH_ENVELOPES)) fatal("queue_process_message: snprintf"); dirp = opendir(evppath); @@ -525,7 +521,6 @@ runner_process_message(struct smtpd *env, char *messageid) void runner_process_envelope(struct smtpd *env, char *msgid, char *evpid) { - int spret; struct message message; time_t tm; char evppath[MAXPATHLEN]; @@ -550,13 +545,11 @@ runner_process_envelope(struct smtpd *env, char *msgid, char *evpid) queue_update_envelope(&message); hval = hash(msgid, strlen(msgid)) % DIRHASH_BUCKETS; - spret = snprintf(evppath, MAXPATHLEN, "%s/%d/%s%s/%s", PATH_QUEUE, hval, - msgid, PATH_ENVELOPES, evpid); - if (spret == -1 || spret >= MAXPATHLEN) + if (! bsnprintf(evppath, MAXPATHLEN, "%s/%d/%s%s/%s", PATH_QUEUE, hval, + msgid, PATH_ENVELOPES, evpid)) fatal("queue_process_envelope: snprintf"); - spret = snprintf(rqpath, MAXPATHLEN, "%s/%s", PATH_RUNQUEUE, evpid); - if (spret == -1 || spret >= MAXPATHLEN) + if (! bsnprintf(rqpath, MAXPATHLEN, "%s/%s", PATH_RUNQUEUE, evpid)) fatal("queue_process_envelope: snprintf"); if (stat(rqpath, &sb) == -1) { diff --git a/usr.sbin/smtpd/ssl.c b/usr.sbin/smtpd/ssl.c index b70bab95713..3c2cefedbb7 100644 --- a/usr.sbin/smtpd/ssl.c +++ b/usr.sbin/smtpd/ssl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl.c,v 1.3 2008/11/10 00:57:35 gilles Exp $ */ +/* $OpenBSD: ssl.c,v 1.4 2008/12/11 23:01:16 gilles Exp $ */ /* * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -285,7 +285,6 @@ ssl_load_certfile(struct smtpd *env, const char *name) struct ssl *s; struct ssl key; char certfile[PATH_MAX]; - int spret; if (strlcpy(key.ssl_name, name, sizeof(key.ssl_name)) >= sizeof(key.ssl_name)) { @@ -302,9 +301,8 @@ ssl_load_certfile(struct smtpd *env, const char *name) (void)strlcpy(s->ssl_name, key.ssl_name, sizeof(s->ssl_name)); - spret = snprintf(certfile, sizeof(certfile), - "/etc/mail/certs/%s.crt", name); - if (spret == -1 || spret >= (int)sizeof(certfile)) { + if (! bsnprintf(certfile, sizeof(certfile), + "/etc/mail/certs/%s.crt", name)) { free(s); return (-1); } @@ -314,9 +312,8 @@ ssl_load_certfile(struct smtpd *env, const char *name) return (-1); } - spret = snprintf(certfile, sizeof(certfile), - "/etc/mail/certs/%s.key", name); - if (spret == -1 || spret >= (int)sizeof(certfile)) { + if (! bsnprintf(certfile, sizeof(certfile), + "/etc/mail/certs/%s.key", name)) { free(s->ssl_cert); free(s); return -1; |