1 files changed, 2 insertions, 131 deletions

diff --git a/contrib/bind/bin/irpd/irpd.c b/contrib/bind/bin/irpd/irpd.c
index 4a94d2c..e03276f 100644
--- a/contrib/bind/bin/irpd/irpd.c
+++ b/contrib/bind/bin/irpd/irpd.c
@@ -37,7 +37,7 @@ seem to be so for getnetbyaddr
 #endif
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: irpd.c,v 1.8 2000/02/04 08:28:27 vixie Exp $";
+static const char rcsid[] = "$Id: irpd.c,v 1.10 2000/12/23 08:14:33 vixie Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /* Imports. */
@@ -144,7 +144,6 @@ static struct response_buff *newbuffer(u_int length);
 static void release_buffer(struct response_buff *b);
 static struct arg_s *split_string(const char *string);
 static void free_args(struct arg_s *args);
-static int is_all_digits(char *p);
 static struct client_ctx *make_cli_ctx(void);
 static struct net_data *get_net_data(struct ctl_sess *sess);
 
@@ -248,8 +247,6 @@ static void irpd_abort(struct ctl_sctx *ctx, struct ctl_sess *sess,
 		       const struct ctl_verb *verb, const char *rest,
 		       u_int respflags, void *respctx, void *uctx);
 
-static void irpd_done(struct ctl_sctx *ctx, struct ctl_sess *sess,
-		      void *param);
 static void response_done(struct ctl_sctx *ctx, struct ctl_sess *sess,
 			  void *uap);
 static void logger(enum ctl_severity, const char *fmt, ...);
@@ -333,7 +330,6 @@ main(int argc, char **argv) {
 	struct sockaddr_un uaddr;
 #endif
 	struct sockaddr_in iaddr;
-	log_channel chan;
 	short port = IRPD_PORT;
 	char *prog = argv[0];
 	char *sockname = IRPD_PATH;
@@ -344,7 +340,7 @@ main(int argc, char **argv) {
 	addr = (struct sockaddr *)&iaddr;
 	socksize = sizeof iaddr;
 
-	openlog("iprd", LOG_CONS|LOG_PID, LOG_DAEMON);
+	openlog("iprd", LOG_CONS|LOG_PID, ISC_FACILITY);
 	while ((ch = getopt(argc, argv, "u:p:c:")) != -1) {
 		switch(ch) {
 		case 'c':
@@ -448,7 +444,6 @@ send_hostent(struct ctl_sess *sess, struct hostent *ho) {
 	if (ho == NULL)
 		simple_response(sess, IRPD_GETHOST_NONE, "No such host");
 	else {
-		size_t need;
 		struct response_buff *b = newbuffer(0);
 
 		if (irp_marshall_ho(ho, &b->buff, &b->bufflen) != 0) {
@@ -500,7 +495,6 @@ irpd_gethostbyname(struct ctl_sctx *ctx, struct ctl_sess *sess,
 {
 	char hname[MAXHOSTNAMELEN];
 	struct arg_s *args;
-	int i;
 	struct net_data *netdata = get_net_data(sess);
 	
 	INSIST(netdata != NULL);
@@ -539,7 +533,6 @@ irpd_gethostbyname2(struct ctl_sctx *ctx, struct ctl_sess *sess,
 {
 	char hname[MAXHOSTNAMELEN];
 	struct arg_s *args;
-	int i;
 	int af;
 	struct net_data *netdata = get_net_data(sess);
 	
@@ -591,7 +584,6 @@ irpd_gethostbyaddr(struct ctl_sctx *ctx, struct ctl_sess *sess,
 	char haddr[MAXHOSTNAMELEN];
 	char tmpaddr[NS_IN6ADDRSZ];
 	struct arg_s *args;
-	int i;
 	int af;
 	int addrlen;
 	struct net_data *netdata = get_net_data(sess);
@@ -657,9 +649,6 @@ irpd_gethostent(struct ctl_sctx *ctx, struct ctl_sess *sess,
 		u_int respflags, void *respctx, void *uctx)
 {
 	struct hostent *ho;
-	size_t need;
-	size_t need_total = 0;
-	struct response_buff *b;
 	struct net_data *netdata = get_net_data(sess);
 	
 	INSIST(netdata != NULL);
@@ -683,10 +672,6 @@ irpd_sethostent(struct ctl_sctx *ctx, struct ctl_sess *sess,
 		const struct ctl_verb *verb, const char *rest,
 		u_int respflags, void *respctx, void *uctx)
 {
-	struct hostent *ho;
-	size_t need;
-	size_t need_total = 0;
-	struct response_buff *b;
 	struct net_data *netdata = get_net_data(sess);
 	
 	INSIST(netdata != NULL);
@@ -742,8 +727,6 @@ irpd_getpwnam(struct ctl_sctx *ctx, struct ctl_sess *sess,
 	struct arg_s *args;
 	struct passwd *pw;
 	char username[64];
-	struct response_buff *b;
-	size_t need;
 	struct net_data *netdata = get_net_data(sess);
 	
 	INSIST(netdata != NULL);
@@ -786,8 +769,6 @@ irpd_getpwuid(struct ctl_sctx *ctx, struct ctl_sess *sess,
 	struct arg_s *args;
 	struct passwd *pw;
 	char userid[64];
-	struct response_buff *b;
-	size_t need;
 	struct net_data *netdata = get_net_data(sess);
 	
 	INSIST(netdata != NULL);
@@ -847,9 +828,6 @@ irpd_getpwent(struct ctl_sctx *ctx, struct ctl_sess *sess,
 	      u_int respflags, void *respctx, void *uctx)
 {
 	struct passwd *pw;
-	size_t need;
-	size_t need_total = 0;
-	struct response_buff *b;
 	struct net_data *netdata = get_net_data(sess);
 	
 	INSIST(netdata != NULL);
@@ -872,10 +850,6 @@ irpd_setpwent(struct ctl_sctx *ctx, struct ctl_sess *sess,
 	      const struct ctl_verb *verb, const char *rest,
 	      u_int respflags, void *respctx, void *uctx)
 {
-	struct passwd *pw;
-	size_t need;
-	size_t need_total = 0;
-	struct response_buff *b;
 	struct net_data *netdata = get_net_data(sess);
 	
 	INSIST(netdata != NULL);
@@ -917,34 +891,6 @@ send_nwent(struct ctl_sess *sess, struct nwent *nw) {
 
 /*
  * static void
- * send_netent(struct ctl_sess *sess, struct netent *ne);
- *	Sends a NETENT structure over the wire, or "No such
- *	Network" error if NE is NULL.
- */
-static void
-send_netent(struct ctl_sess *sess, struct netent *ne) {
-	if (ne == NULL) {
-		simple_response(sess, IRPD_GETNET_NONE, "No such net");
-	} else {
-		struct response_buff *b = newbuffer(0);
-
-		if (irp_marshall_ne(ne, &b->buff,
-				    &b->bufflen) != 0) {
-			simple_response(sess, IRPD_GETNET_ERROR,
-					"Internal error");
-			logger(ctl_warning, "Cant marshall ne\n");
-			return;
-		}
-
-		strcat(b->buff, "\r\n");
-
-		ctl_response(sess, IRPD_GETNET_OK, "Network found", 0, 0,
-			     response_done, b, b->buff, strlen(b->buff));
-	}
-}
-
-/*
- * static void
  * irpd_getnetbyname(struct ctl_sctx *ctx, struct ctl_sess *sess,
  *		     const struct ctl_verb *verb, const char *rest,
  *		     u_int respflags, void *respctx, void *uctx);
@@ -959,8 +905,6 @@ irpd_getnetbyname(struct ctl_sctx *ctx, struct ctl_sess *sess,
 	struct netent *ne;
 	struct nwent *nw;
 	char netname[MAXNETNAMELEN];
-	struct response_buff *b;
-	size_t need;
 	struct net_data *netdata = get_net_data(sess);
 	
 	INSIST(netdata != NULL);
@@ -1015,7 +959,6 @@ irpd_getnetbyaddr(struct ctl_sctx *ctx, struct ctl_sess *sess,
 	char haddr[MAXHOSTNAMELEN];
 	long tmpaddr;
 	struct arg_s *args;
-	int i;
 	int af;
 	int addrlen;
 	int bits;
@@ -1105,9 +1048,6 @@ irpd_getnetent(struct ctl_sctx *ctx, struct ctl_sess *sess,
 {
 	struct netent *ne;
 	struct nwent *nw;
-	size_t need;
-	size_t need_total = 0;
-	struct response_buff *b;
 	struct net_data *netdata = get_net_data(sess);
 	
 	INSIST(netdata != NULL);
@@ -1136,11 +1076,6 @@ irpd_setnetent(struct ctl_sctx *ctx, struct ctl_sess *sess,
 	       const struct ctl_verb *verb, const char *rest,
 	       u_int respflags, void *respctx, void *uctx)
 {
-	struct netent *ne;
-	struct nwent *nw;
-	size_t need;
-	size_t need_total = 0;
-	struct response_buff *b;
 	struct net_data *netdata = get_net_data(sess);
 	
 	INSIST(netdata != NULL);
@@ -1195,8 +1130,6 @@ irpd_getgrnam(struct ctl_sctx *ctx, struct ctl_sess *sess,
 	struct arg_s *args;
 	struct group *gr;
 	char groupname[64];
-	struct response_buff *b;
-	size_t need;
 	struct net_data *netdata = get_net_data(sess);
 	
 	INSIST(netdata != NULL);
@@ -1239,8 +1172,6 @@ irpd_getgrgid(struct ctl_sctx *ctx, struct ctl_sess *sess,
 	struct arg_s *args;
 	struct group *gr;
 	char groupid[64];
-	struct response_buff *b;
-	size_t need;
 	struct net_data *netdata = get_net_data(sess);
 	
 	INSIST(netdata != NULL);
@@ -1300,9 +1231,6 @@ irpd_getgrent(struct ctl_sctx *ctx, struct ctl_sess *sess,
 	      u_int respflags, void *respctx, void *uctx)
 {
 	struct group *gr;
-	size_t need;
-	size_t need_total = 0;
-	struct response_buff *b;
 	struct net_data *netdata = get_net_data(sess);
 	
 	INSIST(netdata != NULL);
@@ -1325,10 +1253,6 @@ irpd_setgrent(struct ctl_sctx *ctx, struct ctl_sess *sess,
 	      const struct ctl_verb *verb, const char *rest,
 	      u_int respflags, void *respctx, void *uctx)
 {
-	struct group *gr;
-	size_t need;
-	size_t need_total = 0;
-	struct response_buff *b;
 	struct net_data *netdata = get_net_data(sess);
 	
 	INSIST(netdata != NULL);
@@ -1372,8 +1296,6 @@ irpd_getservbyname(struct ctl_sctx *ctx, struct ctl_sess *sess,
 	struct servent *serv;
 	char servicename[64];
 	char protoname[10];
-	struct response_buff *b;
-	size_t need;
 	struct net_data *netdata = get_net_data(sess);
 	
 	INSIST(netdata != NULL);
@@ -1425,8 +1347,6 @@ irpd_getservbyport(struct ctl_sctx *ctx, struct ctl_sess *sess,
 	struct servent *sv;
 	char portnum[64];
 	char protoname[10];
-	struct response_buff *b;
-	size_t need;
 	struct net_data *netdata = get_net_data(sess);
 	
 	INSIST(netdata != NULL);
@@ -1494,9 +1414,6 @@ irpd_getservent(struct ctl_sctx *ctx, struct ctl_sess *sess,
 	       u_int respflags, void *respctx, void *uctx)
 {
 	struct servent *sv;
-	size_t need;
-	size_t need_total = 0;
-	struct response_buff *b;
 	struct net_data *netdata = get_net_data(sess);
 	
 	INSIST(netdata != NULL);
@@ -1519,10 +1436,6 @@ irpd_setservent(struct ctl_sctx *ctx, struct ctl_sess *sess,
 	       const struct ctl_verb *verb, const char *rest,
 	       u_int respflags, void *respctx, void *uctx)
 {
-	struct servent *sv;
-	size_t need;
-	size_t need_total = 0;
-	struct response_buff *b;
 	struct net_data *netdata = get_net_data(sess);
 	
 	INSIST(netdata != NULL);
@@ -1577,8 +1490,6 @@ irpd_getprotobyname(struct ctl_sctx *ctx, struct ctl_sess *sess,
 	struct arg_s *args;
 	struct protoent *pr;
 	char protoname[64];
-	struct response_buff *b;
-	size_t need;
 	struct net_data *netdata = get_net_data(sess);
 	
 	INSIST(netdata != NULL);
@@ -1621,8 +1532,6 @@ irpd_getprotobynumber(struct ctl_sctx *ctx, struct ctl_sess *sess,
 	struct arg_s *args;
 	struct protoent *pr;
 	char protonum[64];
-	struct response_buff *b;
-	size_t need;
 	struct net_data *netdata = get_net_data(sess);
 	
 	INSIST(netdata != NULL);
@@ -1682,9 +1591,6 @@ irpd_getprotoent(struct ctl_sctx *ctx, struct ctl_sess *sess,
 		u_int respflags, void *respctx, void *uctx)
 {
 	struct protoent *pr;
-	size_t need;
-	size_t need_total = 0;
-	struct response_buff *b;
 	struct net_data *netdata = get_net_data(sess);
 	
 	INSIST(netdata != NULL);
@@ -1707,10 +1613,6 @@ irpd_setprotoent(struct ctl_sctx *ctx, struct ctl_sess *sess,
 		const struct ctl_verb *verb, const char *rest,
 		u_int respflags, void *respctx, void *uctx)
 {
-	struct protoent *pr;
-	size_t need;
-	size_t need_total = 0;
-	struct response_buff *b;
 	struct net_data *netdata = get_net_data(sess);
 	
 	INSIST(netdata != NULL);
@@ -1757,9 +1659,6 @@ irpd_getnetgrent(struct ctl_sctx *ctx, struct ctl_sess *sess,
 		 const struct ctl_verb *verb, const char *rest,
 		 u_int respflags, void *respctx, void *uctx)
 {
-	char netgroupname[64];
-	struct response_buff *b = NULL;
-	size_t need;
 	struct net_data *netdata = get_net_data(sess);
 	
 	INSIST(netdata != NULL);
@@ -1794,8 +1693,6 @@ irpd_innetgr(struct ctl_sctx *ctx, struct ctl_sess *sess,
 		 u_int respflags, void *respctx, void *uctx)
 {
 	struct arg_s *args;
-	struct response_buff *b;
-	size_t need;
 	struct net_data *netdata = get_net_data(sess);
 	char *host;
 	char *user;
@@ -1837,7 +1734,6 @@ irpd_innetgr(struct ctl_sctx *ctx, struct ctl_sess *sess,
 		memput(ngtmp, args->iov[1].iov_len + 1);
 	}
 	
-  untimely:
 	free_args(args);
 }
 
@@ -1870,7 +1766,6 @@ irpd_setnetgrent(struct ctl_sctx *ctx, struct ctl_sess *sess,
 				"setnetgrent ok");
 	}
 	
-  untimely:
 	free_args(args);
 }
 
@@ -1886,7 +1781,6 @@ irpd_endnetgrent(struct ctl_sctx *ctx, struct ctl_sess *sess,
 		 const struct ctl_verb *verb, const char *rest,
 		 u_int respflags, void *respctx, void *uctx)
 {
-	struct arg_s *args;
 	struct net_data *netdata = get_net_data(sess);
 	
 	INSIST(netdata != NULL);
@@ -1905,20 +1799,6 @@ irpd_endnetgrent(struct ctl_sctx *ctx, struct ctl_sess *sess,
 
 /*
  * static void
- * irpd_done(struct ctl_sctx *ctx, struct ctl_sess *sess, void *param)
- *	Callback for when QUIT respnse is sent out.
- */
-static void
-irpd_done(struct ctl_sctx *ctx, struct ctl_sess *sess, void *param) {
-	struct net_data *netdata = get_net_data(sess);
-
-	INSIST(netdata != NULL);
-	
-	net_data_destroy(netdata);
-}
-	
-/*
- * static void
  * irpd_quit(struct ctl_sctx *ctx, struct ctl_sess *sess,
  *	     const struct ctl_verb *verb, const char *rest,
  *	     u_int respflags, void *respctx, void *uctx);
@@ -2239,15 +2119,6 @@ make_cli_ctx(void) {
 	return (p);
 }
 
-static void
-release_cli_ctx(struct client_ctx *ctx) {
-	INSIST(ctx != NULL);
-	INSIST(ctx->net_data != NULL);
-
-	net_data_destroy(ctx->net_data);
-	memput(ctx, sizeof *ctx);
-}
-		
 static struct net_data *
 get_net_data(struct ctl_sess *sess) {
 	struct client_ctx *ctx = ctl_getcsctx(sess);