OpenBSD CVS

CVS log for src/usr.sbin/smtpd/makemap.8


[BACK] Up to [local] / src / usr.sbin / smtpd

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.31 / (download) - annotate - [select for diffs], Sat Feb 13 07:37:13 2021 UTC (3 years, 3 months ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_7_5_BASE, OPENBSD_7_5, OPENBSD_7_4_BASE, OPENBSD_7_4, OPENBSD_7_3_BASE, OPENBSD_7_3, OPENBSD_7_2_BASE, OPENBSD_7_2, OPENBSD_7_1_BASE, OPENBSD_7_1, OPENBSD_7_0_BASE, OPENBSD_7_0, OPENBSD_6_9_BASE, OPENBSD_6_9, HEAD
Changes since 1.30: +6 -6 lines
Diff to previous 1.30 (colored)

various readability fixes; from larry hynes

Revision 1.30 / (download) - annotate - [select for diffs], Sun Nov 25 14:41:16 2018 UTC (5 years, 6 months ago) by gilles
Branch: MAIN
CVS Tags: OPENBSD_6_8_BASE, OPENBSD_6_8, OPENBSD_6_7_BASE, OPENBSD_6_7, OPENBSD_6_6_BASE, OPENBSD_6_6, OPENBSD_6_5_BASE, OPENBSD_6_5
Changes since 1.29: +13 -8 lines
Diff to previous 1.29 (colored)

fix examples there were still using old grammar

diff from Edgar Pettijohn III <edgar@pettijohn-web.com>

Revision 1.29 / (download) - annotate - [select for diffs], Sat Feb 13 08:53:18 2016 UTC (8 years, 3 months ago) by gilles
Branch: MAIN
CVS Tags: OPENBSD_6_4_BASE, OPENBSD_6_4, OPENBSD_6_3_BASE, OPENBSD_6_3, OPENBSD_6_2_BASE, OPENBSD_6_2, OPENBSD_6_1_BASE, OPENBSD_6_1, OPENBSD_6_0_BASE, OPENBSD_6_0, OPENBSD_5_9_BASE, OPENBSD_5_9
Changes since 1.28: +3 -4 lines
Diff to previous 1.28 (colored)

remove support for 'dbm' which is really 'recno' from our makemap, it can't
work because it requires dbopen() to be the call that creates the db, while
we want mkstemp() to create an empty db ourselves.

it has never worked, no one could ever create a recno db with our makemap &
no one actually noticed so drop it.

ok millert@, sunil@, jung@

Revision 1.28 / (download) - annotate - [select for diffs], Mon Dec 14 10:17:45 2015 UTC (8 years, 5 months ago) by jmc
Branch: MAIN
Changes since 1.27: +11 -11 lines
Diff to previous 1.27 (colored)

oops, sorry sunil, -d was in the wrong place:
so much for my ok ;(

Revision 1.27 / (download) - annotate - [select for diffs], Mon Dec 14 09:22:57 2015 UTC (8 years, 5 months ago) by sunil
Branch: MAIN
Changes since 1.26: +12 -2 lines
Diff to previous 1.26 (colored)

Document -d option.

Ok gilles@ jmc@

Revision 1.26 / (download) - annotate - [select for diffs], Fri Dec 11 07:10:06 2015 UTC (8 years, 5 months ago) by guenther
Branch: MAIN
Changes since 1.25: +7 -2 lines
Diff to previous 1.25 (colored)

Add -U option like the sendmail makemap, for dumping DB files back to text

ok sunil@ gilles@

Revision 1.25 / (download) - annotate - [select for diffs], Sat Oct 17 19:42:12 2015 UTC (8 years, 7 months ago) by gilles
Branch: MAIN
Changes since 1.24: +9 -2 lines
Diff to previous 1.24 (colored)

document handling of comments in makemap

ok millert@, ok sunil@, ok jung@

Revision 1.24 / (download) - annotate - [select for diffs], Tue Sep 29 13:57:01 2015 UTC (8 years, 8 months ago) by millert
Branch: MAIN
Changes since 1.23: +3 -2 lines
Diff to previous 1.23 (colored)

makemap(8) should Xr table(5); OK gilles@

Revision 1.23 / (download) - annotate - [select for diffs], Tue Sep 16 21:18:19 2014 UTC (9 years, 8 months ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_5_8_BASE, OPENBSD_5_8, OPENBSD_5_7_BASE, OPENBSD_5_7
Changes since 1.22: +2 -3 lines
Diff to previous 1.22 (colored)

there is no editmap;

Revision 1.22 / (download) - annotate - [select for diffs], Fri Jul 19 15:17:01 2013 UTC (10 years, 10 months ago) by eric
Branch: MAIN
CVS Tags: OPENBSD_5_6_BASE, OPENBSD_5_6, OPENBSD_5_5_BASE, OPENBSD_5_5, OPENBSD_5_4_BASE, OPENBSD_5_4
Changes since 1.21: +2 -2 lines
Diff to previous 1.21 (colored)

typo in copyright

Revision 1.21 / (download) - annotate - [select for diffs], Sat Jan 26 14:13:25 2013 UTC (11 years, 4 months ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_5_3_BASE, OPENBSD_5_3
Changes since 1.20: +3 -4 lines
Diff to previous 1.20 (colored)

tweak previous;

Revision 1.20 / (download) - annotate - [select for diffs], Sat Jan 26 09:37:23 2013 UTC (11 years, 4 months ago) by gilles
Branch: MAIN
Changes since 1.19: +35 -17 lines
Diff to previous 1.19 (colored)

Sync with our smtpd repo:

* first bricks of ldap and sqlite support (not finished but both working)
* new table API to replace map API, all lookups are done through tables
* improved handling of temporary errors throughout the daemon
* improved scheduler and mta logic: connection reuse, optimizes batches
* improved queue: more tolerant to admin errors, new layout, less disk-IO
* improved memory usage under high load
* SSL certs/keys isolated to lookup process to avoid facing network
* VIRTUAL support improved, fully virtual setups possible now
* runtime tracing of processes through smtpctl trace
* ssl_privsep.c sync-ed with relayd
* ssl.c no longer contains smtpd specific interfaces
* smtpd-specific ssl bits moved to ssl_smtpd.c
* update mail address in copyright

FLUSH YOUR QUEUE. FLUSH YOUR QUEUE. FLUSH YOUR QUEUE. FLUSH YOUR QUEUE.

smtpd.conf(5) simplified, it will require adaptations

ok eric@

Revision 1.19 / (download) - annotate - [select for diffs], Sun Nov 18 22:38:57 2012 UTC (11 years, 6 months ago) by jmc
Branch: MAIN
Changes since 1.18: +2 -3 lines
Diff to previous 1.18 (colored)

knock out a useless .Pp;

Revision 1.18 / (download) - annotate - [select for diffs], Sun Nov 18 22:08:56 2012 UTC (11 years, 6 months ago) by rpe
Branch: MAIN
Changes since 1.17: +3 -3 lines
Diff to previous 1.17 (colored)

remove { } from example in PRIMARY DOMAIN section

ok gilles

Revision 1.17 / (download) - annotate - [select for diffs], Sun May 13 13:57:24 2012 UTC (12 years ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_5_2_BASE, OPENBSD_5_2
Changes since 1.16: +5 -5 lines
Diff to previous 1.16 (colored)

replace tabs with spaces, to avoid markup problems; ok gilles

Revision 1.16 / (download) - annotate - [select for diffs], Sat May 12 21:49:31 2012 UTC (12 years ago) by gilles
Branch: MAIN
Changes since 1.15: +4 -4 lines
Diff to previous 1.15 (colored)

- remove unused sources S_EXT, S_DYN and S_EXT from enum map_src
- continue simplification of parse.y
- remove "for network", if we ever need it we can reimport, probably no
  one knows of that undocumented strange feature ;-)
- change syntax for virtual domains configuration:

	  accept for virtual vmap	[...] <- wrong
	  accept for virtual map vmap	[...] <- right

  the reason for this change is that we will soon implement relay rules
  through maps and that keeping that syntax would make it inconsistent
  with the other rules.

- update man pages for makemap and smtpd.conf to reflect changes

ok eric@, looks ok chl@

Revision 1.15 / (download) - annotate - [select for diffs], Mon Oct 10 21:06:06 2011 UTC (12 years, 7 months ago) by gilles
Branch: MAIN
CVS Tags: OPENBSD_5_1_BASE, OPENBSD_5_1
Changes since 1.14: +5 -2 lines
Diff to previous 1.14 (colored)

document that virtual maps require a domain key

Revision 1.14 / (download) - annotate - [select for diffs], Fri Sep 3 11:22:36 2010 UTC (13 years, 9 months ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_5_0_BASE, OPENBSD_5_0, OPENBSD_4_9_BASE, OPENBSD_4_9
Changes since 1.13: +4 -3 lines
Diff to previous 1.13 (colored)

add an EXIT STATUS section for /usr/sbin;

Revision 1.13 / (download) - annotate - [select for diffs], Wed Nov 4 08:31:26 2009 UTC (14 years, 7 months ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_4_8_BASE, OPENBSD_4_8, OPENBSD_4_7_BASE, OPENBSD_4_7
Changes since 1.12: +5 -7 lines
Diff to previous 1.12 (colored)

tweak previous;

Revision 1.12 / (download) - annotate - [select for diffs], Tue Nov 3 23:10:31 2009 UTC (14 years, 7 months ago) by gilles
Branch: MAIN
Changes since 1.11: +19 -2 lines
Diff to previous 1.11 (colored)

document the new -t set mode of makemap, and add a paragraph describing
the use of makemap to generate a primary domains map

Revision 1.11 / (download) - annotate - [select for diffs], Mon Oct 19 21:19:13 2009 UTC (14 years, 7 months ago) by gilles
Branch: MAIN
Changes since 1.10: +3 -3 lines
Diff to previous 1.10 (colored)

update man pages

Revision 1.10 / (download) - annotate - [select for diffs], Sun Oct 11 17:40:49 2009 UTC (14 years, 7 months ago) by gilles
Branch: MAIN
Changes since 1.9: +9 -7 lines
Diff to previous 1.9 (colored)

implement proper virtual domains instead of faking them on top of primary
domains. this means that:

- virtual domains no longer deliver to a local user when not told to
- they no longer attempt to resolve aliases when not told to
- they no longer need an explicit rule in smtpd.conf for EACH domain
- the "virtual" map is no longer hardcoded
- smtpd no longer needs a restart to support a new domain

instead we introduce the: accept for virtual map "mapname" [...] syntax
which refers to a map that can be manipulated at runtime.

idea discussed and okayd with jacekm@

Revision 1.9 / (download) - annotate - [select for diffs], Fri Sep 25 13:44:33 2009 UTC (14 years, 8 months ago) by jmc
Branch: MAIN
Changes since 1.8: +2 -48 lines
Diff to previous 1.8 (colored)

move the smtpd.conf-specific map bits back from makemap to smtpd.conf,
along with some tweakage;

ok jacekm gilles

Revision 1.8 / (download) - annotate - [select for diffs], Tue Sep 22 13:05:20 2009 UTC (14 years, 8 months ago) by jmc
Branch: MAIN
Changes since 1.7: +72 -7 lines
Diff to previous 1.7 (colored)

- move the map stuff to makemap.8
- use a single list for smtpd.conf keywords

ok jacekm gilles

Revision 1.7 / (download) - annotate - [select for diffs], Mon Mar 23 21:48:40 2009 UTC (15 years, 2 months ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_4_6_BASE, OPENBSD_4_6
Changes since 1.6: +20 -19 lines
Diff to previous 1.6 (colored)

various minor improvements; ok jacekm gilles

Revision 1.6 / (download) - annotate - [select for diffs], Mon Mar 16 20:43:29 2009 UTC (15 years, 2 months ago) by gilles
Branch: MAIN
Changes since 1.5: +4 -2 lines
Diff to previous 1.5 (colored)

mention /etc/mail/secrets in the FILES section

Revision 1.5 / (download) - annotate - [select for diffs], Tue Feb 17 23:46:03 2009 UTC (15 years, 3 months ago) by jacekm
Branch: MAIN
CVS Tags: OPENBSD_4_5_BASE, OPENBSD_4_5
Changes since 1.4: +37 -45 lines
Diff to previous 1.4 (colored)

sync makemap man page with the code. create separate page for newaliases
which points at makemap as the preferred utility; ok gilles@

Revision 1.4 / (download) - annotate - [select for diffs], Sat Feb 14 18:37:12 2009 UTC (15 years, 3 months ago) by jacekm
Branch: MAIN
Changes since 1.3: +33 -4 lines
Diff to previous 1.3 (colored)

Implement makemap -t and -o, for output type and dest resp.; ok gilles@

Revision 1.3 / (download) - annotate - [select for diffs], Wed Dec 17 22:59:36 2008 UTC (15 years, 5 months ago) by jacekm
Branch: MAIN
Changes since 1.2: +36 -24 lines
Diff to previous 1.2 (colored)

Merge newaliases into makemap.

ok gilles@

Revision 1.2 / (download) - annotate - [select for diffs], Thu Dec 4 06:22:05 2008 UTC (15 years, 6 months ago) by jmc
Branch: MAIN
Changes since 1.1: +7 -7 lines
Diff to previous 1.1 (colored)

some basic cleanup;

Revision 1.1 / (download) - annotate - [select for diffs], Wed Dec 3 21:20:20 2008 UTC (15 years, 6 months ago) by gilles
Branch: MAIN

- smtpd's db maps are incompatible with sendmail's and needs a distinct
	makemap utility, this is needed for virtual users support amongst
	other things. links to smtpd's aliases.c and only provides a
	frontent to parse map descriptions. contains code from pyr@, chl@
	and I. Should have also been imported with smtpd.

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.