PERFORCE change 93445 for review

[soc-bushman]

http://perforce.freebsd.org/chv.cgi?CH=93445

Change 93445 by soc-bushman at soc-bushman_stinger on 2006/03/17 13:34:02

	usr.sbin/cached structure simplified - there is no need longer in "startup" folder, because rc.d/cached and cached.conf files were placed directly into repository

Affected files ...

.. //depot/projects/soc2005/nsswitch_cached/src/etc/Makefile#2 edit
.. //depot/projects/soc2005/nsswitch_cached/src/etc/rc.d/Makefile#2 edit
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/Makefile#6 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/agent.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/agent.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/agents/Makefile.inc#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/agents/group.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/agents/group.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/agents/hosts.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/agents/hosts.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/agents/passwd.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/agents/passwd.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/agents/services.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/agents/services.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached.8#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached.conf#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached.conf.5#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/Makefile#6 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agent.c#5 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agent.h#5 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/Makefile.inc#5 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/group.c#6 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/group.h#5 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/hosts.c#5 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/hosts.h#5 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/passwd.c#5 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/passwd.h#5 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/services.c#6 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/services.h#5 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cached.8#5 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cached.c#5 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cached.conf#5 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cached.conf.5#5 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cachedcli.c#2 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cachedcli.h#2 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cachelib.c#5 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cachelib.h#5 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cacheplcs.c#5 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cacheplcs.h#5 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/config.c#5 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/config.h#5 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/debug.c#5 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/debug.h#6 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/hashtable.h#5 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/log.c#5 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/log.h#5 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/mp_rs_query.c#5 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/mp_rs_query.h#5 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/mp_ws_query.c#5 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/mp_ws_query.h#5 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/parser.c#5 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/parser.h#5 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/protocol.c#5 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/protocol.h#5 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/query.c#5 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/query.h#5 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/singletons.c#5 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/singletons.h#5 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cachedcli.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cachedcli.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cachelib.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cachelib.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cacheplcs.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cacheplcs.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/config.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/config.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/debug.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/debug.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/hashtable.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/log.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/log.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/mp_rs_query.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/mp_rs_query.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/mp_ws_query.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/mp_ws_query.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/parser.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/parser.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/protocol.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/protocol.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/query.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/query.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/singletons.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/singletons.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/startup/cached#5 delete

Differences ...

==== //depot/projects/soc2005/nsswitch_cached/src/etc/Makefile#2 (text+ko) ====

@@ -33,6 +33,10 @@
 BIN1+=	printcap
 .endif
 
+.if !defined(NO_NS_CACHING)
+BIN1+= cached.conf
+.endif
+
 .if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
 .if !defined(NO_OPENSSH)
 SSH=	${.CURDIR}/../crypto/openssh/ssh_config \

==== //depot/projects/soc2005/nsswitch_cached/src/etc/rc.d/Makefile#2 (text+ko) ====

@@ -45,6 +45,10 @@
 FILES+=	sshd
 .endif
 
+.if !defined(NO_NS_CACHING)
+FILES+= cached
+.endif
+
 FILESDIR=	/etc/rc.d
 FILESMODE=	${BINMODE}