remove deprecated API

2 files changed, 0 insertions, 122 deletions

diff --git a/smtpd/user.c b/smtpd/user.c
deleted file mode 100644
index 12aad9d6..00000000
--- a/smtpd/user.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*	$OpenBSD: user.c,v 1.1 2011/12/13 22:04:35 eric Exp $	*/
-
-/*
- * Copyright (c) 2011 Gilles Chehade <gilles@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-
-#include <event.h>
-#include <imsg.h>
-#include <stdio.h>
-
-#include "smtpd.h"
-#include "log.h"
-
-extern struct user_backend	user_backend_pwd;
-
-struct user_backend *
-user_backend_lookup(enum user_type type)
-{
-	switch (type) {
-	case USER_PWD:
-		return &user_backend_pwd;
-
-	default:
-		fatalx("invalid user backend");
-	}
-
-	return (NULL);
-}
diff --git a/smtpd/user_pwd.c b/smtpd/user_pwd.c
deleted file mode 100644
index 341a897b..00000000
--- a/smtpd/user_pwd.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*	$OpenBSD: user_pwd.c,v 1.3 2012/09/25 17:38:55 eric Exp $	*/
-
-/*
- * Copyright (c) 2011 Gilles Chehade <gilles@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-
-#include <event.h>
-#include <imsg.h>
-#include <libgen.h>
-#include <pwd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "smtpd.h"
-#include "log.h"
-
-static int user_getpw_ret(struct userinfo *, struct passwd *); /* helper */
-static int user_getpwnam(struct userinfo *, const char *);
-
-struct user_backend user_backend_pwd = {
-	user_getpwnam
-};
-
-static int
-user_getpw_ret(struct userinfo *u, struct passwd *pw)
-{
-	if (strlcpy(u->username, pw->pw_name, sizeof (u->username))
-	    >= sizeof (u->username))
-		return 0;
-
-	if (strlcpy(u->password, pw->pw_passwd, sizeof (u->password))
-	    >= sizeof (u->password))
-		return 0;
-
-	if (strlcpy(u->directory, pw->pw_dir, sizeof (u->directory))
-	    >= sizeof (u->directory))
-		return 0;
-
-	u->uid = pw->pw_uid;
-	u->gid = pw->pw_gid;
-
-	return 1;
-}
-
-static int
-user_getpwnam(struct userinfo *u, const char *username)
-{
-	struct passwd *pw;
-
-	pw = getpwnam(username);
-	if (pw == NULL)
-		return 0;
-
-	return user_getpw_ret(u, pw);
-}