[gentoo-commits] gentoo-x86 commit in mail-mta/opensmtpd/files: build-warnings.patch pam.patch smtpd.initd smtpd.pam

[Jason Donenfeld (zx2c4)]

zx2c4       13/02/28 17:57:15

  Added:                build-warnings.patch pam.patch smtpd.initd
                        smtpd.pam
  Log:
  Initial import.
  
  (Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key A5DE03AE)

Revision  Changes    Path
1.1                  mail-mta/opensmtpd/files/build-warnings.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/opensmtpd/files/build-warnings.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/opensmtpd/files/build-warnings.patch?rev=1.1&content-type=text/plain

Index: build-warnings.patch
===================================================================
diff --git a/openbsd-compat/entropy.c b/openbsd-compat/entropy.c
index 2d4e151..ac1ab37 100644
--- a/openbsd-compat/entropy.c
+++ b/openbsd-compat/entropy.c
@@ -48,7 +48,7 @@
 //#include "xmalloc.h"
 //#include "atomicio.h"
 //#include "pathnames.h"
-//#include "log.h"
+#include "log.h"
 //#include "buffer.h"
 
 /* wrapper for signal interface */
diff --git a/openbsd-compat/imsg-buffer.c b/openbsd-compat/imsg-buffer.c
index 7223ad7..7c4d686 100644
--- a/openbsd-compat/imsg-buffer.c
+++ b/openbsd-compat/imsg-buffer.c
@@ -256,7 +256,7 @@ msgbuf_write(struct msgbuf *msgbuf)
 		cmsg->cmsg_len = CMSG_LEN(sizeof(int));
 		cmsg->cmsg_level = SOL_SOCKET;
 		cmsg->cmsg_type = SCM_RIGHTS;
-		*(int *)CMSG_DATA(cmsg) = buf->fd;
+		memcpy(CMSG_DATA(cmsg), &buf->fd, sizeof(int));
 	}
 
 again:
diff --git a/smtpd/mproc.c b/smtpd/mproc.c
index 7d9e593..d152784 100644
--- a/smtpd/mproc.c
+++ b/smtpd/mproc.c
@@ -230,7 +230,7 @@ msgbuf_write2(struct msgbuf *msgbuf)
 		cmsg->cmsg_len = CMSG_LEN(sizeof(int));
 		cmsg->cmsg_level = SOL_SOCKET;
 		cmsg->cmsg_type = SCM_RIGHTS;
-		*(int *)CMSG_DATA(cmsg) = buf->fd;
+		memcpy(CMSG_DATA(cmsg), &buf->fd, sizeof(int));
 	}
 
 again:



1.1                  mail-mta/opensmtpd/files/pam.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/opensmtpd/files/pam.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/opensmtpd/files/pam.patch?rev=1.1&content-type=text/plain

Index: pam.patch
===================================================================
diff -ru opensmtpd-5.2.xp1/smtpd/smtpd.c opensmtpd-5.2.xp1-pam/smtpd/smtpd.c
--- opensmtpd-5.2.xp1/smtpd/smtpd.c	2013-02-21 20:13:32.000000000 +0100
+++ opensmtpd-5.2.xp1-pam/smtpd/smtpd.c	2013-02-28 06:02:51.034730193 +0100
@@ -34,6 +34,15 @@
 #ifdef BSD_AUTH
 #include <bsd_auth.h>
 #endif
+
+#ifdef USE_PAM
+#if defined(HAVE_SECURITY_PAM_APPL_H)
+#include <security/pam_appl.h>
+#elif defined (HAVE_PAM_PAM_APPL_H)
+#include <pam/pam_appl.h>
+#endif
+#endif
+
 #ifdef HAVE_CRYPT_H
 #include <crypt.h> /* needed for crypt() */
 #endif
@@ -1639,6 +1648,53 @@
 }
 #endif
 
+#ifdef USE_PAM
+int 
+pam_conv_password(int num_msg, const struct pam_message **msg, struct pam_response **respp, const char *password)
+{
+	struct pam_response *response;
+	if (num_msg != 1)
+		return PAM_CONV_ERR;
+	response = malloc(sizeof(struct pam_response));
+	if (!response)
+		return PAM_BUF_ERR;
+	memset(response, 0, sizeof(struct pam_response));
+	response->resp = strdup(password);
+	if (!response->resp)
+		return PAM_BUF_ERR;
+	*respp = response;
+	return PAM_SUCCESS;
+}
+int
+parent_auth_pam(const char *username, const char *password)
+{
+	int rc;
+	pam_handle_t *pamh = NULL;
+	struct pam_conv conv = { pam_conv_password, password };
+	
+	if ((rc = pam_start("smtpd", username, &conv, &pamh)) != PAM_SUCCESS)
+		goto end;
+	if ((rc = pam_authenticate(pamh, 0)) != PAM_SUCCESS)
+		goto end;
+	if ((rc = pam_acct_mgmt(pamh, 0)) != PAM_SUCCESS)
+		goto end;
+end:
+	pam_end(pamh, rc);
+	
+	switch (rc) {
+		case PAM_SUCCESS:
+			return LKA_OK;
+		case PAM_SYSTEM_ERR:
+		case PAM_ABORT:
+		case PAM_AUTHINFO_UNAVAIL:
+			return LKA_TEMPFAIL;
+		default:
+			return LKA_PERMFAIL;
+			
+	}
+}
+#endif
+
 int
 parent_auth_pwd(const char *username, const char *password)
 {
@@ -1664,8 +1720,10 @@
 int
 parent_auth_user(const char *username, const char *password)
 {
-#ifdef BSD_AUTH
+#if defined(BSD_AUTH)
 	return (parent_auth_bsd(username, password));
+#elif defined(USE_PAM)
+	return (parent_auth_pam(username, password));
 #else
 	return (parent_auth_pwd(username, password));
 #endif



1.1                  mail-mta/opensmtpd/files/smtpd.initd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/opensmtpd/files/smtpd.initd?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/opensmtpd/files/smtpd.initd?rev=1.1&content-type=text/plain

Index: smtpd.initd
===================================================================
#!/sbin/runscript
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/mail-mta/opensmtpd/files/smtpd.initd,v 1.1 2013/02/28 17:57:15 zx2c4 Exp $

depend() {
	need net
}

start() {
	ebegin "Starting OpenSMTPD"
	start-stop-daemon --start --quiet --exec /usr/sbin/smtpd
	eend ${?}
}

stop() {
	ebegin "Stopping OpenSMTPD"
	/usr/sbin/smtpctl stop
	eend ${?}
}



1.1                  mail-mta/opensmtpd/files/smtpd.pam

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/opensmtpd/files/smtpd.pam?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/opensmtpd/files/smtpd.pam?rev=1.1&content-type=text/plain

Index: smtpd.pam
===================================================================
auth       required     pam_nologin.so
auth       include      system-auth
account    include      system-auth
session    include      system-auth