PERFORCE change 83032 for review
soc-bushman
soc-bushman at FreeBSD.org
Fri Sep 2 18:24:04 GMT 2005
http://perforce.freebsd.org/chv.cgi?CH=83032
Change 83032 by soc-bushman at soc-bushman_stinger on 2005/09/02 18:23:08
patch updated
Affected files ...
.. //depot/projects/soc2005/nsswitch_cached/patches/nsswitch_cached.diff#2 edit
Differences ...
==== //depot/projects/soc2005/nsswitch_cached/patches/nsswitch_cached.diff#2 (text+ko) ====
@@ -1,6 +1,6 @@
diff -urN /usr/src/include/nscache.h /usr/src/include.new/nscache.h
--- /usr/src/include/nscache.h Thu Jan 1 03:00:00 1970
-+++ /usr/src/include.new/nscache.h Tue Aug 30 20:01:29 2005
++++ /usr/src/include.new/nscache.h Tue Aug 30 22:43:25 2005
@@ -0,0 +1,170 @@
+/*-
+ * Copyright (c) 2005 Michael Bushkov <bushman at rsu.ru>
@@ -174,7 +174,7 @@
+#endif
diff -urN /usr/src/include/nscachedcli.h /usr/src/include.new/nscachedcli.h
--- /usr/src/include/nscachedcli.h Thu Jan 1 03:00:00 1970
-+++ /usr/src/include.new/nscachedcli.h Tue Aug 30 20:01:29 2005
++++ /usr/src/include.new/nscachedcli.h Tue Aug 30 22:43:25 2005
@@ -0,0 +1,103 @@
+/*-
+ * Copyright (c) 2004 Michael Bushkov <bushman at rsu.ru>
@@ -280,8 +280,8 @@
+
+#endif
diff -urN /usr/src/include/nsswitch.h /usr/src/include.new/nsswitch.h
---- /usr/src/include/nsswitch.h Tue Aug 30 19:56:47 2005
-+++ /usr/src/include.new/nsswitch.h Tue Aug 30 20:01:27 2005
+--- /usr/src/include/nsswitch.h Tue Aug 30 22:41:29 2005
++++ /usr/src/include.new/nsswitch.h Tue Aug 30 22:43:23 2005
@@ -68,6 +68,7 @@
#define NSSRC_DNS "dns" /* DNS; IN for hosts, HS for others */
#define NSSRC_NIS "nis" /* YP/NIS */
@@ -329,8 +329,8 @@
* private data structures for back-end nsswitch implementation
*/
diff -urN /usr/src/include/rpc/rpcent.h /usr/src/include.new/rpc/rpcent.h
---- /usr/src/include/rpc/rpcent.h Tue Aug 30 19:56:47 2005
-+++ /usr/src/include.new/rpc/rpcent.h Tue Aug 30 20:01:28 2005
+--- /usr/src/include/rpc/rpcent.h Tue Aug 30 22:41:29 2005
++++ /usr/src/include.new/rpc/rpcent.h Tue Aug 30 22:43:23 2005
@@ -53,12 +53,13 @@
};
@@ -352,8 +352,8 @@
extern struct rpcent *getrpcbynumber(int);
extern struct rpcent *getrpcent(void);
diff -urN /usr/src/lib/libc/Makefile /usr/src/lib/libc.new/Makefile
---- /usr/src/lib/libc/Makefile Tue Aug 30 19:56:52 2005
-+++ /usr/src/lib/libc.new/Makefile Tue Aug 30 20:02:48 2005
+--- /usr/src/lib/libc/Makefile Tue Aug 30 22:41:34 2005
++++ /usr/src/lib/libc.new/Makefile Tue Aug 30 22:48:30 2005
@@ -64,6 +64,9 @@
.if defined(NO_FP_LIBC)
CFLAGS+= -DNO_FLOATING_POINT
@@ -365,8 +365,8 @@
# If there are no machine dependent sources, append all the
# machine-independent sources:
diff -urN /usr/src/lib/libc/gen/getgrent.c /usr/src/lib/libc.new/gen/getgrent.c
---- /usr/src/lib/libc/gen/getgrent.c Tue Aug 30 19:56:49 2005
-+++ /usr/src/lib/libc.new/gen/getgrent.c Tue Aug 30 20:02:52 2005
+--- /usr/src/lib/libc/gen/getgrent.c Tue Aug 30 22:41:31 2005
++++ /usr/src/lib/libc.new/gen/getgrent.c Tue Aug 30 22:48:38 2005
@@ -141,11 +141,211 @@
static int compat_setgrent(void *, void *, va_list);
static int compat_group(void *, void *, va_list);
@@ -707,8 +707,8 @@
};
int rv, ret_errno;
diff -urN /usr/src/lib/libc/gen/getpwent.c /usr/src/lib/libc.new/gen/getpwent.c
---- /usr/src/lib/libc/gen/getpwent.c Tue Aug 30 19:56:49 2005
-+++ /usr/src/lib/libc.new/gen/getpwent.c Tue Aug 30 20:02:52 2005
+--- /usr/src/lib/libc/gen/getpwent.c Tue Aug 30 22:41:31 2005
++++ /usr/src/lib/libc.new/gen/getpwent.c Tue Aug 30 22:48:39 2005
@@ -195,9 +195,210 @@
static int compat_redispatch(struct compat_state *, enum nss_lookup_type,
enum nss_lookup_type, const char *, const char *, uid_t,
@@ -1048,8 +1048,8 @@
};
int rv, ret_errno;
diff -urN /usr/src/lib/libc/net/Makefile.inc /usr/src/lib/libc.new/net/Makefile.inc
---- /usr/src/lib/libc/net/Makefile.inc Tue Aug 30 19:56:50 2005
-+++ /usr/src/lib/libc.new/net/Makefile.inc Tue Aug 30 20:02:56 2005
+--- /usr/src/lib/libc/net/Makefile.inc Tue Aug 30 22:41:32 2005
++++ /usr/src/lib/libc.new/net/Makefile.inc Tue Aug 30 22:48:44 2005
@@ -16,9 +16,9 @@
inet_netof.c inet_network.c inet_ntoa.c inet_ntop.c \
inet_pton.c ip6opt.c linkaddr.c map_v4v6.c name6.c \
@@ -1064,8 +1064,8 @@
CFLAGS+=-DINET6 -I${.OBJDIR}
diff -urN /usr/src/lib/libc/net/getaddrinfo.c /usr/src/lib/libc.new/net/getaddrinfo.c
---- /usr/src/lib/libc/net/getaddrinfo.c Tue Aug 30 19:56:50 2005
-+++ /usr/src/lib/libc.new/net/getaddrinfo.c Tue Aug 30 20:02:56 2005
+--- /usr/src/lib/libc/net/getaddrinfo.c Tue Aug 30 22:41:32 2005
++++ /usr/src/lib/libc.new/net/getaddrinfo.c Tue Aug 30 22:48:44 2005
@@ -279,6 +279,11 @@
static struct addrinfo *_yphostent(char *, const struct addrinfo *);
static int _yp_getaddrinfo(void *, void *, va_list);
@@ -1238,8 +1238,8 @@
};
diff -urN /usr/src/lib/libc/net/gethostnamadr.c /usr/src/lib/libc.new/net/gethostnamadr.c
---- /usr/src/lib/libc/net/gethostnamadr.c Tue Aug 30 19:56:50 2005
-+++ /usr/src/lib/libc.new/net/gethostnamadr.c Tue Aug 30 20:02:56 2005
+--- /usr/src/lib/libc/net/gethostnamadr.c Tue Aug 30 22:41:32 2005
++++ /usr/src/lib/libc.new/net/gethostnamadr.c Tue Aug 30 22:48:44 2005
@@ -62,6 +62,11 @@
{ NSSRC_DNS, NS_SUCCESS },
{ 0 }
@@ -1510,8 +1510,8 @@
};
diff -urN /usr/src/lib/libc/net/getproto.c /usr/src/lib/libc.new/net/getproto.c
---- /usr/src/lib/libc/net/getproto.c Tue Aug 30 19:56:50 2005
-+++ /usr/src/lib/libc.new/net/getproto.c Tue Aug 30 20:02:56 2005
+--- /usr/src/lib/libc/net/getproto.c Tue Aug 30 22:41:32 2005
++++ /usr/src/lib/libc.new/net/getproto.c Tue Aug 30 22:48:44 2005
@@ -37,31 +37,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD: src/lib/libc/net/getproto.c,v 1.4 2005/04/19 14:41:13 ume Exp $");
@@ -1548,8 +1548,8 @@
+ * nsswitch subsystem. The functionality of all getserv*_r functions is currently
+ * incapsulated in the files_protoent functions in the getprotoent.c file */
diff -urN /usr/src/lib/libc/net/getprotoent.c /usr/src/lib/libc.new/net/getprotoent.c
---- /usr/src/lib/libc/net/getprotoent.c Tue Aug 30 19:56:50 2005
-+++ /usr/src/lib/libc.new/net/getprotoent.c Tue Aug 30 20:02:56 2005
+--- /usr/src/lib/libc/net/getprotoent.c Tue Aug 30 22:41:32 2005
++++ /usr/src/lib/libc.new/net/getprotoent.c Tue Aug 30 22:48:45 2005
@@ -40,108 +40,89 @@
#include <sys/types.h>
#include <sys/socket.h>
@@ -2371,8 +2371,8 @@
+ return (getpe(wrap_getprotoent_r, key));
}
diff -urN /usr/src/lib/libc/net/getprotoname.c /usr/src/lib/libc.new/net/getprotoname.c
---- /usr/src/lib/libc/net/getprotoname.c Tue Aug 30 19:56:50 2005
-+++ /usr/src/lib/libc.new/net/getprotoname.c Tue Aug 30 20:02:56 2005
+--- /usr/src/lib/libc/net/getprotoname.c Tue Aug 30 22:41:32 2005
++++ /usr/src/lib/libc.new/net/getprotoname.c Tue Aug 30 22:48:45 2005
@@ -37,39 +37,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD: src/lib/libc/net/getprotoname.c,v 1.4 2005/04/19 14:41:13 ume Exp $");
@@ -2417,8 +2417,8 @@
+ * nsswitch subsystem. The functionality of all getserv*_r functions is currently
+ * incapsulated in the files_protoent functions in the getprotoent.c file */
diff -urN /usr/src/lib/libc/net/getservbyname.c /usr/src/lib/libc.new/net/getservbyname.c
---- /usr/src/lib/libc/net/getservbyname.c Tue Aug 30 19:56:50 2005
-+++ /usr/src/lib/libc.new/net/getservbyname.c Tue Aug 30 20:02:56 2005
+--- /usr/src/lib/libc/net/getservbyname.c Tue Aug 30 22:41:32 2005
++++ /usr/src/lib/libc.new/net/getservbyname.c Tue Aug 30 22:48:45 2005
@@ -36,54 +36,3 @@
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
@@ -2475,8 +2475,8 @@
- return (&sd->serv);
-}
diff -urN /usr/src/lib/libc/net/getservbyport.c /usr/src/lib/libc.new/net/getservbyport.c
---- /usr/src/lib/libc/net/getservbyport.c Tue Aug 30 19:56:50 2005
-+++ /usr/src/lib/libc.new/net/getservbyport.c Tue Aug 30 20:02:56 2005
+--- /usr/src/lib/libc/net/getservbyport.c Tue Aug 30 22:41:32 2005
++++ /usr/src/lib/libc.new/net/getservbyport.c Tue Aug 30 22:48:45 2005
@@ -36,48 +36,3 @@
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
@@ -2527,8 +2527,8 @@
- return (&sd->serv);
-}
diff -urN /usr/src/lib/libc/net/getservent.c /usr/src/lib/libc.new/net/getservent.c
---- /usr/src/lib/libc/net/getservent.c Tue Aug 30 19:56:50 2005
-+++ /usr/src/lib/libc.new/net/getservent.c Tue Aug 30 20:02:57 2005
+--- /usr/src/lib/libc/net/getservent.c Tue Aug 30 22:41:32 2005
++++ /usr/src/lib/libc.new/net/getservent.c Tue Aug 30 22:48:45 2005
@@ -37,10 +37,13 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD: src/lib/libc/net/getservent.c,v 1.20 2005/08/20 07:59:13 stefanf Exp $");
@@ -3898,8 +3898,8 @@
+ return (getserv(wrap_getservent_r, key));
}
diff -urN /usr/src/lib/libc/net/name6.c /usr/src/lib/libc.new/net/name6.c
---- /usr/src/lib/libc/net/name6.c Tue Aug 30 19:56:50 2005
-+++ /usr/src/lib/libc.new/net/name6.c Tue Aug 30 20:02:57 2005
+--- /usr/src/lib/libc/net/name6.c Tue Aug 30 22:41:32 2005
++++ /usr/src/lib/libc.new/net/name6.c Tue Aug 30 22:48:45 2005
@@ -233,6 +233,11 @@
#ifdef ICMPNL
static int _icmp_ghbyaddr(void *, void *, va_list);
@@ -4143,8 +4143,8 @@
{ 0 }
};
diff -urN /usr/src/lib/libc/net/netdb_private.h /usr/src/lib/libc.new/net/netdb_private.h
---- /usr/src/lib/libc/net/netdb_private.h Tue Aug 30 19:56:50 2005
-+++ /usr/src/lib/libc.new/net/netdb_private.h Tue Aug 30 20:02:57 2005
+--- /usr/src/lib/libc/net/netdb_private.h Tue Aug 30 22:41:32 2005
++++ /usr/src/lib/libc.new/net/netdb_private.h Tue Aug 30 22:48:45 2005
@@ -58,29 +58,6 @@
#endif
};
@@ -4243,7 +4243,7 @@
#endif /* _NETDB_PRIVATE_H_ */
diff -urN /usr/src/lib/libc/net/nscache.c /usr/src/lib/libc.new/net/nscache.c
--- /usr/src/lib/libc/net/nscache.c Thu Jan 1 03:00:00 1970
-+++ /usr/src/lib/libc.new/net/nscache.c Tue Aug 30 20:02:58 2005
++++ /usr/src/lib/libc.new/net/nscache.c Tue Aug 30 22:48:46 2005
@@ -0,0 +1,393 @@
+/*-
+ * Copyright (c) 2005 Michael Bushkov <bushman at rsu.ru>
@@ -4640,8 +4640,8 @@
+}
diff -urN /usr/src/lib/libc/net/nscachedcli.c /usr/src/lib/libc.new/net/nscachedcli.c
--- /usr/src/lib/libc/net/nscachedcli.c Thu Jan 1 03:00:00 1970
-+++ /usr/src/lib/libc.new/net/nscachedcli.c Tue Aug 30 20:02:58 2005
-@@ -0,0 +1,526 @@
++++ /usr/src/lib/libc.new/net/nscachedcli.c Tue Aug 30 22:48:47 2005
+@@ -0,0 +1,529 @@
+/*-
+ * Copyright (c) 2005 Michael Bushkov <bushman at rsu.ru>
+ * All rights reserved.
@@ -5160,17 +5160,12 @@
+int
+close_cached_mp_read_session(struct cached_connection_ *rs)
+{
-+ int notification;
-+ int result;
-+
-+ notification = CET_MP_READ_SESSION_CLOSE_NOTIFICATION;
-+ result = safe_write(rs, ¬ification, sizeof(int));
+ close_cached_connection(rs);
+ return (0);
+}
diff -urN /usr/src/lib/libc/net/nsdispatch.c /usr/src/lib/libc.new/net/nsdispatch.c
---- /usr/src/lib/libc/net/nsdispatch.c Tue Aug 30 19:56:50 2005
-+++ /usr/src/lib/libc.new/net/nsdispatch.c Tue Aug 30 20:02:57 2005
+--- /usr/src/lib/libc/net/nsdispatch.c Tue Aug 30 22:41:32 2005
++++ /usr/src/lib/libc.new/net/nsdispatch.c Tue Aug 30 22:48:46 2005
@@ -231,8 +231,6 @@
*count = 0;
}
@@ -5281,8 +5276,8 @@
(void)_pthread_rwlock_unlock(&nss_lock);
fin:
diff -urN /usr/src/lib/libc/rpc/getrpcent.c /usr/src/lib/libc.new/rpc/getrpcent.c
---- /usr/src/lib/libc/rpc/getrpcent.c Tue Aug 30 19:56:51 2005
-+++ /usr/src/lib/libc.new/rpc/getrpcent.c Tue Aug 30 20:03:01 2005
+--- /usr/src/lib/libc/rpc/getrpcent.c Tue Aug 30 22:41:33 2005
++++ /usr/src/lib/libc.new/rpc/getrpcent.c Tue Aug 30 22:48:50 2005
@@ -40,281 +40,985 @@
* Copyright (c) 1984 by Sun Microsystems, Inc.
*/
@@ -6488,8 +6483,8 @@
+ return (getrpc(wrap_getrpcent_r, key));
+}
diff -urN /usr/src/usr.sbin/Makefile /usr/src/usr.sbin.new/Makefile
---- /usr/src/usr.sbin/Makefile Tue Aug 30 19:55:02 2005
-+++ /usr/src/usr.sbin.new/Makefile Tue Aug 30 20:13:52 2005
+--- /usr/src/usr.sbin/Makefile Tue Aug 30 22:39:25 2005
++++ /usr/src/usr.sbin.new/Makefile Tue Aug 30 22:47:24 2005
@@ -22,6 +22,7 @@
bsnmpd \
${_btxld} \
@@ -6511,7 +6506,7 @@
.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
diff -urN /usr/src/usr.sbin/cached/Makefile /usr/src/usr.sbin.new/cached/Makefile
--- /usr/src/usr.sbin/cached/Makefile Thu Jan 1 03:00:00 1970
-+++ /usr/src/usr.sbin.new/cached/Makefile Tue Aug 30 20:14:26 2005
++++ /usr/src/usr.sbin.new/cached/Makefile Tue Aug 30 22:47:58 2005
@@ -0,0 +1,4 @@
+# $FreeBSD$
+SUBDIR+="test" "cachelib" "bin"
@@ -6519,7 +6514,7 @@
+.include <bsd.subdir.mk>
diff -urN /usr/src/usr.sbin/cached/bin/Makefile /usr/src/usr.sbin.new/cached/bin/Makefile
--- /usr/src/usr.sbin/cached/bin/Makefile Thu Jan 1 03:00:00 1970
-+++ /usr/src/usr.sbin.new/cached/bin/Makefile Tue Aug 30 20:14:26 2005
++++ /usr/src/usr.sbin.new/cached/bin/Makefile Tue Aug 30 22:47:58 2005
@@ -0,0 +1,24 @@
+# $FreeBSD$
+
@@ -6543,12 +6538,11 @@
+CONFDIR=${PREFIX}/etc
+CONFMODE=${SHAREMODE}
+CONF+=${.CURDIR}/cached.conf
-+
+.include "../../Makefile.inc"
+.include <bsd.prog.mk>
diff -urN /usr/src/usr.sbin/cached/bin/cached.8 /usr/src/usr.sbin.new/cached/bin/cached.8
--- /usr/src/usr.sbin/cached/bin/cached.8 Thu Jan 1 03:00:00 1970
-+++ /usr/src/usr.sbin.new/cached/bin/cached.8 Tue Aug 30 20:14:26 2005
++++ /usr/src/usr.sbin.new/cached/bin/cached.8 Tue Aug 30 22:47:58 2005
@@ -0,0 +1,105 @@
+.\" Copyright (c) 2005 Michael Bushkov <bushman at rsu.ru>
+.\" All rights reserved.
@@ -6657,7 +6651,7 @@
+.Aq bushman at rsu.ru.
diff -urN /usr/src/usr.sbin/cached/bin/cached.c /usr/src/usr.sbin.new/cached/bin/cached.c
--- /usr/src/usr.sbin/cached/bin/cached.c Thu Jan 1 03:00:00 1970
-+++ /usr/src/usr.sbin.new/cached/bin/cached.c Tue Aug 30 20:14:25 2005
++++ /usr/src/usr.sbin.new/cached/bin/cached.c Tue Aug 30 22:47:57 2005
@@ -0,0 +1,719 @@
+/*-
+ * Copyright (c) 2005 Michael Bushkov <bushman at rsu.ru>
@@ -6939,9 +6933,9 @@
+ qstate = init_query_state(fd, sizeof(int));
+ memset(&timeout, 0, sizeof(struct timespec));
+
-+ EV_SET(&eventlist[0], fd, EVFILT_READ, EV_ADD | EV_ONESHOT,
++ EV_SET(&eventlist[1], fd, EVFILT_READ, EV_ADD | EV_ONESHOT,
+ NOTE_LOWAT, qstate->kevent_watermark, qstate);
-+ EV_SET(&eventlist[1], fd, EVFILT_TIMER, EV_ADD | EV_ONESHOT,
++ EV_SET(&eventlist[0], fd, EVFILT_TIMER, EV_ADD | EV_ONESHOT,
+ 0, qstate->timeout.tv_sec * 1000, qstate);
+ res = kevent(env->queue, eventlist, 2, NULL, 0, &timeout);
+ TRACE_INT(res);
@@ -7099,11 +7093,11 @@
+ qstate->use_alternate_io = 1;
+
+ qstate->io_buffer_watermark = MAX_SOCKET_IO_SIZE;
-+ EV_SET(&eventlist[0], event_data->ident,
++ EV_SET(&eventlist[1], event_data->ident,
+ qstate->kevent_filter, EV_ADD | EV_ONESHOT,
+ NOTE_LOWAT, MAX_SOCKET_IO_SIZE, qstate);
+ } else {
-+ EV_SET(&eventlist[0], event_data->ident,
++ EV_SET(&eventlist[1], event_data->ident,
+ qstate->kevent_filter, EV_ADD | EV_ONESHOT,
+ NOTE_LOWAT, qstate->kevent_watermark, qstate);
+ }
@@ -7114,7 +7108,7 @@
+ MAX_SOCKET_IO_SIZE) {
+ qstate->io_buffer_watermark = qstate->io_buffer +
+ qstate->io_buffer_size - qstate->io_buffer_p;
-+ EV_SET(&eventlist[0], event_data->ident,
++ EV_SET(&eventlist[1], event_data->ident,
+ qstate->io_buffer_filter,
+ EV_ADD | EV_ONESHOT, NOTE_LOWAT,
+ qstate->io_buffer_watermark,
@@ -7122,12 +7116,12 @@
+ } else {
+ TRACE_POINT();
+ qstate->io_buffer_watermark = MAX_SOCKET_IO_SIZE;
-+ EV_SET(&eventlist[0], event_data->ident,
++ EV_SET(&eventlist[1], event_data->ident,
+ qstate->io_buffer_filter, EV_ADD | EV_ONESHOT,
+ NOTE_LOWAT, MAX_SOCKET_IO_SIZE, qstate);
+ }
+ }
-+ EV_SET(&eventlist[1], event_data->ident, EVFILT_TIMER,
++ EV_SET(&eventlist[0], event_data->ident, EVFILT_TIMER,
+ EV_ADD | EV_ONESHOT, 0, query_timeout.tv_sec * 1000, qstate);
+ kevent(env->queue, eventlist, 2, NULL, 0, &kevent_timeout);
+
@@ -7380,7 +7374,7 @@
+}
diff -urN /usr/src/usr.sbin/cached/bin/cached.conf /usr/src/usr.sbin.new/cached/bin/cached.conf
--- /usr/src/usr.sbin/cached/bin/cached.conf Thu Jan 1 03:00:00 1970
-+++ /usr/src/usr.sbin.new/cached/bin/cached.conf Tue Aug 30 20:14:25 2005
++++ /usr/src/usr.sbin.new/cached/bin/cached.conf Tue Aug 30 22:47:57 2005
@@ -0,0 +1,168 @@
+socket_path = "/var/run/cached"
+pidfile_path = "/var/run/cached.pid"
@@ -7552,7 +7546,7 @@
+}
diff -urN /usr/src/usr.sbin/cached/bin/cached.conf.5 /usr/src/usr.sbin.new/cached/bin/cached.conf.5
--- /usr/src/usr.sbin/cached/bin/cached.conf.5 Thu Jan 1 03:00:00 1970
-+++ /usr/src/usr.sbin.new/cached/bin/cached.conf.5 Tue Aug 30 20:14:25 2005
++++ /usr/src/usr.sbin.new/cached/bin/cached.conf.5 Tue Aug 30 22:47:57 2005
@@ -0,0 +1,199 @@
+.\" Copyright (c) 2005 Michael Bushkov <bushman at rsu.ru>
+.\" All rights reserved.
@@ -7755,7 +7749,7 @@
+.Aq bushman at rsu.ru.
diff -urN /usr/src/usr.sbin/cached/bin/config.c /usr/src/usr.sbin.new/cached/bin/config.c
--- /usr/src/usr.sbin/cached/bin/config.c Thu Jan 1 03:00:00 1970
-+++ /usr/src/usr.sbin.new/cached/bin/config.c Tue Aug 30 20:14:25 2005
++++ /usr/src/usr.sbin.new/cached/bin/config.c Tue Aug 30 22:47:58 2005
@@ -0,0 +1,698 @@
+/*-
+ * Copyright (c) 2005 Michael Bushkov <bushman at rsu.ru>
@@ -8457,7 +8451,7 @@
+}
diff -urN /usr/src/usr.sbin/cached/bin/config.h /usr/src/usr.sbin.new/cached/bin/config.h
--- /usr/src/usr.sbin/cached/bin/config.h Thu Jan 1 03:00:00 1970
-+++ /usr/src/usr.sbin.new/cached/bin/config.h Tue Aug 30 20:14:25 2005
++++ /usr/src/usr.sbin.new/cached/bin/config.h Tue Aug 30 22:47:58 2005
@@ -0,0 +1,86 @@
+/*-
+ * Copyright (c) 2005 Michael Bushkov <bushman at rsu.ru>
@@ -8547,7 +8541,7 @@
+#endif
diff -urN /usr/src/usr.sbin/cached/bin/debug.c /usr/src/usr.sbin.new/cached/bin/debug.c
--- /usr/src/usr.sbin/cached/bin/debug.c Thu Jan 1 03:00:00 1970
-+++ /usr/src/usr.sbin.new/cached/bin/debug.c Tue Aug 30 20:14:25 2005
++++ /usr/src/usr.sbin.new/cached/bin/debug.c Tue Aug 30 22:47:58 2005
@@ -0,0 +1,146 @@
+/*-
+ * Copyright (c) 2004 Michael Bushkov <bushman at rsu.ru>
@@ -8697,7 +8691,7 @@
+}
diff -urN /usr/src/usr.sbin/cached/bin/debug.h /usr/src/usr.sbin.new/cached/bin/debug.h
--- /usr/src/usr.sbin/cached/bin/debug.h Thu Jan 1 03:00:00 1970
-+++ /usr/src/usr.sbin.new/cached/bin/debug.h Tue Aug 30 20:14:25 2005
++++ /usr/src/usr.sbin.new/cached/bin/debug.h Tue Aug 30 22:47:58 2005
@@ -0,0 +1,65 @@
+/*-
+ * Copyright (c) 2004 Michael Bushkov <bushman at rsu.ru>
@@ -8766,7 +8760,7 @@
+#endif
diff -urN /usr/src/usr.sbin/cached/bin/log.c /usr/src/usr.sbin.new/cached/bin/log.c
--- /usr/src/usr.sbin/cached/bin/log.c Thu Jan 1 03:00:00 1970
-+++ /usr/src/usr.sbin.new/cached/bin/log.c Tue Aug 30 20:14:25 2005
++++ /usr/src/usr.sbin.new/cached/bin/log.c Tue Aug 30 22:47:58 2005
@@ -0,0 +1,75 @@
+/*-
+ * Copyright (c) 2005 Michael Bushkov <bushman at rsu.ru>
@@ -8845,7 +8839,7 @@
+}
diff -urN /usr/src/usr.sbin/cached/bin/log.h /usr/src/usr.sbin.new/cached/bin/log.h
--- /usr/src/usr.sbin/cached/bin/log.h Thu Jan 1 03:00:00 1970
-+++ /usr/src/usr.sbin.new/cached/bin/log.h Tue Aug 30 20:14:25 2005
++++ /usr/src/usr.sbin.new/cached/bin/log.h Tue Aug 30 22:47:58 2005
@@ -0,0 +1,42 @@
+/*-
+ * Copyright (c) 2005 Michael Bushkov <bushman at rsu.ru>
@@ -8891,7 +8885,7 @@
+#endif
diff -urN /usr/src/usr.sbin/cached/bin/mp_rs_query.c /usr/src/usr.sbin.new/cached/bin/mp_rs_query.c
--- /usr/src/usr.sbin/cached/bin/mp_rs_query.c Thu Jan 1 03:00:00 1970
-+++ /usr/src/usr.sbin.new/cached/bin/mp_rs_query.c Tue Aug 30 20:14:25 2005
++++ /usr/src/usr.sbin.new/cached/bin/mp_rs_query.c Tue Aug 30 22:47:58 2005
@@ -0,0 +1,385 @@
+/*-
+ * Copyright (c) 2005 Michael Bushkov <bushman at rsu.ru>
@@ -9280,7 +9274,7 @@
+}
diff -urN /usr/src/usr.sbin/cached/bin/mp_rs_query.h /usr/src/usr.sbin.new/cached/bin/mp_rs_query.h
--- /usr/src/usr.sbin/cached/bin/mp_rs_query.h Thu Jan 1 03:00:00 1970
-+++ /usr/src/usr.sbin.new/cached/bin/mp_rs_query.h Tue Aug 30 20:14:25 2005
++++ /usr/src/usr.sbin.new/cached/bin/mp_rs_query.h Tue Aug 30 22:47:58 2005
@@ -0,0 +1,35 @@
+/*-
+ * Copyright (c) 2005 Michael Bushkov <bushman at rsu.ru>
@@ -9319,7 +9313,7 @@
+#endif
diff -urN /usr/src/usr.sbin/cached/bin/mp_ws_query.c /usr/src/usr.sbin.new/cached/bin/mp_ws_query.c
--- /usr/src/usr.sbin/cached/bin/mp_ws_query.c Thu Jan 1 03:00:00 1970
-+++ /usr/src/usr.sbin.new/cached/bin/mp_ws_query.c Tue Aug 30 20:14:26 2005
++++ /usr/src/usr.sbin.new/cached/bin/mp_ws_query.c Tue Aug 30 22:47:58 2005
@@ -0,0 +1,431 @@
+/*-
+ * Copyright (c) 2005 Michael Bushkov <bushman at rsu.ru>
@@ -9754,7 +9748,7 @@
+}
diff -urN /usr/src/usr.sbin/cached/bin/mp_ws_query.h /usr/src/usr.sbin.new/cached/bin/mp_ws_query.h
--- /usr/src/usr.sbin/cached/bin/mp_ws_query.h Thu Jan 1 03:00:00 1970
-+++ /usr/src/usr.sbin.new/cached/bin/mp_ws_query.h Tue Aug 30 20:14:26 2005
++++ /usr/src/usr.sbin.new/cached/bin/mp_ws_query.h Tue Aug 30 22:47:58 2005
@@ -0,0 +1,35 @@
+/*-
+ * Copyright (c) 2005 Michael Bushkov <bushman at rsu.ru>
@@ -9793,7 +9787,7 @@
+#endif
diff -urN /usr/src/usr.sbin/cached/bin/parser.c /usr/src/usr.sbin.new/cached/bin/parser.c
--- /usr/src/usr.sbin/cached/bin/parser.c Thu Jan 1 03:00:00 1970
-+++ /usr/src/usr.sbin.new/cached/bin/parser.c Tue Aug 30 20:14:26 2005
++++ /usr/src/usr.sbin.new/cached/bin/parser.c Tue Aug 30 22:47:58 2005
@@ -0,0 +1,687 @@
+/*-
+ * Copyright (c) 2005 Michael Bushkov <bushman at rsu.ru>
@@ -10484,7 +10478,7 @@
+}
diff -urN /usr/src/usr.sbin/cached/bin/parser.h /usr/src/usr.sbin.new/cached/bin/parser.h
--- /usr/src/usr.sbin/cached/bin/parser.h Thu Jan 1 03:00:00 1970
-+++ /usr/src/usr.sbin.new/cached/bin/parser.h Tue Aug 30 20:14:26 2005
++++ /usr/src/usr.sbin.new/cached/bin/parser.h Tue Aug 30 22:47:58 2005
@@ -0,0 +1,101 @@
+/*-
+ * Copyright (c) 2005 Michael Bushkov <bushman at rsu.ru>
@@ -10589,7 +10583,7 @@
+#endif
diff -urN /usr/src/usr.sbin/cached/bin/protocol.c /usr/src/usr.sbin.new/cached/bin/protocol.c
--- /usr/src/usr.sbin/cached/bin/protocol.c Thu Jan 1 03:00:00 1970
-+++ /usr/src/usr.sbin.new/cached/bin/protocol.c Tue Aug 30 20:14:26 2005
++++ /usr/src/usr.sbin.new/cached/bin/protocol.c Tue Aug 30 22:47:58 2005
@@ -0,0 +1,498 @@
+/*-
+ * Copyright (c) 2005 Michael Bushkov <bushman at rsu.ru>
@@ -11091,7 +11085,7 @@
+}
diff -urN /usr/src/usr.sbin/cached/bin/protocol.h /usr/src/usr.sbin.new/cached/bin/protocol.h
--- /usr/src/usr.sbin/cached/bin/protocol.h Thu Jan 1 03:00:00 1970
-+++ /usr/src/usr.sbin.new/cached/bin/protocol.h Tue Aug 30 20:14:26 2005
++++ /usr/src/usr.sbin.new/cached/bin/protocol.h Tue Aug 30 22:47:58 2005
@@ -0,0 +1,242 @@
+/*-
+ * Copyright (c) 2005 Michael Bushkov <bushman at rsu.ru>
@@ -11337,7 +11331,7 @@
+#endif
diff -urN /usr/src/usr.sbin/cached/bin/query.c /usr/src/usr.sbin.new/cached/bin/query.c
--- /usr/src/usr.sbin/cached/bin/query.c Thu Jan 1 03:00:00 1970
-+++ /usr/src/usr.sbin.new/cached/bin/query.c Tue Aug 30 20:14:26 2005
++++ /usr/src/usr.sbin.new/cached/bin/query.c Tue Aug 30 22:47:58 2005
@@ -0,0 +1,756 @@
+/*-
+ * Copyright (c) 2005 Michael Bushkov <bushman at rsu.ru>
@@ -12097,7 +12091,7 @@
+}
diff -urN /usr/src/usr.sbin/cached/bin/query.h /usr/src/usr.sbin.new/cached/bin/query.h
--- /usr/src/usr.sbin/cached/bin/query.h Thu Jan 1 03:00:00 1970
-+++ /usr/src/usr.sbin.new/cached/bin/query.h Tue Aug 30 20:14:26 2005
++++ /usr/src/usr.sbin.new/cached/bin/query.h Tue Aug 30 22:47:58 2005
@@ -0,0 +1,100 @@
+/*-
+ * Copyright (c) 2005 Michael Bushkov <bushman at rsu.ru>
@@ -12201,7 +12195,7 @@
+#endif
diff -urN /usr/src/usr.sbin/cached/bin/singletons.c /usr/src/usr.sbin.new/cached/bin/singletons.c
--- /usr/src/usr.sbin/cached/bin/singletons.c Thu Jan 1 03:00:00 1970
-+++ /usr/src/usr.sbin.new/cached/bin/singletons.c Tue Aug 30 20:14:26 2005
++++ /usr/src/usr.sbin.new/cached/bin/singletons.c Tue Aug 30 22:47:58 2005
@@ -0,0 +1,32 @@
+/*-
+ * Copyright (c) 2005 Michael Bushkov <bushman at rsu.ru>
@@ -12237,7 +12231,7 @@
+struct runtime_env *s_runtime_env = NULL;
diff -urN /usr/src/usr.sbin/cached/bin/singletons.h /usr/src/usr.sbin.new/cached/bin/singletons.h
--- /usr/src/usr.sbin/cached/bin/singletons.h Thu Jan 1 03:00:00 1970
-+++ /usr/src/usr.sbin.new/cached/bin/singletons.h Tue Aug 30 20:14:26 2005
++++ /usr/src/usr.sbin.new/cached/bin/singletons.h Tue Aug 30 22:47:58 2005
@@ -0,0 +1,44 @@
+/*-
+ * Copyright (c) 2005 Michael Bushkov <bushman at rsu.ru>
@@ -12285,7 +12279,7 @@
+#endif
diff -urN /usr/src/usr.sbin/cached/cachelib/Makefile /usr/src/usr.sbin.new/cached/cachelib/Makefile
--- /usr/src/usr.sbin/cached/cachelib/Makefile Thu Jan 1 03:00:00 1970
-+++ /usr/src/usr.sbin.new/cached/cachelib/Makefile Tue Aug 30 20:14:25 2005
++++ /usr/src/usr.sbin.new/cached/cachelib/Makefile Tue Aug 30 22:47:57 2005
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
@@ -12301,7 +12295,7 @@
+.include <bsd.lib.mk>
diff -urN /usr/src/usr.sbin/cached/cachelib/cachelib.c /usr/src/usr.sbin.new/cached/cachelib/cachelib.c
--- /usr/src/usr.sbin/cached/cachelib/cachelib.c Thu Jan 1 03:00:00 1970
-+++ /usr/src/usr.sbin.new/cached/cachelib/cachelib.c Tue Aug 30 20:14:25 2005
++++ /usr/src/usr.sbin.new/cached/cachelib/cachelib.c Tue Aug 30 22:47:57 2005
@@ -0,0 +1,1039 @@
+/*-
+ * Copyright (c) 2005 Michael Bushkov <bushman at rsu.ru>
@@ -13344,82 +13338,82 @@
+}
diff -urN /usr/src/usr.sbin/cached/cachelib/hashfuncs.c /usr/src/usr.sbin.new/cached/cachelib/hashfuncs.c
--- /usr/src/usr.sbin/cached/cachelib/hashfuncs.c Thu Jan 1 03:00:00 1970
-+++ /usr/src/usr.sbin.new/cached/cachelib/hashfuncs.c Tue Aug 30 20:14:25 2005
++++ /usr/src/usr.sbin.new/cached/cachelib/hashfuncs.c Tue Aug 30 22:47:57 2005
@@ -0,0 +1,28 @@
-+/*-
-+ * Copyright (c) 2005 Michael Bushkov <bushman at rsu.ru>
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ *
-+ */
-+
++/*-
++ * Copyright (c) 2005 Michael Bushkov <bushman at rsu.ru>
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ * notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ * notice, this list of conditions and the following disclaimer in the
++ * documentation and/or other materials provided with the distribution.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
++ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
++ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
++ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
++ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
++ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
++ * SUCH DAMAGE.
++ *
++ */
++
+#include "hashfuncs.h"
diff -urN /usr/src/usr.sbin/cached/cachelib/hashfuncs.h /usr/src/usr.sbin.new/cached/cachelib/hashfuncs.h
--- /usr/src/usr.sbin/cached/cachelib/hashfuncs.h Thu Jan 1 03:00:00 1970
-+++ /usr/src/usr.sbin.new/cached/cachelib/hashfuncs.h Tue Aug 30 20:14:25 2005
++++ /usr/src/usr.sbin.new/cached/cachelib/hashfuncs.h Tue Aug 30 22:47:57 2005
@@ -0,0 +1,39 @@
-+/*-
-+ * Copyright (c) 2005 Michael Bushkov <bushman at rsu.ru>
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ *
-+ */
-+
-+#ifndef __CACHELIB_HASHFUNCS_H__
-+#define __CACHELIB_HASHFUNCS_H__
-+
-+#define STRING_SIMPLE_HASH_BODY(in_var, var, a, M) \
-+ for ((var) = 0; *(in_var) != '\0'; ++(in_var)) \
-+ (var) = ((a)*(var) + *(in_var)) % (M)
-+
-+#define STRING_SIMPLE_MP2_HASH_BODY(in_var, var, a, M) \
-+ for ((var) = 0; *(in_var) != 0; ++(in_var)) \
-+ (var) = ((a)*(var) + *(in_var)) & (M - 1)
-+
++/*-
++ * Copyright (c) 2005 Michael Bushkov <bushman at rsu.ru>
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ * notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ * notice, this list of conditions and the following disclaimer in the
++ * documentation and/or other materials provided with the distribution.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
++ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
++ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
++ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
++ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
++ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
++ * SUCH DAMAGE.
++ *
++ */
++
++#ifndef __CACHELIB_HASHFUNCS_H__
++#define __CACHELIB_HASHFUNCS_H__
++
++#define STRING_SIMPLE_HASH_BODY(in_var, var, a, M) \
++ for ((var) = 0; *(in_var) != '\0'; ++(in_var)) \
++ (var) = ((a)*(var) + *(in_var)) % (M)
++
++#define STRING_SIMPLE_MP2_HASH_BODY(in_var, var, a, M) \
++ for ((var) = 0; *(in_var) != 0; ++(in_var)) \
++ (var) = ((a)*(var) + *(in_var)) & (M - 1)
++
+#endif
diff -urN /usr/src/usr.sbin/cached/cachelib/hashtable.h /usr/src/usr.sbin.new/cached/cachelib/hashtable.h
--- /usr/src/usr.sbin/cached/cachelib/hashtable.h Thu Jan 1 03:00:00 1970
-+++ /usr/src/usr.sbin.new/cached/cachelib/hashtable.h Tue Aug 30 20:14:25 2005
++++ /usr/src/usr.sbin.new/cached/cachelib/hashtable.h Tue Aug 30 22:47:57 2005
@@ -0,0 +1,152 @@
+/*-
+ * Copyright (c) 2005 Michael Bushkov <bushman at rsu.ru>
@@ -13575,7 +13569,7 @@
+#endif
diff -urN /usr/src/usr.sbin/cached/cachelib/include/cachelib.h /usr/src/usr.sbin.new/cached/cachelib/include/cachelib.h
--- /usr/src/usr.sbin/cached/cachelib/include/cachelib.h Thu Jan 1 03:00:00 1970
-+++ /usr/src/usr.sbin.new/cached/cachelib/include/cachelib.h Tue Aug 30 20:14:25 2005
++++ /usr/src/usr.sbin.new/cached/cachelib/include/cachelib.h Tue Aug 30 22:47:57 2005
@@ -0,0 +1,242 @@
+/*-
+ * Copyright (c) 2005 Michael Bushkov <bushman at rsu.ru>
@@ -13821,7 +13815,7 @@
+#endif
diff -urN /usr/src/usr.sbin/cached/cachelib/policies.c /usr/src/usr.sbin.new/cached/cachelib/policies.c
--- /usr/src/usr.sbin/cached/cachelib/policies.c Thu Jan 1 03:00:00 1970
-+++ /usr/src/usr.sbin.new/cached/cachelib/policies.c Tue Aug 30 20:14:25 2005
++++ /usr/src/usr.sbin.new/cached/cachelib/policies.c Tue Aug 30 22:47:57 2005
@@ -0,0 +1,546 @@
+/*-
+ * Copyright (c) 2005 Michael Bushkov <bushman at rsu.ru>
@@ -14371,7 +14365,7 @@
+}
diff -urN /usr/src/usr.sbin/cached/cachelib/policies.h /usr/src/usr.sbin.new/cached/cachelib/policies.h
--- /usr/src/usr.sbin/cached/cachelib/policies.h Thu Jan 1 03:00:00 1970
-+++ /usr/src/usr.sbin.new/cached/cachelib/policies.h Tue Aug 30 20:14:25 2005
++++ /usr/src/usr.sbin.new/cached/cachelib/policies.h Tue Aug 30 22:47:57 2005
@@ -0,0 +1,114 @@
+/*-
+ * Copyright (c) 2005 Michael Bushkov <bushman at rsu.ru>
@@ -14489,7 +14483,7 @@
+#endif
diff -urN /usr/src/usr.sbin/cached/startup/cached /usr/src/usr.sbin.new/cached/startup/cached
--- /usr/src/usr.sbin/cached/startup/cached Thu Jan 1 03:00:00 1970
-+++ /usr/src/usr.sbin.new/cached/startup/cached Tue Aug 30 20:14:25 2005
++++ /usr/src/usr.sbin.new/cached/startup/cached Tue Aug 30 22:47:57 2005
@@ -0,0 +1,31 @@
+#!/bin/sh
+#
@@ -14524,7 +14518,7 @@
+run_rc_command "$1"
diff -urN /usr/src/usr.sbin/cached/test/Makefile /usr/src/usr.sbin.new/cached/test/Makefile
--- /usr/src/usr.sbin/cached/test/Makefile Thu Jan 1 03:00:00 1970
-+++ /usr/src/usr.sbin.new/cached/test/Makefile Tue Aug 30 20:14:25 2005
++++ /usr/src/usr.sbin.new/cached/test/Makefile Tue Aug 30 22:47:57 2005
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
@@ -14537,7 +14531,7 @@
+.include <bsd.lib.mk>
diff -urN /usr/src/usr.sbin/cached/test/debug.c /usr/src/usr.sbin.new/cached/test/debug.c
--- /usr/src/usr.sbin/cached/test/debug.c Thu Jan 1 03:00:00 1970
-+++ /usr/src/usr.sbin.new/cached/test/debug.c Tue Aug 30 20:14:25 2005
++++ /usr/src/usr.sbin.new/cached/test/debug.c Tue Aug 30 22:47:57 2005
@@ -0,0 +1,146 @@
+/*-
+ * Copyright (c) 2004 Michael Bushkov <bushman at rsu.ru>
@@ -14687,7 +14681,7 @@
+}
diff -urN /usr/src/usr.sbin/cached/test/debug.h /usr/src/usr.sbin.new/cached/test/debug.h
--- /usr/src/usr.sbin/cached/test/debug.h Thu Jan 1 03:00:00 1970
-+++ /usr/src/usr.sbin.new/cached/test/debug.h Tue Aug 30 20:14:25 2005
++++ /usr/src/usr.sbin.new/cached/test/debug.h Tue Aug 30 22:47:57 2005
@@ -0,0 +1,65 @@
+/*-
+ * Copyright (c) 2004 Michael Bushkov <bushman at rsu.ru>
@@ -14756,7 +14750,7 @@
+#endif
diff -urN /usr/src/usr.sbin/cached/test/test.c /usr/src/usr.sbin.new/cached/test/test.c
--- /usr/src/usr.sbin/cached/test/test.c Thu Jan 1 03:00:00 1970
-+++ /usr/src/usr.sbin.new/cached/test/test.c Tue Aug 30 20:14:25 2005
++++ /usr/src/usr.sbin.new/cached/test/test.c Tue Aug 30 22:47:57 2005
@@ -0,0 +1,181 @@
+/*-
+ * Copyright (c) 2004 Michael Bushkov <bushman at rsu.ru>
@@ -14941,7 +14935,7 @@
+__TEST_LOG_IMPL(3)
diff -urN /usr/src/usr.sbin/cached/test/test.h /usr/src/usr.sbin.new/cached/test/test.h
--- /usr/src/usr.sbin/cached/test/test.h Thu Jan 1 03:00:00 1970
-+++ /usr/src/usr.sbin.new/cached/test/test.h Tue Aug 30 20:14:25 2005
++++ /usr/src/usr.sbin.new/cached/test/test.h Tue Aug 30 22:47:57 2005
@@ -0,0 +1,71 @@
+/*-
+ * Copyright (c) 2004 Michael Bushkov <bushman at rsu.ru>
More information about the p4-projects
mailing list