[Midnightbsd-cvs] src: src/libexec:

Tue Nov 11 15:36:14 EST 2008

Log Message:
-----------


Modified Files:
--------------
    src/lib/bind/bind:
        port_before.h (r1.3 -> r1.4)
    src/libexec:
        Makefile (r1.1.1.1 -> r1.2)

Added Files:
-----------
    src/libexec/tftp-proxy:
        Makefile (r1.1)

Removed Files:
-------------
    src/libexec/ftp-proxy:
        Makefile

-------------- next part --------------
Index: port_before.h
===================================================================
RCS file: /home/cvs/src/lib/bind/bind/port_before.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -L lib/bind/bind/port_before.h -L lib/bind/bind/port_before.h -u -r1.3 -r1.4

--- lib/bind/bind/port_before.h
+++ lib/bind/bind/port_before.h
@@ -1,3 +1,5 @@
+/* $FreeBSD: src/lib/bind/bind/port_before.h,v 1.4.2.1 2007/12/07 08:31:23 dougb Exp $ */
+
 #ifndef port_before_h
 #define port_before_h
 #include <config.h>
@@ -34,21 +36,21 @@
 
 #define DO_PTHREADS 1
 #define GETGROUPLIST_ARGS const char *name, gid_t basegid, gid_t *groups, int *ngroups
-#define GETNETBYADDR_ADDR_T long
+#define GETNETBYADDR_ADDR_T unsigned long int
 #define SETPWENT_VOID 1
 #undef SETGRENT_VOID
 
-#define NET_R_ARGS char *buf, int buflen
-#define NET_R_BAD NULL
+#define NET_R_ARGS char *buf, size_t buflen, struct netent **answerp, int *h_errnop
+#define NET_R_BAD ERANGE
 #define NET_R_COPY buf, buflen
-#define NET_R_COPY_ARGS NET_R_ARGS
+#define NET_R_COPY_ARGS char *buf, size_t buflen
 #define NET_R_END_RESULT(x) /*empty*/
 #define NET_R_END_RETURN void
 #undef NET_R_ENT_ARGS /*empty*/
-#define NET_R_OK nptr
-#define NET_R_RETURN struct netent *
+#define NET_R_OK 0
+#define NET_R_RETURN int
 #undef NET_R_SET_RESULT /*empty*/
-#undef NET_R_SETANSWER
+#define NET_R_SETANSWER 1
 #define NET_R_SET_RETURN void
 #undef NETENT_DATA
 
@@ -62,17 +64,17 @@
 
 
 
-#define HOST_R_ARGS char *buf, int buflen, int *h_errnop
-#define HOST_R_BAD NULL
+#define HOST_R_ARGS char *buf, size_t buflen, struct hostent **answerp, int *h_errnop
+#define HOST_R_BAD ERANGE
 #define HOST_R_COPY buf, buflen
 #define HOST_R_COPY_ARGS char *buf, int buflen
 #define HOST_R_END_RESULT(x) /*empty*/
 #define HOST_R_END_RETURN void
 #undef HOST_R_ENT_ARGS /*empty*/
 #define HOST_R_ERRNO *h_errnop = h_errno
-#define HOST_R_OK hptr
-#define HOST_R_RETURN struct hostent *
-#undef HOST_R_SETANSWER
+#define HOST_R_OK 0
+#define HOST_R_RETURN int
+#define HOST_R_SETANSWER 1
 #undef HOST_R_SET_RESULT
 #define HOST_R_SET_RETURN void
 #undef HOSTENT_DATA
@@ -90,17 +92,17 @@
 #define NGR_R_SET_RETURN void
 
 
-#define PROTO_R_ARGS char *buf, int buflen
-#define PROTO_R_BAD NULL
+#define PROTO_R_ARGS char *buf, size_t buflen, struct protoent **answerp
+#define PROTO_R_BAD ERANGE
 #define PROTO_R_COPY buf, buflen
-#define PROTO_R_COPY_ARGS PROTO_R_ARGS
+#define PROTO_R_COPY_ARGS char *buf, size_t buflen
 #define PROTO_R_END_RESULT(x) /*empty*/
 #define PROTO_R_END_RETURN void
 #undef PROTO_R_ENT_ARGS /*empty*/
 #undef PROTO_R_ENT_UNUSED
-#define PROTO_R_OK pptr
-#undef PROTO_R_SETANSWER
-#define PROTO_R_RETURN struct protoent *
+#define PROTO_R_OK 0
+#define PROTO_R_SETANSWER 1
+#define PROTO_R_RETURN int
 #undef PROTO_R_SET_RESULT
 #define PROTO_R_SET_RETURN void
 #undef PROTOENT_DATA
@@ -117,17 +119,17 @@
 #undef PASS_R_SET_RESULT /*empty*/
 #define PASS_R_SET_RETURN void
 
-#define SERV_R_ARGS char *buf, int buflen
-#define SERV_R_BAD NULL
+#define SERV_R_ARGS char *buf, size_t buflen, struct servent **answerp
+#define SERV_R_BAD ERANGE
 #define SERV_R_COPY buf, buflen
-#define SERV_R_COPY_ARGS SERV_R_ARGS
+#define SERV_R_COPY_ARGS char *buf, size_t buflen
 #define SERV_R_END_RESULT(x) /*empty*/
 #define SERV_R_END_RETURN void 
 #undef SERV_R_ENT_ARGS /*empty*/
 #undef SERV_R_ENT_UNUSED /*empty*/
-#define SERV_R_OK sptr
-#undef SERV_R_SETANSWER
-#define SERV_R_RETURN struct servent *
+#define SERV_R_OK (0)
+#define SERV_R_SETANSWER 1
+#define SERV_R_RETURN int
 #undef SERV_R_SET_RESULT
 #define SERV_R_SET_RETURN void
 
Index: Makefile
===================================================================
RCS file: /home/cvs/src/libexec/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L libexec/Makefile -L libexec/Makefile -u -r1.1.1.1 -r1.2
--- libexec/Makefile
+++ libexec/Makefile
@@ -1,12 +1,13 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/libexec/Makefile,v 1.75 2005/06/10 20:52:35 nectar Exp $
+# $FreeBSD: src/libexec/Makefile,v 1.77 2007/07/03 12:46:04 mlaier Exp $
+
+.include <bsd.own.mk>
 
 SUBDIR=	atrun \
 	bootpd \
 	comsat \
 	fingerd \
 	ftpd \
-	${_ftp-proxy} \
 	getty \
 	lukemftpd \
 	${_mail.local} \
@@ -30,27 +31,28 @@
 	tcpd \
 	telnetd \
 	tftpd \
+	${_tftp-proxy} \
 	${_ypxfr}
 
-.if !defined(NO_NIS)
+.if ${MK_NIS} != "no"
 _mknetid=	mknetid
 _ypxfr=		ypxfr
 .endif
 
-.if !defined(NO_PF)
-_ftp-proxy=	ftp-proxy
+.if ${MK_PF} != "no"
+_tftp-proxy=	tftp-proxy
 .endif
 
 .if !defined(NO_PIC)
 _rtld-elf=	rtld-elf
 .endif
 
-.if !defined(NO_RCMDS)
+.if ${MK_RCMDS} != "no"
 _rlogind=	rlogind
 _rshd=		rshd
 .endif
 
-.if !defined(NO_SENDMAIL)
+.if ${MK_SENDMAIL} != "no"
 _mail.local=	mail.local
 _smrsh=	smrsh
 .endif
--- libexec/ftp-proxy/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $FreeBSD: src/libexec/ftp-proxy/Makefile,v 1.2 2005/05/18 12:19:50 keramida Exp $
-
-.PATH:	${.CURDIR}/../../contrib/pf/ftp-proxy
-
-PROG=	ftp-proxy
-MAN=	ftp-proxy.8
-
-SRCS=   ftp-proxy.c getline.c util.c
-
-WARNS?=	2
-
-.include <bsd.prog.mk>
--- /dev/null
+++ libexec/tftp-proxy/Makefile
@@ -0,0 +1,10 @@
+# $MidnightBSD: src/libexec/tftp-proxy/Makefile,v 1.1 2008/11/11 20:36:12 laffer1 Exp $
+# $FreeBSD: src/libexec/tftp-proxy/Makefile,v 1.1 2007/07/03 12:46:05 mlaier Exp $
+
+.PATH:	${.CURDIR}/../../contrib/pf/tftp-proxy
+
+PROG=	tftp-proxy
+SRCS=	tftp-proxy.c filter.c
+MAN=	tftp-proxy.8
+
+.include <bsd.prog.mk>
