ALT Linux repos
Group :: Sound
RPM: nas
Navigation
Main Changelog Spec Patches Sources Download Gear Bugs and FR Repocop
Patch: nas-1.9.1-alt3.patch
Download
Download
Imakefile | 1 +
clients/Imakefile | 1 +
clients/audio/Imakefile | 1 +
clients/audio/auconvert/Imakefile | 1 +
clients/audio/auctl/Imakefile | 1 +
clients/audio/audemo/Imakefile | 1 +
clients/audio/audial/Imakefile | 1 +
clients/audio/auedit/Imakefile | 1 +
clients/audio/auinfo/Imakefile | 1 +
clients/audio/aupanel/Imakefile | 1 +
clients/audio/auphone/Imakefile | 1 +
clients/audio/auplay/Imakefile | 1 +
clients/audio/aurecord/Imakefile | 1 +
clients/audio/auscope/Imakefile | 1 +
clients/audio/autool/Imakefile | 1 +
clients/audio/auwave/Imakefile | 1 +
clients/audio/examples/Imakefile | 1 +
clients/audio/util/Imakefile | 1 +
clients/audio/widgets/Imakefile | 1 +
doc/Imakefile | 1 +
doc/man/Imakefile | 1 +
doc/man/lib/Imakefile | 1 +
include/Imakefile | 1 +
include/audio/Imakefile | 1 +
lib/Imakefile | 1 +
lib/audio/Imakefile | 1 +
server/dda/hpux/Imakefile | 1 +
server/dda/sgi/Imakefile | 1 +
server/dda/sun/Imakefile | 1 +
server/dda/voxware/Imakefile | 1 +
server/dia/main.c | 3 ++-
server/dia/nasconf.h | 1 +
server/nasd.man | 2 ++
server/os/Imakefile | 1 +
server/os/utils.c | 3 +++
35 files changed, 39 insertions(+), 1 deletions(-)
diff --git a/Imakefile b/Imakefile
index 8f36ba0..6cd8f4e 100644
--- a/Imakefile
+++ b/Imakefile
@@ -24,6 +24,7 @@
XCOMM $NCDId: @(#)Imakefile,v 1.4 1995/12/06 01:00:49 greg Exp $
+#include "config/NetAudio.def"
#include "config/NetAudio.tmpl"
#define IHaveSubdirs
diff --git a/clients/Imakefile b/clients/Imakefile
index 6793145..1c3178e 100644
--- a/clients/Imakefile
+++ b/clients/Imakefile
@@ -22,6 +22,7 @@
* $NCDId: @(#)Imakefile,v 1.3 1995/12/06 01:02:44 greg Exp $
*/
+#include "../config/NetAudio.def"
#include "../config/NetAudio.tmpl"
#define IHaveSubdirs
diff --git a/clients/audio/Imakefile b/clients/audio/Imakefile
index 0e2485d..65baf07 100644
--- a/clients/audio/Imakefile
+++ b/clients/audio/Imakefile
@@ -22,6 +22,7 @@
* $NCDId: @(#)Imakefile,v 1.7 1995/12/06 01:03:17 greg Exp $
*/
+#include "../../config/NetAudio.def"
#include "../../config/NetAudio.tmpl"
#define IHaveSubdirs
diff --git a/clients/audio/auconvert/Imakefile b/clients/audio/auconvert/Imakefile
index 68569f3..c46d21b 100644
--- a/clients/audio/auconvert/Imakefile
+++ b/clients/audio/auconvert/Imakefile
@@ -22,6 +22,7 @@
* $NCDId: @(#)Imakefile,v 1.4 1994/08/09 19:22:55 greg Exp $
*/
+#include "../../../config/NetAudio.def"
#include "../../../config/NetAudio.tmpl"
#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
diff --git a/clients/audio/auctl/Imakefile b/clients/audio/auctl/Imakefile
index 270d1b3..45ed9bd 100644
--- a/clients/audio/auctl/Imakefile
+++ b/clients/audio/auctl/Imakefile
@@ -22,6 +22,7 @@
* $NCDId: @(#)Imakefile,v 1.5 1995/12/06 19:23:59 greg Exp $
*/
+#include "../../../config/NetAudio.def"
#include "../../../config/NetAudio.tmpl"
FILES = auctl.c execute.c auctl.h auctl.man
diff --git a/clients/audio/audemo/Imakefile b/clients/audio/audemo/Imakefile
index 734375e..6a6e363 100644
--- a/clients/audio/audemo/Imakefile
+++ b/clients/audio/audemo/Imakefile
@@ -22,6 +22,7 @@
* $NCDId: @(#)Imakefile,v 1.4 1994/08/09 19:22:57 greg Exp $
*/
+#include "../../../config/NetAudio.def"
#include "../../../config/NetAudio.tmpl"
FILES = audemo.c resources.h Audemo.ad audemo.man
diff --git a/clients/audio/audial/Imakefile b/clients/audio/audial/Imakefile
index a3566f9..ac80930 100644
--- a/clients/audio/audial/Imakefile
+++ b/clients/audio/audial/Imakefile
@@ -23,6 +23,7 @@
* $NCDId: @(#)Imakefile,v 1.7 1994/08/09 19:22:59 greg Exp $
*/
+#include "../../../config/NetAudio.def"
#include "../../../config/NetAudio.tmpl"
FILES = audial.c audial.man
diff --git a/clients/audio/auedit/Imakefile b/clients/audio/auedit/Imakefile
index fe87f6c..44cfb68 100644
--- a/clients/audio/auedit/Imakefile
+++ b/clients/audio/auedit/Imakefile
@@ -22,6 +22,7 @@
* $NCDId: @(#)Imakefile,v 1.5 1995/12/06 01:09:48 greg Exp $
*/
+#include "../../../config/NetAudio.def"
#include "../../../config/NetAudio.tmpl"
#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
diff --git a/clients/audio/auinfo/Imakefile b/clients/audio/auinfo/Imakefile
index d7cd1b0..f05da5c 100644
--- a/clients/audio/auinfo/Imakefile
+++ b/clients/audio/auinfo/Imakefile
@@ -22,6 +22,7 @@
* $NCDId: @(#)Imakefile,v 1.4 1994/08/09 19:23:01 greg Exp $
*/
+#include "../../../config/NetAudio.def"
#include "../../../config/NetAudio.tmpl"
FILES = auinfo.c auinfo.man
diff --git a/clients/audio/aupanel/Imakefile b/clients/audio/aupanel/Imakefile
index d9fbfb1..fbf8811 100644
--- a/clients/audio/aupanel/Imakefile
+++ b/clients/audio/aupanel/Imakefile
@@ -22,6 +22,7 @@
* $NCDId: @(#)Imakefile,v 1.4 1994/08/09 19:23:02 greg Exp $
*/
+#include "../../../config/NetAudio.def"
#include "../../../config/NetAudio.tmpl"
FILES = aupanel.c aupanel.man Aupanel.ad
diff --git a/clients/audio/auphone/Imakefile b/clients/audio/auphone/Imakefile
index 97ecbab..c8c26b3 100644
--- a/clients/audio/auphone/Imakefile
+++ b/clients/audio/auphone/Imakefile
@@ -22,6 +22,7 @@
* $NCDId: @(#)Imakefile,v 1.5 1995/12/06 19:23:36 greg Exp $
*/
+#include "../../../config/NetAudio.def"
#include "../../../config/NetAudio.tmpl"
FILES = auphone.c rings.c busy.h ringin.h ringout.h phone.xbm Auphone.ad \
diff --git a/clients/audio/auplay/Imakefile b/clients/audio/auplay/Imakefile
index 796ac2d..a83c186 100644
--- a/clients/audio/auplay/Imakefile
+++ b/clients/audio/auplay/Imakefile
@@ -22,6 +22,7 @@
* $NCDId: @(#)Imakefile,v 1.4 1994/08/09 19:23:05 greg Exp $
*/
+#include "../../../config/NetAudio.def"
#include "../../../config/NetAudio.tmpl"
FILES = auplay.c auplay.man
diff --git a/clients/audio/aurecord/Imakefile b/clients/audio/aurecord/Imakefile
index 469b95d..2e42821 100644
--- a/clients/audio/aurecord/Imakefile
+++ b/clients/audio/aurecord/Imakefile
@@ -22,6 +22,7 @@
* $NCDId: @(#)Imakefile,v 1.4 1994/08/09 19:23:06 greg Exp $
*/
+#include "../../../config/NetAudio.def"
#include "../../../config/NetAudio.tmpl"
FILES = aurecord.c aurecord.man
diff --git a/clients/audio/auscope/Imakefile b/clients/audio/auscope/Imakefile
index 59e0bbb..fd70942 100644
--- a/clients/audio/auscope/Imakefile
+++ b/clients/audio/auscope/Imakefile
@@ -22,6 +22,7 @@
* $NCDId: @(#)Imakefile,v 1.8 1994/08/15 21:31:36 greg Exp $
*/
+#include "../../../config/NetAudio.def"
#include "../../../config/NetAudio.tmpl"
all::
diff --git a/clients/audio/autool/Imakefile b/clients/audio/autool/Imakefile
index 091f245..76ee56b 100644
--- a/clients/audio/autool/Imakefile
+++ b/clients/audio/autool/Imakefile
@@ -22,6 +22,7 @@
* $NCDId: @(#)Imakefile,v 1.5 1995/12/06 01:07:07 greg Exp $
*/
+#include "../../../config/NetAudio.def"
#include "../../../config/NetAudio.tmpl"
FILES = audiotool.c autool.man
diff --git a/clients/audio/auwave/Imakefile b/clients/audio/auwave/Imakefile
index 8f6495c..dc0f163 100644
--- a/clients/audio/auwave/Imakefile
+++ b/clients/audio/auwave/Imakefile
@@ -22,6 +22,7 @@
* $NCDId: @(#)Imakefile,v 1.4 1994/08/09 19:23:10 greg Exp $
*/
+#include "../../../config/NetAudio.def"
#include "../../../config/NetAudio.tmpl"
FILES = auwave.c auwave.man Auwave.ad
diff --git a/clients/audio/examples/Imakefile b/clients/audio/examples/Imakefile
index 2f8c9cd..dd32d2a 100644
--- a/clients/audio/examples/Imakefile
+++ b/clients/audio/examples/Imakefile
@@ -22,6 +22,7 @@
* $NCDId: @(#)Imakefile,v 1.7 1995/12/06 19:24:55 greg Exp $
*/
+#include "../../../config/NetAudio.def"
#include "../../../config/NetAudio.tmpl"
#ifndef WIN32
diff --git a/clients/audio/util/Imakefile b/clients/audio/util/Imakefile
index a5d126b..e7be23f 100644
--- a/clients/audio/util/Imakefile
+++ b/clients/audio/util/Imakefile
@@ -22,6 +22,7 @@
* $NCDId: @(#)Imakefile,v 1.9 1995/12/06 19:23:11 greg Exp $
*/
+#include "../../../config/NetAudio.def"
#include "../../../config/NetAudio.tmpl"
SRCS = soundtoh.c issndfile.c playbucket.c
diff --git a/clients/audio/widgets/Imakefile b/clients/audio/widgets/Imakefile
index 65b6e17..8d5e29f 100644
--- a/clients/audio/widgets/Imakefile
+++ b/clients/audio/widgets/Imakefile
@@ -22,6 +22,7 @@
* $NCDId: @(#)Imakefile,v 1.3 1994/08/09 19:23:13 greg Exp $
*/
+#include "../../../config/NetAudio.def"
#include "../../../config/NetAudio.tmpl"
SRCS = Slider.c
diff --git a/doc/Imakefile b/doc/Imakefile
index 16c7652..6ece681 100644
--- a/doc/Imakefile
+++ b/doc/Imakefile
@@ -22,6 +22,7 @@
* $NCDId: @(#)Imakefile,v 1.8 1995/12/06 01:01:20 greg Exp $
*/
+#include "../config/NetAudio.def"
#include "../config/NetAudio.tmpl"
#define IHaveSubdirs
diff --git a/doc/man/Imakefile b/doc/man/Imakefile
index 30a5962..ec6c0c8 100644
--- a/doc/man/Imakefile
+++ b/doc/man/Imakefile
@@ -22,6 +22,7 @@
* $NCDId: @(#)Imakefile,v 1.4 1995/12/06 01:01:48 greg Exp $
*/
+#include "../../config/NetAudio.def"
#include "../../config/NetAudio.tmpl"
#define IHaveSubdirs
diff --git a/doc/man/lib/Imakefile b/doc/man/lib/Imakefile
index e26eb21..7d3b7f5 100644
--- a/doc/man/lib/Imakefile
+++ b/doc/man/lib/Imakefile
@@ -22,6 +22,7 @@
* $NCDId: @(#)Imakefile,v 1.3 1995/05/23 23:53:12 greg Exp $
*/
+#include "../../../config/NetAudio.def"
#include "../../../config/NetAudio.tmpl"
MANDIR = $(LIBMANDIR)
diff --git a/include/Imakefile b/include/Imakefile
index 6d2bc0a..b983211 100644
--- a/include/Imakefile
+++ b/include/Imakefile
@@ -22,6 +22,7 @@
* $NCDId: @(#)Imakefile,v 1.3 1995/12/06 01:26:47 greg Exp $
*/
+#include "../config/NetAudio.def"
#include "../config/NetAudio.tmpl"
#define IHaveSubdirs
diff --git a/include/audio/Imakefile b/include/audio/Imakefile
index d033994..b10e2b7 100644
--- a/include/audio/Imakefile
+++ b/include/audio/Imakefile
@@ -23,6 +23,7 @@
* $NCDId: @(#)Imakefile,v 1.5 1995/12/06 19:25:36 greg Exp $
*/
+#include "../../config/NetAudio.def"
#include "../../config/NetAudio.tmpl"
HEADERS = Afuncproto.h Afuncs.h Amd.h Aos.h Aosdefs.h Aproto.h audio.h
diff --git a/lib/Imakefile b/lib/Imakefile
index 095c56d..ccb11bf 100644
--- a/lib/Imakefile
+++ b/lib/Imakefile
@@ -22,6 +22,7 @@
* $NCDId: @(#)Imakefile,v 1.3 1995/12/06 01:11:45 greg Exp $
*/
+#include "../config/NetAudio.def"
#include "../config/NetAudio.tmpl"
#define IHaveSubdirs
diff --git a/lib/audio/Imakefile b/lib/audio/Imakefile
index 81389af..f3af514 100644
--- a/lib/audio/Imakefile
+++ b/lib/audio/Imakefile
@@ -23,6 +23,7 @@
* $NCDId: @(#)Imakefile,v 1.21 1996/09/04 23:06:02 greg Exp $
*/
+#include "../../config/NetAudio.def"
#include "../../config/NetAudio.tmpl"
#include <Threads.tmpl>
diff --git a/server/dda/hpux/Imakefile b/server/dda/hpux/Imakefile
index 8262006..75b9d35 100644
--- a/server/dda/hpux/Imakefile
+++ b/server/dda/hpux/Imakefile
@@ -22,6 +22,7 @@
* $NCDId: @(#)Imakefile,v 1.1 1995/05/24 01:07:55 greg Exp $
*/
+#include "../../../config/NetAudio.def"
#include "../../../config/NetAudio.tmpl"
SRCS = auhpux.c config.c
diff --git a/server/dda/sgi/Imakefile b/server/dda/sgi/Imakefile
index f295258..b1fcb69 100644
--- a/server/dda/sgi/Imakefile
+++ b/server/dda/sgi/Imakefile
@@ -28,6 +28,7 @@
XCOMM $NCDId: @(#)Imakefile,v 1.2 1994/08/09 19:23:31 greg Exp $
XCOMM $Id$
+#include "../../../config/NetAudio.def"
#include "../../../config/NetAudio.tmpl"
SRCS = ausgi.c config.c
diff --git a/server/dda/sun/Imakefile b/server/dda/sun/Imakefile
index 5262da0..4fcdd25 100644
--- a/server/dda/sun/Imakefile
+++ b/server/dda/sun/Imakefile
@@ -23,6 +23,7 @@
* $Id$
*/
+#include "../../../config/NetAudio.def"
#include "../../../config/NetAudio.tmpl"
SRCS = ausuni.c config.c
diff --git a/server/dda/voxware/Imakefile b/server/dda/voxware/Imakefile
index ce32b26..aaacc24 100644
--- a/server/dda/voxware/Imakefile
+++ b/server/dda/voxware/Imakefile
@@ -27,6 +27,7 @@
XCOMM $NCDId: @(#)Imakefile,v 1.8 1996/04/24 17:04:17 greg Exp $
+#include "../../../config/NetAudio.def"
#include "../../../config/NetAudio.tmpl"
SRCS = auvoxware.c config.c
diff --git a/server/dia/main.c b/server/dia/main.c
index 462e89b..e733cc8 100644
--- a/server/dia/main.c
+++ b/server/dia/main.c
@@ -148,7 +148,8 @@ main(int argc, char *argv[])
osBecomeDaemon();
/* we could store pid info here... */
- /* osStorePid() */
+ if (NasConfig.PidFile)
+ osStorePid();
}
/* And cd to / so we don't hold anything up; core files will also
diff --git a/server/dia/nasconf.h b/server/dia/nasconf.h
index 4f60894..47cf1ca 100644
--- a/server/dia/nasconf.h
+++ b/server/dia/nasconf.h
@@ -24,6 +24,7 @@ typedef struct {int DoDaemon;
int LocalOnly;
int AllowAny;
+ int PidFile;
} NasConfig_t;
GEXTERN NasConfig_t NasConfig;
diff --git a/server/nasd.man b/server/nasd.man
index 50c0b83..64a93a5 100644
--- a/server/nasd.man
+++ b/server/nasd.man
@@ -56,6 +56,8 @@ Print version information and exit (ignoring other options).
.TP 8
.B \-b
Fork a child to run in the background and exit (daemon mode).
+.B \-p
+Create /var/run/nasd.pid.
.TP 8
.B \-d \fIn\fP
Enable debugging output at level \fIn\fP, where \fIn\fP is a positive
diff --git a/server/os/Imakefile b/server/os/Imakefile
index 6e3a913..e26ea2f 100644
--- a/server/os/Imakefile
+++ b/server/os/Imakefile
@@ -22,6 +22,7 @@
* $NCDId: @(#)Imakefile,v 1.5 1994/09/27 16:52:40 greg Exp $
*/
+#include "../../config/NetAudio.def"
#include "../../config/NetAudio.tmpl"
FILES = WaitFor.c connection.c io.c osinit.c access.c genalloca.c mitauth.c \
diff --git a/server/os/utils.c b/server/os/utils.c
index c0aa354..ada4110 100644
--- a/server/os/utils.c
+++ b/server/os/utils.c
@@ -238,6 +238,7 @@ UseMsg(void)
ErrorF(" -aa allow any client to connect\n"); ErrorF(" -local allow local clients only\n"); ErrorF(" -b detach and run in background\n");+ ErrorF(" -p create /var/run/nasd.pid\n"); ErrorF(" -v enable verbose messages\n"); ErrorF(" -d <num> enable debug messages at level <num>\n"); ErrorF(" -config <file> use <file> as the nasd config file\n");@@ -331,6 +332,8 @@ ProcessCommandLine(int argc, char *argv[])
}
} else if (strcmp(argv[i], "-b") == 0) {NasConfig.DoDaemon = TRUE;
+ } else if (strcmp(argv[i], "-p") == 0) {+ NasConfig.PidFile = TRUE;
} else if (strcmp(argv[i], "-V") == 0) { /* print version and exit */ printf("%s\n", release);exit(0);