[Selinux-commits] SF.net SVN: selinux: [2200] branches/stable/1_0/policycoreutils

[<ssm...@us...>]

Revision: 2200
          http://svn.sourceforge.net/selinux/?rev=2200&view=rev
Author:   ssmalley
Date:     2007-01-22 10:37:59 -0800 (Mon, 22 Jan 2007)

Log Message:
-----------
policycoreutils:  ported r2199 (newrole non-pam build fix) from trunk.

Modified Paths:
--------------
    branches/stable/1_0/policycoreutils/ChangeLog
    branches/stable/1_0/policycoreutils/VERSION
    branches/stable/1_0/policycoreutils/newrole/newrole.c

Modified: branches/stable/1_0/policycoreutils/ChangeLog
===================================================================
--- branches/stable/1_0/policycoreutils/ChangeLog	2007-01-22 18:34:12 UTC (rev 2199)
+++ branches/stable/1_0/policycoreutils/ChangeLog	2007-01-22 18:37:59 UTC (rev 2200)
@@ -1,3 +1,6 @@
+1.34.1 2007-01-22
+	* Fixed newrole non-pam build.
+
 1.34.0 2007-01-18
 	* Updated version for stable branch.
 

Modified: branches/stable/1_0/policycoreutils/VERSION
===================================================================
--- branches/stable/1_0/policycoreutils/VERSION	2007-01-22 18:34:12 UTC (rev 2199)
+++ branches/stable/1_0/policycoreutils/VERSION	2007-01-22 18:37:59 UTC (rev 2200)
@@ -1 +1 @@
-1.34.0
+1.34.1

Modified: branches/stable/1_0/policycoreutils/newrole/newrole.c
===================================================================
--- branches/stable/1_0/policycoreutils/newrole/newrole.c	2007-01-22 18:34:12 UTC (rev 2199)
+++ branches/stable/1_0/policycoreutils/newrole/newrole.c	2007-01-22 18:37:59 UTC (rev 2200)
@@ -944,11 +944,11 @@
 	int preserve_environment;
 
 	int fd;
-	int rc;
 	pid_t childPid = 0;
 	char *shell_argv0 = NULL;
 
 #ifdef USE_PAM
+	int rc;
 	int pam_status;		   /* pam return code */
 	pam_handle_t *pam_handle;  /* opaque handle used by all PAM functions */
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.