* userv - execserv.c
* daemon code which executes actual service (ie child process)
*
- * Copyright (C)1996-1997 Ian Jackson
+ * Copyright (C)1996-1997,1999-2001,2003 Ian Jackson
*
* This is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by
#include <limits.h>
#include <errno.h>
#include <assert.h>
+#include <string.h>
#include <unistd.h>
#include <stdarg.h>
#include <stdlib.h>
#include "common.h"
#include "daemon.h"
#include "lib.h"
+#include "both.h"
#include "version.h"
static void NONRETURNING serv_syscallfail(const char *msg) {
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 VEREXT "; copyright (C)1996-1997 Ian Jackson.\n"
+ printf("uservd version " VERSION VEREXT "; copyright (C)1996-2000 Ian Jackson.\n"
#ifdef DEBUG
"DEBUGGING VERSION"
#else
BASE_MAGIC,
MAX_ALLOW_FD, MAX_GENERAL_STRING,
MAX_GIDS, MAX_OVERRIDE_LEN,
- MAX_ARGSDEFVAR, ERRMSG_RESERVE_ERRNO,
- MAX_INCLUDE_NEST, MAX_ERRMSG_LEN);
+ MAX_ARGSDEFVAR, MAX_ERRMSG_LEN,
+ MAX_INCLUDE_NEST, ERRMSG_RESERVE_ERRNO);
for (i=0, p=protocolchecksumversion; i<sizeof(protocolchecksumversion); i++, p++)
printf("%02x",*p);
printf("\n"
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;
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);
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) {
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) {
"-",
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;
char *envvarbuf=0;
const char **args, *const *cpp;
char *const *pp;
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<fdarrayused; fd++) {
+ if (fdarray[fd].holdfd == -1) continue;
+ if (close(fdarray[fd].holdfd)) serv_syscallfail("close pipe hold fd");
+ fdarray[fd].holdfd= -1;
+ }
+ /* Now we can reuse the .holdfd member of the fdarray entries. */
+
+ /* We have to make all the fd's work. It's rather a complicated
* algorithm, unfortunately. We remember in holdfd[fd] whether fd
* is being used to hold a file descriptor we actually want for some
* other real fd in the service program; holdfd[fd] contains the fd
* move it out of the way with dup and record its new location.
*/
for (fd=0; fd<fdarrayused; fd++) {
- if (fdarray[fd].holdfd == -1) continue;
- if (close(fdarray[fd].holdfd)) serv_syscallfail("close pipe hold fd");
- fdarray[fd].holdfd= -1;
- }
- for (fd=0; fd<fdarrayused; fd++) {
- if (fdarray[fd].realfd < fdarrayused) fdarray[fdarray[fd].realfd].holdfd= fd;
+ if (fdarray[fd].realfd < fdarrayused && fdarray[fd].realfd >= 0)
+ fdarray[fdarray[fd].realfd].holdfd= fd;
}
for (fd=0; fd<fdarrayused; fd++) {
realfd= fdarray[fd].realfd;
}
if (dup2(fdarray[fd].realfd,fd)<0) serv_syscallfail("dup2 set up fd");
if (close(fdarray[fd].realfd)) serv_syscallfail("close old fd");
- if (fcntl(fd,F_SETFD,0)<0) serv_syscallfail("set no-close-on-exec on fd");
+ fdflags= fcntl(fd,F_GETFD); if (fdflags<0) serv_syscallfail("get fd flags");
+ if (fcntl(fd,F_SETFD,fdflags&~FD_CLOEXEC)==-1) serv_syscallfail("set no-close-on-exec on fd");
fdarray[fd].realfd= fd;
}
~ian / userv.git / blobdiff