LU-6210 utils: Change positional struct initializers to C99

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

diff --git a/lustre/utils/gss/gssd.c b/lustre/utils/gss/gssd.c
index 6650648..2f96b5c 100644 (file)
--- a/lustre/utils/gss/gssd.c
+++ b/lustre/utils/gss/gssd.c
@@ -9,6 +9,8 @@
   Copyright (c) 2002 Marius Aamodt Eriksen <marius@UMICH.EDU>.
   All rights reserved, all wrongs reversed.
 
+  Copyright (c) 2014, Intel Corporation.
+
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
   are met:
@@ -52,6 +54,8 @@
 #include <string.h>
 #include <signal.h>
 #include <errno.h>
+#include <libcfs/util/string.h>
+
 #include "gssd.h"
 #include "err_util.h"
 #include "gss_util.h"
@@ -105,10 +109,13 @@ void lgssd_fini_mutexs(void)
 
 void lgssd_mutex_get(int semid)
 {
-       struct sembuf   op[1] = { {0, -1, SEM_UNDO} };
-       int             rc;
+       struct sembuf op = {
+               .sem_op = -1,
+               .sem_flag = SEM_UNDO
+       };
+       int rc;
 
-       rc = semop(semid, op, 1);
+       rc = semop(semid, &op, 1);
        if (rc != 0) {
                printerr(0, "exit on mutex_get err %d: %s\n",
                         rc, strerror(errno));
@@ -118,10 +125,12 @@ void lgssd_mutex_get(int semid)
 
 void lgssd_mutex_put(int semid)
 {
-       struct sembuf   op[1] = { {0, 1, 0} };
-       int             rc;
+       struct sembuf op = {
+               .sem_op = 1
+       };
+       int rc;
 
-       rc = semop(semid, op, 1);
+       rc = semop(semid, &op, 1);
        if (rc != 0) {
                printerr(0, "ignore mutex_put err %d: %s\n",
                         rc, strerror(errno));
@@ -192,17 +201,17 @@ main(int argc, char *argv[])
                                verbosity++;
                                break;
                        case 'p':
-                               strncpy(pipefs_dir, optarg, sizeof(pipefs_dir));
+                               strlcpy(pipefs_dir, optarg, sizeof(pipefs_dir));
                                if (pipefs_dir[sizeof(pipefs_dir)-1] != '\0')
                                        errx(1, "pipefs path name too long");
                                break;
                        case 'k':
-                               strncpy(keytabfile, optarg, sizeof(keytabfile));
+                               strlcpy(keytabfile, optarg, sizeof(keytabfile));
                                if (keytabfile[sizeof(keytabfile)-1] != '\0')
                                        errx(1, "keytab path name too long");
                                break;
                        case 'd':
-                               strncpy(ccachedir, optarg, sizeof(ccachedir));
+                               strlcpy(ccachedir, optarg, sizeof(ccachedir));
                                if (ccachedir[sizeof(ccachedir)-1] != '\0')
                                        errx(1, "ccachedir path name too long");
                                break;
@@ -243,11 +252,6 @@ main(int argc, char *argv[])
        signal(SIGTERM, sig_die);
        signal(SIGHUP, sig_hup);
 
-#if 0
-       /* Determine Kerberos information from the kernel */
-       gssd_obtain_kernel_krb5_info();
-#endif
-
        lgssd_init_mutexs();
 
        printerr(0, "lgssd initialized and ready to serve\n");