From: Arvin Schnell <aschnell@suse.de>
Date: Thu, 2 May 2013 14:30:04 +0000 (+0200)
Subject: - moved ignoreroot test to other ignore tests
X-Git-Tag: v0.1.4~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d23a1cfab591ede175898f38d0866d154bb68b9c;p=thirdparty%2Fsnapper.git

- moved ignoreroot test to other ignore tests
---

diff --git a/pam/pam_snapper.c b/pam/pam_snapper.c
index 64478ac8..0fc7d22b 100644
--- a/pam/pam_snapper.c
+++ b/pam/pam_snapper.c
@@ -624,6 +624,11 @@ static int cdbus_pam_options_parser( pam_handle_t * pamh, pam_options_t * option
 			return PAM_IGNORE;
 		}
 	}
+	if ( options->ignoreroot ) {
+		if ( strcmp( pamuser, "root" ) == 0 ) {
+			return PAM_IGNORE;
+		}
+	}
 	if ( options->debug ) {
 		pam_syslog( pamh, LOG_ERR,
 			    "current settings: homeprefix=%s ignoreservices=%s ignoreusers=%s",
@@ -735,8 +740,6 @@ static int cdbus_pam_session( pam_handle_t * pamh, openclose_t openclose, char *
 	}
 	if ( !strcmp( real_user, "root" ) && options.rootasroot ) {
 		real_user_config = strdup( "root" );
-	} else if ( !strcmp( real_user, "root" ) && options.ignoreroot ) {
-		goto pam_sm_open_session_err;
 	} else {
 		real_user_config = malloc( strlen( options.homeprefix ) + strlen( real_user ) + 1 );
 		if ( !real_user_config ) {