unifdef LOGIN_CAP, we always want to use login.conf

OK jca@, no objection deraadt@

diff --git a/sbin/init/Makefile b/sbin/init/Makefile
index a400090..e1e8bde 100644 (file)
--- a/sbin/init/Makefile
+++ b/sbin/init/Makefile
@@ -1,9 +1,9 @@
-#      $OpenBSD: Makefile,v 1.9 2015/09/25 16:09:09 tedu Exp $
+#      $OpenBSD: Makefile,v 1.10 2018/01/06 16:26:12 millert Exp $
 
 PROG=  init
 MAN=   init.8
 DPADD= ${LIBUTIL}
 LDADD= -lutil
-CFLAGS+=-DDEBUGSHELL -DSECURE -DLOGIN_CAP
+CFLAGS+=-DDEBUGSHELL -DSECURE
 
 .include <bsd.prog.mk>

diff --git a/sbin/init/init.c b/sbin/init/init.c
index f3d8446..5440d13 100644 (file)
--- a/sbin/init/init.c
+++ b/sbin/init/init.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: init.c,v 1.65 2017/06/16 06:46:54 natano Exp $        */
+/*     $OpenBSD: init.c,v 1.66 2018/01/06 16:26:12 millert Exp $       */
 /*     $NetBSD: init.c,v 1.22 1996/05/15 23:29:33 jtc Exp $    */
 
 /*-
@@ -45,6 +45,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
+#include <login_cap.h>
 #include <signal.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -61,10 +62,6 @@
 #include <readpassphrase.h>
 #endif
 
-#ifdef LOGIN_CAP
-#include <login_cap.h>
-#endif
-
 #include "pathnames.h"
 
 /*
@@ -177,16 +174,11 @@ pid_t start_getty(session_t *);
 void transition_handler(int);
 void alrm_handler(int);
 void setsecuritylevel(int);
+void setprocresources(char *);
 int getsecuritylevel(void);
 int setupargv(session_t *, struct ttyent *);
 int clang;
 
-#ifdef LOGIN_CAP
-void setprocresources(char *);
-#else
-#define setprocresources(p)
-#endif
-
 void clear_session_logs(session_t *);
 
 void add_session(session_t *);
@@ -1442,7 +1434,6 @@ f_death(void)
        return single_user;
 }
 
-#ifdef LOGIN_CAP
 void
 setprocresources(char *class)
 {
@@ -1454,4 +1445,3 @@ setprocresources(char *class)
                login_close(lc);
        }
 }
-#endif