Attachment 207051 Details for Bug 306901 – Do not fail when SELinux is not available

[patch] Do not fail when SELinux is not available

pam-0.99.7.1-namespace-nofail-without-selinux.patch (text/plain), 2.96 KB, created by Jan "Yenya" Kasprzak on 2007-09-26 13:17:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan "Yenya" Kasprzak

Created: 2007-09-26 13:17:09 UTC

Size: 2.96 KB

patch

obsolete

>--- Linux-PAM-0.99.7.1/modules/pam_namespace/pam_namespace.c.nofail-without-selinux	2007-09-26 14:44:02.000000000 +0200
>+++ Linux-PAM-0.99.7.1/modules/pam_namespace/pam_namespace.c	2007-09-26 14:44:06.000000000 +0200
>@@ -592,9 +592,6 @@
> #ifdef WITH_SELINUX
>     *i_context = NULL;
>     *origcon = NULL;
>-    if ((rc=form_context(polyptr, i_context, origcon, idata)) != PAM_SUCCESS) {
>-	return rc;
>-    }
> #endif
> 
>     rc = PAM_SESSION_ERR;
>@@ -617,6 +614,15 @@
> #ifdef WITH_SELINUX
>     	case LEVEL:
>         case CONTEXT:
>+#ifdef WITH_SELINUX
>+	    {
>+		int rc1;
>+		if ((rc1=form_context(polyptr, i_context, origcon, idata))
>+			!= PAM_SUCCESS)
>+		return rc1;
>+	    }
>+#endif
>+
> 	    if (selinux_trans_to_raw_context(*i_context, &rawcon) < 0) {
> 		pam_syslog(idata->pamh, LOG_ERR, "Error translating directory context");
> 		goto fail;
>--- Linux-PAM-0.99.7.1/modules/pam_namespace/pam_namespace.c.nofail-without-selinux	2007-09-26 14:44:02.000000000 +0200
>+++ Linux-PAM-0.99.7.1/modules/pam_namespace/pam_namespace.c	2007-09-26 14:52:27.000000000 +0200
>@@ -592,9 +592,6 @@
> #ifdef WITH_SELINUX
>     *i_context = NULL;
>     *origcon = NULL;
>-    if ((rc=form_context(polyptr, i_context, origcon, idata)) != PAM_SUCCESS) {
>-	return rc;
>-    }
> #endif
> 
>     rc = PAM_SESSION_ERR;
>@@ -617,6 +614,13 @@
> #ifdef WITH_SELINUX
>     	case LEVEL:
>         case CONTEXT:
>+	    {
>+		int rc1;
>+		if ((rc1=form_context(polyptr, i_context, origcon, idata))
>+			!= PAM_SUCCESS)
>+		return rc1;
>+	    }
>+
> 	    if (selinux_trans_to_raw_context(*i_context, &rawcon) < 0) {
> 		pam_syslog(idata->pamh, LOG_ERR, "Error translating directory context");
> 		goto fail;
>@@ -666,10 +670,10 @@
> #endif
>     if (rc != PAM_SUCCESS) {
> #ifdef WITH_SELINUX
>-	freecon(*i_context);
>-	*i_context = NULL;
>-	freecon(*origcon);
>-	*origcon = NULL;
>+	if (i_context)
>+		freecon(*i_context);
>+	if (origcon)
>+		freecon(*origcon);
> #endif
> 	free(*i_name);
> 	*i_name = NULL;
>--- Linux-PAM-0.99.7.1/modules/pam_namespace/pam_namespace.c.nofail-without-selinux	2007-09-26 14:44:02.000000000 +0200
>+++ Linux-PAM-0.99.7.1/modules/pam_namespace/pam_namespace.c	2007-09-26 14:53:42.000000000 +0200
>@@ -592,9 +592,6 @@
> #ifdef WITH_SELINUX
>     *i_context = NULL;
>     *origcon = NULL;
>-    if ((rc=form_context(polyptr, i_context, origcon, idata)) != PAM_SUCCESS) {
>-	return rc;
>-    }
> #endif
> 
>     rc = PAM_SESSION_ERR;
>@@ -617,6 +614,13 @@
> #ifdef WITH_SELINUX
>     	case LEVEL:
>         case CONTEXT:
>+	    {
>+		int rc1;
>+		if ((rc1=form_context(polyptr, i_context, origcon, idata))
>+				!= PAM_SUCCESS)
>+			return rc1;
>+	    }
>+
> 	    if (selinux_trans_to_raw_context(*i_context, &rawcon) < 0) {
> 		pam_syslog(idata->pamh, LOG_ERR, "Error translating directory context");
> 		goto fail;
>@@ -666,10 +670,10 @@
> #endif
>     if (rc != PAM_SUCCESS) {
> #ifdef WITH_SELINUX
>-	freecon(*i_context);
>-	*i_context = NULL;
>-	freecon(*origcon);
>-	*origcon = NULL;
>+	if (i_context)
>+		freecon(*i_context);
>+	if (origcon)
>+		freecon(*origcon);
> #endif
> 	free(*i_name);
> 	*i_name = NULL;

Actions: View | Diff

Attachments on bug 306901: 207051 | 207091 | 207161