b96bd1b1c3
Fixes to several DOS attacks that could be carried out aginst a nasd server, ANSI'fication of most of the server and client code, and significant rework of input and output mixer handling in the voxware (OSS) server.
43 lines
1.5 KiB
Text
43 lines
1.5 KiB
Text
$NetBSD: patch-ab,v 1.13 2007/05/05 21:31:10 markd Exp $
|
|
|
|
--- server/Imakefile.orig 2006-08-14 13:04:17.000000000 +1200
|
|
+++ server/Imakefile
|
|
@@ -61,7 +61,7 @@ XCOMM $NCDId: @(#)Imakefile,v 1.17 1995/
|
|
#endif
|
|
|
|
#ifdef NetBSDArchitecture
|
|
- SYSLIBS = -lossaudio
|
|
+ SYSLIBS = $(LIBOSSAUDIO)
|
|
#endif
|
|
|
|
CBRT =
|
|
@@ -96,7 +96,7 @@ ALL1 = nasd
|
|
#endif
|
|
|
|
|
|
-#if defined(i386SVR4Architecture) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) || defined(FreeBSDArchitecture) || defined(LinuxArchitecture) || defined(i386BsdArchitecture) || defined(USLArchitecture) || defined(cygwinArchitecture) || defined(__DragonFly__)
|
|
+#if defined(i386SVR4Architecture) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) || defined(NetBSDArchitecture) || defined(FreeBSDArchitecture) || defined(LinuxArchitecture) || defined(i386BsdArchitecture) || defined(USLArchitecture) || defined(cygwinArchitecture) || defined(__DragonFly__)
|
|
# define CanBuildAuServer YES
|
|
|
|
# if defined(cygwinArchitecture)
|
|
@@ -213,14 +213,19 @@ clean::
|
|
$(RM) $(ALL)
|
|
|
|
ETCDIR = NasConfigSearchPath
|
|
+ EGDIR = ${PREFIX}/share/examples/nas
|
|
|
|
InstallManPage(nasd,$(MANDIR))
|
|
#ifdef InstallGenManPage
|
|
InstallGenManPage(nasd.conf,$(FILEMANDIR),$(FILEMANSUFFIX))
|
|
#else
|
|
+#ifdef InstallNamedTarget
|
|
+InstallNamedTarget(install.man,nasd.conf.man,$(INSTMANFLAGS),$(FILEMANDIR),nasd.conf.$(FILEMANSUFFIX))
|
|
+#else
|
|
InstallManPage(nasd.conf,$(FILEMANDIR))
|
|
#endif
|
|
-InstallNonExecFile(nasd.conf.eg,$(ETCDIR))
|
|
+#endif
|
|
+InstallNonExecFile(nasd.conf.eg,$(EGDIR))
|
|
|
|
#else /* CanBuildAuServer */
|
|
|