LU-9243 gss: fix GSS struct definition badness

[fs/lustre-release.git] / lustre / utils / gss / lsupport.h

diff --git a/lustre/utils/gss/lsupport.h b/lustre/utils/gss/lsupport.h
index f01b3cf..7a6ec0b 100644 (file)
--- a/lustre/utils/gss/lsupport.h
+++ b/lustre/utils/gss/lsupport.h
@@ -24,11 +24,10 @@
  * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, 2014 Intel Corporation.
+ * Copyright (c) 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  *
  * lustre/utils/gss/lsupport.h
  */
@@ -38,9 +37,12 @@
 
 #include <assert.h>
 #include <unistd.h>
+#include <stdbool.h>
 #include <stdint.h>
 
-#include <lnet/types.h>
+#include <libcfs/util/list.h>
+#include <linux/lnet/lnet-types.h>
+#include <linux/lnet/nidstr.h>
 
 #define GSSD_CLI        (0)
 #define GSSD_SVC        (1)
@@ -68,6 +70,20 @@ enum lgss_mech {
        LGSS_MECH_SK    = 2,
 };
 
+enum {
+       /* sec part flags */
+       LGSS_ROOT_CRED_ROOT     = 0x01,
+       LGSS_ROOT_CRED_MDT      = 0x02,
+       LGSS_ROOT_CRED_OST      = 0x04,
+       /* service type flags */
+       LGSS_SVC_NULL           = 0x10,
+       LGSS_SVC_AUTH           = 0x20,
+       LGSS_SVC_INTG           = 0x40,
+       LGSS_SVC_PRIV           = 0x80,
+       /* Number of sec part flags */
+       LGSS_ROOT_CRED_NR       = 3,
+};
+
 struct lgssd_upcall_data {
         uint32_t        seq;
         uint32_t        uid;
@@ -77,22 +93,9 @@ struct lgssd_upcall_data {
         char            obd[64];
 };
 
-#define GSSD_INTERFACE_VERSION        (1)
-
-struct lgssd_ioctl_param {
-        int             version;        /* in   */
-        int             secid;          /* in   */
-        char           *uuid;           /* in   */
-        int             lustre_svc;     /* in   */
-        uid_t           uid;            /* in   */
-        gid_t           gid;            /* in   */
-        long            send_token_size;/* in   */
-        char           *send_token;     /* in   */
-        long            reply_buf_size; /* in   */
-        char           *reply_buf;      /* in   */
-        long            status;         /* out  */
-        long            reply_length;   /* out  */
-};
+#define GSSD_INTERFACE_VERSION          GSSD_INTERFACE_VERSION_V2
+#define GSSD_INTERFACE_VERSION_V2       (2)
+#define GSSD_INTERFACE_VERSION_V1       (1)
 
 #define GSSD_DEFAULT_GETHOSTNAME_EX     "/etc/lustre/nid2hostname"
 #define MAPPING_DATABASE_FILE           "/etc/lustre/idmap.conf"