summaryrefslogtreecommitdiff
path: root/usr.sbin/smtpd/enqueue.c
diff options
context:
space:
mode:
authorGilles Chehade <gilles@cvs.openbsd.org>2009-11-08 21:40:06 +0000
committerGilles Chehade <gilles@cvs.openbsd.org>2009-11-08 21:40:06 +0000
commit0dfe9b155ae3af80cc0cd39fb4c62e8dd6d2db28 (patch)
tree0a1a6b3248ea8a8426e96d81dc154e66ec6f23c3 /usr.sbin/smtpd/enqueue.c
parent2783b9e7a388c4dd94479d27f871f1d3af90d142 (diff)
- make aliases expansion use a rb tree instead of a tail queue, the code
doesn't take advantage of the new structure yet, but this was a needed change for upcoming improvements. - introduce aliasestree_{lookup,insert,remove} to the aliases api - rename queue_generate_id() to generate_uid() and move it to utils.c as it is used all over the place and not only in queue tree idea discussed with jacekm@, if you update rebuild aliases db, make clean and flush queue
Diffstat (limited to 'usr.sbin/smtpd/enqueue.c')
-rw-r--r--usr.sbin/smtpd/enqueue.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/smtpd/enqueue.c b/usr.sbin/smtpd/enqueue.c
index e683354297b..87ed3035892 100644
--- a/usr.sbin/smtpd/enqueue.c
+++ b/usr.sbin/smtpd/enqueue.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: enqueue.c,v 1.24 2009/09/21 20:35:26 jacekm Exp $ */
+/* $OpenBSD: enqueue.c,v 1.25 2009/11/08 21:40:05 gilles Exp $ */
/*
* Copyright (c) 2005 Henning Brauer <henning@bulabula.org>
@@ -233,7 +233,7 @@ enqueue(int argc, char *argv[])
if (!msg.saw_msgid)
if (client_data_printf(sp,
"Message-Id: <%llu.enqueue@%s>\n",
- queue_generate_id(), host) < 0)
+ generate_uid(), host) < 0)
err(1, "client_data_printf failed");
/* add separating newline */