X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=userv.git;a=blobdiff_plain;f=client.c;h=d201bef428672b9b84683082b990b886f514700e;hp=3e9f08fa835da9dfa5fa921d5f345a8e87887a2b;hb=574777cfe5f60257117950ab6861cb6db87279fe;hpb=db59ee1476515a65cfcca10a3059d8ccb2d24d32

diff --git a/client.c b/client.c
index 3e9f08f..d201bef 100644
--- a/client.c
+++ b/client.c
@@ -378,6 +378,7 @@ static void sighandler_chld(int ignored) /* DOES return, unlike in daemon */ {
 	memset(&event_mbuf,0,sizeof(event_mbuf));
 	event_mbuf.magic= EVENT_MAGIC;
 	event_mbuf.type= et_closereadfd;
+        event_mbuf.data.closereadfd.fd= fd;
 	r= fwrite(&event_mbuf,1,sizeof(event_mbuf),swfile);
 	if (r != sizeof(event_mbuf) || fflush(swfile))
 	  if (errno != EPIPE) syscallerror("inform service of closed read fd");
@@ -434,7 +435,7 @@ static void usage(void) {
     "         --spoof-user <username>         }  or same user\n"
     "fdmodifiers:            read    write  overwrite    trunc[ate]\n"
     "(separate with commas)  append  sync   excl[usive]  creat[e]  fd\n\n"
-    "userv and uservd version " VERSION "; copyright (C)1996-1997 Ian Jackson.\n"
+    "userv and uservd version " VERSION VEREXT "; copyright (C)1996-1997 Ian Jackson.\n"
     "there is NO WARRANTY; type `userv --copyright' for details.\n",
             stderr) < 0)
     syscallerror("write usage to stderr");
@@ -737,13 +738,14 @@ static void callvalueoption(const struct optioninfo *oip, char *arg) {
   char *equals;
   if (oip->values == 2) {
     equals= strchr(arg,'=');
-    if (!equals)
+    if (!equals) {
       if (oip->abbrev)
         usageerror("option --%s (-%c) passed argument `%s' with no `='",
                    oip->full,oip->abbrev,arg);
       else
         usageerror("option --%s passed argument `%s' with no `='",
                    oip->full,arg);
+    }
     *equals++= 0;
     (oip->fn)(oip,equals,arg);
   } else {
@@ -988,7 +990,8 @@ static int server_connect(void) {
   while (connect(sfd,(struct sockaddr*)&ssockname,sizeof(ssockname))) {
     if (errno == ECONNREFUSED || errno == ENOENT)
       syscallerror("uservd daemon is not running - service not available");
-    syscallerror("unable to connect to uservd daemon");
+    if (errno != EINTR)
+      syscallerror("unable to connect to uservd daemon: %m");
   }
 
   return sfd;
@@ -1046,6 +1049,7 @@ static void server_sendrequest(int argc, char *const *argv) {
   request_mbuf.serviceuserlen= strlen(serviceuser);
   request_mbuf.servicelen= strlen(argv[0]);
   request_mbuf.lognamelen= strlen(logname);
+  request_mbuf.spoofed= spoofuser ? 1 : 0;
   request_mbuf.cwdlen= cwdbufsize;
   request_mbuf.callinguid= spoofuid;
   request_mbuf.ngids= ngids+1;