diff options
| author |   gilles <gilles@openbsd.org> | 2009-01-10 23:54:15 +0000 |
|---|---|---|
| committer | gilles <gilles@openbsd.org> | 2009-01-10 23:54:15 +0000 |
| commit | 99490e459e7165f958f0f9052b1468d05c1fa4dc (patch) | |
| tree | 90aa84761e5a94efa8eddf89882821fc24a42063 | |
| parent | Do not compile in wsdisplay_emulinput() if WSEMUL_NO_VT100 is #defined. (diff) | |
| download | wireguard-openbsd-99490e459e7165f958f0f9052b1468d05c1fa4dc.tar.xz wireguard-openbsd-99490e459e7165f958f0f9052b1468d05c1fa4dc.zip | |
- remove a comment that was no longer relevant
- when authenticating user, instead of doing a getpwnam() and checking the
passwd field, issue a call to auth_userokay(), this will allow the
use of login scripts to implement custom authentications without
bloating smtpd.
| -rw-r--r-- | usr.sbin/smtpd/smtpd.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/usr.sbin/smtpd/smtpd.c b/usr.sbin/smtpd/smtpd.c index 5e7fb64ff2e..bde5d2bc21d 100644 --- a/usr.sbin/smtpd/smtpd.c +++ b/usr.sbin/smtpd/smtpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpd.c,v 1.22 2009/01/08 19:17:31 jacekm Exp $ */ +/* $OpenBSD: smtpd.c,v 1.23 2009/01/10 23:54:15 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -26,10 +26,12 @@ #include <sys/stat.h> #include <sys/uio.h> +#include <bsd_auth.h> #include <err.h> #include <errno.h> #include <event.h> #include <fcntl.h> +#include <login_cap.h> #include <paths.h> #include <pwd.h> #include <regex.h> @@ -375,14 +377,12 @@ parent_dispatch_smtp(int fd, short event, void *p) break; switch (imsg.hdr.type) { - /* XXX - NOT ADVERTISED YET */ case IMSG_PARENT_AUTHENTICATE: { struct session_auth_req *req; struct session_auth_reply reply; u_int8_t buffer[1024]; char *pw_name; char *pw_passwd; - struct passwd *pw; req = (struct session_auth_req *)imsg.data; @@ -392,11 +392,9 @@ parent_dispatch_smtp(int fd, short event, void *p) if (kn_decode_base64(req->buffer, buffer, sizeof(buffer)) != -1) { pw_name = buffer+1; pw_passwd = pw_name+strlen(pw_name)+1; - pw = safe_getpwnam(pw_name); - if (pw != NULL) - if (strcmp(pw->pw_passwd, crypt(pw_passwd, - pw->pw_passwd)) == 0) - reply.value = 1; + + if (auth_userokay(pw_name, NULL, "auth-smtp", pw_passwd)) + reply.value = 1; } imsg_compose(ibuf, IMSG_PARENT_AUTHENTICATE, 0, 0, -1, &reply, sizeof(reply)); |