revert

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

diff --git a/utils/gssd/gssd_proc.c b/utils/gssd/gssd_proc.c
index a51dbaeba3d06e8414356573418bf02b36a15d6c..a46b3bd01bf6b6bf107182bc5d70abf1c9cb4d93 100644 (file)
--- a/utils/gssd/gssd_proc.c
+++ b/utils/gssd/gssd_proc.c
@@ -676,7 +676,7 @@ do_error_downcall(int k5_fd, uid_t uid, int err)
        unsigned int timeout = 0;
        int     zero = 0;
 
-       printerr(1, "doing error downcall\n");
+       printerr(2, "doing error downcall\n");
 
        if (WRITE_BYTES(&p, end, uid)) goto out_err;
        if (WRITE_BYTES(&p, end, timeout)) goto out_err;
@@ -918,6 +918,23 @@ int create_auth_rpc_client(struct clnt_info *clp,
        goto out;
 }
 
+static char *
+user_cachedir(char *dirname, uid_t uid)
+{
+       struct passwd *pw;
+       char *ptr;
+
+       if ((pw = getpwuid(uid)) == NULL) {
+               printerr(0, "user_cachedir: Failed to find '%d' uid"
+                           " for cache directory\n");
+               return NULL;
+       }
+       ptr = malloc(strlen(dirname)+strlen(pw->pw_name)+2);
+       if (ptr)
+               sprintf(ptr, "%s/%s", dirname, pw->pw_name);
+
+       return ptr;
+}
 /*
  * this code uses the userland rpcsec gss library to create a krb5
  * context on behalf of the kernel
@@ -932,11 +949,11 @@ process_krb5_upcall(struct clnt_info *clp, uid_t uid, int fd, char *tgtname,
        gss_buffer_desc         token;
        char                    **credlist = NULL;
        char                    **ccname;
-       char                    **dirname;
+       char                    **dirname, *dir, *userdir;
        int                     create_resp = -1;
        int                     err, downcall_err = -EACCES;
 
-       printerr(1, "handling krb5 upcall (%s)\n", clp->dirname);
+       printerr(2, "handling krb5 upcall (%s)\n", clp->dirname);
 
        if (tgtname) {
                if (clp->servicename) {
@@ -975,7 +992,22 @@ process_krb5_upcall(struct clnt_info *clp, uid_t uid, int fd, char *tgtname,
                                service == NULL)) {
                /* Tell krb5 gss which credentials cache to use */
                for (dirname = ccachesearch; *dirname != NULL; dirname++) {
-                       err = gssd_setup_krb5_user_gss_ccache(uid, clp->servername, *dirname);
+                       /* See if the user name is needed */
+                       if (strncmp(*dirname, GSSD_USER_CRED_DIR, 
+                                       strlen(GSSD_USER_CRED_DIR)) == 0) {
+                               userdir = user_cachedir(*dirname, uid);
+                               if (userdir == NULL) 
+                                       continue;
+                               dir = userdir;
+                       } else
+                               dir = *dirname;
+
+                       err = gssd_setup_krb5_user_gss_ccache(uid, clp->servername, dir);
+
+                       if (userdir) {
+                               free(userdir);
+                               userdir = NULL;
+                       }
                        if (err == -EKEYEXPIRED)
                                downcall_err = -EKEYEXPIRED;
                        else if (!err)
@@ -1039,7 +1071,7 @@ process_krb5_upcall(struct clnt_info *clp, uid_t uid, int fd, char *tgtname,
        }
 
        if (!authgss_get_private_data(auth, &pd)) {
-               printerr(1, "WARNING: Failed to obtain authentication "
+               printerr(2, "WARNING: Failed to obtain authentication "
                            "data for user with uid %d for server %s\n",
                         uid, clp->servername);
                goto out_return_error;