kill a bunch of dead code.

3 files changed, 6 insertions, 32 deletions

diff --git a/usr.sbin/ypldap/ldapclient.c b/usr.sbin/ypldap/ldapclient.c
index cc4b8bdd1d8..7a98b20b5ef 100644
--- a/usr.sbin/ypldap/ldapclient.c
+++ b/usr.sbin/ypldap/ldapclient.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ldapclient.c,v 1.1 2008/06/26 15:10:01 pyr Exp $ */
+/* $OpenBSD: ldapclient.c,v 1.2 2008/07/02 17:36:15 pyr Exp $ */
 
 /*
  * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -186,7 +186,7 @@ ldapclient(int pipe_main2client[2])
 #warning disabling chrooting in DEBUG mode
 #endif
 	setproctitle("ldap client");
-	lb_process = PROC_CLIENT;
+	ypldap_process = PROC_CLIENT;
 
 #ifndef DEBUG
 	if (setgroups(1, &pw->pw_gid) ||
diff --git a/usr.sbin/ypldap/ypldap.c b/usr.sbin/ypldap/ypldap.c
index 436282ed3a6..bb90f9b0908 100644
--- a/usr.sbin/ypldap/ypldap.c
+++ b/usr.sbin/ypldap/ypldap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ypldap.c,v 1.2 2008/06/26 15:13:17 pyr Exp $ */
+/*	$OpenBSD: ypldap.c,v 1.3 2008/07/02 17:36:15 pyr Exp $ */
 
 /*
  * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -361,7 +361,7 @@ main(int argc, char *argv[])
 	struct timeval	 tv;
 
 	debug = 0;
-	lb_process = PROC_MAIN;
+	ypldap_process = PROC_MAIN;
 
 	log_init(1);
 
diff --git a/usr.sbin/ypldap/ypldap.h b/usr.sbin/ypldap/ypldap.h
index 33c9b88ed2e..d31ee4f6872 100644
--- a/usr.sbin/ypldap/ypldap.h
+++ b/usr.sbin/ypldap/ypldap.h
@@ -65,18 +65,9 @@ struct imsgbuf {
 };
 
 enum imsg_type {
-	IMSG_NONE = 0,
-	IMSG_GETPWENT = 1,	/* sends nothing expects nothing */
-	IMSG_SETPWENT = 2,	/* sends nothing expects nothing */
-	IMSG_GETPWNAM = 3,	/* sends a name expects a line */ 
-	IMSG_GETPWID = 4,	/* sends a uid_t expects a line */
-	IMSG_GETGRENT = 5,	/* sends nothing expects nothing */
-	IMSG_SETGRENT = 6,	/* sends nothing expects nothing */
-	IMSG_GETGRNAM = 7,	/* sends a name expects a line */ 
-	IMSG_GETGRID = 8,	/* sends a uid_t expects a line */
+	IMSG_NONE,
 	IMSG_CONF_START,
 	IMSG_CONF_IDM,
-	IMSG_CONF_SERVER,
 	IMSG_CONF_END,
 	IMSG_START_UPDATE,
 	IMSG_END_UPDATE,
@@ -97,21 +88,10 @@ struct imsg {
 	void		*data;
 };
 
-enum blockmodes {
-	BM_NORMAL,
-	BM_NONBLOCK,
-};
-
 enum {
 	PROC_MAIN,
 	PROC_CLIENT
-} lb_process;
-
-union req {
-	uid_t	uid;
-	gid_t	gid;
-	char	nam[_PW_NAME_LEN+1];
-};
+} ypldap_process;
 
 struct userent {
 	RB_ENTRY(userent)		 ue_name_node;
@@ -227,12 +207,6 @@ ssize_t	 imsg_read(struct imsgbuf *);
 ssize_t	 imsg_get(struct imsgbuf *, struct imsg *);
 int	 imsg_compose(struct imsgbuf *, enum imsg_type, u_int32_t, pid_t,
 	    void *, u_int16_t);
-#if 0
-int	 imsg_get_fd(struct imsgbuf *);
-int	 imsg_composev(struct imsgbuf *, enum imsg_type, u_int32_t,
-	    pid_t, const struct iovec *, int);
-int	 imsg_flush(struct imsgbuf *);
-#endif
 struct buf *imsg_create(struct imsgbuf *, enum imsg_type, u_int32_t, pid_t,
 	    u_int16_t);
 int	 imsg_add(struct buf *, void *, u_int16_t);