Attachment 221581 Details for Bug 325281 – CVS Diffs

[patch] CVS Diffs

diffs.txt (text/plain), 3.51 KB, created by Nathan Kinder on 2007-10-09 17:59:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nathan Kinder

Created: 2007-10-09 17:59:01 UTC

Size: 3.51 KB

patch

obsolete

>Index: Makefile.am
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
>retrieving revision 1.60
>diff -u -5 -t -r1.60 Makefile.am
>--- Makefile.am	5 Oct 2007 23:45:49 -0000	1.60
>+++ Makefile.am	9 Oct 2007 17:53:03 -0000
>@@ -80,10 +80,11 @@
> initdir = $(sysconfdir)@initdir@
> initconfigdir = $(sysconfdir)@initconfigdir@
> instconfigdir = @instconfigdir@
> perldir = $(libdir)@perldir@
> infdir = $(datadir)@infdir@
>+mibdir = $(datadir)@mibdir@
> 
> defaultuser=@defaultuser@
> defaultgroup=@defaultgroup@
> 
> #------------------------
>@@ -246,10 +247,18 @@
> 
> inf_DATA = ldap/admin/src/slapd.inf \
>         ldap/admin/src/scripts/dscreate.map \
>         ldap/admin/src/scripts/dsorgentries.map
> 
>+mib_DATA = ldap/servers/snmp/RFC-1215.txt \
>+        ldap/servers/snmp/SNMPv2-TC.txt \
>+        ldap/servers/snmp/redhat-directory.mib \
>+        ldap/servers/snmp/SNMPv2-CONF.txt \
>+        ldap/servers/snmp/NETWORK-SERVICES-MIB.txt \
>+        ldap/servers/snmp/RFC1155-SMI.txt \
>+        ldap/servers/snmp/SNMPv2-SMI.txt
>+
> #////////////////////////////////////////////////////////////////
> #
> #   Server Strings
> #
> #////////////////////////////////////////////////////////////////
>@@ -1018,10 +1027,11 @@
>         -e 's,@taskdir\@,$(taskdir),g' \
>         -e 's,@configdir\@,$(configdir),g' \
>         -e 's,@sysconfdir\@,$(sysconfdir),g' \
>         -e 's,@localstatedir\@,$(localstatedir),g' \
>         -e 's,@infdir\@,$(infdir),g' \
>+        -e 's,@mibdir\@,$(mibdir),g' \
>         -e 's,@templatedir\@,$(sampledatadir),g' \
>         -e 's,@package_name\@,$(PACKAGE_NAME),g' \
>         -e 's,@instconfigdir\@,$(instconfigdir),g' \
>         -e 's,@enable_ldapi\@,$(enable_ldapi),g' \
>         -e 's,@enable_pam_passthru\@,$(enable_pam_passthru),g' \
>@@ -1066,10 +1076,11 @@
>         -e 's,@taskdir\@,$(taskdir),g' \
>         -e 's,@configdir\@,$(configdir),g' \
>         -e 's,@sysconfdir\@,$(sysconfdir),g' \
>         -e 's,@localstatedir\@,$(localstatedir),g' \
>         -e 's,@infdir\@,$(infdir),g' \
>+        -e 's,@mibdir\@,$(mibdir),g' \
>         -e 's,@templatedir\@,$(sampledatadir),g' \
>         -e 's,@package_name\@,$(PACKAGE_NAME),g' \
>         -e 's,@instconfigdir\@,$(instconfigdir),g' \
>         -e 's,@enable_ldapi\@,$(enable_ldapi),g' \
>         -e 's,@enable_pam_passthru\@,$(enable_pam_passthru),g' \
>Index: configure.ac
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/configure.ac,v
>retrieving revision 1.39
>diff -u -5 -t -r1.39 configure.ac
>--- configure.ac	5 Oct 2007 23:45:49 -0000	1.39
>+++ configure.ac	9 Oct 2007 17:53:04 -0000
>@@ -163,10 +163,12 @@
>   serverdir=
>   # relative to libdir
>   serverplugindir=/plugins
>   # relative to datadir
>   infdir=/inf
>+  # relative to datadir
>+  mibdir=/mibs
>   # location of property/resource files, relative to datadir
>   propertydir=/properties
>   # relative to libdir
>   perldir=/perl
> else
>@@ -187,10 +189,12 @@
>   serverdir=/$PACKAGE_NAME
>   # relative to libdir
>   serverplugindir=/$PACKAGE_NAME/plugins
>   # relative to datadir
>   infdir=/$PACKAGE_NAME/inf
>+  # relative to datadir
>+  mibdir=/$PACKAGE_NAME/mibs
>   # location of property/resource files, relative to datadir
>   propertydir=/$PACKAGE_NAME/properties
>   # relative to libdir
>   perldir=/$PACKAGE_NAME/perl
> fi
>@@ -212,10 +216,11 @@
> AC_SUBST(serverdir)
> AC_SUBST(serverplugindir)
> AC_SUBST(scripttemplatedir)
> AC_SUBST(perldir)
> AC_SUBST(infdir)
>+AC_SUBST(mibdir)
> 
> AC_SUBST(defaultuser)
> AC_SUBST(defaultgroup)
> 
> # check for --with-instconfigdir

Actions: View | Diff

Attachments on bug 325281: 221581