summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCamiel Dobbelaar <camield@cvs.openbsd.org>2001-08-16 19:58:17 +0000
committerCamiel Dobbelaar <camield@cvs.openbsd.org>2001-08-16 19:58:17 +0000
commit4e750b9097132627473e39f1aa16f9842eed56e5 (patch)
treead9b02ed2b3dbfa2c05e7468c23612365234e944
parentb92376109688e7345732c96fa559d1285a39bb3c (diff)
remove SHADOW hooks
-rw-r--r--libexec/popa3d/params.h6
-rw-r--r--libexec/popa3d/pop_root.c3
2 files changed, 3 insertions, 6 deletions
diff --git a/libexec/popa3d/params.h b/libexec/popa3d/params.h
index ba906eca603..81119019f8d 100644
--- a/libexec/popa3d/params.h
+++ b/libexec/popa3d/params.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: params.h,v 1.4 2001/08/16 19:54:20 camield Exp $ */
+/* $OpenBSD: params.h,v 1.5 2001/08/16 19:58:16 camield Exp $ */
/*
* Global POP daemon parameters.
@@ -103,14 +103,12 @@
* Choose the password authentication method your system uses:
*
* AUTH_PASSWD Use getpwnam(3) only, for *BSD or readable passwd;
- * AUTH_SHADOW Use shadow passwords directly (not via PAM);
* AUTH_PAM Use PAM in the old-fashioned way;
* AUTH_PAM_USERPASS Talk to pam_userpass via Linux-PAM binary prompts.
*
* Note that there's no built-in password aging support.
*/
#define AUTH_PASSWD 1
-#define AUTH_SHADOW 0
#define AUTH_PAM 0
#define AUTH_PAM_USERPASS 0
@@ -120,7 +118,7 @@
#endif
-#if POP_VIRTUAL || AUTH_PASSWD || AUTH_SHADOW
+#if POP_VIRTUAL || AUTH_PASSWD
/*
* A salt used to waste some CPU time on dummy crypt(3) calls and make
diff --git a/libexec/popa3d/pop_root.c b/libexec/popa3d/pop_root.c
index e55ab950af9..ab43565308e 100644
--- a/libexec/popa3d/pop_root.c
+++ b/libexec/popa3d/pop_root.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pop_root.c,v 1.2 2001/08/13 20:19:33 camield Exp $ */
+/* $OpenBSD: pop_root.c,v 1.3 2001/08/16 19:58:16 camield Exp $ */
/*
* Main daemon code: invokes the actual POP handling routines. Most calls
@@ -9,7 +9,6 @@
* standalone.c if not running via an inetd clone (POP_STANDALONE)
* virtual.c if supporting virtual domains (POP_VIRTUAL)
* auth_passwd.c if using passwd or *BSD (AUTH_PASSWD && !VIRTUAL_ONLY)
- * auth_shadow.c if using shadow (AUTH_SHADOW && !VIRTUAL_ONLY)
* auth_pam.c if using PAM (AUTH_PAM || AUTH_PAM_USERPASS)
*/