Make print_hexl function write to stdout rather than using printerr

[nfs-utils.git] / utils / gssd / svcgssd_proc.c

diff --git a/utils/gssd/svcgssd_proc.c b/utils/gssd/svcgssd_proc.c
index bf40bc98bbb03004e8d91dee33264fdcf8f0f227..52c3aaf05c03fa3f55d42b5401f15222f499e9a5 100644 (file)
--- a/utils/gssd/svcgssd_proc.c
+++ b/utils/gssd/svcgssd_proc.c
@@ -72,6 +72,7 @@ do_svc_downcall(gss_buffer_desc *out_handle, struct svc_cred *cred,
        FILE *f;
        int i;
        char *fname = NULL;
+       int err;
 
        printerr(1, "doing downcall\n");
        if ((fname = mech2file(mech)) == NULL)
@@ -93,9 +94,9 @@ do_svc_downcall(gss_buffer_desc *out_handle, struct svc_cred *cred,
                qword_printint(f, cred->cr_groups[i]);
        qword_print(f, fname);
        qword_printhex(f, context_token->value, context_token->length);
-       qword_eol(f);
+       err = qword_eol(f);
        fclose(f);
-       return 0;
+       return err;
 out_err:
        printerr(0, "WARNING: downcall failed\n");
        return -1;
@@ -124,8 +125,8 @@ send_response(FILE *f, gss_buffer_desc *in_handle, gss_buffer_desc *in_token,
        qword_addhex(&bp, &blen, in_handle->value, in_handle->length);
        qword_addhex(&bp, &blen, in_token->value, in_token->length);
        qword_addint(&bp, &blen, 0x7fffffff); /*XXX need a better timeout */
-       qword_addint(&bp, &blen, maj_stat);
-       qword_addint(&bp, &blen, min_stat);
+       qword_adduint(&bp, &blen, maj_stat);
+       qword_adduint(&bp, &blen, min_stat);
        qword_addhex(&bp, &blen, out_handle->value, out_handle->length);
        qword_addhex(&bp, &blen, out_token->value, out_token->length);
        qword_addeol(&bp, &blen);
@@ -224,10 +225,13 @@ get_ids(gss_name_t client_name, gss_OID mech, struct svc_cred *cred)
                 * -ENOENT means there was no mapping, any other error
                 * value means there was an error trying to do the
                 * mapping.
+                * If there was no mapping, we send down the value -1
+                * to indicate that the anonuid/anongid for the export
+                * should be used.
                 */
                if (res == -ENOENT) {
-                       cred->cr_uid = 65534;   /* XXX */
-                       cred->cr_gid = 65534;   /* XXX */
+                       cred->cr_uid = -1;
+                       cred->cr_gid = -1;
                        cred->cr_ngroups = 0;
                        res = 0;
                        goto out_free;
@@ -246,42 +250,43 @@ out:
        return res;
 }
 
+#ifdef DEBUG
 void
-print_hexl(int pri, unsigned char *cp, int length)
+print_hexl(const char *description, unsigned char *cp, int length)
 {
        int i, j, jm;
        unsigned char c;
 
-       printerr(pri, "length %d\n",length);
-       printerr(pri, "\n");
+       printf("%s (length %d)\n", description, length);
 
        for (i = 0; i < length; i += 0x10) {
-               printerr(pri, "  %04x: ", (u_int)i);
+               printf("  %04x: ", (u_int)i);
                jm = length - i;
                jm = jm > 16 ? 16 : jm;
 
                for (j = 0; j < jm; j++) {
                        if ((j % 2) == 1)
-                               printerr(pri,"%02x ", (u_int)cp[i+j]);
+                               printf("%02x ", (u_int)cp[i+j]);
                        else
-                               printerr(pri,"%02x", (u_int)cp[i+j]);
+                               printf("%02x", (u_int)cp[i+j]);
                }
                for (; j < 16; j++) {
                        if ((j % 2) == 1)
-                               printerr(pri,"   ");
+                               printf("   ");
                        else
-                               printerr(pri,"  ");
+                               printf("  ");
                }
-               printerr(pri," ");
+               printf(" ");
 
                for (j = 0; j < jm; j++) {
                        c = cp[i+j];
                        c = isprint(c) ? c : '.';
-                       printerr(pri,"%c", c);
+                       printf("%c", c);
                }
-               printerr(pri,"\n");
+               printf("\n");
        }
 }
+#endif
 
 void
 handle_nullreq(FILE *f) {
@@ -322,13 +327,15 @@ handle_nullreq(FILE *f) {
 
        in_handle.length = (size_t) qword_get(&cp, in_handle.value,
                                              sizeof(in_handle_buf));
-       printerr(2, "in_handle: \n");
-       print_hexl(2, in_handle.value, in_handle.length);
+#ifdef DEBUG
+       print_hexl("in_handle", in_handle.value, in_handle.length);
+#endif
 
        in_tok.length = (size_t) qword_get(&cp, in_tok.value,
                                           sizeof(in_tok_buf));
-       printerr(2, "in_tok: \n");
-       print_hexl(2, in_tok.value, in_tok.length);
+#ifdef DEBUG
+       print_hexl("in_tok", in_tok.value, in_tok.length);
+#endif
 
        if (in_tok.length < 0) {
                printerr(0, "WARNING: handle_nullreq: "