summaryrefslogtreecommitdiff
path: root/usr.sbin/smtpd/smtpd.c
diff options
context:
space:
mode:
authorJoerg Jung <jung@cvs.openbsd.org>2015-12-28 22:08:31 +0000
committerJoerg Jung <jung@cvs.openbsd.org>2015-12-28 22:08:31 +0000
commit3e921c7dd8d131d23866c66897ecbc8d31ed8cfd (patch)
tree2eac5faa44ffaf675263cdaf9edc9253e1966c40 /usr.sbin/smtpd/smtpd.c
parent2b7e45a9f71e83195c6a0adf68237584f51e58a7 (diff)
remove spaces after '!'
no binary change ok millert
Diffstat (limited to 'usr.sbin/smtpd/smtpd.c')
-rw-r--r--usr.sbin/smtpd/smtpd.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/usr.sbin/smtpd/smtpd.c b/usr.sbin/smtpd/smtpd.c
index 2e0d4e8d313..2fd69397bd4 100644
--- a/usr.sbin/smtpd/smtpd.c
+++ b/usr.sbin/smtpd/smtpd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: smtpd.c,v 1.268 2015/12/20 14:06:24 gilles Exp $ */
+/* $OpenBSD: smtpd.c,v 1.269 2015/12/28 22:08:30 jung Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -644,7 +644,7 @@ main(int argc, char *argv[])
log_info("info: %s %s starting", SMTPD_NAME, SMTPD_VERSION);
- if (! foreground)
+ if (!foreground)
if (daemon(0, 0) == -1)
err(1, "failed to daemonize");
@@ -726,11 +726,11 @@ load_pki_tree(void)
if (pki->pki_key_file == NULL)
fatalx("load_pki_tree: missing key file");
- if (! ssl_load_certificate(pki, pki->pki_cert_file))
+ if (!ssl_load_certificate(pki, pki->pki_cert_file))
fatalx("load_pki_tree: failed to load certificate file");
if (pki->pki_dhparams_file)
- if (! ssl_load_dhparams(pki, pki->pki_dhparams_file))
+ if (!ssl_load_dhparams(pki, pki->pki_dhparams_file))
fatalx("load_pki_tree: failed to load dhparams file");
}
@@ -738,7 +738,7 @@ load_pki_tree(void)
iter_dict = NULL;
while (dict_iter(env->sc_ca_dict, &iter_dict, &k, (void **)&sca)) {
log_debug("info: loading CA information for %s", k);
- if (! ssl_load_cafile(sca, sca->ca_cert_file))
+ if (!ssl_load_cafile(sca, sca->ca_cert_file))
fatalx("load_pki_tree: failed to load CA file");
}
}
@@ -755,7 +755,7 @@ load_pki_keys(void)
while (dict_iter(env->sc_pki_dict, &iter_dict, &k, (void **)&pki)) {
log_debug("info: loading pki keys for %s", k);
- if (! ssl_load_keyfile(pki, pki->pki_key_file, k))
+ if (!ssl_load_keyfile(pki, pki->pki_key_file, k))
fatalx("load_pki_keys: failed to load key file");
}
}
@@ -933,7 +933,7 @@ forkmda(struct mproc *p, uint64_t id, struct deliver *deliver)
return;
}
- if (deliver->userinfo.uid == 0 && ! db->allow_root) {
+ if (deliver->userinfo.uid == 0 && !db->allow_root) {
(void)snprintf(ebuf, sizeof ebuf, "not allowed to deliver to: %s",
deliver->user);
m_create(p_pony, IMSG_MDA_DONE, 0, 0, -1);
@@ -1129,7 +1129,7 @@ offline_enqueue(char *name)
_exit(1);
}
- if (! S_ISREG(sb.st_mode)) {
+ if (!S_ISREG(sb.st_mode)) {
log_warnx("warn: smtpd: file %s (uid %d) not regular",
path, sb.st_uid);
_exit(1);
@@ -1237,7 +1237,7 @@ parent_forward_open(char *username, char *directory, uid_t uid, gid_t gid)
int fd;
struct stat sb;
- if (! bsnprintf(pathname, sizeof (pathname), "%s/.forward",
+ if (!bsnprintf(pathname, sizeof (pathname), "%s/.forward",
directory)) {
log_warnx("warn: smtpd: %s: pathname too large", pathname);
return -1;
@@ -1272,7 +1272,7 @@ parent_forward_open(char *username, char *directory, uid_t uid, gid_t gid)
return -1;
}
- if (! secure_file(fd, pathname, directory, uid, 1)) {
+ if (!secure_file(fd, pathname, directory, uid, 1)) {
log_warnx("warn: smtpd: %s: unsecure file", pathname);
close(fd);
return -1;
@@ -1318,7 +1318,7 @@ imsg_dispatch(struct mproc *p, struct imsg *imsg)
if (smtpd_process == PROC_CONTROL)
return;
- if (! bsnprintf(key, sizeof key,
+ if (!bsnprintf(key, sizeof key,
"profiling.imsg.%s.%s.%s",
proc_name(smtpd_process),
proc_name(p->proc),