copyright notices and Makefile

diff --git a/cprogs/.cvsignore b/cprogs/.cvsignore
index ebfb6ab5dfecfbca858e8a2eeec484382a689257..61779d678a2bbd0a93e0a8c6c9adeb2437603036 100644 (file)
--- a/cprogs/.cvsignore
+++ b/cprogs/.cvsignore
@@ -1,3 +1,4 @@
 readbuffer
 writebuffer
 trivsoundd
+really

diff --git a/cprogs/Makefile b/cprogs/Makefile
index 141dbc0b107e78417ac63faf17c546afb3859852..baa0a02575cddeae7682121929f63c473e13dc8b 100644 (file)
--- a/cprogs/Makefile
+++ b/cprogs/Makefile
@@ -25,24 +25,30 @@ include ../settings.make
 
 RWBUFFER_SIZE_MB=16
 
-PROGRAMS=      readbuffer writebuffer
-DAEMONS=       trivsoundd
-MAN1PAGES=     readbuffer.1 writebuffer.1
-MAN8PAGES=     trivsoundd.8
+PROGRAMS=              readbuffer writebuffer
+SUIDSBINPROGRAMS=      really
+DAEMONS=               trivsoundd
+MAN1PAGES=             readbuffer.1 writebuffer.1
+MAN8PAGES=             trivsoundd.8
 
-TARGETS=       $(PROGRAMS) $(DAEMONS)
+TARGETS=       $(PROGRAMS) $(SUIDSBINPROGRAMS) $(DAEMONS)
 
 all:           $(TARGETS)
 
 readbuffer:                    readbuffer.o                    rwbuffer.o
 writebuffer:                   writebuffer.o   wrbufcore.o     rwbuffer.o 
 trivsoundd:                    trivsoundd.o    wrbufcore.o     rwbuffer.o 
+really:                                really.o myopt.o
+
+really.o myopt.o: myopt.h
 readbuffer.o writebuffer.o rwbuffer.o wrbufcore.o trivsoundd.o:        rwbuffer.h
 
 install:               all
                $(INSTALL_DIRECTORY) $(bindir) $(sbindir)
                $(INSTALL_PROGRAM) $(PROGRAMS) $(bindir)
                $(INSTALL_PROGRAM) $(DAEMONS) $(sbindir)
+               $(INSTALL) -m 4774 root.$(SYSTEM_GROUP) \
+                       $(SUIDSBINPROGRAMS) $(sbindir)
 
 install-docs:
                $(INSTALL_DIRECTORY) $(man1dir) $(man8dir) $(txtdocdir)

diff --git a/cprogs/really.c b/cprogs/really.c
index 39fe8dddbe62036ac46cd22ece5483255047ce46..cce79462e96bda4a33b8367f82c199eb2bb74be6 100644 (file)
--- a/cprogs/really.c
+++ b/cprogs/really.c
@@ -1,4 +1,22 @@
-/**/
+/*
+ * really.c - program for gaining privilege
+ *
+ * Copyright (C) 1992-3 Ian Jackson <iwj10@cus.cam.ac.uk>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2,
+ * or (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this file; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/cprogs/smtpallow.c b/cprogs/smtpallow.c
index d8c85325821801a22e8af2610443a5be0bda5994..4893413d034d4c9d51b09d736db7a56d845fd83b 100644 (file)
--- a/cprogs/smtpallow.c
+++ b/cprogs/smtpallow.c
@@ -1,4 +1,22 @@
-/**/
+/*
+ * smtpallow.c - ld_preload for hacking with connect() !
+ *
+ * Copyright (C) 1994,1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2,
+ * or (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this file; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
 
 #include <syscall.h>
 #include <sys/socketcall.h>

diff --git a/scripts/cvsweb-list b/scripts/cvsweb-list
index b5ac8197a54763d3f5b37f3f15ebf36b364d3b2f..166c2bed5832e8ad21d6315b2f1e241a57629403 100755 (executable)
--- a/scripts/cvsweb-list
+++ b/scripts/cvsweb-list
@@ -1,4 +1,28 @@
 #!/usr/bin/perl
+# cvsweb-list
+# This little program produces a web page listing the cvs repositories
+# available by ucgi cvsweb.  It doesn't really separate code and
+# configuration, so it's not installed by default with chiark-utils.
+
+# This file is part of chiark-utils, a collection of useful programs
+# used on chiark.greenend.org.uk.
+#
+# This file is:
+#  Copyright (C) 2001 Ian Jackson <ian@chiark.greenend.org.uk>
+#
+# This is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2, or (at your option) any later version.
+#
+# This is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
 
 print <<END or die $!;
 Content-Type: text/html

diff --git a/settings.make b/settings.make
index 37e41abf624e5eb2da8e7277abafce5a7da264f5..3da848c0be0461df66afaf93e30917ff29399e36 100644 (file)
--- a/settings.make
+++ b/settings.make
@@ -19,9 +19,12 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+CONFIG_CPPFLAGS=       -DRWBUFFER_SIZE_MB=$(RWBUFFER_SIZE_MB) \
+                       -DREALLY_CHECK_FILE='"/etc/inittab"'
+
 CC=            gcc
 CFLAGS=                $(WARNINGS) $(OPTIMISE) $(DEBUG)
-CPPFLAGS=      -DRWBUFFER_SIZE_MB=$(RWBUFFER_SIZE_MB)
+CPPFLAGS=      $(CONFIG_CPPFLAGS)
 
 WARNINGS=      -Wall -Wwrite-strings -Wmissing-prototypes \
                -Wstrict-prototypes -Wpointer-arith