[Fedora-directory-commits] ldapserver/ldap/servers/slapd main.c, 1.29, 1.30

[Nathan Kinder]

Author: nkinder

Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26341/ldap/servers/slapd

Modified Files:
    main.c 
Log Message:
Resolves:479065
Summary: Only check permissions on nsslapd-rundir in normal execution mode.

Index: main.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/main.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- main.c	15 Dec 2008 17:42:25 -0000	1.29
+++ main.c	7 Jan 2009 00:15:44 -0000	1.30
@@ -976,17 +976,18 @@
    case SLAPD_EXEMODE_PRINTVERSION:
    	slapd_print_version(1);
    	exit(1);
-	}
-
-	/* Ensure that we can read from and write to our rundir */
-	if (access(config_get_rundir(), R_OK | W_OK)) {
-		LDAPDebug(LDAP_DEBUG_ANY, "Unable to access nsslapd-rundir: %s\n",
-			slapd_system_strerror(errno), 0, 0);
-		LDAPDebug(LDAP_DEBUG_ANY, "Ensure that user "%s" has read and write "
-			"permissions on %s\n",
-			slapdFrontendConfig->localuser, config_get_rundir(), 0);
-		LDAPDebug(LDAP_DEBUG_ANY, "Shutting down.\n", 0, 0, 0);
-		exit(1);
+	default:
+		/* Ensure that we can read from and write to our rundir */
+		if (access(config_get_rundir(), R_OK | W_OK)) {
+			LDAPDebug(LDAP_DEBUG_ANY, "Unable to access nsslapd-rundir: %s\n",
+				slapd_system_strerror(errno), 0, 0);
+			LDAPDebug(LDAP_DEBUG_ANY, "Ensure that user "%s" has read and write "
+				"permissions on %s\n",
+				slapdFrontendConfig->localuser, config_get_rundir(), 0);
+			LDAPDebug(LDAP_DEBUG_ANY, "Shutting down.\n", 0, 0, 0);
+			exit(1);
+		}
+		break;
    }

/*