From owner-freebsd-ports  Sun Jun 10 22: 0:30 2001
Delivered-To: freebsd-ports@hub.freebsd.org
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 4165737B40B
	for <freebsd-ports@hub.freebsd.org>; Sun, 10 Jun 2001 22:00:19 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.11.3/8.11.3) id f5B50JJ52606;
	Sun, 10 Jun 2001 22:00:19 -0700 (PDT)
	(envelope-from gnats)
Received: from shumai.marcuscom.com (rdu26-228-058.nc.rr.com [66.26.228.58])
	by hub.freebsd.org (Postfix) with ESMTP id C26BE37B407
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 10 Jun 2001 21:52:16 -0700 (PDT)
	(envelope-from marcus@shumai.marcuscom.com)
Received: (from marcus@localhost)
	by shumai.marcuscom.com (8.11.3/8.11.3) id f5B4qTU21946;
	Mon, 11 Jun 2001 00:52:29 -0400 (EDT)
	(envelope-from marcus)
Message-Id: <200106110452.f5B4qTU21946@shumai.marcuscom.com>
Date: Mon, 11 Jun 2001 00:52:29 -0400 (EDT)
From: marcus@marcuscom.com
Reply-To: marcus@marcuscom.com
To: FreeBSD-gnats-submit@freebsd.org
X-Send-Pr-Version: 3.113
Subject: ports/28028: Fix pam_ldap's configuration file
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-ports.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo?subject=subscribe%20freebsd-ports>
List-Unsubscribe: <mailto:majordomo?subject=unsubscribe%20freebsd-ports>
X-Loop: FreeBSD.org


>Number:         28028
>Category:       ports
>Synopsis:       Fix pam_ldap's configuration file
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jun 10 22:00:18 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     Joe Marcus Clarke
>Release:        FreeBSD 4.3-RELEASE i386
>Organization:
MarcusCom
>Environment:
System: FreeBSD shumai.marcuscom.com 4.3-RELEASE FreeBSD 4.3-RELEASE #0: Sun May 6 01:46:59 EDT 2001 root@shumai.marcuscom.com:/usr/src/sys/compile/SHUMAI i386


	
>Description:
	Even with all of David and I's beating on this one, I still managed
to screw up the location of the configuration file.  The config should be 
in ${PREFIX}/etc, and not ${PREFIX}/etc/pam_ldap (as David said, no need
to waste inodes).  The attached patches will clear things up.
>How-To-Repeat:
	
>Fix:

--- Makefile.orig	Mon Jun 11 00:36:36 2001
+++ Makefile	Mon Jun 11 00:36:11 2001
@@ -33,8 +33,8 @@
 
 post-install:
 	@${ECHO} "================================================================================"
-	@${ECHO} "Copy/move/symlink ${PREFIX}/etc/pam_ldap/ldap.conf.dist to"
-	@${ECHO} "${PREFIX}/etc/pam_ldap/ldap.conf to be able to use it."
+	@${ECHO} "Copy/move/symlink ${PREFIX}/etc/ldap.conf.dist to"
+	@${ECHO} "${PREFIX}/etc/ldap.conf to be able to use it."
 	@${ECHO} "Add lines like the following to /etc/pam.conf"
 	@${ECHO} "to get things going:"
 	@${ECHO} ""

--- patch-ab.orig	Mon Jun 11 00:35:48 2001
+++ patch-ab	Mon Jun 11 00:35:56 2001
@@ -5,7 +5,7 @@
    /* configuration file location is configurable; default /etc/ldap.conf */
    if (configFile == NULL)
 -    configFile = "/etc/ldap.conf";
-+    configFile = "/usr/local/etc/pam_ldap/ldap.conf";
++    configFile = "/usr/local/etc/ldap.conf";
  
    fp = fopen (configFile, "r");
  
>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message