summaryrefslogtreecommitdiff
path: root/databases/nss_ldap/patches/patch-af
blob: e1e8488fa5ddec16f78528ef637dbfa2b50780e9 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
$NetBSD: patch-af,v 1.6 2010/11/03 11:39:08 adam Exp $

--- Makefile.in.orig	2009-11-06 10:28:08.000000000 +0000
+++ Makefile.in
@@ -60,7 +60,7 @@ am_NSS_LDAP_OBJECTS = ldap-nss.$(OBJEXT)
 	util.$(OBJEXT) ltf.$(OBJEXT) snprintf.$(OBJEXT) \
 	resolve.$(OBJEXT) dnsconfig.$(OBJEXT) irs-nss.$(OBJEXT) \
 	pagectrl.$(OBJEXT) aix_authmeth.$(OBJEXT) \
-	ldap-init-krb5-cache.$(OBJEXT) vers.$(OBJEXT)
+	ldap-init-krb5-cache.$(OBJEXT) netbsd.$(OBJEXT)
 NSS_LDAP_OBJECTS = $(am_NSS_LDAP_OBJECTS)
 NSS_LDAP_LDADD = $(LDADD)
 am_nss_ldap_so_OBJECTS = ldap-nss.$(OBJEXT) ldap-pwd.$(OBJEXT) \
@@ -72,7 +72,7 @@ am_nss_ldap_so_OBJECTS = ldap-nss.$(OBJE
 	ldap-automount.$(OBJEXT) util.$(OBJEXT) ltf.$(OBJEXT) \
 	snprintf.$(OBJEXT) resolve.$(OBJEXT) dnsconfig.$(OBJEXT) \
 	irs-nss.$(OBJEXT) pagectrl.$(OBJEXT) ldap-sldap.$(OBJEXT) \
-	ldap-init-krb5-cache.$(OBJEXT) vers.$(OBJEXT)
+	ldap-init-krb5-cache.$(OBJEXT) netbsd.$(OBJEXT)
 nss_ldap_so_OBJECTS = $(am_nss_ldap_so_OBJECTS)
 nss_ldap_so_LDADD = $(LDADD)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
@@ -204,7 +204,7 @@ target_vendor = @target_vendor@
 @AIX_FALSE@authmod = 
 @AIX_TRUE@authmod = NSS_LDAP
 INST_UID = root
-@AIX_FALSE@INST_GID = root
+@AIX_FALSE@INST_GID = wheel
 @AIX_TRUE@INST_GID = system
 EXTRA_DIST = CVSVersionInfo.txt ChangeLog \
 	     AUTHORS ANNOUNCE NEWS INSTALL README LICENSE.OpenLDAP COPYING\
@@ -216,11 +216,11 @@ nss_ldap_so_SOURCES = ldap-nss.c ldap-pw
 	ldap-alias.c ldap-service.c ldap-schema.c ldap-ethers.c \
 	ldap-bp.c ldap-automount.c util.c ltf.c snprintf.c resolve.c \
 	dnsconfig.c irs-nss.c pagectrl.c ldap-sldap.c ldap-init-krb5-cache.c \
-	vers.c
+	netbsd.c
 
 NSS_LDAP_SOURCES = ldap-nss.c ldap-grp.c ldap-pwd.c ldap-netgrp.c ldap-schema.c \
 	util.c ltf.c snprintf.c resolve.c dnsconfig.c \
-	irs-nss.c pagectrl.c aix_authmeth.c ldap-init-krb5-cache.c vers.c
+	irs-nss.c pagectrl.c aix_authmeth.c ldap-init-krb5-cache.c netbsd.c
 
 @GCC_FALSE@MULTI_OS_DIRECTORY = .
 #INCLUDES = -I$(top_builddir) -I$(srcdir)
@@ -331,7 +331,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resolve.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/snprintf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vers.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netbsd.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@@ -693,10 +693,8 @@ uninstall-man: uninstall-man5
 
 install-data-local:
 	@$(NORMAL_INSTALL)
-	@if test ! -f $(DESTDIR)$(NSS_LDAP_PATH_CONF); then \
-		$(mkinstalldirs) $(DESTDIR)$(dir $(NSS_LDAP_PATH_CONF)); \
-		$(INSTALL_DATA) -o $(INST_UID) -g $(INST_GID) $(srcdir)/ldap.conf $(DESTDIR)$(NSS_LDAP_PATH_CONF); \
-	fi
+	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
+	$(INSTALL_DATA) -o $(INST_UID) -g $(INST_GID) $(srcdir)/ldap.conf $(DESTDIR)$(sysconfdir)/ldap.conf
 	$(INSTALL_DATA) -o $(INST_UID) -g $(INST_GID) $(srcdir)/nsswitch.ldap $(DESTDIR)$(sysconfdir)/nsswitch.ldap; 
 
 uninstall-local: