There's no need for a compile-time knob to control the use of
login.conf.

 - todd

Index: sbin/init/Makefile
===================================================================
RCS file: /cvs/src/sbin/init/Makefile,v
retrieving revision 1.9
diff -u -p -u -r1.9 Makefile
--- sbin/init/Makefile  25 Sep 2015 16:09:09 -0000      1.9
+++ sbin/init/Makefile  6 Jan 2018 13:46:41 -0000
@@ -4,6 +4,6 @@ PROG=   init
 MAN=   init.8
 DPADD= ${LIBUTIL}
 LDADD= -lutil
-CFLAGS+=-DDEBUGSHELL -DSECURE -DLOGIN_CAP
+CFLAGS+=-DDEBUGSHELL -DSECURE
 
 .include <bsd.prog.mk>
Index: sbin/init/init.c
===================================================================
RCS file: /cvs/src/sbin/init/init.c,v
retrieving revision 1.65
diff -u -p -u -r1.65 init.c
--- sbin/init/init.c    16 Jun 2017 06:46:54 -0000      1.65
+++ sbin/init/init.c    6 Jan 2018 13:47:47 -0000
@@ -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

Reply via email to