*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 4f9839deda0a7b8b93b61564a038f0e9a6ef3154..dd490b115c449f46a731b233ed263cebf72e86db 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,8 @@
        * utils/idmapd/idmapd.c: Make sure we catch all errors on
        daemonizing by waiting for child to report succesfull startup
        using a pipe. 
+       * utils/idmapd/idmapd.c: Let libnfsidmapd parse the idmapd.conf
+       file for the default domain, instead of doing that ourselves.
 
        
 2004-11-22 NeilBrown <neilb@cse.unsw.edu.au>

diff --git a/utils/gssd/gssd_proc.c b/utils/gssd/gssd_proc.c
index 1e7ebaed67d85ba03c38f95ba53c9dc5e96aa5cc..416653be28144238b858f6049b3a51157a31df4c 100644 (file)
--- a/utils/gssd/gssd_proc.c
+++ b/utils/gssd/gssd_proc.c
@@ -372,15 +372,18 @@ do_downcall(int k5_fd, uid_t uid, struct authgss_private_data *pd,
 
        printerr(1, "doing downcall\n");
 
-       if (WRITE_BYTES(&p, end, uid)) return -1;
+       if (WRITE_BYTES(&p, end, uid)) goto out_err;
        /* Not setting any timeout for now: */
-       if (WRITE_BYTES(&p, end, timeout)) return -1;
-       if (WRITE_BYTES(&p, end, pd->pd_seq_win)) return -1;
-       if (write_buffer(&p, end, &pd->pd_ctx_hndl)) return -1;
-       if (write_buffer(&p, end, context_token)) return -1;
+       if (WRITE_BYTES(&p, end, timeout)) goto out_err;
+       if (WRITE_BYTES(&p, end, pd->pd_seq_win)) goto out_err;
+       if (write_buffer(&p, end, &pd->pd_ctx_hndl)) goto out_err;
+       if (write_buffer(&p, end, context_token)) goto out_err;
 
-       if (write(k5_fd, buf, p - buf) < p - buf) return -1;
+       if (write(k5_fd, buf, p - buf) < p - buf) goto out_err;
        return 0;
+out_err:
+       printerr(0, "Failed to write downcall!\n");
+       return -1;
 }
 
 static int
@@ -393,15 +396,17 @@ do_error_downcall(int k5_fd, uid_t uid, int err)
 
        printerr(1, "doing error downcall\n");
 
-       if (WRITE_BYTES(&p, end, uid)) return -1;
-       if (WRITE_BYTES(&p, end, timeout)) return -1;
+       if (WRITE_BYTES(&p, end, uid)) goto out_err;
+       if (WRITE_BYTES(&p, end, timeout)) goto out_err;
        /* use seq_win = 0 to indicate an error: */
-       if (WRITE_BYTES(&p, end, zero)) return -1;
-       if (WRITE_BYTES(&p, end, err)) return -1;
+       if (WRITE_BYTES(&p, end, zero)) goto out_err;
+       if (WRITE_BYTES(&p, end, err)) goto out_err;
 
-       if (write(k5_fd, buf, p - buf) < p - buf) return -1;
+       if (write(k5_fd, buf, p - buf) < p - buf) goto out_err;
        return 0;
-
+out_err:
+       printerr(0, "Failed to write error downcall!\n");
+       return -1;
 }
 
 /*