Attachment 153048 Details for Bug 237163 – patch file

[patch] patch file

pam-0.99.7.0-namespace-expand-home.patch (text/plain), 1.53 KB, created by Ted X Toth on 2007-04-19 19:06:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ted X Toth

Created: 2007-04-19 19:06:05 UTC

Size: 1.53 KB

patch

obsolete

>--- Linux-PAM-0.99.7.0/modules/pam_namespace/pam_namespace.c	2007-04-18 09:32:05.000000000 -0500
>+++ Linux-PAM-0.99.7.0.new/modules/pam_namespace/pam_namespace.c	2007-04-18 09:31:23.000000000 -0500
>@@ -196,14 +196,18 @@
>     uids = strtok_r(NULL, " \t", &tptr);
> 
>     /*
>-     * If the directory being polyinstantiated is the home directory
>-     * of the user who is establishing a session, we have to swap
>-     * the "$HOME" string with the user's home directory that is
>-     * passed in as an argument.
>+     * Expand $HOME in dir
>      */
>-    if (strcmp(dir, "$HOME") == 0) {
>-	dir = home;
>+    if ((tptr = strstr(dir, "$HOME")) != 0) {
>+        if (strlen(dir) > 5) {
>+            char *expanded = alloca(strlen(home)+strlen(dir)-5+1);
>+            *tptr = 0;
>+            sprintf(expanded, "%s%s", home, tptr+5);
>+            dir = expanded;
>+	}
>+	else
>+            dir = home;
>     }
> 
>     /*
>      * Expand $HOME and $USER in instance dir prefix
>@@ -1117,10 +1141,11 @@
> 
>                 if (umount(pptr->dir) < 0) {
>             	    int saved_errno = errno;
>-            	    pam_syslog(idata->pamh, LOG_ERR, "Unmount of %s failed, %m",
>+            	    if (saved_errno != EINVAL) {
>+            	        pam_syslog(idata->pamh, LOG_ERR, "Unmount of %s failed, %m",
>                     	pptr->dir);
>-            	    if (saved_errno != EINVAL)
>                 	return PAM_SESSION_ERR;
>+		    }
>                 } else if (idata->flags & PAMNS_DEBUG)
>                     pam_syslog(idata->pamh, LOG_DEBUG, "Umount succeeded %s",
> 				pptr->dir);

Actions: View | Diff

Attachments on bug 237163: 153048