Merge branch 'sid'

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

diff --git a/utils/gssd/svcgssd.c b/utils/gssd/svcgssd.c
index 9b463f3723ab066a228e62a24cd45313798c6440..8aee3b2e64a99d5c66f6f3674219410ad9157c10 100644 (file)
--- a/utils/gssd/svcgssd.c
+++ b/utils/gssd/svcgssd.c
@@ -153,7 +153,7 @@ sig_die(int signal)
 {
        /* destroy krb5 machine creds */
        printerr(1, "exiting on signal %d\n", signal);
-       exit(1);
+       exit(0);
 }
 
 void
@@ -262,11 +262,19 @@ main(int argc, char *argv[])
                                "/etc/krb5.keytab?\n");
                        exit(1);
                }
+       } else {
+               status = gssd_acquire_cred(NULL,
+                       (const gss_OID)GSS_C_NT_HOSTBASED_SERVICE);
+               if (status == FALSE) {
+                       printerr(0, "unable to obtain nameless credentials\n");
+                       exit(1);
+               }
        }
 
        if (!fg)
                release_parent();
 
+       nfs4_init_name_mapping(NULL); /* XXX: should only do this once */
        gssd_run();
        printerr(0, "gssd_run returned!\n");
        abort();