Attachment 155722 Details for Bug 241797 – patch to add level_user and context_user methods of polyinstantiation

[patch] patch to add level_user and context_user methods of polyinstantiation

pam-0.99.6.2-namespace-_user.patch (text/plain), 2.07 KB, created by Ted X Toth on 2007-05-30 18:25:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ted X Toth

Created: 2007-05-30 18:25:58 UTC

Size: 2.07 KB

patch

obsolete

>--- Linux-PAM-0.99.6.2/modules/pam_namespace/pam_namespace.c	2007-05-25 14:23:24.000000000 -0500
>+++ Linux-PAM-0.99.6.2.new1/modules/pam_namespace/pam_namespace.c	2007-05-25 08:41:35.000000000 -0500
>@@ -263,6 +263,14 @@
>         poly.method = CONTEXT;
>     }
> 
>+    if (strcmp(method, "level_user") == 0) {
>+        poly.method = LEVEL_USER;
>+    }
>+
>+    if (strcmp(method, "context_user") == 0) {
>+        poly.method = CONTEXT_USER;
>+    }
>+
> #endif
> 
>     if ( poly.method == NONE) {
>@@ -421,13 +429,13 @@
> {
>     unsigned int i;
> 
>-    if (idata->flags & PAMNS_DEBUG)
>-    	pam_syslog(idata->pamh, LOG_DEBUG,
>-		"Checking for ns override in dir %s for uid %d",
>-		polyptr->dir, uid);
> 
>     for (i = 0; i < polyptr->num_uids; i++) {
>         if (uid == polyptr->uid[i]) {
>+	    if (idata->flags & PAMNS_DEBUG)
>+	        pam_syslog(idata->pamh, LOG_DEBUG,
>+		           "ns override of dir %s for uid %d",
>+		           polyptr->dir, uid);
>             return 1;
>         }
>     }
>@@ -577,7 +585,7 @@
> 	 * and change the directories MLS Level to match process.
> 	 */
> 
>-	if (polyptr->method == LEVEL) {
>+	if (polyptr->method == LEVEL || polyptr->method == LEVEL_USER) {
> 		context_t scontext = NULL;
> 		context_t fcontext = NULL;
> 		rc = PAM_SESSION_ERR;
>@@ -669,6 +677,17 @@
> 		pam_syslog(idata->pamh, LOG_ERR, "Error translating directory context");
> 		goto fail;
> 	    }    	     
>+	    if (asprintf(i_name, "%s", rawcon) < 0) {
>+		*i_name = NULL;
>+		goto fail;
>+	    }
>+    	    break;
>+       case LEVEL_USER:
>+       case CONTEXT_USER:
>+	    if (selinux_trans_to_raw_context(*i_context, &rawcon) < 0) {
>+		pam_syslog(idata->pamh, LOG_ERR, "Error translating directory context");
>+		goto fail;
>+	    }    	     
> 	    if (asprintf(i_name, "%s_%s", rawcon, idata->user) < 0) {
> 		*i_name = NULL;
> 		goto fail;
>--- Linux-PAM-0.99.6.2/modules/pam_namespace/pam_namespace.h	2007-05-25 14:23:24.000000000 -0500
>+++ Linux-PAM-0.99.6.2.new1/modules/pam_namespace/pam_namespace.h	2007-05-25 07:57:30.000000000 -0500
>@@ -102,6 +102,8 @@
>     USER,
>     CONTEXT,
>     LEVEL,
>+    CONTEXT_USER,
>+    LEVEL_USER
> };
> 
> /*

Actions: View | Diff

Attachments on bug 241797: 155722