diff options
| author | Gilles Chehade <gilles@cvs.openbsd.org> | 2009-06-03 18:16:30 +0000 |
|---|---|---|
| committer | Gilles Chehade <gilles@cvs.openbsd.org> | 2009-06-03 18:16:30 +0000 |
| commit | fcd184b84e4d304da035d3702d7713cfdca9babd (patch) | |
| tree | 1b759c06408c955fa304b6b78ce017540f592ffe | |
| parent | af667a04b5b4a1b58339d002876674c313ca3833 (diff) | |
rename sc_config to sc_conffile since that's what this field is about, it
will prevent a confusion with sc_config which will be a pointer to the
actual configuration.
| -rw-r--r-- | usr.sbin/smtpd/smtpd.c | 6 | ||||
| -rw-r--r-- | usr.sbin/smtpd/smtpd.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/smtpd/smtpd.c b/usr.sbin/smtpd/smtpd.c index d59ae8b6b59..9c49ca130dc 100644 --- a/usr.sbin/smtpd/smtpd.c +++ b/usr.sbin/smtpd/smtpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpd.c,v 1.72 2009/06/02 22:23:36 gilles Exp $ */ +/* $OpenBSD: smtpd.c,v 1.73 2009/06/03 18:16:29 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -665,7 +665,7 @@ parent_dispatch_control(int sig, short event, void *p) struct smtpd newenv; r->ret = 0; - if (parse_config(&newenv, env->sc_config, 0) == 0) { + if (parse_config(&newenv, env->sc_conffile, 0) == 0) { (void)strlcpy(env->sc_hostname, newenv.sc_hostname, sizeof(env->sc_hostname)); @@ -836,7 +836,7 @@ main(int argc, char *argv[]) if (parse_config(&env, conffile, opts)) exit(1); - if (strlcpy(env.sc_config, conffile, MAXPATHLEN) >= MAXPATHLEN) + if (strlcpy(env.sc_conffile, conffile, MAXPATHLEN) >= MAXPATHLEN) errx(1, "config file exceeds MAXPATHLEN"); diff --git a/usr.sbin/smtpd/smtpd.h b/usr.sbin/smtpd/smtpd.h index 4ffeb3cca9f..4d6b7505fca 100644 --- a/usr.sbin/smtpd/smtpd.h +++ b/usr.sbin/smtpd/smtpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpd.h,v 1.122 2009/06/02 22:23:36 gilles Exp $ */ +/* $OpenBSD: smtpd.h,v 1.123 2009/06/03 18:16:29 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -653,7 +653,7 @@ struct session { }; struct smtpd { - char sc_config[MAXPATHLEN]; + char sc_conffile[MAXPATHLEN]; #define SMTPD_OPT_VERBOSE 0x00000001 #define SMTPD_OPT_NOACTION 0x00000002 |