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

[Nathan Kinder]

Author: nkinder

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

Modified Files:
	main.c 
Log Message:
Resolves: 381361
Summary: Add support for synchronizing the cn attribute between DS and AD.



Index: main.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/main.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- main.c	7 Jan 2009 00:15:44 -0000	1.30
+++ main.c	9 Jan 2009 17:24:30 -0000	1.31
@@ -977,17 +977,23 @@
 		slapd_print_version(1);
 		exit(1);
 	default:
+		{
+		char *rundir = config_get_rundir();
+
 		/* Ensure that we can read from and write to our rundir */
-		if (access(config_get_rundir(), R_OK | W_OK)) {
+		if (access(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);
+				slapdFrontendConfig->localuser, rundir, 0);
 			LDAPDebug(LDAP_DEBUG_ANY, "Shutting down.\n", 0, 0, 0);
+			slapi_ch_free_string(&rundir);
 			exit(1);
 		}
+		slapi_ch_free_string(&rundir);
 		break;
+		}
 	}
 
 	/*