LU-3289 gss: Interface and code changes for shared key

[fs/lustre-release.git] / lustre / utils / gss / svcgssd_main_loop.c

diff --git a/lustre/utils/gss/svcgssd_main_loop.c b/lustre/utils/gss/svcgssd_main_loop.c
index bd5fea7..c8cfb41 100644 (file)
--- a/lustre/utils/gss/svcgssd_main_loop.c
+++ b/lustre/utils/gss/svcgssd_main_loop.c
@@ -60,25 +60,25 @@
 void
 svcgssd_run()
 {
+       static const char gss_rpc_channel_path[] =
+               "/proc/net/rpc/auth.sptlrpc.init/channel";
        int                     ret;
        FILE                    *f = NULL;
        struct pollfd           pollfd;
        struct timespec         halfsec = { .tv_sec = 0, .tv_nsec = 500000000 };
 
-#define NULLRPC_FILE "/proc/net/rpc/auth.sptlrpc.init/channel"
-
        while (1) {
                int save_err;
 
                while (f == NULL) {
-                       f = fopen(NULLRPC_FILE, "rw");
+                       f = fopen(gss_rpc_channel_path, "rw");
                        if (f == NULL) {
                                printerr(4, "failed to open %s: %s\n",
-                                        NULLRPC_FILE, strerror(errno));
+                                        gss_rpc_channel_path, strerror(errno));
                                nanosleep(&halfsec, NULL);
                        } else {
                                printerr(1, "successfully open %s\n",
-                                        NULLRPC_FILE);
+                                        gss_rpc_channel_path);
                                break;
                        }
                }
@@ -95,7 +95,7 @@ svcgssd_run()
                        fclose(f);
                        f = NULL;
                } else if (ret == 0) {
-                       printerr(3, "poll timeout\n");
+                       printerr(4, "poll timeout\n");
                } else {
                        if (ret != 1) {
                                printerr(0, "bug: unexpected poll return %d\n",
@@ -103,7 +103,7 @@ svcgssd_run()
                                exit(1);
                        }
                        if (pollfd.revents & POLLIN) {
-                               if (handle_nullreq(f) < 0) {
+                               if (handle_channel_request(f) < 0) {
                                        fclose(f);
                                        f = NULL;
                                }