gssd: Use /run/user/${UID} instead of /run/user/${USER}

[nfs-utils.git] / utils / gssd / gssd.h

diff --git a/utils/gssd/gssd.h b/utils/gssd/gssd.h
index 082039a6783ba1343d480d0ebefc41eb19489347..86472a1239355d18f2ad2acd6583907a7c6b294a 100644 (file)
--- a/utils/gssd/gssd.h
+++ b/utils/gssd/gssd.h
@@ -45,7 +45,8 @@
 #define DNOTIFY_SIGNAL         (SIGRTMIN + 3)
 
 #define GSSD_DEFAULT_CRED_DIR                  "/tmp"
-#define GSSD_DEFAULT_CRED_PREFIX               "krb5cc_"
+#define GSSD_USER_CRED_DIR                     "/run/user/%U"
+#define GSSD_DEFAULT_CRED_PREFIX               "krb5cc"
 #define GSSD_DEFAULT_MACHINE_CRED_SUFFIX       "machine"
 #define GSSD_DEFAULT_KEYTAB_FILE               "/etc/krb5.keytab"
 #define GSSD_SERVICE_NAME                      "nfs"
@@ -55,12 +56,11 @@
 /*
  * The gss mechanisms that we can handle
  */
-enum {AUTHTYPE_KRB5, AUTHTYPE_SPKM3, AUTHTYPE_LIPKEY};
+enum {AUTHTYPE_KRB5, AUTHTYPE_LIPKEY};
 
 
 
 extern char                    pipefs_dir[PATH_MAX];
-extern char                    pipefs_nfsdir[PATH_MAX];
 extern char                    keytabfile[PATH_MAX];
 extern char                    *ccachesearch[];
 extern int                     use_memcache;
@@ -81,16 +81,25 @@ struct clnt_info {
        char                    *protocol;
        int                     krb5_fd;
        int                     krb5_poll_index;
-       int                     spkm3_fd;
-       int                     spkm3_poll_index;
-       int                     port;
+       int                     krb5_close_me;
+       int                     gssd_fd;
+       int                     gssd_poll_index;
+       int                     gssd_close_me;
+       struct sockaddr_storage addr;
+};
+
+TAILQ_HEAD(topdirs_list_head, topdirs_info) topdirs_list;
+
+struct topdirs_info {
+       TAILQ_ENTRY(topdirs_info)   list;
+       char                    *dirname;
+       int                     fd;
 };
 
 void init_client_list(void);
 int update_client_list(void);
 void handle_krb5_upcall(struct clnt_info *clp);
-void handle_spkm3_upcall(struct clnt_info *clp);
-int gssd_acquire_cred(char *server_name);
+void handle_gssd_upcall(struct clnt_info *clp);
 void gssd_run(void);