debian: Use debhelper to generate maint scripts

[userv.git] / servexec.c

diff --git a/servexec.c b/servexec.c
index 5fa8e1f3787babb29de15abf783a495cfbb4f450..80b754c1dd31938ae3092ce1363f8c62f9c50e76 100644 (file)
--- a/servexec.c
+++ b/servexec.c
@@ -2,10 +2,8 @@
  * userv - execserv.c
  * daemon code which executes actual service (ie child process)
  *
- * userv is
- * Copyright 1996-2017 Ian Jackson <ian@davenant.greenend.org.uk>.
- * Copyright 2000      Ben Harris <bjh21@cam.ac.uk>
- * Copyright 2016-2017 Peter Benie <pjb1008@cam.ac.uk>
+ * 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
@@ -228,6 +226,7 @@ void execservice(const int synchsocket[], int clientfd) {
     0
   };
   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;
@@ -236,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);
@@ -250,6 +250,7 @@ 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");