X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=servexec.c;h=80b754c1dd31938ae3092ce1363f8c62f9c50e76;hb=7adf2c71251abac86b93cbd21914acccac295575;hp=abd36089ad5296b8c1692a2a413418d6f5c88618;hpb=464d71c37246e556de9ec05f7b97af834a5224ee;p=userv.git
diff --git a/servexec.c b/servexec.c
index abd3608..80b754c 100644
--- a/servexec.c
+++ b/servexec.c
@@ -2,11 +2,12 @@
* userv - execserv.c
* daemon code which executes actual service (ie child process)
*
- * Copyright (C)1996-1997 Ian Jackson
+ * userv is copyright Ian Jackson and other contributors.
+ * See README for full authorship information.
*
* 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 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
@@ -15,14 +16,14 @@
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with userv; if not, write to the Free Software
- * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with userv; if not, see .
*/
#include
#include
#include
#include
+#include
#include
#include
#include
@@ -34,6 +35,7 @@
#include "common.h"
#include "daemon.h"
#include "lib.h"
+#include "both.h"
#include "version.h"
static void NONRETURNING serv_syscallfail(const char *msg) {
@@ -57,52 +59,66 @@ void bisexec_parameter(const char *const *argv) {
serv_checkstdoutexit();
}
+void bisexec_help(const char *const *argv) {
+ const char *const *pp;
+
+ fputs("recognised builtin services:\n",stdout);
+ for (pp= builtinservicehelpstrings; *pp; pp++) printf(" %s\n",*pp);
+ serv_checkstdoutexit();
+}
+
void bisexec_version(const char *const *argv) {
const unsigned char *p;
int i;
- printf("uservd version " VERSION "; copyright (C)1996-1997 Ian Jackson.\n"
+ printf("uservd version " VERSION VEREXT "\n"
#ifdef DEBUG
"DEBUGGING VERSION"
#else
"production version"
#endif
" - protocol magic number %08lx\n"
- "protocol checksum:",
- BASE_MAGIC);
+ "maximums: fd %-10d general string %d\n"
+ " gids %-10d override length %d\n"
+ " args or variables %-10d error message %d\n"
+ " nested inclusion %-10d errno string reserve %d\n"
+ "protocol checksum: ",
+ BASE_MAGIC,
+ MAX_ALLOW_FD, MAX_GENERAL_STRING,
+ MAX_GIDS, MAX_OVERRIDE_LEN,
+ MAX_ARGSDEFVAR, MAX_ERRMSG_LEN,
+ MAX_INCLUDE_NEST, ERRMSG_RESERVE_ERRNO);
for (i=0, p=protocolchecksumversion; i0) { putchar(' '); nspaces--; }
putchar(c);
+ lnl= 0;
+ break;
}
}
- assert(*--string == '\n');
+ assert(lnl);
serv_checkstdoutexit();
}
@@ -123,6 +139,15 @@ void bisexec_execute(const char *const *argv) {
serv_checkstdoutexit();
}
+void bisexec_shutdown(const char *const *argv) {
+ /* This is only reached if the serviceuser_uid test in
+ * process.c:servicerequest() fails (we have to handle the
+ * shutdown request there, unfortunately).
+ */
+ fputs("uservd: builtin service shutdown: permission denied\n",stderr);
+ _exit(-1);
+}
+
static void serv_resetsignal(int signo) {
struct sigaction sig;
@@ -132,13 +157,13 @@ static void serv_resetsignal(int signo) {
if (sigaction(signo,&sig,0)) serv_syscallfail("reset signal handler");
}
-static const char *see_logname(void) { return serviceuser; }
+static const char *see_loginname(void) { return serviceuser; }
static const char *see_home(void) { return serviceuser_dir; }
static const char *see_shell(void) { return serviceuser_shell; }
static const char *see_service(void) { return service; }
static const char *see_c_cwd(void) { return cwd; }
-static const char *see_c_logname(void) { return logname; }
+static const char *see_c_loginname(void) { return loginname; }
static const char *see_c_uid(void) {
static char buf[CHAR_BIT*sizeof(uid_t)/3+4];
snyprintf(buf,sizeof(buf),"%lu",(unsigned long)request_mbuf.callinguid);
@@ -167,7 +192,7 @@ static const char *see_c_group(void) {
static const char *seei_gid(int i) {
static char buf[CHAR_BIT*sizeof(gid_t)/3+4];
- snyprintf(buf,sizeof(buf),"%d",calling_gids[i]);
+ snyprintf(buf,sizeof(buf),"%ld",(long)calling_gids[i]);
return buf;
}
static const char *see_c_gid(void) {
@@ -178,18 +203,18 @@ static const struct serv_envinfo {
const char *name;
const char *(*fn)(void);
} serv_envinfos[]= {
- { "USER", see_logname },
- { "LOGNAME", see_logname },
- { "HOME", see_home },
- { "SHELL", see_shell },
- { "PATH", defaultpath },
- { "USERV_SERVICE", see_service },
- { "USERV_CWD", see_c_cwd },
- { "USERV_USER", see_c_logname },
- { "USERV_UID", see_c_uid },
- { "USERV_GROUP", see_c_group },
- { "USERV_GID", see_c_gid },
- { 0 }
+ { "USER", see_loginname },
+ { "LOGNAME", see_loginname },
+ { "HOME", see_home },
+ { "SHELL", see_shell },
+ { "PATH", defaultpath },
+ { "USERV_SERVICE", see_service },
+ { "USERV_CWD", see_c_cwd },
+ { "USERV_USER", see_c_loginname },
+ { "USERV_UID", see_c_uid },
+ { "USERV_GROUP", see_c_group },
+ { "USERV_GID", see_c_gid },
+ { 0 }
};
void execservice(const int synchsocket[], int clientfd) {
@@ -200,7 +225,8 @@ void execservice(const int synchsocket[], int clientfd) {
"-",
0
};
- int fd, realfd, holdfd, newfd, r, envvarbufsize=0, targ, nargs, i, l;
+ int fd, realfd, holdfd, newfd, r, envvarbufsize=0, targ, nargs, i, l, fdflags;
+ int unused;
char *envvarbuf=0;
const char **args, *const *cpp;
char *const *pp;
@@ -209,7 +235,8 @@ void execservice(const int synchsocket[], int clientfd) {
if (dup2(fdarray[2].realfd,2)<0) {
static const char duperrmsg[]= "uservd(service): cannot dup2 for stderr\n";
- write(fdarray[2].realfd,duperrmsg,sizeof(duperrmsg)-1);
+ unused= write(fdarray[2].realfd,duperrmsg,sizeof(duperrmsg)-1);
+ (void)unused;
_exit(-1);
}
serv_resetsignal(SIGPIPE);
@@ -223,10 +250,20 @@ void execservice(const int synchsocket[], int clientfd) {
if (r!=1) serv_syscallfail("write synch byte to parent");
r= synchread(synchsocket[1],'g');
if (r) serv_syscallfail("reach synch byte from parent");
+ if (close(synchsocket[1])) serv_syscallfail("close our synch socket");
if (close(clientfd)) serv_syscallfail("close client socket fd");
- /* Now we have to make all the fd's work. It's rather a complicated
+ /* First we need to close the holding writing ends of the pipes
+ * inherited from our parent: */
+ for (fd=0; fd= 0)
+ fdarray[fdarray[fd].realfd].holdfd= fd;
}
for (fd=0; fd