From fedora-directory-commits at redhat.com Thu Nov 2 02:22:37 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Wed, 1 Nov 2006 19:22:37 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src/scripts template-bak2db.pl, 1.7, 1.8 template-bak2db.pl.in, 1.1, 1.2 template-cl-dump.pl, 1.9, 1.10 template-cl-dump.pl.in, 1.1, 1.2 template-db2bak.pl, 1.6, 1.7 template-db2bak.pl.in, 1.1, 1.2 template-db2index.pl, 1.7, 1.8 template-db2index.pl.in, 1.1, 1.2 template-db2ldif.pl, 1.6, 1.7 template-db2ldif.pl.in, 1.1, 1.2 template-ldif2db.pl, 1.6, 1.7 template-ldif2db.pl.in, 1.1, 1.2 template-ns-accountstatus.pl, 1.6, 1.7 template-ns-accountstatus.pl.in, 1.1, 1.2 template-ns-activate.pl, 1.6, 1.7 template-ns-activate.pl.in, 1.1, 1.2 template-ns-inactivate.pl, 1.6, 1.7 template-ns-inactivate.pl.in, 1.1, 1.2 template-ns-newpwpolicy.pl, 1.7, 1.8 template-ns-newpwpolicy.pl.in, 1.1, 1.2 template-repl-monitor-cgi.pl, 1.7, 1.8 template-repl-monitor-cgi.pl.in, 1.1, 1.2 template-verify-db.pl, 1.7, 1.8 template-verify-db.pl.in, 1.2, 1.3 Message-ID: <200611020222.kA22MbrI032492@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32426 Modified Files: template-bak2db.pl template-bak2db.pl.in template-cl-dump.pl template-cl-dump.pl.in template-db2bak.pl template-db2bak.pl.in template-db2index.pl template-db2index.pl.in template-db2ldif.pl template-db2ldif.pl.in template-ldif2db.pl template-ldif2db.pl.in template-ns-accountstatus.pl template-ns-accountstatus.pl.in template-ns-activate.pl template-ns-activate.pl.in template-ns-inactivate.pl template-ns-inactivate.pl.in template-ns-newpwpolicy.pl template-ns-newpwpolicy.pl.in template-repl-monitor-cgi.pl template-repl-monitor-cgi.pl.in template-verify-db.pl template-verify-db.pl.in Log Message: Resolves: #210947 Summary: Processed: parameterizing the hardcoded paths (phase 3. installed binaries, change log, setup) Comment #29 Index: template-bak2db.pl =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-bak2db.pl,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- template-bak2db.pl 25 Oct 2006 00:04:42 -0000 1.7 +++ template-bak2db.pl 2 Nov 2006 02:22:33 -0000 1.8 @@ -126,9 +126,9 @@ $entry = "${dn}${misc}${cn}${nsinstance}${nsarchivedir}${nsdbtype}"; $vstr = ""; if ($verbose != 0) { $vstr = "-v"; } -$ENV{'PATH'} = '$prefix/usr/lib/mozldap6:$prefix/usr/lib:/usr/lib/mozldap6:/usr/lib'; -$ENV{'LD_LIBRARY_PATH'} = '$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib'; -$ENV{'SHLIB_PATH'} = '$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib'; +$ENV{'PATH'} = "$prefix/usr/lib/mozldap6:$prefix/usr/bin:/usr/lib/mozldap6:/usr/bin"; +$ENV{'LD_LIBRARY_PATH'} = "$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib"; +$ENV{'SHLIB_PATH'} = "$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib"; open(FOO, "| ldapmodify $vstr -h {{SERVER-NAME}} -p {{SERVER-PORT}} -D \"$rootdn\" -w \"$passwd\" -a" ); print(FOO "$entry"); close(FOO); Index: template-bak2db.pl.in =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-bak2db.pl.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- template-bak2db.pl.in 25 Oct 2006 20:36:46 -0000 1.1 +++ template-bak2db.pl.in 2 Nov 2006 02:22:33 -0000 1.2 @@ -126,9 +126,9 @@ $entry = "${dn}${misc}${cn}${nsinstance}${nsarchivedir}${nsdbtype}"; $vstr = ""; if ($verbose != 0) { $vstr = "-v"; } -$ENV{'PATH'} = '$prefix at ldapsdk_bindir@:$prefix/usr/lib:@ldapsdk_bindir@:/usr/lib'; -$ENV{'LD_LIBRARY_PATH'} = '$prefix at nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib'; -$ENV{'SHLIB_PATH'} = '$prefix at nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib'; +$ENV{'PATH'} = "$prefix at ldapsdk_bindir@:$prefix/usr/bin:@ldapsdk_bindir@:/usr/bin"; +$ENV{'LD_LIBRARY_PATH'} = "$prefix at nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib"; +$ENV{'SHLIB_PATH'} = "$prefix at nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib"; open(FOO, "| ldapmodify $vstr -h {{SERVER-NAME}} -p {{SERVER-PORT}} -D \"$rootdn\" -w \"$passwd\" -a" ); print(FOO "$entry"); close(FOO); Index: template-cl-dump.pl =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-cl-dump.pl,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- template-cl-dump.pl 25 Oct 2006 20:36:46 -0000 1.9 +++ template-cl-dump.pl 2 Nov 2006 02:22:33 -0000 1.10 @@ -101,8 +101,8 @@ # installed in the operating system locations (e.g. /usr/lib /usr/lib/perl5) $prefix = "{{DS-ROOT}}"; -$ENV{'LD_LIBRARY_PATH'} = '$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib'; -$ENV{'SHLIB_PATH'} = '$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib'; +$ENV{'LD_LIBRARY_PATH'} = "$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib"; +$ENV{'SHLIB_PATH'} = "$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib"; $usage="Usage: $0 [-h host] [-p port] [-D bind-dn] [-w bind-password | -P bind-cert] [-r replica-roots] [-o output-file] [-c] [-v]\n\n $0 -i changelog-ldif-file-with-base64encoding [-o output-file] [-c]"; Index: template-cl-dump.pl.in =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-cl-dump.pl.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- template-cl-dump.pl.in 25 Oct 2006 20:36:46 -0000 1.1 +++ template-cl-dump.pl.in 2 Nov 2006 02:22:33 -0000 1.2 @@ -101,8 +101,8 @@ # installed in the operating system locations (e.g. /usr/lib /usr/lib/perl5) $prefix = "{{DS-ROOT}}"; -$ENV{'LD_LIBRARY_PATH'} = '$prefix at nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib'; -$ENV{'SHLIB_PATH'} = '$prefix at nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib'; +$ENV{'LD_LIBRARY_PATH'} = "$prefix at nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib"; +$ENV{'SHLIB_PATH'} = "$prefix at nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib"; $usage="Usage: $0 [-h host] [-p port] [-D bind-dn] [-w bind-password | -P bind-cert] [-r replica-roots] [-o output-file] [-c] [-v]\n\n $0 -i changelog-ldif-file-with-base64encoding [-o output-file] [-c]"; Index: template-db2bak.pl =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-db2bak.pl,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- template-db2bak.pl 25 Oct 2006 00:04:42 -0000 1.6 +++ template-db2bak.pl 2 Nov 2006 02:22:33 -0000 1.7 @@ -115,9 +115,9 @@ $entry = "${dn}${misc}${cn}${nsarchivedir}${nsdbtype}"; $vstr = ""; if ($verbose != 0) { $vstr = "-v"; } -$ENV{'PATH'} = '$prefix/usr/lib/mozldap6:$prefix/usr/lib:/usr/lib/mozldap6:/usr/lib'; -$ENV{'LD_LIBRARY_PATH'} = '$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib'; -$ENV{'SHLIB_PATH'} = '$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib'; +$ENV{'PATH'} = "$prefix/usr/lib/mozldap6:$prefix/usr/bin:/usr/lib/mozldap6:/usr/bin"; +$ENV{'LD_LIBRARY_PATH'} = "$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib"; +$ENV{'SHLIB_PATH'} = "$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib"; open(FOO, "| ldapmodify $vstr -h {{SERVER-NAME}} -p {{SERVER-PORT}} -D \"$rootdn\" -w \"$passwd\" -a" ); print(FOO "$entry"); close(FOO); Index: template-db2bak.pl.in =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-db2bak.pl.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- template-db2bak.pl.in 25 Oct 2006 20:36:46 -0000 1.1 +++ template-db2bak.pl.in 2 Nov 2006 02:22:33 -0000 1.2 @@ -115,9 +115,9 @@ $entry = "${dn}${misc}${cn}${nsarchivedir}${nsdbtype}"; $vstr = ""; if ($verbose != 0) { $vstr = "-v"; } -$ENV{'PATH'} = '$prefix at ldapsdk_bindir@:$prefix/usr/lib:@ldapsdk_bindir@:/usr/lib'; -$ENV{'LD_LIBRARY_PATH'} = '$prefix at nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib'; -$ENV{'SHLIB_PATH'} = '$prefix at nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib'; +$ENV{'PATH'} = "$prefix at ldapsdk_bindir@:$prefix/usr/bin:@ldapsdk_bindir@:/usr/bin"; +$ENV{'LD_LIBRARY_PATH'} = "$prefix at nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib"; +$ENV{'SHLIB_PATH'} = "$prefix at nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib"; open(FOO, "| ldapmodify $vstr -h {{SERVER-NAME}} -p {{SERVER-PORT}} -D \"$rootdn\" -w \"$passwd\" -a" ); print(FOO "$entry"); close(FOO); Index: template-db2index.pl =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-db2index.pl,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- template-db2index.pl 25 Oct 2006 00:04:42 -0000 1.7 +++ template-db2index.pl 2 Nov 2006 02:22:33 -0000 1.8 @@ -67,9 +67,9 @@ $prefix = "{{DS-ROOT}}"; -$ENV{'PATH'} = '$prefix/usr/lib/mozldap6:$prefix/usr/lib:/usr/lib/mozldap6:/usr/lib'; -$ENV{'LD_LIBRARY_PATH'} = '$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib'; -$ENV{'SHLIB_PATH'} = '$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib'; +$ENV{'PATH'} = "$prefix/usr/lib/mozldap6:$prefix/usr/bin:/usr/lib/mozldap6:/usr/bin"; +$ENV{'LD_LIBRARY_PATH'} = "$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib"; +$ENV{'SHLIB_PATH'} = "$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib"; $i = 0; while ($i <= $#ARGV) Index: template-db2index.pl.in =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-db2index.pl.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- template-db2index.pl.in 25 Oct 2006 20:36:46 -0000 1.1 +++ template-db2index.pl.in 2 Nov 2006 02:22:33 -0000 1.2 @@ -67,9 +67,9 @@ $prefix = "{{DS-ROOT}}"; -$ENV{'PATH'} = '$prefix at ldapsdk_bindir@:$prefix/usr/lib:@ldapsdk_bindir@:/usr/lib'; -$ENV{'LD_LIBRARY_PATH'} = '$prefix at nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib'; -$ENV{'SHLIB_PATH'} = '$prefix at nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib'; +$ENV{'PATH'} = "$prefix at ldapsdk_bindir@:$prefix/usr/bin:@ldapsdk_bindir@:/usr/bin"; +$ENV{'LD_LIBRARY_PATH'} = "$prefix at nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib"; +$ENV{'SHLIB_PATH'} = "$prefix at nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib"; $i = 0; while ($i <= $#ARGV) Index: template-db2ldif.pl =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-db2ldif.pl,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- template-db2ldif.pl 25 Oct 2006 00:04:42 -0000 1.6 +++ template-db2ldif.pl 2 Nov 2006 02:22:33 -0000 1.7 @@ -242,9 +242,9 @@ $entry = "${dn}${misc}${cn}${nsinstance}${nsincluded}${nsexcluded}${nsreplica}${nsnobase64}${nsnowrap}${nsnoversion}${nsnouniqueid}${nsuseid2entry}${nsonefile}${nsexportdecrypt}${nsprintkey}${nsldiffile}"; $vstr = ""; if ($verbose != 0) { $vstr = "-v"; } -$ENV{'PATH'} = '$prefix/usr/lib/mozldap6:$prefix/usr/lib:/usr/lib/mozldap6:/usr/lib'; -$ENV{'LD_LIBRARY_PATH'} = '$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib'; -$ENV{'SHLIB_PATH'} = '$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib'; +$ENV{'PATH'} = "$prefix/usr/lib/mozldap6:$prefix/usr/bin:/usr/lib/mozldap6:/usr/bin"; +$ENV{'LD_LIBRARY_PATH'} = "$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib"; +$ENV{'SHLIB_PATH'} = "$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib"; open(FOO, "| ldapmodify $vstr -h {{SERVER-NAME}} -p {{SERVER-PORT}} -D \"$rootdn\" -w \"$passwd\" -a" ); print(FOO "$entry"); close(FOO); Index: template-db2ldif.pl.in =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-db2ldif.pl.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- template-db2ldif.pl.in 25 Oct 2006 20:36:46 -0000 1.1 +++ template-db2ldif.pl.in 2 Nov 2006 02:22:33 -0000 1.2 @@ -242,9 +242,9 @@ $entry = "${dn}${misc}${cn}${nsinstance}${nsincluded}${nsexcluded}${nsreplica}${nsnobase64}${nsnowrap}${nsnoversion}${nsnouniqueid}${nsuseid2entry}${nsonefile}${nsexportdecrypt}${nsprintkey}${nsldiffile}"; $vstr = ""; if ($verbose != 0) { $vstr = "-v"; } -$ENV{'PATH'} = '$prefix at ldapsdk_bindir@:$prefix/usr/lib:@ldapsdk_bindir@:/usr/lib'; -$ENV{'LD_LIBRARY_PATH'} = '$prefix at nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib'; -$ENV{'SHLIB_PATH'} = '$prefix at nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib'; +$ENV{'PATH'} = "$prefix at ldapsdk_bindir@:$prefix/usr/bin:@ldapsdk_bindir@:/usr/bin"; +$ENV{'LD_LIBRARY_PATH'} = "$prefix at nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib"; +$ENV{'SHLIB_PATH'} = "$prefix at nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib"; open(FOO, "| ldapmodify $vstr -h {{SERVER-NAME}} -p {{SERVER-PORT}} -D \"$rootdn\" -w \"$passwd\" -a" ); print(FOO "$entry"); close(FOO); Index: template-ldif2db.pl =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-ldif2db.pl,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- template-ldif2db.pl 25 Oct 2006 00:04:42 -0000 1.6 +++ template-ldif2db.pl 2 Nov 2006 02:22:33 -0000 1.7 @@ -218,9 +218,9 @@ $entry = "${dn}${misc}${cn}${nsinstance}${nsincluded}${nsexcluded}${nsldiffiles}${nsnoattrindexes}${nsimportencrypt}${nsmergechunksiz}${nsgenuniqid}${nsuniqidname}"; $vstr = ""; if ($verbose != 0) { $vstr = "-v"; } -$ENV{'PATH'} = '$prefix/usr/lib/mozldap6:$prefix/usr/lib:/usr/lib/mozldap6:/usr/lib'; -$ENV{'LD_LIBRARY_PATH'} = '$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib'; -$ENV{'SHLIB_PATH'} = '$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib'; +$ENV{'PATH'} = "$prefix/usr/lib/mozldap6:$prefix/usr/bin:/usr/lib/mozldap6:/usr/bin"; +$ENV{'LD_LIBRARY_PATH'} = "$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib"; +$ENV{'SHLIB_PATH'} = "$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib"; open(FOO, "| ldapmodify $vstr -h {{SERVER-NAME}} -p {{SERVER-PORT}} -D \"$rootdn\" -w \"$passwd\" -a" ); print(FOO "$entry"); close(FOO); Index: template-ldif2db.pl.in =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-ldif2db.pl.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- template-ldif2db.pl.in 25 Oct 2006 20:36:46 -0000 1.1 +++ template-ldif2db.pl.in 2 Nov 2006 02:22:33 -0000 1.2 @@ -218,9 +218,9 @@ $entry = "${dn}${misc}${cn}${nsinstance}${nsincluded}${nsexcluded}${nsldiffiles}${nsnoattrindexes}${nsimportencrypt}${nsmergechunksiz}${nsgenuniqid}${nsuniqidname}"; $vstr = ""; if ($verbose != 0) { $vstr = "-v"; } -$ENV{'PATH'} = '$prefix at ldapsdk_bindir@:$prefix/usr/lib:@ldapsdk_bindir@:/usr/lib'; -$ENV{'LD_LIBRARY_PATH'} = '$prefix at nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib'; -$ENV{'SHLIB_PATH'} = '$prefix at nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib'; +$ENV{'PATH'} = "$prefix at ldapsdk_bindir@:$prefix/usr/bin:@ldapsdk_bindir@:/usr/bin"; +$ENV{'LD_LIBRARY_PATH'} = "$prefix at nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib"; +$ENV{'SHLIB_PATH'} = "$prefix at nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib"; open(FOO, "| ldapmodify $vstr -h {{SERVER-NAME}} -p {{SERVER-PORT}} -D \"$rootdn\" -w \"$passwd\" -a" ); print(FOO "$entry"); close(FOO); Index: template-ns-accountstatus.pl =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-ns-accountstatus.pl,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- template-ns-accountstatus.pl 25 Oct 2006 00:04:42 -0000 1.6 +++ template-ns-accountstatus.pl 2 Nov 2006 02:22:33 -0000 1.7 @@ -392,9 +392,9 @@ debug("Running ** $cmd ** $operation\n"); -$ENV{'PATH'} = '$prefix/usr/lib/mozldap6:$prefix/usr/lib:/usr/lib/mozldap6:/usr/lib'; -$ENV{'LD_LIBRARY_PATH'} = '$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib'; -$ENV{'SHLIB_PATH'} = '$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib'; +$ENV{'PATH'} = "$prefix/usr/lib/mozldap6:$prefix/usr/bin:/usr/lib/mozldap6:/usr/bin"; +$ENV{'LD_LIBRARY_PATH'} = "$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib"; +$ENV{'SHLIB_PATH'} = "$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib"; $ldapsearch="ldapsearch -1"; $ldapmodify="ldapmodify"; Index: template-ns-accountstatus.pl.in =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-ns-accountstatus.pl.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- template-ns-accountstatus.pl.in 25 Oct 2006 20:36:46 -0000 1.1 +++ template-ns-accountstatus.pl.in 2 Nov 2006 02:22:33 -0000 1.2 @@ -392,9 +392,9 @@ debug("Running ** $cmd ** $operation\n"); -$ENV{'PATH'} = '$prefix at ldapsdk_bindir@:$prefix/usr/lib:@ldapsdk_bindir@:/usr/lib'; -$ENV{'LD_LIBRARY_PATH'} = '$prefix at nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib'; -$ENV{'SHLIB_PATH'} = '$prefix at nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib'; +$ENV{'PATH'} = "$prefix at ldapsdk_bindir@:$prefix/usr/bin:@ldapsdk_bindir@:/usr/bin"; +$ENV{'LD_LIBRARY_PATH'} = "$prefix at nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib"; +$ENV{'SHLIB_PATH'} = "$prefix at nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib"; $ldapsearch="ldapsearch -1"; $ldapmodify="ldapmodify"; Index: template-ns-activate.pl =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-ns-activate.pl,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- template-ns-activate.pl 25 Oct 2006 00:04:42 -0000 1.6 +++ template-ns-activate.pl 2 Nov 2006 02:22:33 -0000 1.7 @@ -392,9 +392,9 @@ debug("Running ** $cmd ** $operation\n"); -$ENV{'PATH'} = '$prefix/usr/lib/mozldap6:$prefix/usr/lib:/usr/lib/mozldap6:/usr/lib'; -$ENV{'LD_LIBRARY_PATH'} = '$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib'; -$ENV{'SHLIB_PATH'} = '$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib'; +$ENV{'PATH'} = "$prefix/usr/lib/mozldap6:$prefix/usr/bin:/usr/lib/mozldap6:/usr/bin"; +$ENV{'LD_LIBRARY_PATH'} = "$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib"; +$ENV{'SHLIB_PATH'} = "$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib"; $ldapsearch="ldapsearch -1"; $ldapmodify="ldapmodify"; Index: template-ns-activate.pl.in =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-ns-activate.pl.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- template-ns-activate.pl.in 25 Oct 2006 20:36:46 -0000 1.1 +++ template-ns-activate.pl.in 2 Nov 2006 02:22:33 -0000 1.2 @@ -392,9 +392,9 @@ debug("Running ** $cmd ** $operation\n"); -$ENV{'PATH'} = '$prefix at ldapsdk_bindir@:$prefix/usr/lib:@ldapsdk_bindir@:/usr/lib'; -$ENV{'LD_LIBRARY_PATH'} = '$prefix at nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib'; -$ENV{'SHLIB_PATH'} = '$prefix at nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib'; +$ENV{'PATH'} = "$prefix at ldapsdk_bindir@:$prefix/usr/bin:@ldapsdk_bindir@:/usr/bin"; +$ENV{'LD_LIBRARY_PATH'} = "$prefix at nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib"; +$ENV{'SHLIB_PATH'} = "$prefix at nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib"; $ldapsearch="ldapsearch -1"; $ldapmodify="ldapmodify"; Index: template-ns-inactivate.pl =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-ns-inactivate.pl,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- template-ns-inactivate.pl 25 Oct 2006 00:04:42 -0000 1.6 +++ template-ns-inactivate.pl 2 Nov 2006 02:22:33 -0000 1.7 @@ -392,9 +392,9 @@ debug("Running ** $cmd ** $operation\n"); -$ENV{'PATH'} = '$prefix/usr/lib/mozldap6:$prefix/usr/lib:/usr/lib/mozldap6:/usr/lib'; -$ENV{'LD_LIBRARY_PATH'} = '$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib'; -$ENV{'SHLIB_PATH'} = '$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib'; +$ENV{'PATH'} = "$prefix/usr/lib/mozldap6:$prefix/usr/bin:/usr/lib/mozldap6:/usr/bin"; +$ENV{'LD_LIBRARY_PATH'} = "$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib"; +$ENV{'SHLIB_PATH'} = "$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib"; $ldapsearch="ldapsearch -1"; $ldapmodify="ldapmodify"; Index: template-ns-inactivate.pl.in =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-ns-inactivate.pl.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- template-ns-inactivate.pl.in 25 Oct 2006 20:36:46 -0000 1.1 +++ template-ns-inactivate.pl.in 2 Nov 2006 02:22:33 -0000 1.2 @@ -392,9 +392,9 @@ debug("Running ** $cmd ** $operation\n"); -$ENV{'PATH'} = '$prefix at ldapsdk_bindir@:$prefix/usr/lib:@ldapsdk_bindir@:/usr/lib'; -$ENV{'LD_LIBRARY_PATH'} = '$prefix at nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib'; -$ENV{'SHLIB_PATH'} = '$prefix at nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib'; +$ENV{'PATH'} = "$prefix at ldapsdk_bindir@:$prefix/usr/bin:@ldapsdk_bindir@:/usr/bin"; +$ENV{'LD_LIBRARY_PATH'} = "$prefix at nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib"; +$ENV{'SHLIB_PATH'} = "$prefix at nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib"; $ldapsearch="ldapsearch -1"; $ldapmodify="ldapmodify"; Index: template-ns-newpwpolicy.pl =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-ns-newpwpolicy.pl,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- template-ns-newpwpolicy.pl 25 Oct 2006 20:36:46 -0000 1.7 +++ template-ns-newpwpolicy.pl 2 Nov 2006 02:22:33 -0000 1.8 @@ -44,9 +44,9 @@ # installed in the operating system locations (e.g. /usr/lib /usr/lib/perl5) $prefix = "{{DS-ROOT}}"; -$ENV{'PATH'} = '$prefix/usr/lib/mozldap6:$prefix/usr/lib:/usr/lib/mozldap6:/usr/lib'; -$ENV{'LD_LIBRARY_PATH'} = '$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib'; -$ENV{'SHLIB_PATH'} = '$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib'; +$ENV{'PATH'} = "$prefix/usr/lib/mozldap6:$prefix/usr/bin:/usr/lib/mozldap6:/usr/bin"; +$ENV{'LD_LIBRARY_PATH'} = "$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib"; +$ENV{'SHLIB_PATH'} = "$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib"; # Add new password policy specific entries ############################################################################# Index: template-ns-newpwpolicy.pl.in =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-ns-newpwpolicy.pl.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- template-ns-newpwpolicy.pl.in 25 Oct 2006 20:36:46 -0000 1.1 +++ template-ns-newpwpolicy.pl.in 2 Nov 2006 02:22:33 -0000 1.2 @@ -44,9 +44,9 @@ # installed in the operating system locations (e.g. /usr/lib /usr/lib/perl5) $prefix = "{{DS-ROOT}}"; -$ENV{'PATH'} = '$prefix at ldapsdk_bindir@:$prefix/usr/lib:@ldapsdk_bindir@:/usr/lib'; -$ENV{'LD_LIBRARY_PATH'} = '$prefix at nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib'; -$ENV{'SHLIB_PATH'} = '$prefix at nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib'; +$ENV{'PATH'} = "$prefix at ldapsdk_bindir@:$prefix/usr/bin:@ldapsdk_bindir@:/usr/bin"; +$ENV{'LD_LIBRARY_PATH'} = "$prefix at nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib"; +$ENV{'SHLIB_PATH'} = "$prefix at nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib"; # Add new password policy specific entries ############################################################################# Index: template-repl-monitor-cgi.pl =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-repl-monitor-cgi.pl,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- template-repl-monitor-cgi.pl 25 Oct 2006 20:36:46 -0000 1.7 +++ template-repl-monitor-cgi.pl 2 Nov 2006 02:22:33 -0000 1.8 @@ -58,9 +58,9 @@ $siteroot = $cgiVars{'siteroot'}; $prefix = "{{DS-ROOT}}"; -$ENV{'PATH'} = '$prefix/usr/lib/mozldap6:$prefix/usr/lib:/usr/lib/mozldap6:/usr/lib'; -$ENV{'LD_LIBRARY_PATH'} = '$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib'; -$ENV{'SHLIB_PATH'} = '$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib'; +$ENV{'PATH'} = "$prefix/usr/lib/mozldap6:$prefix/usr/bin:/usr/lib/mozldap6:/usr/bin"; +$ENV{'LD_LIBRARY_PATH'} = "$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib"; +$ENV{'SHLIB_PATH'} = "$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec:/usr/lib"; # Save user-specified parameters as cookies in monreplication.properties. # Sync up with the property file so that monreplication2 is interval, and Index: template-repl-monitor-cgi.pl.in =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-repl-monitor-cgi.pl.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- template-repl-monitor-cgi.pl.in 25 Oct 2006 20:36:46 -0000 1.1 +++ template-repl-monitor-cgi.pl.in 2 Nov 2006 02:22:33 -0000 1.2 @@ -58,9 +58,9 @@ $siteroot = $cgiVars{'siteroot'}; $prefix = "{{DS-ROOT}}"; -$ENV{'PATH'} = '$prefix at ldapsdk_bindir@:$prefix/usr/lib:@ldapsdk_bindir@:/usr/lib'; -$ENV{'LD_LIBRARY_PATH'} = '$prefix at nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib'; -$ENV{'SHLIB_PATH'} = '$prefix at nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib'; +$ENV{'PATH'} = "$prefix at ldapsdk_bindir@:$prefix/usr/bin:@ldapsdk_bindir@:/usr/bin"; +$ENV{'LD_LIBRARY_PATH'} = "$prefix at nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib"; +$ENV{'SHLIB_PATH'} = "$prefix at nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib"; # Save user-specified parameters as cookies in monreplication.properties. # Sync up with the property file so that monreplication2 is interval, and Index: template-verify-db.pl =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-verify-db.pl,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- template-verify-db.pl 25 Oct 2006 20:36:46 -0000 1.7 +++ template-verify-db.pl 2 Nov 2006 02:22:33 -0000 1.8 @@ -111,12 +111,11 @@ # get dirs having DBVERSION my $dbdirs = getDbDir("."); -my $brand_ds = {{DS-BRAND}}; my $prefix = "{{DS-ROOT}}"; -$ENV{'PATH'} = '$prefix/usr/bin:$prefix/usr/lib:/usr/bin:/usr/lib'; -$ENV{'LD_LIBRARY_PATH'} = ':/usr/lib'; -$ENV{'SHLIB_PATH'} = ':/usr/lib'; +$ENV{'PATH'} = "$prefix/usr/bin:$prefix/usr/bin:/usr/bin:/usr/bin"; +$ENV{'LD_LIBRARY_PATH'} = ":/usr/lib"; +$ENV{'SHLIB_PATH'} = ":/usr/lib"; for (my $i = 0; $i < @$dbdirs; $i++) { Index: template-verify-db.pl.in =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-verify-db.pl.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- template-verify-db.pl.in 26 Oct 2006 17:45:28 -0000 1.2 +++ template-verify-db.pl.in 2 Nov 2006 02:22:33 -0000 1.3 @@ -113,9 +113,9 @@ my $dbdirs = getDbDir("."); my $prefix = "{{DS-ROOT}}"; -$ENV{'PATH'} = '$prefix at db_bindir@:$prefix/usr/lib:@db_bindir@:/usr/lib'; -$ENV{'LD_LIBRARY_PATH'} = '@db_libdir@:/usr/lib'; -$ENV{'SHLIB_PATH'} = '@db_libdir@:/usr/lib'; +$ENV{'PATH'} = "$prefix at db_bindir@:$prefix/usr/bin:@db_bindir@:/usr/bin"; +$ENV{'LD_LIBRARY_PATH'} = "@db_libdir@:/usr/lib"; +$ENV{'SHLIB_PATH'} = "@db_libdir@:/usr/lib"; for (my $i = 0; $i < @$dbdirs; $i++) { From fedora-directory-commits at redhat.com Thu Nov 2 03:11:43 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 1 Nov 2006 20:11:43 -0700 Subject: [Fedora-directory-commits] ldapserver/wrappers dbscan.in, 1.1, 1.2 ds_newinst.in, 1.1, 1.2 dsktune.in, 1.1, 1.2 infadd.in, 1.1, 1.2 ldap-agent.in, 1.1, 1.2 ldclt.in, 1.1, 1.2 ldif.in, 1.1, 1.2 migratecred.in, 1.1, 1.2 mmldif.in, 1.1, 1.2 pwdhash.in, 1.1, 1.2 rsearch.in, 1.1, 1.2 Message-ID: <200611020311.kA23BhAV003307@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/wrappers In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3235/ldapserver/wrappers Modified Files: dbscan.in ds_newinst.in dsktune.in infadd.in ldap-agent.in ldclt.in ldif.in migratecred.in mmldif.in pwdhash.in rsearch.in Log Message: Bug(s) fixed: 213352 Bug Description: autotools: support redhat/fedora rpmbuild %configure and %makeinstall Reviewed by: nhosoi (Thanks!) Fix Description: The standard way to do an rpmbuild on fedora/redhat is to use the %configure macro in the %prep section of the spec file and the %makeinstall macro in the %install section. These set all of the bindir, libdir, datadir, sysconfdir, etc. paths used by the application. %configure sets them to their "real" runtime locations e.g. /usr/lib, and %makeinstall sets them to their paths used for rpm packaging e.g. /var/tmp/fedora-ds-foo-bar-baz/usr/lib. There were a few places in our autotools files where we were running afoul of this. Another thing is that configure defines bindir etc. as literally '${exec_prefix}/bin' so that the real value doesn't get expanded until make or make install time. This means that we cannot create scripts from templates in configure, we have to do that in make. So this adds a sed command to Makefile.am in order to do all of the script and config file path replacement at make time. Since we do the subst this way, whatever $prefix is set during make will be incorporated into the value of $bindir etc. so we can omit directly referencing @prefix@ in the template files. Platforms tested: RHEL4 Flag Day: no Doc impact: no Index: dbscan.in =================================================================== RCS file: /cvs/dirsec/ldapserver/wrappers/dbscan.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dbscan.in 24 Oct 2006 21:11:07 -0000 1.1 +++ dbscan.in 2 Nov 2006 03:11:40 -0000 1.2 @@ -5,7 +5,7 @@ ############################################################################### LIB_DIR=@nspr_libdir@:@db_libdir@ -BIN_DIR=@prefix@@serverdir@ +BIN_DIR=@serverdir@ COMMAND=dbscan-bin Index: ds_newinst.in =================================================================== RCS file: /cvs/dirsec/ldapserver/wrappers/ds_newinst.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ds_newinst.in 24 Oct 2006 21:11:07 -0000 1.1 +++ ds_newinst.in 2 Nov 2006 03:11:40 -0000 1.2 @@ -4,8 +4,8 @@ ## (1) Specify variables used by this script. ## ############################################################################### -LIB_DIR=@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@:@prefix@@serverdir@ -BIN_DIR=@prefix@@serverdir@ +LIB_DIR=@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@:@serverdir@ +BIN_DIR=@serverdir@ COMMAND=ds_newinst-bin Index: dsktune.in =================================================================== RCS file: /cvs/dirsec/ldapserver/wrappers/dsktune.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dsktune.in 24 Oct 2006 21:11:07 -0000 1.1 +++ dsktune.in 2 Nov 2006 03:11:40 -0000 1.2 @@ -5,7 +5,7 @@ ############################################################################### LIB_DIR= -BIN_DIR=@prefix@@serverdir@ +BIN_DIR=@serverdir@ COMMAND=dsktune-bin Index: infadd.in =================================================================== RCS file: /cvs/dirsec/ldapserver/wrappers/infadd.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- infadd.in 24 Oct 2006 21:11:07 -0000 1.1 +++ infadd.in 2 Nov 2006 03:11:40 -0000 1.2 @@ -5,7 +5,7 @@ ############################################################################### LIB_DIR=@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@ -BIN_DIR=@prefix@@bindir@ +BIN_DIR=@bindir@ COMMAND=infadd-bin Index: ldap-agent.in =================================================================== RCS file: /cvs/dirsec/ldapserver/wrappers/ldap-agent.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ldap-agent.in 24 Oct 2006 21:11:07 -0000 1.1 +++ ldap-agent.in 2 Nov 2006 03:11:40 -0000 1.2 @@ -5,7 +5,7 @@ ############################################################################### LIB_DIR=@netsnmp_libdir@ -BIN_DIR=@prefix@@serverdir@ +BIN_DIR=@serverdir@ COMMAND=ldap-agent-bin Index: ldclt.in =================================================================== RCS file: /cvs/dirsec/ldapserver/wrappers/ldclt.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ldclt.in 24 Oct 2006 21:11:07 -0000 1.1 +++ ldclt.in 2 Nov 2006 03:11:40 -0000 1.2 @@ -5,7 +5,7 @@ ############################################################################### LIB_DIR=@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@ -BIN_DIR=@prefix@@bindir@ +BIN_DIR=@bindir@ COMMAND=ldclt-bin Index: ldif.in =================================================================== RCS file: /cvs/dirsec/ldapserver/wrappers/ldif.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ldif.in 24 Oct 2006 21:11:07 -0000 1.1 +++ ldif.in 2 Nov 2006 03:11:40 -0000 1.2 @@ -5,7 +5,7 @@ ############################################################################### LIB_DIR=@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@ -BIN_DIR=@prefix@@serverdir@ +BIN_DIR=@serverdir@ COMMAND=ldif-bin Index: migratecred.in =================================================================== RCS file: /cvs/dirsec/ldapserver/wrappers/migratecred.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- migratecred.in 24 Oct 2006 21:11:07 -0000 1.1 +++ migratecred.in 2 Nov 2006 03:11:40 -0000 1.2 @@ -5,7 +5,7 @@ ############################################################################### LIB_DIR=@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@ -BIN_DIR=@prefix@@serverdir@ +BIN_DIR=@serverdir@ COMMAND=migratecred-bin Index: mmldif.in =================================================================== RCS file: /cvs/dirsec/ldapserver/wrappers/mmldif.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mmldif.in 24 Oct 2006 21:11:07 -0000 1.1 +++ mmldif.in 2 Nov 2006 03:11:40 -0000 1.2 @@ -5,7 +5,7 @@ ############################################################################### LIB_DIR=@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@ -BIN_DIR=@prefix@@serverdir@ +BIN_DIR=@serverdir@ COMMAND=mmldif-bin Index: pwdhash.in =================================================================== RCS file: /cvs/dirsec/ldapserver/wrappers/pwdhash.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pwdhash.in 24 Oct 2006 21:11:07 -0000 1.1 +++ pwdhash.in 2 Nov 2006 03:11:40 -0000 1.2 @@ -5,7 +5,7 @@ ############################################################################### LIB_DIR=@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@ -BIN_DIR=@prefix@@serverdir@ +BIN_DIR=@serverdir@ COMMAND=pwdhash-bin Index: rsearch.in =================================================================== RCS file: /cvs/dirsec/ldapserver/wrappers/rsearch.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rsearch.in 24 Oct 2006 21:11:07 -0000 1.1 +++ rsearch.in 2 Nov 2006 03:11:40 -0000 1.2 @@ -5,7 +5,7 @@ ############################################################################### LIB_DIR=@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@ -BIN_DIR=@prefix@@bindir@ +BIN_DIR=@bindir@ COMMAND=rsearch-bin From fedora-directory-commits at redhat.com Thu Nov 2 03:11:42 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 1 Nov 2006 20:11:42 -0700 Subject: [Fedora-directory-commits] ldapserver Makefile.am, 1.8, 1.9 Makefile.in, 1.9, 1.10 aclocal.m4, 1.2, 1.3 compile, 1.1, 1.2 config.guess, 1.1, 1.2 config.sub, 1.1, 1.2 configure, 1.6, 1.7 configure.ac, 1.6, 1.7 depcomp, 1.1, 1.2 install-sh, 1.1, 1.2 missing, 1.1, 1.2 Message-ID: <200611020311.kA23BgOQ003290@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3235/ldapserver Modified Files: Makefile.am Makefile.in aclocal.m4 compile config.guess config.sub configure configure.ac depcomp install-sh missing Log Message: Bug(s) fixed: 213352 Bug Description: autotools: support redhat/fedora rpmbuild %configure and %makeinstall Reviewed by: nhosoi (Thanks!) Fix Description: The standard way to do an rpmbuild on fedora/redhat is to use the %configure macro in the %prep section of the spec file and the %makeinstall macro in the %install section. These set all of the bindir, libdir, datadir, sysconfdir, etc. paths used by the application. %configure sets them to their "real" runtime locations e.g. /usr/lib, and %makeinstall sets them to their paths used for rpm packaging e.g. /var/tmp/fedora-ds-foo-bar-baz/usr/lib. There were a few places in our autotools files where we were running afoul of this. Another thing is that configure defines bindir etc. as literally '${exec_prefix}/bin' so that the real value doesn't get expanded until make or make install time. This means that we cannot create scripts from templates in configure, we have to do that in make. So this adds a sed command to Makefile.am in order to do all of the script and config file path replacement at make time. Since we do the subst this way, whatever $prefix is set during make will be incorporated into the value of $bindir etc. so we can omit directly referencing @prefix@ in the template files. Platforms tested: RHEL4 Flag Day: no Doc impact: no Index: Makefile.am =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.am,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Makefile.am 26 Oct 2006 17:45:27 -0000 1.8 +++ Makefile.am 2 Nov 2006 03:11:39 -0000 1.9 @@ -44,14 +44,13 @@ #------------------------ # Install Paths #------------------------ -bindir = @prefix@@bindir@ -configdir = @sysconfdir@@configdir@ -datadir = @prefix@@datadir@ -propertydir = @sysconfdir@@propertydir@ -schemadir = @sysconfdir@@schemadir@ -serverdir = @prefix@@serverdir@ -serverplugindir = @prefix@@serverplugindir@ -taskdir = @sysconfdir@@scripttemplatedir@ +configdir = $(sysconfdir)@configdir@ +sampledatadir = $(datadir)@sampledatadir@ +propertydir = $(sysconfdir)@propertydir@ +schemadir = $(sysconfdir)@schemadir@ +serverdir = $(libdir)@serverdir@ +serverplugindir = $(libdir)@serverplugindir@ +taskdir = $(sysconfdir)@scripttemplatedir@ #------------------------ # Build Products @@ -83,7 +82,7 @@ config_DATA = $(srcdir)/lib/ldaputil/certmap.conf \ $(srcdir)/ldap/schema/slapd-collations.conf -data_DATA = $(srcdir)/ldap/ldif/Ace.ldif \ +sampledata_DATA = $(srcdir)/ldap/ldif/Ace.ldif \ $(srcdir)/ldap/ldif/commonTasks.ldif \ $(srcdir)/ldap/ldif/European.ldif \ $(srcdir)/ldap/ldif/Eurosuffix.ldif \ @@ -882,3 +881,31 @@ rsearch_bin_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@ rsearch_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) + +# these are for the config files and scripts that we need to generate and replace +# the paths and other tokens with the real values set during configure/make +# note that we cannot just use AC_OUTPUT to do this for us, since it will do things like this: +# LD_LIBRARY_PATH = ${prefix}/lib/fedora-ds +# i.e. it literally copies in '${prefix}' rather than expanding it out - we want this instead: +# LD_LIBRARY_PATH = /usr/lib/fedora-ds +fixupcmd = sed \ + -e 's, at bindir\@,$(bindir),g' \ + -e 's, at libdir\@,$(libdir),g' \ + -e 's, at nspr_libdir\@,$(nspr_libdir),g' \ + -e 's, at nss_libdir\@,$(nss_libdir),g' \ + -e 's, at ldapsdk_libdir\@,$(ldapsdk_libdir),g' \ + -e 's, at ldapsdk_bindir\@,$(ldapsdk_bindir),g' \ + -e 's, at db_libdir\@,$(db_libdir),g' \ + -e 's, at db_bindir\@,$(db_bindir),g' \ + -e 's, at sasl_libdir\@,$(sasl_libdir),g' \ + -e 's, at netsnmp_libdir\@,$(netsnmp_libdir),g' \ + -e 's, at propertydir\@,$(propertydir),g' \ + -e 's, at datadir\@,$(datadir),g' \ + -e 's, at schemadir\@,$(schemadir),g' \ + -e 's, at serverdir\@,$(serverdir),g' \ + -e 's, at serverplugindir\@,$(serverplugindir),g' \ + -e 's, at taskdir\@,$(taskdir),g' \ + -e 's, at configdir\@,$(configdir),g' + +% : %.in + $(fixupcmd) $^ > $@ View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.9 -r 1.10 Makefile.in Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.in,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Makefile.in 26 Oct 2006 22:23:03 -0000 1.9 +++ Makefile.in 2 Nov 2006 03:11:39 -0000 1.10 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.2 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,8 +18,6 @@ -SOURCES = $(libavl_a_SOURCES) $(libldaputil_a_SOURCES) $(libacl_plugin_la_SOURCES) $(libattr_unique_plugin_la_SOURCES) $(libback_ldbm_la_SOURCES) $(libchainingdb_plugin_la_SOURCES) $(libcollation_plugin_la_SOURCES) $(libcos_plugin_la_SOURCES) $(libdes_plugin_la_SOURCES) $(libdistrib_plugin_la_SOURCES) $(libds_admin_la_SOURCES) $(libhttp_client_plugin_la_SOURCES) $(libns_dshttpd_la_SOURCES) $(libpam_passthru_plugin_la_SOURCES) $(libpassthru_plugin_la_SOURCES) $(libpresence_plugin_la_SOURCES) $(libpwdstorage_plugin_la_SOURCES) $(libreferint_plugin_la_SOURCES) $(libreplication_plugin_la_SOURCES) $(libretrocl_plugin_la_SOURCES) $(libroles_plugin_la_SOURCES) $(libslapd_la_SOURCES) $(libstatechange_plugin_la_SOURCES) $(libsyntax_plugin_la_SOURCES) $(libviews_plugin_la_SOURCES) $(dbscan_bin_SOURCES) $(ds_newinst_bin_SOURCES) $(dsktune_bin_SOURCES) $(infadd_bin_SOURCES) $(ldap_agent_bin_SOURCES) $(ldclt_bin_SOURCES) $(ldif_bin_SOURCES) $(makstrdb_SOURCES) $(migratecred_bin_SOURCES)! $(mmldif_bin_SOURCES) $(ns_slapd_SOURCES) $(pwdhash_bin_SOURCES) $(rsearch_bin_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -51,44 +49,8 @@ noinst_PROGRAMS = makstrdb$(EXEEXT) @SOLARIS_TRUE at am__append_1 = ldap/servers/slapd/tools/ldclt/opCheck.c DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/configure \ - $(top_srcdir)/ldap/admin/src/scripts/template-bak2db.in \ - $(top_srcdir)/ldap/admin/src/scripts/template-bak2db.pl.in \ - $(top_srcdir)/ldap/admin/src/scripts/template-cl-dump.pl.in \ - $(top_srcdir)/ldap/admin/src/scripts/template-db2bak.in \ - $(top_srcdir)/ldap/admin/src/scripts/template-db2bak.pl.in \ - $(top_srcdir)/ldap/admin/src/scripts/template-db2index.in \ - $(top_srcdir)/ldap/admin/src/scripts/template-db2index.pl.in \ - $(top_srcdir)/ldap/admin/src/scripts/template-db2ldif.in \ - $(top_srcdir)/ldap/admin/src/scripts/template-db2ldif.pl.in \ - $(top_srcdir)/ldap/admin/src/scripts/template-ldif2db.in \ - $(top_srcdir)/ldap/admin/src/scripts/template-ldif2db.pl.in \ - $(top_srcdir)/ldap/admin/src/scripts/template-ldif2ldap.in \ - $(top_srcdir)/ldap/admin/src/scripts/template-monitor.in \ - $(top_srcdir)/ldap/admin/src/scripts/template-ns-accountstatus.pl.in \ - $(top_srcdir)/ldap/admin/src/scripts/template-ns-activate.pl.in \ - $(top_srcdir)/ldap/admin/src/scripts/template-ns-inactivate.pl.in \ - $(top_srcdir)/ldap/admin/src/scripts/template-ns-newpwpolicy.pl.in \ - $(top_srcdir)/ldap/admin/src/scripts/template-repl-monitor-cgi.pl.in \ - $(top_srcdir)/ldap/admin/src/scripts/template-repl-monitor.pl.in \ - $(top_srcdir)/ldap/admin/src/scripts/template-restoreconfig.in \ - $(top_srcdir)/ldap/admin/src/scripts/template-saveconfig.in \ - $(top_srcdir)/ldap/admin/src/scripts/template-start-slapd.in \ - $(top_srcdir)/ldap/admin/src/scripts/template-stop-slapd.in \ - $(top_srcdir)/ldap/admin/src/scripts/template-suffix2instance.in \ - $(top_srcdir)/ldap/admin/src/scripts/template-verify-db.pl.in \ - $(top_srcdir)/ldap/admin/src/scripts/template-vlvindex.in \ - $(top_srcdir)/wrappers/dbscan.in \ - $(top_srcdir)/wrappers/ds_newinst.in \ - $(top_srcdir)/wrappers/dsktune.in \ - $(top_srcdir)/wrappers/infadd.in \ - $(top_srcdir)/wrappers/ldap-agent.in \ - $(top_srcdir)/wrappers/ldclt.in $(top_srcdir)/wrappers/ldif.in \ - $(top_srcdir)/wrappers/migratecred.in \ - $(top_srcdir)/wrappers/mmldif.in \ - $(top_srcdir)/wrappers/pwdhash.in \ - $(top_srcdir)/wrappers/rsearch.in compile config.guess \ - config.sub depcomp install-sh ltmain.sh missing + $(srcdir)/Makefile.in $(top_srcdir)/configure compile \ + config.guess config.sub depcomp install-sh ltmain.sh missing subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/nspr.m4 $(top_srcdir)/m4/nss.m4 \ @@ -101,36 +63,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno configure.status.lineno mkinstalldirs = $(install_sh) -d -CONFIG_CLEAN_FILES = wrappers/dbscan wrappers/dsktune \ - wrappers/ds_newinst wrappers/infadd wrappers/ldap-agent \ - wrappers/ldclt wrappers/ldif wrappers/migratecred \ - wrappers/mmldif wrappers/pwdhash wrappers/rsearch \ - ldap/admin/src/scripts/template-bak2db \ - ldap/admin/src/scripts/template-db2bak \ - ldap/admin/src/scripts/template-db2index \ - ldap/admin/src/scripts/template-db2ldif \ - ldap/admin/src/scripts/template-ldif2db \ - ldap/admin/src/scripts/template-ldif2ldap \ - ldap/admin/src/scripts/template-monitor \ - ldap/admin/src/scripts/template-restoreconfig \ - ldap/admin/src/scripts/template-saveconfig \ - ldap/admin/src/scripts/template-start-slapd \ - ldap/admin/src/scripts/template-stop-slapd \ - ldap/admin/src/scripts/template-suffix2instance \ - ldap/admin/src/scripts/template-vlvindex \ - ldap/admin/src/scripts/template-bak2db.pl \ - ldap/admin/src/scripts/template-cl-dump.pl \ - ldap/admin/src/scripts/template-db2bak.pl \ - ldap/admin/src/scripts/template-db2index.pl \ - ldap/admin/src/scripts/template-db2ldif.pl \ - ldap/admin/src/scripts/template-ldif2db.pl \ - ldap/admin/src/scripts/template-ns-accountstatus.pl \ - ldap/admin/src/scripts/template-ns-activate.pl \ - ldap/admin/src/scripts/template-ns-inactivate.pl \ - ldap/admin/src/scripts/template-ns-newpwpolicy.pl \ - ldap/admin/src/scripts/template-repl-monitor-cgi.pl \ - ldap/admin/src/scripts/template-repl-monitor.pl \ - ldap/admin/src/scripts/template-verify-db.pl +CONFIG_CLEAN_FILES = LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = cru libavl_a_AR = $(AR) $(ARFLAGS) @@ -160,8 +93,8 @@ "$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" \ "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(bindir)" \ "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(taskdir)" \ - "$(DESTDIR)$(configdir)" "$(DESTDIR)$(datadir)" \ - "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(schemadir)" + "$(DESTDIR)$(configdir)" "$(DESTDIR)$(propertydir)" \ + "$(DESTDIR)$(sampledatadir)" "$(DESTDIR)$(schemadir)" serverLTLIBRARIES_INSTALL = $(INSTALL) serverpluginLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(server_LTLIBRARIES) $(serverplugin_LTLIBRARIES) @@ -739,19 +672,19 @@ am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \ +LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \ +LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \ +CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(libavl_a_SOURCES) $(libldaputil_a_SOURCES) \ $(libacl_plugin_la_SOURCES) \ @@ -802,10 +735,10 @@ $(ns_slapd_SOURCES) $(pwdhash_bin_SOURCES) \ $(rsearch_bin_SOURCES) configDATA_INSTALL = $(INSTALL_DATA) -dataDATA_INSTALL = $(INSTALL_DATA) nodist_propertyDATA_INSTALL = $(INSTALL_DATA) +sampledataDATA_INSTALL = $(INSTALL_DATA) schemaDATA_INSTALL = $(INSTALL_DATA) -DATA = $(config_DATA) $(data_DATA) $(nodist_property_DATA) \ +DATA = $(config_DATA) $(nodist_property_DATA) $(sampledata_DATA) \ $(schema_DATA) ETAGS = etags CTAGS = ctags @@ -898,18 +831,18 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ - -#------------------------ -# Install Paths -#------------------------ -bindir = @prefix@@bindir@ +bindir = @bindir@ build = @build@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ -configdir = @sysconfdir@@configdir@ -datadir = @prefix@@datadir@ + +#------------------------ +# Install Paths +#------------------------ +configdir = $(sysconfdir)@configdir@ +datadir = @datadir@ db_bindir = @db_bindir@ db_inc = @db_inc@ db_incdir = @db_incdir@ @@ -951,15 +884,16 @@ platform_defs = @platform_defs@ prefix = @prefix@ program_transform_name = @program_transform_name@ -propertydir = @sysconfdir@@propertydir@ +propertydir = $(sysconfdir)@propertydir@ +sampledatadir = $(datadir)@sampledatadir@ sasl_inc = @sasl_inc@ sasl_lib = @sasl_lib@ sasl_libdir = @sasl_libdir@ sbindir = @sbindir@ -schemadir = @sysconfdir@@schemadir@ +schemadir = $(sysconfdir)@schemadir@ [...3377 lines suppressed...] + at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-plist.lo `test -f 'lib/base/plist.cpp' || echo '$(srcdir)/'`lib/base/plist.cpp lib/base/libns_dshttpd_la-pool.lo: lib/base/pool.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-pool.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Tpo" -c -o lib/base/libns_dshttpd_la-pool.lo `test -f 'lib/base/pool.cpp' || echo '$(srcdir)/'`lib/base/pool.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-pool.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Tpo" -c -o lib/base/libns_dshttpd_la-pool.lo `test -f 'lib/base/pool.cpp' || echo '$(srcdir)/'`lib/base/pool.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/pool.cpp' object='lib/base/libns_dshttpd_la-pool.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-pool.lo `test -f 'lib/base/pool.cpp' || echo '$(srcdir)/'`lib/base/pool.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-pool.lo `test -f 'lib/base/pool.cpp' || echo '$(srcdir)/'`lib/base/pool.cpp lib/base/libns_dshttpd_la-rwlock.lo: lib/base/rwlock.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-rwlock.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Tpo" -c -o lib/base/libns_dshttpd_la-rwlock.lo `test -f 'lib/base/rwlock.cpp' || echo '$(srcdir)/'`lib/base/rwlock.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-rwlock.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Tpo" -c -o lib/base/libns_dshttpd_la-rwlock.lo `test -f 'lib/base/rwlock.cpp' || echo '$(srcdir)/'`lib/base/rwlock.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/rwlock.cpp' object='lib/base/libns_dshttpd_la-rwlock.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-rwlock.lo `test -f 'lib/base/rwlock.cpp' || echo '$(srcdir)/'`lib/base/rwlock.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-rwlock.lo `test -f 'lib/base/rwlock.cpp' || echo '$(srcdir)/'`lib/base/rwlock.cpp lib/base/libns_dshttpd_la-shexp.lo: lib/base/shexp.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-shexp.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Tpo" -c -o lib/base/libns_dshttpd_la-shexp.lo `test -f 'lib/base/shexp.cpp' || echo '$(srcdir)/'`lib/base/shexp.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-shexp.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Tpo" -c -o lib/base/libns_dshttpd_la-shexp.lo `test -f 'lib/base/shexp.cpp' || echo '$(srcdir)/'`lib/base/shexp.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/shexp.cpp' object='lib/base/libns_dshttpd_la-shexp.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-shexp.lo `test -f 'lib/base/shexp.cpp' || echo '$(srcdir)/'`lib/base/shexp.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-shexp.lo `test -f 'lib/base/shexp.cpp' || echo '$(srcdir)/'`lib/base/shexp.cpp lib/base/libns_dshttpd_la-system.lo: lib/base/system.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-system.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Tpo" -c -o lib/base/libns_dshttpd_la-system.lo `test -f 'lib/base/system.cpp' || echo '$(srcdir)/'`lib/base/system.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-system.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Tpo" -c -o lib/base/libns_dshttpd_la-system.lo `test -f 'lib/base/system.cpp' || echo '$(srcdir)/'`lib/base/system.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/system.cpp' object='lib/base/libns_dshttpd_la-system.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-system.lo `test -f 'lib/base/system.cpp' || echo '$(srcdir)/'`lib/base/system.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-system.lo `test -f 'lib/base/system.cpp' || echo '$(srcdir)/'`lib/base/system.cpp lib/base/libns_dshttpd_la-systhr.lo: lib/base/systhr.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-systhr.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Tpo" -c -o lib/base/libns_dshttpd_la-systhr.lo `test -f 'lib/base/systhr.cpp' || echo '$(srcdir)/'`lib/base/systhr.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-systhr.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Tpo" -c -o lib/base/libns_dshttpd_la-systhr.lo `test -f 'lib/base/systhr.cpp' || echo '$(srcdir)/'`lib/base/systhr.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/systhr.cpp' object='lib/base/libns_dshttpd_la-systhr.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-systhr.lo `test -f 'lib/base/systhr.cpp' || echo '$(srcdir)/'`lib/base/systhr.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-systhr.lo `test -f 'lib/base/systhr.cpp' || echo '$(srcdir)/'`lib/base/systhr.cpp lib/base/libns_dshttpd_la-util.lo: lib/base/util.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-util.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Tpo" -c -o lib/base/libns_dshttpd_la-util.lo `test -f 'lib/base/util.cpp' || echo '$(srcdir)/'`lib/base/util.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-util.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Tpo" -c -o lib/base/libns_dshttpd_la-util.lo `test -f 'lib/base/util.cpp' || echo '$(srcdir)/'`lib/base/util.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/util.cpp' object='lib/base/libns_dshttpd_la-util.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-util.lo `test -f 'lib/base/util.cpp' || echo '$(srcdir)/'`lib/base/util.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-util.lo `test -f 'lib/base/util.cpp' || echo '$(srcdir)/'`lib/base/util.cpp mostlyclean-libtool: -rm -f *.lo @@ -8637,23 +8523,6 @@ echo " rm -f '$(DESTDIR)$(configdir)/$$f'"; \ rm -f "$(DESTDIR)$(configdir)/$$f"; \ done -install-dataDATA: $(data_DATA) - @$(NORMAL_INSTALL) - test -z "$(datadir)" || $(mkdir_p) "$(DESTDIR)$(datadir)" - @list='$(data_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datadir)/$$f'"; \ - $(dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/$$f"; \ - done - -uninstall-dataDATA: - @$(NORMAL_UNINSTALL) - @list='$(data_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(datadir)/$$f'"; \ - rm -f "$(DESTDIR)$(datadir)/$$f"; \ - done install-nodist_propertyDATA: $(nodist_property_DATA) @$(NORMAL_INSTALL) test -z "$(propertydir)" || $(mkdir_p) "$(DESTDIR)$(propertydir)" @@ -8671,6 +8540,23 @@ echo " rm -f '$(DESTDIR)$(propertydir)/$$f'"; \ rm -f "$(DESTDIR)$(propertydir)/$$f"; \ done +install-sampledataDATA: $(sampledata_DATA) + @$(NORMAL_INSTALL) + test -z "$(sampledatadir)" || $(mkdir_p) "$(DESTDIR)$(sampledatadir)" + @list='$(sampledata_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(sampledataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sampledatadir)/$$f'"; \ + $(sampledataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sampledatadir)/$$f"; \ + done + +uninstall-sampledataDATA: + @$(NORMAL_UNINSTALL) + @list='$(sampledata_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(sampledatadir)/$$f'"; \ + rm -f "$(DESTDIR)$(sampledatadir)/$$f"; \ + done install-schemaDATA: $(schema_DATA) @$(NORMAL_INSTALL) test -z "$(schemadir)" || $(mkdir_p) "$(DESTDIR)$(schemadir)" @@ -8740,7 +8626,7 @@ distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) - $(mkdir_p) $(distdir)/ldap/admin/src/scripts $(distdir)/m4 $(distdir)/wrappers + $(mkdir_p) $(distdir)/m4 @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ @@ -8870,7 +8756,7 @@ all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) \ $(DATA) installdirs: - for dir in "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(taskdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(datadir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(schemadir)"; do \ + for dir in "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(taskdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(sampledatadir)" "$(DESTDIR)$(schemadir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -8994,8 +8880,8 @@ info-am: -install-data-am: install-configDATA install-dataDATA \ - install-nodist_propertyDATA install-schemaDATA \ +install-data-am: install-configDATA install-nodist_propertyDATA \ + install-sampledataDATA install-schemaDATA \ install-serverLTLIBRARIES install-serverPROGRAMS \ install-serverSCRIPTS install-serverpluginLTLIBRARIES \ install-taskSCRIPTS @@ -9029,11 +8915,11 @@ ps-am: uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ - uninstall-configDATA uninstall-dataDATA uninstall-info-am \ - uninstall-nodist_propertyDATA uninstall-schemaDATA \ - uninstall-serverLTLIBRARIES uninstall-serverPROGRAMS \ - uninstall-serverSCRIPTS uninstall-serverpluginLTLIBRARIES \ - uninstall-taskSCRIPTS + uninstall-configDATA uninstall-info-am \ + uninstall-nodist_propertyDATA uninstall-sampledataDATA \ + uninstall-schemaDATA uninstall-serverLTLIBRARIES \ + uninstall-serverPROGRAMS uninstall-serverSCRIPTS \ + uninstall-serverpluginLTLIBRARIES uninstall-taskSCRIPTS .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ clean-binPROGRAMS clean-generic clean-libtool \ @@ -9045,21 +8931,22 @@ distclean-tags distcleancheck distdir distuninstallcheck dvi \ dvi-am html html-am info info-am install install-am \ install-binPROGRAMS install-binSCRIPTS install-configDATA \ - install-data install-data-am install-dataDATA install-exec \ - install-exec-am install-info install-info-am install-man \ - install-nodist_propertyDATA install-schemaDATA \ - install-serverLTLIBRARIES install-serverPROGRAMS \ - install-serverSCRIPTS install-serverpluginLTLIBRARIES \ - install-strip install-taskSCRIPTS installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-binPROGRAMS uninstall-binSCRIPTS \ - uninstall-configDATA uninstall-dataDATA uninstall-info-am \ - uninstall-nodist_propertyDATA uninstall-schemaDATA \ - uninstall-serverLTLIBRARIES uninstall-serverPROGRAMS \ - uninstall-serverSCRIPTS uninstall-serverpluginLTLIBRARIES \ - uninstall-taskSCRIPTS + install-data install-data-am install-exec install-exec-am \ + install-info install-info-am install-man \ + install-nodist_propertyDATA install-sampledataDATA \ + install-schemaDATA install-serverLTLIBRARIES \ + install-serverPROGRAMS install-serverSCRIPTS \ + install-serverpluginLTLIBRARIES install-strip \ + install-taskSCRIPTS installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags uninstall uninstall-am \ + uninstall-binPROGRAMS uninstall-binSCRIPTS \ + uninstall-configDATA uninstall-info-am \ + uninstall-nodist_propertyDATA uninstall-sampledataDATA \ + uninstall-schemaDATA uninstall-serverLTLIBRARIES \ + uninstall-serverPROGRAMS uninstall-serverSCRIPTS \ + uninstall-serverpluginLTLIBRARIES uninstall-taskSCRIPTS dirver.h: Makefile @@ -9073,6 +8960,9 @@ #------------------------ ns-slapd.properties: makstrdb ./makstrdb + +% : %.in + $(fixupcmd) $^ > $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.2 -r 1.3 aclocal.m4 Index: aclocal.m4 =================================================================== RCS file: /cvs/dirsec/ldapserver/aclocal.m4,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- aclocal.m4 26 Oct 2006 22:23:03 -0000 1.2 +++ aclocal.m4 2 Nov 2006 03:11:39 -0000 1.3 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.9.2 -*- Autoconf -*- +# generated automatically by aclocal 1.9.6 -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,7 +13,7 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# serial 47 AC_PROG_LIBTOOL +# serial 48 AC_PROG_LIBTOOL # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) @@ -123,7 +123,7 @@ # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. -Xsed='sed -e s/^X//' +Xsed='sed -e 1s/^X//' [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] # Same as above, but do not quote variable references. @@ -143,7 +143,7 @@ default_ofile=libtool can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except M$VC, +# All known linkers require a `.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a ltmain="$ac_aux_dir/ltmain.sh" @@ -163,6 +163,7 @@ test -z "$AS" && AS=as test -z "$CC" && CC=cc test -z "$LTCC" && LTCC=$CC +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS test -z "$DLLTOOL" && DLLTOOL=dlltool test -z "$LD" && LD=ld test -z "$LN_S" && LN_S="ln -s" @@ -182,15 +183,17 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ;; *) - old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ;; esac old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" fi +_LT_CC_BASENAME([$compiler]) + # Only perform the check for file, if the check method requires it case $deplibs_check_method in file_magic*) @@ -231,11 +234,56 @@ # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + # Allow CC to be a program name with arguments. compiler=$CC ])# _LT_AC_SYS_COMPILER +# _LT_CC_BASENAME(CC) +# ------------------- +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +AC_DEFUN([_LT_CC_BASENAME], +[for cc_temp in $1""; do + case $cc_temp in + compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; + distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +]) + + +# _LT_COMPILER_BOILERPLATE +# ------------------------ +# Check for compiler boilerplate output or warnings with +# the simple compiler test code. +AC_DEFUN([_LT_COMPILER_BOILERPLATE], +[ac_outfile=conftest.$ac_objext +printf "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$rm conftest* +])# _LT_COMPILER_BOILERPLATE + + +# _LT_LINKER_BOILERPLATE +# ---------------------- +# Check for linker boilerplate output or warnings with +# the simple link test code. +AC_DEFUN([_LT_LINKER_BOILERPLATE], +[ac_outfile=conftest.$ac_objext +printf "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$rm conftest* +])# _LT_LINKER_BOILERPLATE + + # _LT_AC_SYS_LIBPATH_AIX # ---------------------- # Links a minimal program and checks the executable @@ -308,15 +356,15 @@ # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. -if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH if test -z "$ECHO"; then if test "X${echo_test_string+set}" != Xset; then # find a string as large as possible, as long as the shell can cope with it for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if (echo_test_string="`eval $cmd`") 2>/dev/null && - echo_test_string="`eval $cmd`" && + if (echo_test_string=`eval $cmd`) 2>/dev/null && + echo_test_string=`eval $cmd` && (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null then break @@ -485,7 +533,7 @@ # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case "`/usr/bin/file conftest.o`" in + case `/usr/bin/file conftest.o` in *32-bit*) case $host in x86_64-*linux*) @@ -536,6 +584,22 @@ CFLAGS="$SAVE_CFLAGS" fi ;; +sparc*-*solaris*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) LD="${LD-ld} -m elf64_sparc" ;; + *) LD="${LD-ld} -64" ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], [*-*-cygwin* | *-*-mingw* | *-*-pw32*) AC_CHECK_TOOL(DLLTOOL, dlltool, false) @@ -567,7 +631,7 @@ # with a dollar sign (not a hyphen), so the echo should work correctly. # The option is referenced via a variable to avoid confusing sed. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) @@ -577,8 +641,10 @@ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - if test ! -s conftest.err; then + # So say no if there are warnings other than the usual output. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 [...3307 lines suppressed...] +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 3 +# serial 4 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ @@ -6694,27 +7027,16 @@ fi ]) +# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + # AM_PROG_MKDIR_P # --------------- # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. - -# Copyright (C) 2003, 2004 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - +# # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories # created by `make install' are always world readable, even if the # installer happens to have an overly restrictive umask (e.g. 077). @@ -6768,26 +7090,15 @@ fi AC_SUBST([mkdir_p])]) -# Helper functions for option handling. -*- Autoconf -*- +# Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# serial 2 +# serial 3 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -6812,28 +7123,16 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# -# Check to make sure that the build environment is sane. -# - -# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# Check to make sure that the build environment is sane. -*- Autoconf -*- -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 4 # AM_SANITY_CHECK # --------------- @@ -6876,25 +7175,14 @@ fi AC_MSG_RESULT(yes)]) -# AM_PROG_INSTALL_STRIP - -# Copyright (C) 2001, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. +# AM_PROG_INSTALL_STRIP +# --------------------- # One issue with vendor `install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip @@ -6917,25 +7205,13 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 1 +# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. +# serial 2 # _AM_PROG_TAR(FORMAT) # -------------------- Index: compile =================================================================== RCS file: /cvs/dirsec/ldapserver/compile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- compile 17 Oct 2006 17:07:13 -0000 1.1 +++ compile 2 Nov 2006 03:11:39 -0000 1.2 @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand `-c -o'. -scriptversion=2004-09-10.20 +scriptversion=2005-05-14.22 -# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -18,7 +18,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -47,11 +47,11 @@ Report bugs to . EOF - exit 0 + exit $? ;; -v | --v*) echo "compile $scriptversion" - exit 0 + exit $? ;; esac @@ -125,6 +125,8 @@ if test -f "$cofile"; then mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + mv "${cofile}bj" "$ofile" fi rmdir "$lockdir" Index: config.guess =================================================================== RCS file: /cvs/dirsec/ldapserver/config.guess,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- config.guess 17 Oct 2006 17:07:13 -0000 1.1 +++ config.guess 2 Nov 2006 03:11:39 -0000 1.2 @@ -1,9 +1,9 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -timestamp='2004-09-07' +timestamp='2005-07-08' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -17,13 +17,15 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. + # Originally written by Per Bothner . # Please send patches to . Submit a context # diff and a properly formatted ChangeLog entry. @@ -53,7 +55,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -66,11 +68,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; + echo "$timestamp" ; exit ;; --version | -v ) - echo "$version" ; exit 0 ;; + echo "$version" ; exit ;; --help | --h* | -h ) - echo "$usage"; exit 0 ;; + echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -123,7 +125,7 @@ ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ;' +esac ; set_cc_for_build= ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi at noc.rutgers.edu 1994-08-24) @@ -196,55 +198,20 @@ # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" - exit 0 ;; - amd64:OpenBSD:*:*) - echo x86_64-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - cats:OpenBSD:*:*) - echo arm-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - luna88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mac68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - macppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvmeppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sgi:OpenBSD:*:*) - echo mips64-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sun3:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + exit ;; *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + exit ;; *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit 0 ;; + exit ;; macppc:MirBSD:*:*) echo powerppc-unknown-mirbsd${UNAME_RELEASE} - exit 0 ;; + exit ;; *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} - exit 0 ;; + exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -297,37 +264,43 @@ # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit 0 ;; + exit ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead # of the specific Alpha model? echo alpha-pc-interix - exit 0 ;; + exit ;; 21064:Windows_NT:50:3) echo alpha-dec-winnt3.5 - exit 0 ;; + exit ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 - exit 0;; + exit ;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos - exit 0 ;; + exit ;; *:[Mm]orph[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-morphos - exit 0 ;; + exit ;; *:OS/390:*:*) echo i370-ibm-openedition - exit 0 ;; + exit ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe + exit ;; *:OS400:*:*) echo powerpc-ibm-os400 - exit 0 ;; + exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} - exit 0;; + exit ;; + arm:riscos:*:*|arm:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp - exit 0;; + exit ;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. if test "`(/bin/universe) 2>/dev/null`" = att ; then @@ -335,32 +308,32 @@ else echo pyramid-pyramid-bsd fi - exit 0 ;; + exit ;; NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 - exit 0 ;; + exit ;; DRS?6000:unix:4.0:6*) echo sparc-icl-nx6 - exit 0 ;; - DRS?6000:UNIX_SV:4.2*:7*) + exit ;; + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7 && exit 0 ;; + sparc) echo sparc-icl-nx7; exit ;; esac ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; i86pc:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:*:*) case "`/usr/bin/arch -k`" in Series*|S4*) @@ -369,10 +342,10 @@ esac # Japanese Language versions have a version number like `4.1.3-JL'. echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit 0 ;; + exit ;; sun3*:SunOS:*:*) echo m68k-sun-sunos${UNAME_RELEASE} - exit 0 ;; + exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 @@ -384,10 +357,10 @@ echo sparc-sun-sunos${UNAME_RELEASE} ;; esac - exit 0 ;; + exit ;; aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} - exit 0 ;; + exit ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -398,40 +371,40 @@ # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) echo m68k-milan-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) echo m68k-hades-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} - exit 0 ;; + exit ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} - exit 0 ;; + exit ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 - exit 0 ;; + exit ;; RISC*:ULTRIX:*:*) echo mips-dec-ultrix${UNAME_RELEASE} - exit 0 ;; + exit ;; VAX*:ULTRIX*:*:*) echo vax-dec-ultrix${UNAME_RELEASE} - exit 0 ;; + exit ;; 2020:CLIX:*:* | 2430:CLIX:*:*) echo clipper-intergraph-clix${UNAME_RELEASE} - exit 0 ;; + exit ;; mips:*:*:UMIPS | mips:*:*:RISCos) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -455,32 +428,33 @@ exit (-1); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c \ - && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && exit 0 + $CC_FOR_BUILD -o $dummy $dummy.c && + dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`$dummy $dummyarg` && + { echo "$SYSTEM_NAME"; exit; } echo mips-mips-riscos${UNAME_RELEASE} - exit 0 ;; + exit ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax - exit 0 ;; + exit ;; Motorola:*:4.3:PL8-*) echo powerpc-harris-powermax - exit 0 ;; + exit ;; Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) echo powerpc-harris-powermax - exit 0 ;; + exit ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix - exit 0 ;; + exit ;; m88k:CX/UX:7*:*) echo m88k-harris-cxux7 - exit 0 ;; + exit ;; m88k:*:4*:R4*) echo m88k-motorola-sysv4 - exit 0 ;; + exit ;; m88k:*:3*:R3*) echo m88k-motorola-sysv3 - exit 0 ;; + exit ;; AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` @@ -496,29 +470,29 @@ else echo i586-dg-dgux${UNAME_RELEASE} fi - exit 0 ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 - exit 0 ;; + exit ;; M88*:*:R3*:*) # Delta 88k system running SVR3 echo m88k-motorola-sysv3 - exit 0 ;; + exit ;; XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) echo m88k-tektronix-sysv3 - exit 0 ;; + exit ;; Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) echo m68k-tektronix-bsd - exit 0 ;; + exit ;; *:IRIX*:*:*) echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit 0 ;; + exit ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' i*86:AIX:*:*) echo i386-ibm-aix - exit 0 ;; + exit ;; ia64:AIX:*:*) if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` @@ -526,7 +500,7 @@ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit 0 ;; + exit ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then eval $set_cc_for_build @@ -541,14 +515,18 @@ exit(0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 - echo rs6000-ibm-aix3.2.5 + if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + then + echo "$SYSTEM_NAME" + else + echo rs6000-ibm-aix3.2.5 + fi elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 else echo rs6000-ibm-aix3.2 fi - exit 0 ;; + exit ;; *:AIX:*:[45]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then @@ -562,28 +540,28 @@ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit 0 ;; + exit ;; *:AIX:*:*) echo rs6000-ibm-aix - exit 0 ;; + exit ;; ibmrt:4.4BSD:*|romp-ibm:BSD:*) echo romp-ibm-bsd4.4 - exit 0 ;; + exit ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit 0 ;; # report: romp-ibm BSD 4.3 + exit ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx - exit 0 ;; + exit ;; DPX/2?00:B.O.S.:*:*) echo m68k-bull-sysv3 - exit 0 ;; + exit ;; 9000/[34]??:4.3bsd:1.*:*) echo m68k-hp-bsd - exit 0 ;; + exit ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) echo m68k-hp-bsd4.4 - exit 0 ;; + exit ;; 9000/[34678]??:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` case "${UNAME_MACHINE}" in @@ -645,9 +623,19 @@ esac if [ ${HP_ARCH} = "hppa2.0w" ] then - # avoid double evaluation of $set_cc_for_build - test -n "$CC_FOR_BUILD" || eval $set_cc_for_build - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null + eval $set_cc_for_build + + # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating + # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler + # generating 64-bit code. GNU and HP use different nomenclature: + # + # $ CC_FOR_BUILD=cc ./config.guess + # => hppa2.0w-hp-hpux11.23 + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + grep __LP64__ >/dev/null then HP_ARCH="hppa2.0w" else @@ -655,11 +643,11 @@ fi fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit 0 ;; + exit ;; ia64:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` echo ia64-hp-hpux${HPUX_REV} - exit 0 ;; + exit ;; 3050*:HI-UX:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -687,158 +675,166 @@ exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 + $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } echo unknown-hitachi-hiuxwe2 - exit 0 ;; + exit ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) echo hppa1.1-hp-bsd - exit 0 ;; + exit ;; 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd - exit 0 ;; + exit ;; *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix - exit 0 ;; + exit ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) echo hppa1.1-hp-osf - exit 0 ;; + exit ;; hp8??:OSF1:*:*) echo hppa1.0-hp-osf - exit 0 ;; + exit ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then echo ${UNAME_MACHINE}-unknown-osf1mk else echo ${UNAME_MACHINE}-unknown-osf1 fi - exit 0 ;; + exit ;; parisc*:Lites*:*:*) echo hppa1.1-hp-lites - exit 0 ;; + exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit 0 ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit 0 ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit 0 ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit 0 ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit 0 ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*[A-Z]90:*:*:*) echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; *:UNICOS/mp:*:*) echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit 0 ;; + exit ;; 5000:UNIX_System_V:4.*:*) FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit 0 ;; + exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; sparc*:BSD/OS:*:*) echo sparc-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; *:BSD/OS:*:*) echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; *:FreeBSD:*:*) echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit 0 ;; + exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin - exit 0 ;; + exit ;; i*:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 - exit 0 ;; + exit ;; + i*:windows32*:*) + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 + exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 - exit 0 ;; + exit ;; x86:Interix*:[34]*) echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' - exit 0 ;; + exit ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks - exit 0 ;; + exit ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we # UNAME_MACHINE based on the output of uname instead of i386? echo i586-pc-interix - exit 0 ;; + exit ;; i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin - exit 0 ;; + exit ;; + amd64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; p*:CYGWIN*:*) echo powerpcle-unknown-cygwin - exit 0 ;; + exit ;; prep*:SunOS:5.*:*) echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; *:GNU:*:*) # the GNU system echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit 0 ;; + exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu - exit 0 ;; + exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix - exit 0 ;; + exit ;; arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; cris:Linux:*:*) echo cris-axis-linux-gnu - exit 0 ;; + exit ;; crisv32:Linux:*:*) echo crisv32-axis-linux-gnu - exit 0 ;; + exit ;; frv:Linux:*:*) echo frv-unknown-linux-gnu - exit 0 ;; + exit ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; m32r*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; mips:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -856,7 +852,7 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; mips64:Linux:*:*) eval $set_cc_for_build @@ -875,14 +871,14 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; ppc:Linux:*:*) echo powerpc-unknown-linux-gnu - exit 0 ;; + exit ;; ppc64:Linux:*:*) echo powerpc64-unknown-linux-gnu - exit 0 ;; + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -896,7 +892,7 @@ objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit 0 ;; + exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -904,25 +900,25 @@ PA8*) echo hppa2.0-unknown-linux-gnu ;; *) echo hppa-unknown-linux-gnu ;; esac - exit 0 ;; + exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) echo hppa64-unknown-linux-gnu - exit 0 ;; + exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux - exit 0 ;; + exit ;; sh64*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu - exit 0 ;; + exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent @@ -940,15 +936,15 @@ ;; a.out-i386-linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit 0 ;; + exit ;; coff-i386) echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit 0 ;; + exit ;; "") # Either a pre-BFD a.out linker (linux-gnuoldld) or # one that does not give us useful --help. echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit 0 ;; + exit ;; esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build @@ -976,15 +972,18 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 - test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 + test x"${LIBC}" != x && { + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + exit + } + test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both # sysname and nodename. echo i386-sequent-sysv4 - exit 0 ;; + exit ;; i*86:UNIX_SV:4.2MP:2.*) # Unixware is an offshoot of SVR4, but it has its own version # number series starting with 2... @@ -992,27 +991,27 @@ # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit 0 ;; + exit ;; i*86:OS/2:*:*) # If we were able to find `uname', then EMX Unix compatibility # is probably installed. echo ${UNAME_MACHINE}-pc-os2-emx - exit 0 ;; + exit ;; i*86:XTS-300:*:STOP) echo ${UNAME_MACHINE}-unknown-stop - exit 0 ;; + exit ;; i*86:atheos:*:*) echo ${UNAME_MACHINE}-unknown-atheos - exit 0 ;; - i*86:syllable:*:*) + exit ;; + i*86:syllable:*:*) echo ${UNAME_MACHINE}-pc-syllable - exit 0 ;; + exit ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; i*86:*DOS:*:*) echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit 0 ;; + exit ;; i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then @@ -1020,15 +1019,16 @@ else echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi - exit 0 ;; - i*86:*:5:[78]*) + exit ;; + i*86:*:5:[678]*) + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit 0 ;; + exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null 2>&1 ; then echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 fi - exit 0 ;; + exit ;; mini*:CTIX:SYS*5:*) # "miniframe" echo m68010-convergent-sysv - exit 0 ;; + exit ;; mc68k:UNIX:SYSTEM5:3.51m) echo m68k-convergent-sysv - exit 0 ;; + exit ;; M680?0:D-NIX:5.3:*) echo m68k-diab-dnix - exit 0 ;; + exit ;; M68*:*:R3V[5678]*:*) - test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; + test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4.3${OS_REL} && exit 0 + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4 && exit 0 ;; + && { echo i486-ncr-sysv4; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 - exit 0 ;; + exit ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} - exit 0 ;; + exit ;; RM*:ReliantUNIX-*:*:*) echo mips-sni-sysv4 - exit 0 ;; + exit ;; RM*:SINIX-*:*:*) echo mips-sni-sysv4 - exit 0 ;; + exit ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` @@ -1120,61 +1120,65 @@ else echo ns32k-sni-sysv fi - exit 0 ;; + exit ;; PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort # says echo i586-unisys-sysv4 - exit 0 ;; + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm echo hppa1.1-stratus-sysv4 - exit 0 ;; + exit ;; *:*:*:FTX*) # From seanf at swdc.stratus.com. echo i860-stratus-sysv4 - exit 0 ;; + exit ;; + i*86:VOS:*:*) + # From Paul.Green at stratus.com. + echo ${UNAME_MACHINE}-stratus-vos + exit ;; *:VOS:*:*) # From Paul.Green at stratus.com. echo hppa1.1-stratus-vos - exit 0 ;; + exit ;; mc68*:A/UX:*:*) echo m68k-apple-aux${UNAME_RELEASE} - exit 0 ;; + exit ;; news*:NEWS-OS:6*:*) echo mips-sony-newsos6 - exit 0 ;; + exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then echo mips-nec-sysv${UNAME_RELEASE} else echo mips-unknown-sysv${UNAME_RELEASE} fi - exit 0 ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos - exit 0 ;; + exit ;; BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. echo powerpc-apple-beos - exit 0 ;; + exit ;; BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos - exit 0 ;; + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; SX-5:SUPER-UX:*:*) echo sx5-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Rhapsody:*:*) echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown case $UNAME_PROCESSOR in @@ -1182,7 +1186,7 @@ unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit 0 ;; + exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` if test "$UNAME_PROCESSOR" = "x86"; then @@ -1190,22 +1194,25 @@ UNAME_MACHINE=pc fi echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit 0 ;; + exit ;; *:QNX:*:4*) echo i386-pc-qnx - exit 0 ;; + exit ;; + NSE-?:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} - exit 0 ;; + exit ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux - exit 0 ;; + exit ;; BS2000:POSIX*:*:*) echo bs2000-siemens-sysv - exit 0 ;; + exit ;; DS/*:UNIX_System_V:*:*) echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 @@ -1216,38 +1223,44 @@ UNAME_MACHINE="$cputype" fi echo ${UNAME_MACHINE}-unknown-plan9 - exit 0 ;; + exit ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 - exit 0 ;; + exit ;; *:TENEX:*:*) echo pdp10-unknown-tenex - exit 0 ;; + exit ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) echo pdp10-dec-tops20 - exit 0 ;; + exit ;; XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) echo pdp10-xkl-tops20 - exit 0 ;; + exit ;; *:TOPS-20:*:*) echo pdp10-unknown-tops20 - exit 0 ;; + exit ;; *:ITS:*:*) echo pdp10-unknown-its - exit 0 ;; + exit ;; SEI:*:*:SEIUX) echo mips-sei-seiux${UNAME_RELEASE} - exit 0 ;; + exit ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit 0 ;; + exit ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms && exit 0 ;; - I*) echo ia64-dec-vms && exit 0 ;; - V*) echo vax-dec-vms && exit 0 ;; - esac + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; + V*) echo vax-dec-vms ; exit ;; + esac ;; + *:XENIX:*:SysV) + echo i386-pc-xenix + exit ;; + i*86:skyos:*:*) + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1279,7 +1292,7 @@ #endif #if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix"); exit (0); + printf ("arm-acorn-riscix\n"); exit (0); #endif #if defined (hp300) && !defined (hpux) @@ -1368,11 +1381,12 @@ } EOF -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } # Apollos put the system type in the environment. -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } # Convex versions that predate uname can use getsysinfo(1) @@ -1381,22 +1395,22 @@ case `getsysinfo -f cpu_type` in c1*) echo c1-convex-bsd - exit 0 ;; + exit ;; c2*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit 0 ;; + exit ;; c34*) echo c34-convex-bsd - exit 0 ;; + exit ;; c38*) echo c38-convex-bsd - exit 0 ;; + exit ;; c4*) echo c4-convex-bsd - exit 0 ;; + exit ;; esac fi @@ -1407,7 +1421,9 @@ the operating system you are using. It is advised that you download the most up to date version of the config scripts from - ftp://ftp.gnu.org/pub/gnu/config/ + http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess +and + http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub If the version you run ($0) is already up to date, please send the following data and any information you think might be Index: config.sub =================================================================== RCS file: /cvs/dirsec/ldapserver/config.sub,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- config.sub 17 Oct 2006 17:07:13 -0000 1.1 +++ config.sub 2 Nov 2006 03:11:39 -0000 1.2 @@ -1,9 +1,9 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -timestamp='2004-08-29' +timestamp='2005-07-08' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,14 +21,15 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. - +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. +# # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. + # Please send patches to . Submit a context # diff and a properly formatted ChangeLog entry. # @@ -70,7 +71,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -83,11 +84,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; + echo "$timestamp" ; exit ;; --version | -v ) - echo "$version" ; exit 0 ;; + echo "$version" ; exit ;; --help | --h* | -h ) - echo "$usage"; exit 0 ;; + echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -99,7 +100,7 @@ *local*) # First pass through any local machine types. echo $1 - exit 0;; + exit ;; * ) break ;; @@ -231,13 +232,14 @@ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ + | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | m32r | m32rle | m68000 | m68k | m88k | mcore \ + | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -246,6 +248,7 @@ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ | mipsisa64 | mipsisa64el \ @@ -254,23 +257,28 @@ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | ms1 \ | msp430 \ | ns16k | ns32k \ - | openrisc | or32 \ + | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ + | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b \ | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xscale | xstormy16 | xtensa \ + | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; + m32c) + basic_machine=$basic_machine-unknown + ;; m6811 | m68hc11 | m6812 | m68hc12) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown @@ -298,7 +306,7 @@ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* \ - | bs2000-* \ + | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ @@ -310,7 +318,7 @@ | ip2k-* | iq2000-* \ | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | mcore-* \ + | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -319,6 +327,7 @@ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ | mipsisa64-* | mipsisa64el-* \ @@ -327,6 +336,7 @@ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ + | ms1-* \ | msp430-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ @@ -334,20 +344,23 @@ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ + | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ - | xtensa-* \ + | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ + | xstormy16-* | xtensa-* \ | ymp-* \ | z8k-*) ;; + m32c-*) + ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) @@ -489,6 +502,10 @@ basic_machine=m88k-motorola os=-sysv3 ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; dpx20 | dpx20-*) basic_machine=rs6000-bull os=-bosx @@ -754,9 +771,8 @@ basic_machine=hppa1.1-oki os=-proelf ;; - or32 | or32-*) + openrisc | openrisc-*) basic_machine=or32-unknown - os=-coff ;; os400) basic_machine=powerpc-ibm @@ -1029,6 +1045,10 @@ basic_machine=hppa1.1-winbond os=-proelf ;; + xbox) + basic_machine=i686-pc + os=-mingw32 + ;; xps | xps100) basic_machine=xps100-honeywell ;; @@ -1078,12 +1098,9 @@ we32k) basic_machine=we32k-att ;; - sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) + sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sh64) - basic_machine=sh64-unknown - ;; sparc | sparcv8 | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; @@ -1170,7 +1187,8 @@ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | -haiku*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1188,7 +1206,7 @@ os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; -mac*) @@ -1297,6 +1315,9 @@ -kaos*) os=-kaos ;; + -zvmoe) + os=-zvmoe + ;; -none) ;; *) @@ -1374,6 +1395,9 @@ *-be) os=-beos ;; + *-haiku) + os=-haiku + ;; *-ibm) os=-aix ;; @@ -1545,7 +1569,7 @@ esac echo $basic_machine$os -exit 0 +exit # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.6 -r 1.7 configure Index: configure =================================================================== RCS file: /cvs/dirsec/ldapserver/configure,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- configure 26 Oct 2006 22:23:03 -0000 1.6 +++ configure 2 Nov 2006 03:11:39 -0000 1.7 @@ -280,15 +280,15 @@ # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. -if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH if test -z "$ECHO"; then if test "X${echo_test_string+set}" != Xset; then # find a string as large as possible, as long as the shell can cope with it for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if (echo_test_string="`eval $cmd`") 2>/dev/null && - echo_test_string="`eval $cmd`" && + if (echo_test_string=`eval $cmd`) 2>/dev/null && + echo_test_string=`eval $cmd` && (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null then break @@ -465,7 +465,7 @@ #endif" ac_default_prefix=/opt/fedora-ds -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CX! XCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS platform_defs SOLARIS_TRUE SOLARIS_FALSE debug_defs PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir sasl_inc sasl_lib sasl_libdir svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link configdir propertydir schemadir serverdir serverplugindir scripttemplatedir WINNT_TRUE WINNT_FALSE LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CX! XCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS platform_defs SOLARIS_TRUE SOLARIS_FALSE debug_defs PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir sasl_inc sasl_lib sasl_libdir svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir WINNT_TRUE WINNT_FALSE LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -3820,7 +3820,7 @@ # Add /usr/xpg4/bin/sed as it is typically found on Solaris # along with /bin/sed that truncates output. for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && break + test ! -f $lt_ac_sed && continue cat /dev/null > conftest.in lt_ac_count=0 echo $ECHO_N "0123456789$ECHO_C" >conftest.in @@ -3845,10 +3845,10 @@ fi done done -SED=$lt_cv_path_SED fi +SED=$lt_cv_path_SED echo "$as_me:$LINENO: result: $SED" >&5 echo "${ECHO_T}$SED" >&6 @@ -3925,7 +3925,7 @@ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then lt_cv_path_LD="$ac_dir/$ac_prog" # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. + # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 &6 else - # I'd rather use --version here, but apparently some GNU ld's only accept -v. + # I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 &5 echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6 @@ -3999,36 +4008,43 @@ # Let the user override the test. lt_cv_path_NM="$NM" else - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/${ac_tool_prefix}nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) - lt_cv_path_NM="$tmp_nm -B" - break - ;; - *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in - */dev/null*) - lt_cv_path_NM="$tmp_nm -p" + lt_nm_to_check="${ac_tool_prefix}nm" + if test -n "$ac_tool_prefix" && test "$build" = "$host"; then + lt_nm_to_check="$lt_nm_to_check nm" + fi + for lt_tmp_nm in $lt_nm_to_check; do + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + tmp_nm="$ac_dir/$lt_tmp_nm" + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + # Check to see if the nm accepts a BSD-compat flag. + # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # nm: unknown option "B" ignored + # Tru64's nm complains that /dev/null is an invalid object file + case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in + */dev/null* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" break ;; *) - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" + break + ;; + *) + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but + continue # so that we can try to find one that supports BSD flags + ;; + esac ;; esac - esac - fi + fi + done + IFS="$lt_save_ifs" done - IFS="$lt_save_ifs" test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm fi fi @@ -4075,7 +4091,7 @@ lt_cv_deplibs_check_method=pass_all ;; -bsdi4*) +bsdi[45]*) lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' lt_cv_file_magic_cmd='/usr/bin/file -L' lt_cv_file_magic_test_file=/shlib/libc.so @@ -4098,13 +4114,13 @@ lt_cv_deplibs_check_method=pass_all ;; -freebsd* | kfreebsd*-gnu) +freebsd* | kfreebsd*-gnu | dragonfly*) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library' + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; @@ -4120,7 +4136,7 @@ hpux10.20* | hpux11*) lt_cv_file_magic_cmd=/usr/bin/file - case "$host_cpu" in + case $host_cpu in ia64*) lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so @@ -4136,6 +4152,11 @@ esac ;; +interix3*) + # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' [...8557 lines suppressed...] old_striplib striplib file_magic_cmd finish_cmds finish_eval \ @@ -18935,6 +18388,12 @@ # The host system. host_alias=$host_alias host=$host +host_os=$host_os + +# The build system. +build_alias=$build_alias +build=$build +build_os=$build_os # An echo program that does not interpret backslashes. echo=$lt_echo @@ -18946,6 +18405,9 @@ # A C compiler. LTCC=$lt_LTCC +# LTCC compiler flags. +LTCFLAGS=$lt_LTCFLAGS + # A language-specific compiler. CC=$lt_compiler_RC @@ -19011,7 +18473,7 @@ # Does compiler simultaneously support -c and -o options? compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC -# Must we lock files when doing compilation ? +# Must we lock files when doing compilation? need_locks=$lt_need_locks # Do we need the lib prefix for modules? @@ -24978,13 +24440,19 @@ # installation paths -bindir=/usr/bin +# relative to sysconfdir configdir=/fedora-ds/config -datadir=/usr/share/fedora-ds/data +# relative to datadir +sampledatadir=/fedora-ds/data +# relative to sysconfdir propertydir=/fedora-ds/property +# relative to sysconfdir schemadir=/fedora-ds/schema -serverdir=/usr/lib/fedora-ds -serverplugindir=/usr/lib/fedora-ds/plugins +# relative to libdir +serverdir=/fedora-ds +# relative to libdir +serverplugindir=/fedora-ds/plugins +# relative to sysconfdir scripttemplatedir=/fedora-ds/script-templates @@ -24994,7 +24462,6 @@ - # WINNT should be true if building on Windows system not using # cygnus, mingw, or the like and using cmd.exe as the shell @@ -25010,82 +24477,6 @@ ac_config_files="$ac_config_files Makefile" - ac_config_files="$ac_config_files wrappers/dbscan" - - ac_config_files="$ac_config_files wrappers/dsktune" - - ac_config_files="$ac_config_files wrappers/ds_newinst" - - ac_config_files="$ac_config_files wrappers/infadd" - - ac_config_files="$ac_config_files wrappers/ldap-agent" - - ac_config_files="$ac_config_files wrappers/ldclt" - - ac_config_files="$ac_config_files wrappers/ldif" - - ac_config_files="$ac_config_files wrappers/migratecred" - - ac_config_files="$ac_config_files wrappers/mmldif" - - ac_config_files="$ac_config_files wrappers/pwdhash" - - ac_config_files="$ac_config_files wrappers/rsearch" - - - ac_config_files="$ac_config_files ldap/admin/src/scripts/template-bak2db" - - ac_config_files="$ac_config_files ldap/admin/src/scripts/template-db2bak" - - ac_config_files="$ac_config_files ldap/admin/src/scripts/template-db2index" - - ac_config_files="$ac_config_files ldap/admin/src/scripts/template-db2ldif" - - ac_config_files="$ac_config_files ldap/admin/src/scripts/template-ldif2db" - - ac_config_files="$ac_config_files ldap/admin/src/scripts/template-ldif2ldap" - - ac_config_files="$ac_config_files ldap/admin/src/scripts/template-monitor" - - ac_config_files="$ac_config_files ldap/admin/src/scripts/template-restoreconfig" - - ac_config_files="$ac_config_files ldap/admin/src/scripts/template-saveconfig" - - ac_config_files="$ac_config_files ldap/admin/src/scripts/template-start-slapd" - - ac_config_files="$ac_config_files ldap/admin/src/scripts/template-stop-slapd" - - ac_config_files="$ac_config_files ldap/admin/src/scripts/template-suffix2instance" - - ac_config_files="$ac_config_files ldap/admin/src/scripts/template-vlvindex" - - - ac_config_files="$ac_config_files ldap/admin/src/scripts/template-bak2db.pl" - - ac_config_files="$ac_config_files ldap/admin/src/scripts/template-cl-dump.pl" - - ac_config_files="$ac_config_files ldap/admin/src/scripts/template-db2bak.pl" - - ac_config_files="$ac_config_files ldap/admin/src/scripts/template-db2index.pl" - - ac_config_files="$ac_config_files ldap/admin/src/scripts/template-db2ldif.pl" - - ac_config_files="$ac_config_files ldap/admin/src/scripts/template-ldif2db.pl" - - ac_config_files="$ac_config_files ldap/admin/src/scripts/template-ns-accountstatus.pl" - - ac_config_files="$ac_config_files ldap/admin/src/scripts/template-ns-activate.pl" - - ac_config_files="$ac_config_files ldap/admin/src/scripts/template-ns-inactivate.pl" - - ac_config_files="$ac_config_files ldap/admin/src/scripts/template-ns-newpwpolicy.pl" - - ac_config_files="$ac_config_files ldap/admin/src/scripts/template-repl-monitor-cgi.pl" - - ac_config_files="$ac_config_files ldap/admin/src/scripts/template-repl-monitor.pl" - - ac_config_files="$ac_config_files ldap/admin/src/scripts/template-verify-db.pl" - cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -25691,43 +25082,6 @@ case "$ac_config_target" in # Handling of arguments. "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "wrappers/dbscan" ) CONFIG_FILES="$CONFIG_FILES wrappers/dbscan" ;; - "wrappers/dsktune" ) CONFIG_FILES="$CONFIG_FILES wrappers/dsktune" ;; - "wrappers/ds_newinst" ) CONFIG_FILES="$CONFIG_FILES wrappers/ds_newinst" ;; - "wrappers/infadd" ) CONFIG_FILES="$CONFIG_FILES wrappers/infadd" ;; - "wrappers/ldap-agent" ) CONFIG_FILES="$CONFIG_FILES wrappers/ldap-agent" ;; - "wrappers/ldclt" ) CONFIG_FILES="$CONFIG_FILES wrappers/ldclt" ;; - "wrappers/ldif" ) CONFIG_FILES="$CONFIG_FILES wrappers/ldif" ;; - "wrappers/migratecred" ) CONFIG_FILES="$CONFIG_FILES wrappers/migratecred" ;; - "wrappers/mmldif" ) CONFIG_FILES="$CONFIG_FILES wrappers/mmldif" ;; - "wrappers/pwdhash" ) CONFIG_FILES="$CONFIG_FILES wrappers/pwdhash" ;; - "wrappers/rsearch" ) CONFIG_FILES="$CONFIG_FILES wrappers/rsearch" ;; - "ldap/admin/src/scripts/template-bak2db" ) CONFIG_FILES="$CONFIG_FILES ldap/admin/src/scripts/template-bak2db" ;; - "ldap/admin/src/scripts/template-db2bak" ) CONFIG_FILES="$CONFIG_FILES ldap/admin/src/scripts/template-db2bak" ;; - "ldap/admin/src/scripts/template-db2index" ) CONFIG_FILES="$CONFIG_FILES ldap/admin/src/scripts/template-db2index" ;; - "ldap/admin/src/scripts/template-db2ldif" ) CONFIG_FILES="$CONFIG_FILES ldap/admin/src/scripts/template-db2ldif" ;; - "ldap/admin/src/scripts/template-ldif2db" ) CONFIG_FILES="$CONFIG_FILES ldap/admin/src/scripts/template-ldif2db" ;; - "ldap/admin/src/scripts/template-ldif2ldap" ) CONFIG_FILES="$CONFIG_FILES ldap/admin/src/scripts/template-ldif2ldap" ;; - "ldap/admin/src/scripts/template-monitor" ) CONFIG_FILES="$CONFIG_FILES ldap/admin/src/scripts/template-monitor" ;; - "ldap/admin/src/scripts/template-restoreconfig" ) CONFIG_FILES="$CONFIG_FILES ldap/admin/src/scripts/template-restoreconfig" ;; - "ldap/admin/src/scripts/template-saveconfig" ) CONFIG_FILES="$CONFIG_FILES ldap/admin/src/scripts/template-saveconfig" ;; - "ldap/admin/src/scripts/template-start-slapd" ) CONFIG_FILES="$CONFIG_FILES ldap/admin/src/scripts/template-start-slapd" ;; - "ldap/admin/src/scripts/template-stop-slapd" ) CONFIG_FILES="$CONFIG_FILES ldap/admin/src/scripts/template-stop-slapd" ;; - "ldap/admin/src/scripts/template-suffix2instance" ) CONFIG_FILES="$CONFIG_FILES ldap/admin/src/scripts/template-suffix2instance" ;; - "ldap/admin/src/scripts/template-vlvindex" ) CONFIG_FILES="$CONFIG_FILES ldap/admin/src/scripts/template-vlvindex" ;; - "ldap/admin/src/scripts/template-bak2db.pl" ) CONFIG_FILES="$CONFIG_FILES ldap/admin/src/scripts/template-bak2db.pl" ;; - "ldap/admin/src/scripts/template-cl-dump.pl" ) CONFIG_FILES="$CONFIG_FILES ldap/admin/src/scripts/template-cl-dump.pl" ;; - "ldap/admin/src/scripts/template-db2bak.pl" ) CONFIG_FILES="$CONFIG_FILES ldap/admin/src/scripts/template-db2bak.pl" ;; - "ldap/admin/src/scripts/template-db2index.pl" ) CONFIG_FILES="$CONFIG_FILES ldap/admin/src/scripts/template-db2index.pl" ;; - "ldap/admin/src/scripts/template-db2ldif.pl" ) CONFIG_FILES="$CONFIG_FILES ldap/admin/src/scripts/template-db2ldif.pl" ;; - "ldap/admin/src/scripts/template-ldif2db.pl" ) CONFIG_FILES="$CONFIG_FILES ldap/admin/src/scripts/template-ldif2db.pl" ;; - "ldap/admin/src/scripts/template-ns-accountstatus.pl" ) CONFIG_FILES="$CONFIG_FILES ldap/admin/src/scripts/template-ns-accountstatus.pl" ;; - "ldap/admin/src/scripts/template-ns-activate.pl" ) CONFIG_FILES="$CONFIG_FILES ldap/admin/src/scripts/template-ns-activate.pl" ;; - "ldap/admin/src/scripts/template-ns-inactivate.pl" ) CONFIG_FILES="$CONFIG_FILES ldap/admin/src/scripts/template-ns-inactivate.pl" ;; - "ldap/admin/src/scripts/template-ns-newpwpolicy.pl" ) CONFIG_FILES="$CONFIG_FILES ldap/admin/src/scripts/template-ns-newpwpolicy.pl" ;; - "ldap/admin/src/scripts/template-repl-monitor-cgi.pl" ) CONFIG_FILES="$CONFIG_FILES ldap/admin/src/scripts/template-repl-monitor-cgi.pl" ;; - "ldap/admin/src/scripts/template-repl-monitor.pl" ) CONFIG_FILES="$CONFIG_FILES ldap/admin/src/scripts/template-repl-monitor.pl" ;; - "ldap/admin/src/scripts/template-verify-db.pl" ) CONFIG_FILES="$CONFIG_FILES ldap/admin/src/scripts/template-verify-db.pl" ;; "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} @@ -25917,6 +25271,7 @@ s, at netsnmp_libdir@,$netsnmp_libdir,;t t s, at netsnmp_link@,$netsnmp_link,;t t s, at configdir@,$configdir,;t t +s, at sampledatadir@,$sampledatadir,;t t s, at propertydir@,$propertydir,;t t s, at schemadir@,$schemadir,;t t s, at serverdir@,$serverdir,;t t Index: configure.ac =================================================================== RCS file: /cvs/dirsec/ldapserver/configure.ac,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- configure.ac 26 Oct 2006 22:23:03 -0000 1.6 +++ configure.ac 2 Nov 2006 03:11:39 -0000 1.7 @@ -125,17 +125,23 @@ AC_SUBST(netsnmp_link) # installation paths -bindir=/usr/bin +dnl bindir=/usr/bin +# relative to sysconfdir configdir=/fedora-ds/config -datadir=/usr/share/fedora-ds/data +# relative to datadir +sampledatadir=/fedora-ds/data +# relative to sysconfdir propertydir=/fedora-ds/property +# relative to sysconfdir schemadir=/fedora-ds/schema -serverdir=/usr/lib/fedora-ds -serverplugindir=/usr/lib/fedora-ds/plugins +# relative to libdir +serverdir=/fedora-ds +# relative to libdir +serverplugindir=/fedora-ds/plugins +# relative to sysconfdir scripttemplatedir=/fedora-ds/script-templates -AC_SUBST(bindir) AC_SUBST(configdir) -AC_SUBST(datadir) +AC_SUBST(sampledatadir) AC_SUBST(propertydir) AC_SUBST(schemadir) AC_SUBST(serverdir) @@ -147,44 +153,5 @@ AM_CONDITIONAL([WINNT], false) AC_CONFIG_FILES([Makefile]) -AC_CONFIG_FILES([wrappers/dbscan]) -AC_CONFIG_FILES([wrappers/dsktune]) -AC_CONFIG_FILES([wrappers/ds_newinst]) -AC_CONFIG_FILES([wrappers/infadd]) -AC_CONFIG_FILES([wrappers/ldap-agent]) -AC_CONFIG_FILES([wrappers/ldclt]) -AC_CONFIG_FILES([wrappers/ldif]) -AC_CONFIG_FILES([wrappers/migratecred]) -AC_CONFIG_FILES([wrappers/mmldif]) -AC_CONFIG_FILES([wrappers/pwdhash]) -AC_CONFIG_FILES([wrappers/rsearch]) - -AC_CONFIG_FILES([ldap/admin/src/scripts/template-bak2db]) -AC_CONFIG_FILES([ldap/admin/src/scripts/template-db2bak]) -AC_CONFIG_FILES([ldap/admin/src/scripts/template-db2index]) -AC_CONFIG_FILES([ldap/admin/src/scripts/template-db2ldif]) -AC_CONFIG_FILES([ldap/admin/src/scripts/template-ldif2db]) -AC_CONFIG_FILES([ldap/admin/src/scripts/template-ldif2ldap]) -AC_CONFIG_FILES([ldap/admin/src/scripts/template-monitor]) -AC_CONFIG_FILES([ldap/admin/src/scripts/template-restoreconfig]) -AC_CONFIG_FILES([ldap/admin/src/scripts/template-saveconfig]) -AC_CONFIG_FILES([ldap/admin/src/scripts/template-start-slapd]) -AC_CONFIG_FILES([ldap/admin/src/scripts/template-stop-slapd]) -AC_CONFIG_FILES([ldap/admin/src/scripts/template-suffix2instance]) -AC_CONFIG_FILES([ldap/admin/src/scripts/template-vlvindex]) - -AC_CONFIG_FILES([ldap/admin/src/scripts/template-bak2db.pl]) -AC_CONFIG_FILES([ldap/admin/src/scripts/template-cl-dump.pl]) -AC_CONFIG_FILES([ldap/admin/src/scripts/template-db2bak.pl]) -AC_CONFIG_FILES([ldap/admin/src/scripts/template-db2index.pl]) -AC_CONFIG_FILES([ldap/admin/src/scripts/template-db2ldif.pl]) -AC_CONFIG_FILES([ldap/admin/src/scripts/template-ldif2db.pl]) -AC_CONFIG_FILES([ldap/admin/src/scripts/template-ns-accountstatus.pl]) -AC_CONFIG_FILES([ldap/admin/src/scripts/template-ns-activate.pl]) -AC_CONFIG_FILES([ldap/admin/src/scripts/template-ns-inactivate.pl]) -AC_CONFIG_FILES([ldap/admin/src/scripts/template-ns-newpwpolicy.pl]) -AC_CONFIG_FILES([ldap/admin/src/scripts/template-repl-monitor-cgi.pl]) -AC_CONFIG_FILES([ldap/admin/src/scripts/template-repl-monitor.pl]) -AC_CONFIG_FILES([ldap/admin/src/scripts/template-verify-db.pl]) AC_OUTPUT Index: depcomp =================================================================== RCS file: /cvs/dirsec/ldapserver/depcomp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- depcomp 17 Oct 2006 17:07:13 -0000 1.1 +++ depcomp 2 Nov 2006 03:11:39 -0000 1.2 @@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2004-05-31.23 +scriptversion=2005-07-09.11 -# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -50,11 +50,11 @@ Report bugs to . EOF - exit 0 + exit $? ;; -v | --v*) echo "depcomp $scriptversion" - exit 0 + exit $? ;; esac @@ -287,36 +287,43 @@ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` if test "$libtool" = yes; then - # Dependencies are output in .lo.d with libtool 1.4. - # With libtool 1.5 they are output both in $dir.libs/$base.o.d - # and in $dir.libs/$base.o.d and $dir$base.o.d. We process the - # latter, because the former will be cleaned when $dir.libs is - # erased. - tmpdepfile1="$dir.libs/$base.lo.d" - tmpdepfile2="$dir$base.o.d" - tmpdepfile3="$dir.libs/$base.d" + # With Tru64 cc, shared objects can also be used to make a + # static library. This mecanism is used in libtool 1.4 series to + # handle both shared and static libraries in a single compilation. + # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. + # + # With libtool 1.5 this exception was removed, and libtool now + # generates 2 separate objects for the 2 libraries. These two + # compilations output dependencies in in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is + # automatically cleaned when .libs/ is deleted, while ignoring + # the former would cause a distcleancheck panic. + tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 + tmpdepfile2=$dir$base.o.d # libtool 1.5 + tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 + tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 "$@" -Wc,-MD else - tmpdepfile1="$dir$base.o.d" - tmpdepfile2="$dir$base.d" - tmpdepfile3="$dir$base.d" + tmpdepfile1=$dir$base.o.d + tmpdepfile2=$dir$base.d + tmpdepfile3=$dir$base.d + tmpdepfile4=$dir$base.d "$@" -MD fi stat=$? if test $stat -eq 0; then : else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" exit $stat fi - if test -f "$tmpdepfile1"; then - tmpdepfile="$tmpdepfile1" - elif test -f "$tmpdepfile2"; then - tmpdepfile="$tmpdepfile2" - else - tmpdepfile="$tmpdepfile3" - fi + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" + do + test -f "$tmpdepfile" && break + done if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" # That's a tab and a space in the []. @@ -460,7 +467,8 @@ done "$@" -E | - sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | + sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" Index: install-sh =================================================================== RCS file: /cvs/dirsec/ldapserver/install-sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- install-sh 17 Oct 2006 17:07:13 -0000 1.1 +++ install-sh 2 Nov 2006 03:11:39 -0000 1.2 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2004-09-10.20 +scriptversion=2005-05-14.22 # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -109,7 +109,7 @@ shift continue;; - --help) echo "$usage"; exit 0;; + --help) echo "$usage"; exit $?;; -m) chmodcmd="$chmodprog $2" shift @@ -134,7 +134,7 @@ shift continue;; - --version) echo "$0 $scriptversion"; exit 0;; + --version) echo "$0 $scriptversion"; exit $?;; *) # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. @@ -213,7 +213,7 @@ fi # This sed command emulates the dirname command. - dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` + dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` # Make sure that the destination directory exists. @@ -226,7 +226,8 @@ oIFS=$IFS # Some sh's can't handle IFS=/ for some reason. IFS='%' - set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` + set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` + shift IFS=$oIFS pathcomp= @@ -295,7 +296,7 @@ || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ || { echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 - (exit 1); exit + (exit 1); exit 1 } else : @@ -306,12 +307,12 @@ $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" } } - fi || { (exit 1); exit; } + fi || { (exit 1); exit 1; } done # The final little trick to "correctly" pass the exit status to the exit trap. { - (exit 0); exit + (exit 0); exit 0 } # Local variables: Index: missing =================================================================== RCS file: /cvs/dirsec/ldapserver/missing,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- missing 17 Oct 2006 17:07:13 -0000 1.1 +++ missing 2 Nov 2006 03:11:39 -0000 1.2 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2004-09-07.08 +scriptversion=2005-06-08.21 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. @@ -19,8 +19,8 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -87,12 +87,12 @@ yacc create \`y.tab.[ch]', if possible, from existing .[ch] Send bug reports to ." - exit 0 + exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) echo "missing $scriptversion (GNU Automake)" - exit 0 + exit $? ;; -*) @@ -288,11 +288,18 @@ call might also be the consequence of using a buggy \`make' (AIX, DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." + # The file to touch is that specified with -o ... file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` if test -z "$file"; then - file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file` - fi + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` + file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 touch $file ;; From fedora-directory-commits at redhat.com Fri Nov 3 00:53:57 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 2 Nov 2006 17:53:57 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/cm Makefile,1.66,1.67 Message-ID: <200611030053.kA30rv0q018068@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/cm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17811 Modified Files: Makefile Log Message: Fixed this problem on Solaris: Netscape Portable Runtime error -5977: ld.so.1: ns-slapd: fatal: libns-dshttpd72.so: open failed: No such file or directory Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- Makefile 25 Oct 2006 17:06:07 -0000 1.66 +++ Makefile 3 Nov 2006 00:53:55 -0000 1.67 @@ -312,7 +312,7 @@ # the httpd library ifneq ($(ARCH), WINNT) - $(INSTALL) -m 755 $(OBJDIR)/$(NSHTTPD_DLL)$(DLL_PRESUF).$(DLL_SUFFIX)* $(RELDIR)/$(DS_LIBDIR) + $(INSTALL) -m 755 $(OBJDIR)/$(NSHTTPD_DLL)$(DLL_PRESUF).$(DLL_SUFFIX)* $(LDAP_PLUGIN_RELDIR) endif # Images for IM Presence plugin @@ -1042,7 +1042,7 @@ then $(INSTALL) -m 755 $$file $(RELDIR)/$(DS_DSGWDIR) ; \ fi ; \ done - $(INSTALL) -m 755 $(OBJDIR)/$(BUILD_HTTPDLL_NAME).dll $(RELDIR)/$(DS_LIBDIR) + $(INSTALL) -m 755 $(OBJDIR)/$(BUILD_HTTPDLL_NAME).dll $(RELDIR)/$(DS_PLUGINDIR) $(INSTALL) -m 755 $(OBJDIR)/$(BUILD_HTTPDLL_NAME).dll $(RELDIR)/$(DS_DSGWDIR) rm -f $(SLAPD_ZIPFILE); cd $(RELDIR); zip -r $(SLAPD_ZIPFILE) * From fedora-directory-commits at redhat.com Fri Nov 3 17:40:32 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 3 Nov 2006 10:40:32 -0700 Subject: [Fedora-directory-commits] adminutil/lib/libadminutil admutil.c, 1.4, 1.5 Message-ID: <200611031740.kA3HeWk5029653@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/adminutil/lib/libadminutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29624/adminutil/lib/libadminutil Modified Files: admutil.c Log Message: Reviewed by: nhosoi (Thanks!) Fix Description: The logic in mod_admserv.c expects admldapBuildInfoSSL to return success but with a NULL ldap handle if no password was given or found. This is essentially what admldapBuildInfo does in the same situation. I also found and fixed a few memory leaks with both strings and LDAP handles. Platforms tested: FC5 Flag Day: no Doc impact: no Index: admutil.c =================================================================== RCS file: /cvs/dirsec/adminutil/lib/libadminutil/admutil.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- admutil.c 11 May 2006 23:30:31 -0000 1.4 +++ admutil.c 3 Nov 2006 17:40:29 -0000 1.5 @@ -1240,6 +1240,7 @@ case LDAP_INVALID_CREDENTIALS: case LDAP_INSUFFICIENT_ACCESS: /* authenticate failed: Should not continue */ + ldap_unbind(admInfo->ldapHndl); admInfo->ldapHndl = NULL; *errorcode = ADMUTIL_LDAP_ERR; break;; @@ -1247,6 +1248,7 @@ case LDAP_ALIAS_PROBLEM: case LDAP_INVALID_DN_SYNTAX: /* Not a good user DN */ + ldap_unbind(admInfo->ldapHndl); admInfo->ldapHndl = NULL; *errorcode = ADMUTIL_LDAP_ERR; break; From fedora-directory-commits at redhat.com Fri Nov 3 17:40:32 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 3 Nov 2006 10:40:32 -0700 Subject: [Fedora-directory-commits] adminutil/lib/libadmsslutil admsslutil.c, 1.4, 1.5 Message-ID: <200611031740.kA3HeWKr029659@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/adminutil/lib/libadmsslutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29624/adminutil/lib/libadmsslutil Modified Files: admsslutil.c Log Message: Reviewed by: nhosoi (Thanks!) Fix Description: The logic in mod_admserv.c expects admldapBuildInfoSSL to return success but with a NULL ldap handle if no password was given or found. This is essentially what admldapBuildInfo does in the same situation. I also found and fixed a few memory leaks with both strings and LDAP handles. Platforms tested: FC5 Flag Day: no Doc impact: no Index: admsslutil.c =================================================================== RCS file: /cvs/dirsec/adminutil/lib/libadmsslutil/admsslutil.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- admsslutil.c 24 Mar 2006 04:48:38 -0000 1.4 +++ admsslutil.c 3 Nov 2006 17:40:30 -0000 1.5 @@ -74,24 +74,37 @@ { LDAP *ld; int ldapError; + char *passwd = NULL; + char *host = NULL; *errorcode = ADMUTIL_OP_OK; + host = admldapGetHost(info); if (admldapGetSecurity(info)) - ld = ldapssl_init(admldapGetHost(info), admldapGetPort(info), 1); + ld = ldapssl_init(host, admldapGetPort(info), 1); else - ld = ldap_init(admldapGetHost(info), admldapGetPort(info)); + ld = ldap_init(host, admldapGetPort(info)); + PL_strfree(host); if (!ld) { *errorcode = ADMUTIL_LDAP_ERR; return 0; } + passwd = admldapGetSIEPWD(info); + if (passwd) { + char *dn = admldapGetSIEDN(info); + ldapError = ldap_simple_bind_s(ld, dn, passwd); + PL_strfree(dn); + PL_strfree(passwd); + } else { + /* no password means just punt rather than do anon bind */ + /* this mimics the same logic in admldapBuildInfoCbk() */ + *errorcode = ADMUTIL_LDAP_ERR; + return 1; /* have to return true here to mimic admldapBuildInfoCbk() */ + } /* authenticate to LDAP server*/ - if ((ldapError = ldap_simple_bind_s(ld, - admldapGetSIEDN(info), - admldapGetSIEPWD(info))) - != LDAP_SUCCESS ) { + if (ldapError != LDAP_SUCCESS) { #ifdef LDAP_DEBUG ldap_perror(ld, "ldap_simple_bind_s"); #endif @@ -100,12 +113,14 @@ case LDAP_INVALID_CREDENTIALS: case LDAP_INSUFFICIENT_ACCESS: /* authenticate failed: Should not continue */ + ldap_unbind(ld); *errorcode = ADMUTIL_LDAP_ERR; return 0; case LDAP_NO_SUCH_OBJECT: case LDAP_ALIAS_PROBLEM: case LDAP_INVALID_DN_SYNTAX: /* Not a good user DN */ + ldap_unbind(ld); *errorcode = ADMUTIL_LDAP_ERR; return 0; break; From fedora-directory-commits at redhat.com Fri Nov 3 17:41:13 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 3 Nov 2006 10:41:13 -0700 Subject: [Fedora-directory-commits] adminutil/lib/libadmsslutil admsslutil.c, 1.5, 1.6 Message-ID: <200611031741.kA3HfDpj029703@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/adminutil/lib/libadmsslutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29671/adminutil/lib/libadmsslutil Modified Files: admsslutil.c Log Message: Bug(s) fixed: 213788 Bug Description: Admin Server cannot talk to SSL Config DS Reviewed by: nhosoi (Thanks!) Fix Description: The logic in mod_admserv.c expects admldapBuildInfoSSL to return success but with a NULL ldap handle if no password was given or found. This is essentially what admldapBuildInfo does in the same situation. I also found and fixed a few memory leaks with both strings and LDAP handles. Platforms tested: FC5 Flag Day: no Doc impact: no From fedora-directory-commits at redhat.com Fri Nov 3 17:41:08 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 3 Nov 2006 10:41:08 -0700 Subject: [Fedora-directory-commits] adminutil/lib/libadminutil admutil.c, 1.5, 1.6 Message-ID: <200611031741.kA3Hfcph029706@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/adminutil/lib/libadminutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29671/adminutil/lib/libadminutil Modified Files: admutil.c Log Message: Bug(s) fixed: 213788 Bug Description: Admin Server cannot talk to SSL Config DS Reviewed by: nhosoi (Thanks!) Fix Description: The logic in mod_admserv.c expects admldapBuildInfoSSL to return success but with a NULL ldap handle if no password was given or found. This is essentially what admldapBuildInfo does in the same situation. I also found and fixed a few memory leaks with both strings and LDAP handles. Platforms tested: FC5 Flag Day: no Doc impact: no From fedora-directory-commits at redhat.com Fri Nov 3 19:09:59 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 3 Nov 2006 12:09:59 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/cm/newinst setup, 1.15, 1.16 Message-ID: <200611031909.kA3J9xvw003982@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/cm/newinst In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3965 Modified Files: setup Log Message: Bug(s) fixed: 213786 Bug Description: upgrade install of ssl enabled servers changes file/dir permisssions from nobody to root Reviewed by: nhosoi (Thanks!) Fix Description: The ssloff and sslon operations change several files, by grep/sed to temp files, then moving the temp files over the original ones. When done as root, this changes the file ownership to root from the original nobody. In order to preserve the file/directory ownership, we first figure out the instance, then use the ownership of that dse.ldif file to determine the server user:group. We have to do this before the call to SSLOff because SSLOff needs the user:group to chown the files. Then, every time we create a new file and replace an existing one, we do a chown $user:$group to preserve the existing file ownership. Platforms tested: RHEL4 Flag Day: no Doc impact: no Index: setup =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/setup,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- setup 23 Feb 2006 19:30:41 -0000 1.15 +++ setup 3 Nov 2006 19:09:57 -0000 1.16 @@ -157,6 +157,10 @@ tmpinffile= nextisinffile= keepinffile= +# set by user or from existing files during upgrade +user= +# set by user or from existing files during upgrade +group= for arg in "$@" ; do if [ "$arg" = "-s" ]; then silent=1 @@ -227,6 +231,7 @@ echo $conffile=$security >> $tmpfile cat $conffile | sed -e "s/^\($security\) .*/\1 off/g" > $conffile.01 mv $conffile.01 $conffile + chown $user:$group $conffile echo "$conffile: SSL off ..." fi fi @@ -248,6 +253,7 @@ echo $conffile=$confparam >> $tmpfile cat $conffile | sed -e "s/\([Ss][Ee][Cc][Uu][Rr][Ii][Tt][Yy]=\)\"[A-Za-z]*\"/\1\"off\"/g" > $conffile.0 mv $conffile.0 $conffile + chown $user:$group $conffile echo "$conffile: SSL off ..." fi sslparams0=`grep -i "<.*SSLPARAMS " $conffile` @@ -263,6 +269,7 @@ sslparams=`echo $sslparams1 | sed -e 's/\"/\\\\\"/g'` cat $conffile | sed -e "s/\($sslparams\)/\<\!-- \1 --\>/g" > $conffile.1 mv $conffile.1 $conffile + chown $user:$group $conffile fi fi } @@ -282,6 +289,7 @@ $dir/stop-slapd cat $dir/config/dse.ldif | sed -e "s/\($security\) .*/\1 off/g" > $dir/config/dse.ldif.0 mv $dir/config/dse.ldif.0 $dir/config/dse.ldif + chown $user:$group $dir/config/dse.ldif echo "$dir/config/dse.ldif: SSL off ..." fi fi @@ -308,6 +316,7 @@ if [ -f $conffile ]; then cat $conffile | sed -e "s/^\($confparam\) .*/\1 on/g" > $conffile.00 mv $conffile.00 $conffile + chown $user:$group $conffile echo "$conffile $confparam: SSL on ..." fi } @@ -317,6 +326,7 @@ if [ -f $conffile ]; then cat $conffile | sed -e "s/\([Ss][Ee][Cc][Uu][Rr][Ii][Tt][Yy]=\)\"[A-Za-z]*\"/\1\"on\"/g" > $conffile.2 mv $conffile.2 $conffile + chown $user:$group $conffile fi grep -i "<.*SSLPARAMS " $conffile > /dev/null 2>&1 rval=$? @@ -324,6 +334,7 @@ then cat $conffile | sed -e "s/<\!-- *$sslparams *-->/$sslparams/g" > $conffile.3 mv $conffile.3 $conffile + chown $user:$group $conffile fi echo "$conffile: SSL on ..." } @@ -336,6 +347,7 @@ $dir/stop-slapd cat $dir/config/dse.ldif | sed -e "s/\($security\) .*/\1 on/g" > $dir/config/dse.ldif.0 mv $dir/config/dse.ldif.0 $dir/config/dse.ldif + chown $user:$group $dir/config/dse.ldif echo "$dir/config/dse.ldif: SSL on ..." echo "Restarting Directory Server: $dir/start-slapd" $dir/start-slapd @@ -370,9 +382,14 @@ # check whether it is an in-place installation if [ -f $sroot/admin-serv/config/adm.conf ]; then + dsinst=`getValFromAdminConf "ldapStart:" "adm.conf" | awk -F/ '{print $1}'` + if [ -f $sroot/$dsinst/config/dse.ldif ]; then + user=`ls -l $sroot/$dsinst/config/dse.ldif | awk '{print $3}'` + group=`ls -l $sroot/$dsinst/config/dse.ldif | awk '{print $4}'` + fi + SSLOff - dsinst=`getValFromAdminConf "ldapStart:" "adm.conf" | awk -F/ '{print $1}'` if [ -f $sroot/$dsinst/config/dse.ldif ]; then # it is an in=place installation ldaphost=`getValFromAdminConf "ldapHost:" "adm.conf"` @@ -380,8 +397,6 @@ adminport=`getValFromAdminConf "\ $inffile echo "FullMachineName= $ldaphost" >> $inffile - echo "SuiteSpotUserID= $suitespotuser" >> $inffile - echo "SuitespotGroup= $suitespotgroup" >> $inffile + echo "SuiteSpotUserID= $user" >> $inffile + echo "SuitespotGroup= $group" >> $inffile echo "ServerRoot= $sroot" >> $inffile echo "ConfigDirectoryLdapURL= ldap://$ldaphost:$ldapport/o=NetscapeRoot" >> $inffile echo "ConfigDirectoryAdminID= $adminid" >> $inffile From fedora-directory-commits at redhat.com Fri Nov 3 19:49:55 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 3 Nov 2006 12:49:55 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/cm Makefile,1.67,1.68 Message-ID: <200611031949.kA3Jnt8E004618@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/cm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4577 Modified Files: Makefile Log Message: Backed off the previous change for the non-Solaris platforms. Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- Makefile 3 Nov 2006 00:53:55 -0000 1.67 +++ Makefile 3 Nov 2006 19:49:52 -0000 1.68 @@ -312,7 +312,11 @@ # the httpd library ifneq ($(ARCH), WINNT) + ifeq ($(ARCH), SOLARIS) $(INSTALL) -m 755 $(OBJDIR)/$(NSHTTPD_DLL)$(DLL_PRESUF).$(DLL_SUFFIX)* $(LDAP_PLUGIN_RELDIR) + else + $(INSTALL) -m 755 $(OBJDIR)/$(NSHTTPD_DLL)$(DLL_PRESUF).$(DLL_SUFFIX)* $(RELDIR)/$(DS_LIBDIR) + endif endif # Images for IM Presence plugin From fedora-directory-commits at redhat.com Fri Nov 3 21:15:34 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 3 Nov 2006 14:15:34 -0700 Subject: [Fedora-directory-commits] ldapserver/include version.h,1.10,1.11 Message-ID: <200611032115.kA3LFYsx015844@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/include In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15776/ldapserver/include Modified Files: version.h Log Message: upgrade version to 1.0.4 Index: version.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/version.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- version.h 9 Oct 2006 22:26:13 -0000 1.10 +++ version.h 3 Nov 2006 21:15:31 -0000 1.11 @@ -44,9 +44,9 @@ exist, the PRODUCT_VERSION define has _DEF appended. */ -#define DIRECTORY_VERSION_DEF "1.0.3" +#define DIRECTORY_VERSION_DEF "1.0.4" #define DIRECTORY_COMPATIBLE "3.0" -#define DIRECTORY_VERSION_STRING "Fedora-DirServer/1.0.3" +#define DIRECTORY_VERSION_STRING "Fedora-DirServer/1.0.4" #define DS_VERSION_DEF DIRECTORY_VERSION_DEF #define DS_VERSION_STRING DIRECTORY_VERSION_STRING From fedora-directory-commits at redhat.com Fri Nov 3 21:15:34 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 3 Nov 2006 14:15:34 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/docs README.txt,1.5,1.6 Message-ID: <200611032115.kA3LFYaf015852@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/docs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15776/ldapserver/ldap/docs Modified Files: README.txt Log Message: upgrade version to 1.0.4 Index: README.txt =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/docs/README.txt,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- README.txt 9 Oct 2006 22:26:20 -0000 1.5 +++ README.txt 3 Nov 2006 21:15:32 -0000 1.6 @@ -1,5 +1,5 @@ ======================================================================= - Fedora Directory Server 1.0.3 + Fedora Directory Server 1.0.4 ======================================================================= The Fedora Directory Server is subject to the terms detailed in the From fedora-directory-commits at redhat.com Fri Nov 3 21:15:35 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 3 Nov 2006 14:15:35 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/test-plugins testbind.c, 1.10, 1.11 testdatainterop.c, 1.9, 1.10 testentry.c, 1.9, 1.10 testextendedop.c, 1.9, 1.10 testgetip.c, 1.9, 1.10 testpostop.c, 1.9, 1.10 testpreop.c, 1.10, 1.11 testsaslbind.c, 1.11, 1.12 Message-ID: <200611032115.kA3LFZNx015864@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15776/ldapserver/ldap/servers/slapd/test-plugins Modified Files: testbind.c testdatainterop.c testentry.c testextendedop.c testgetip.c testpostop.c testpreop.c testsaslbind.c Log Message: upgrade version to 1.0.4 Index: testbind.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testbind.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- testbind.c 9 Oct 2006 22:26:20 -0000 1.10 +++ testbind.c 3 Nov 2006 21:15:32 -0000 1.11 @@ -69,7 +69,7 @@ #include #include "slapi-plugin.h" -Slapi_PluginDesc bindpdesc = { "test-bind", "Fedora Project", "1.0.3", +Slapi_PluginDesc bindpdesc = { "test-bind", "Fedora Project", "1.0.4", "sample bind pre-operation plugin" }; static Slapi_ComponentId *plugin_id = NULL; Index: testdatainterop.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testdatainterop.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- testdatainterop.c 9 Oct 2006 22:26:20 -0000 1.9 +++ testdatainterop.c 3 Nov 2006 21:15:33 -0000 1.10 @@ -113,7 +113,7 @@ /* * Static variables. */ -static Slapi_PluginDesc plugindesc = { PLUGIN_NAME, "Fedora Project", "1.0.3", +static Slapi_PluginDesc plugindesc = { PLUGIN_NAME, "Fedora Project", "1.0.4", "sample pre-operation null suffix plugin" }; static Slapi_ComponentId *plugin_id = NULL; Index: testentry.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testentry.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- testentry.c 9 Oct 2006 22:26:20 -0000 1.9 +++ testentry.c 3 Nov 2006 21:15:33 -0000 1.10 @@ -90,7 +90,7 @@ #include #include "slapi-plugin.h" -Slapi_PluginDesc entrypdesc = { "test-entry", "Fedora Project", "1.0.3", +Slapi_PluginDesc entrypdesc = { "test-entry", "Fedora Project", "1.0.4", "sample entry modification plugin" }; /* Entry store plug-in function */ Index: testextendedop.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testextendedop.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- testextendedop.c 9 Oct 2006 22:26:20 -0000 1.9 +++ testextendedop.c 3 Nov 2006 21:15:33 -0000 1.10 @@ -83,7 +83,7 @@ /* OID of the extended operation handled by this plug-in */ #define MY_OID "1.2.3.4" -Slapi_PluginDesc expdesc = { "test-extendedop", "Fedora Project", "1.0.3", +Slapi_PluginDesc expdesc = { "test-extendedop", "Fedora Project", "1.0.4", "sample extended operation plugin" }; Index: testgetip.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testgetip.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- testgetip.c 9 Oct 2006 22:26:20 -0000 1.9 +++ testgetip.c 3 Nov 2006 21:15:33 -0000 1.10 @@ -74,7 +74,7 @@ #include "slapi-plugin.h" #include "nspr.h" -Slapi_PluginDesc getippdesc = { "test-getip", "Fedora Project", "1.0.3", +Slapi_PluginDesc getippdesc = { "test-getip", "Fedora Project", "1.0.4", "sample pre-operation plugin" }; static char *netaddr2str( PRNetAddr *addrp, char *buf, size_t buflen ); Index: testpostop.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testpostop.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- testpostop.c 9 Oct 2006 22:26:20 -0000 1.9 +++ testpostop.c 3 Nov 2006 21:15:33 -0000 1.10 @@ -93,7 +93,7 @@ static char *changelogfile = "/tmp/changelog"; #endif -Slapi_PluginDesc postoppdesc = { "test-postop", "Fedora Project", "1.0.3", +Slapi_PluginDesc postoppdesc = { "test-postop", "Fedora Project", "1.0.4", "sample post-operation plugin" }; static void write_changelog( int optype, char *dn, void *change, int flag ); Index: testpreop.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testpreop.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- testpreop.c 9 Oct 2006 22:26:20 -0000 1.10 +++ testpreop.c 3 Nov 2006 21:15:33 -0000 1.11 @@ -79,7 +79,7 @@ #include #include "slapi-plugin.h" -Slapi_PluginDesc preoppdesc = { "test-preop", "Fedora Project", "1.0.3", +Slapi_PluginDesc preoppdesc = { "test-preop", "Fedora Project", "1.0.4", "sample pre-operation plugin" }; /* Pre-operation plug-in function */ Index: testsaslbind.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testsaslbind.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- testsaslbind.c 9 Oct 2006 22:26:20 -0000 1.11 +++ testsaslbind.c 3 Nov 2006 21:15:33 -0000 1.12 @@ -80,7 +80,7 @@ #include #include "slapi-plugin.h" -Slapi_PluginDesc saslpdesc = { "test-saslbind", "Fedora Project", "1.0.3", +Slapi_PluginDesc saslpdesc = { "test-saslbind", "Fedora Project", "1.0.4", "sample SASL bind pre-operation plugin" }; From fedora-directory-commits at redhat.com Fri Nov 3 21:15:33 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 3 Nov 2006 14:15:33 -0700 Subject: [Fedora-directory-commits] ldapserver Makefile, 1.36, 1.37 nsdefs.mk, 1.20, 1.21 Message-ID: <200611032116.kA3LG3Zn015900@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15776/ldapserver Modified Files: Makefile nsdefs.mk Log Message: upgrade version to 1.0.4 Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- Makefile 9 Oct 2006 22:26:13 -0000 1.36 +++ Makefile 3 Nov 2006 21:15:30 -0000 1.37 @@ -360,7 +360,7 @@ -e 's/@COMPANY-PRODUCT-NAME@/Fedora Directory Server/g' \ -e 's/@LCASE-COMPANY-NAME-NOSP@/fedora/g' \ -e 's/@GEN-VERSION@/1.0/g' \ - -e 's/@NOSP-VERSION@/1.0.3/g' \ + -e 's/@NOSP-VERSION@/1.0.4/g' \ -e 's+ at COMPANY-URL@+http://directory.fedora.redhat.com/+g' \ ldapserver.spec.tmpl > $@ mv $@ $(OBJDIR) Index: nsdefs.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/nsdefs.mk,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- nsdefs.mk 9 Oct 2006 22:26:13 -0000 1.20 +++ nsdefs.mk 3 Nov 2006 21:15:30 -0000 1.21 @@ -227,8 +227,8 @@ OBJDIR=$(COMMON_OBJDIR) OBJDIR_32=$(COMMON_OBJDIR_32) DO_SEARCH=no -DIR_VERSION:=1.0.3 -NOSP_DIR_VERSION:=1.0.3 +DIR_VERSION:=1.0.4 +NOSP_DIR_VERSION:=1.0.4 DIR_NORM_VERSION:=1.0 PRODUCT_NAME="$(PRODUCTCORE) $(DIR_VERSION)" # When you change DIRSDK_VERSION or DIRSDK_VERSION_DLL_SUFFIX, you must From fedora-directory-commits at redhat.com Fri Nov 3 21:26:38 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 3 Nov 2006 14:26:38 -0700 Subject: [Fedora-directory-commits] adminutil/lib/libadmsslutil srvutilssl.c, 1.2, 1.3 uginfossl.c, 1.1.1.1, 1.2 Message-ID: <200611032126.kA3LQcu1016388@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/adminutil/lib/libadmsslutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16359/adminutil/lib/libadmsslutil Modified Files: srvutilssl.c uginfossl.c Log Message: Bug: 213788 Description: Admin Server cannot talk to SSL Config DS - additional mem leaks Reviewed by: nkinder (Thanks!) Fix Description: Fix additional memory leaks caused by not freeing the return values of the admldapGet*() functions, and fixed more places where we were not calling ldap_unbind(ld) to free and clean up the LDAP handle. Platform: FC5 Index: srvutilssl.c =================================================================== RCS file: /cvs/dirsec/adminutil/lib/libadmsslutil/srvutilssl.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- srvutilssl.c 16 Nov 2005 18:50:15 -0000 1.2 +++ srvutilssl.c 3 Nov 2006 21:26:35 -0000 1.3 @@ -28,6 +28,8 @@ { char *domainDN = NULL, *isie = NULL, *sie = NULL; char *ptr = NULL, *adminName = NULL; + char *host = NULL; + char *siepwd = NULL; PsetHndl domainPset; int errorCode; AttrNameList nl; @@ -59,20 +61,27 @@ adminName++; /* Use domainDN to create a pset */ - domainPset = psetRealCreateSSL(admldapGetHost(info), + host = admldapGetHost(info); + siepwd = admldapGetSIEPWD(info); + domainPset = psetRealCreateSSL(host, admldapGetPort(info), admldapGetSecurity(info), domainDN, sie, - admldapGetSIEPWD(info), + siepwd, NULL, &errorCode); + PR_Free(host); + host = NULL; + PR_Free(siepwd); + siepwd = NULL; if (!domainPset) goto err; nl = retrieveSIEs(domainPset, domainDN, adminName); psetDelete(domainPset); /* free sie, domainDN, internally */ + if (sie) PR_Free(sie); if (isie) PR_Free(isie); return nl; @@ -86,7 +95,10 @@ PR_IMPLEMENT(AttributeList) getInstalledServerDNListSSL(AdmldapInfo info) { - char *domainDN, *isie; + char *domainDN, *isie = NULL; + char *host = NULL; + char *siedn = NULL; + char *siepwd = NULL; PsetHndl domainPset; int errorCode; AttributeList resultList; @@ -94,29 +106,40 @@ isie = admldapGetISIEDN(info); domainDN=strchr(isie, ','); - if (!domainDN) return NULL; + if (!domainDN) goto err; domainDN++; while (*domainDN == ' ' && *domainDN != '\0') domainDN++; - if (*domainDN == '\0') return NULL; + if (*domainDN == '\0') goto err; /* Use domainDN to create a pset */ - domainPset = psetRealCreateSSL(admldapGetHost(info), + host = admldapGetHost(info); + siedn = admldapGetSIEDN(info); + siepwd = admldapGetSIEPWD(info); + domainPset = psetRealCreateSSL(host, admldapGetPort(info), admldapGetSecurity(info), domainDN, - admldapGetSIEDN(info), - admldapGetSIEPWD(info), + siedn, + siepwd, NULL, &errorCode); - - if (!domainPset) return NULL; + PR_Free(host); + host = NULL; + PR_Free(siedn); + siedn = NULL; + PR_Free(siepwd); + siepwd = NULL; + if (!domainPset) goto err; resultList = retrieveISIEs(domainPset, domainDN); psetDelete(domainPset); return resultList; +err: + if (isie) PR_Free(isie); + return NULL; } Index: uginfossl.c =================================================================== RCS file: /cvs/dirsec/adminutil/lib/libadmsslutil/uginfossl.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- uginfossl.c 20 Jul 2005 22:51:33 -0000 1.1.1.1 +++ uginfossl.c 3 Nov 2006 21:26:35 -0000 1.2 @@ -41,6 +41,7 @@ char *username = 0; char *binddn = 0; char *bindpw = 0; + char *host = 0; LDAP *ld; int rv, err; int ldapError; @@ -72,12 +73,15 @@ if (strcmp(username, localAdmin)) { *error_code = ADMUTIL_ENV_ERR; destroyAdmldap(ldapInfo); + PL_strfree(localAdmin); return NULL; } else { binddn = admldapGetSIEDN(ldapInfo); bindpw = admldapGetSIEPWD(ldapInfo); } + PL_strfree(localAdmin); + localAdmin = NULL; } else { *error_code = ADMUTIL_ENV_ERR; @@ -94,22 +98,30 @@ *error_code = ADMUTIL_OP_OK; + host = admldapGetHost(ldapInfo); if (admldapGetSecurity(ldapInfo)) - ld = ldapssl_init(admldapGetHost(ldapInfo), admldapGetPort(ldapInfo), 1); + ld = ldapssl_init(host, admldapGetPort(ldapInfo), 1); else - ld = ldap_init(admldapGetHost(ldapInfo), admldapGetPort(ldapInfo)); + ld = ldap_init(host, admldapGetPort(ldapInfo)); + PL_strfree(host); + host = NULL; if (!ld) { *error_code = ADMUTIL_LDAP_ERR; destroyAdmldap(ldapInfo); + PL_strfree(binddn); + PL_strfree(bindpw); return NULL; } + ldapError = ldap_simple_bind_s(ld, + binddn, + bindpw); + PL_strfree(binddn); + PL_strfree(bindpw); + /* authenticate to LDAP server*/ - if ((ldapError = ldap_simple_bind_s(ld, - binddn, - bindpw)) - != LDAP_SUCCESS ) { + if (ldapError != LDAP_SUCCESS) { #ifdef LDAP_DEBUG ldap_perror(ld, "ldap_simple_bind_s"); #endif @@ -118,6 +130,7 @@ case LDAP_INVALID_CREDENTIALS: case LDAP_INSUFFICIENT_ACCESS: /* authenticate failed: Should not continue */ + ldap_unbind(ld); *error_code = ADMUTIL_LDAP_ERR; destroyAdmldap(ldapInfo); return NULL; @@ -125,6 +138,7 @@ case LDAP_ALIAS_PROBLEM: case LDAP_INVALID_DN_SYNTAX: /* Not a good user DN */ + ldap_unbind(ld); *error_code = ADMUTIL_LDAP_ERR; destroyAdmldap(ldapInfo); return NULL; From fedora-directory-commits at redhat.com Fri Nov 3 22:33:23 2006 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Fri, 3 Nov 2006 15:33:23 -0700 Subject: [Fedora-directory-commits] ldapserver Makefile.am, 1.9, 1.10 Makefile.in, 1.10, 1.11 aclocal.m4, 1.3, 1.4 compile, 1.2, 1.3 config.guess, 1.2, 1.3 config.sub, 1.2, 1.3 configure, 1.7, 1.8 depcomp, 1.2, 1.3 install-sh, 1.2, 1.3 missing, 1.2, 1.3 Message-ID: <200611032233.kA3MXNCw020559@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20525 Modified Files: Makefile.am Makefile.in aclocal.m4 compile config.guess config.sub configure depcomp install-sh missing Log Message: Related: 213352 Summary: built wrapper directory must be created during make. Index: Makefile.am =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.am,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Makefile.am 2 Nov 2006 03:11:39 -0000 1.9 +++ Makefile.am 3 Nov 2006 22:33:15 -0000 1.10 @@ -907,5 +907,6 @@ -e 's, at taskdir\@,$(taskdir),g' \ -e 's, at configdir\@,$(configdir),g' -% : %.in +%: %.in + mkdir -p $(dir $@) $(fixupcmd) $^ > $@ View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.10 -r 1.11 Makefile.in Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.in,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- Makefile.in 2 Nov 2006 03:11:39 -0000 1.10 +++ Makefile.in 3 Nov 2006 22:33:15 -0000 1.11 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.9.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,6 +18,8 @@ +SOURCES = $(libavl_a_SOURCES) $(libldaputil_a_SOURCES) $(libacl_plugin_la_SOURCES) $(libattr_unique_plugin_la_SOURCES) $(libback_ldbm_la_SOURCES) $(libchainingdb_plugin_la_SOURCES) $(libcollation_plugin_la_SOURCES) $(libcos_plugin_la_SOURCES) $(libdes_plugin_la_SOURCES) $(libdistrib_plugin_la_SOURCES) $(libds_admin_la_SOURCES) $(libhttp_client_plugin_la_SOURCES) $(libns_dshttpd_la_SOURCES) $(libpam_passthru_plugin_la_SOURCES) $(libpassthru_plugin_la_SOURCES) $(libpresence_plugin_la_SOURCES) $(libpwdstorage_plugin_la_SOURCES) $(libreferint_plugin_la_SOURCES) $(libreplication_plugin_la_SOURCES) $(libretrocl_plugin_la_SOURCES) $(libroles_plugin_la_SOURCES) $(libslapd_la_SOURCES) $(libstatechange_plugin_la_SOURCES) $(libsyntax_plugin_la_SOURCES) $(libviews_plugin_la_SOURCES) $(dbscan_bin_SOURCES) $(ds_newinst_bin_SOURCES) $(dsktune_bin_SOURCES) $(infadd_bin_SOURCES) $(ldap_agent_bin_SOURCES) $(ldclt_bin_SOURCES) $(ldif_bin_SOURCES) $(makstrdb_SOURCES) $(migratecred_bin_SOURCES)! $(mmldif_bin_SOURCES) $(ns_slapd_SOURCES) $(pwdhash_bin_SOURCES) $(rsearch_bin_SOURCES) + srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -672,19 +674,19 @@ am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ +LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ +LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ +CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(libavl_a_SOURCES) $(libldaputil_a_SOURCES) \ $(libacl_plugin_la_SOURCES) \ @@ -4980,2279 +4982,2279 @@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libldaputil_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/ldaputil/libldaputil_a-vtable.obj `if test -f 'lib/ldaputil/vtable.c'; then $(CYGPATH_W) 'lib/ldaputil/vtable.c'; else $(CYGPATH_W) '$(srcdir)/lib/ldaputil/vtable.c'; fi` ldap/servers/plugins/acl/libacl_plugin_la-acl.lo: ldap/servers/plugins/acl/acl.c - at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acl.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl.lo `test -f 'ldap/servers/plugins/acl/acl.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl.c; \ + at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acl.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl.lo `test -f 'ldap/servers/plugins/acl/acl.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/plugins/acl/acl.c' object='ldap/servers/plugins/acl/libacl_plugin_la-acl.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl.lo `test -f 'ldap/servers/plugins/acl/acl.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl.c + at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl.lo `test -f 'ldap/servers/plugins/acl/acl.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl.c ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo: ldap/servers/plugins/acl/acl_ext.c - at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl_ext.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo `test -f 'ldap/servers/plugins/acl/acl_ext.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl_ext.c; \ + at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl_ext.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo `test -f 'ldap/servers/plugins/acl/acl_ext.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl_ext.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl_ext.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl_ext.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl_ext.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/plugins/acl/acl_ext.c' object='ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo `test -f 'ldap/servers/plugins/acl/acl_ext.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl_ext.c + at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo `test -f 'ldap/servers/plugins/acl/acl_ext.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl_ext.c ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo: ldap/servers/plugins/acl/aclanom.c - at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclanom.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo `test -f 'ldap/servers/plugins/acl/aclanom.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclanom.c; \ + at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclanom.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo `test -f 'ldap/servers/plugins/acl/aclanom.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclanom.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclanom.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclanom.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclanom.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/plugins/acl/aclanom.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo `test -f 'ldap/servers/plugins/acl/aclanom.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclanom.c + at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo `test -f 'ldap/servers/plugins/acl/aclanom.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclanom.c ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo: ldap/servers/plugins/acl/acleffectiverights.c - at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acleffectiverights.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo `test -f 'ldap/servers/plugins/acl/acleffectiverights.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acleffectiverights.c; \ + at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acleffectiverights.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo `test -f 'ldap/servers/plugins/acl/acleffectiverights.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acleffectiverights.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acleffectiverights.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acleffectiverights.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acleffectiverights.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/plugins/acl/acleffectiverights.c' object='ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo `test -f 'ldap/servers/plugins/acl/acleffectiverights.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acleffectiverights.c + at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo `test -f 'ldap/servers/plugins/acl/acleffectiverights.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acleffectiverights.c ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo: ldap/servers/plugins/acl/aclgroup.c - at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclgroup.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo `test -f 'ldap/servers/plugins/acl/aclgroup.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclgroup.c; \ + at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclgroup.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo `test -f 'ldap/servers/plugins/acl/aclgroup.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclgroup.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclgroup.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclgroup.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclgroup.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/plugins/acl/aclgroup.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo `test -f 'ldap/servers/plugins/acl/aclgroup.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclgroup.c + at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo `test -f 'ldap/servers/plugins/acl/aclgroup.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclgroup.c ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo: ldap/servers/plugins/acl/aclinit.c - at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclinit.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo `test -f 'ldap/servers/plugins/acl/aclinit.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclinit.c; \ + at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclinit.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo `test -f 'ldap/servers/plugins/acl/aclinit.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclinit.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclinit.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclinit.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclinit.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/plugins/acl/aclinit.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo `test -f 'ldap/servers/plugins/acl/aclinit.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclinit.c + at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo `test -f 'ldap/servers/plugins/acl/aclinit.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclinit.c ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo: ldap/servers/plugins/acl/acllas.c - at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllas.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo `test -f 'ldap/servers/plugins/acl/acllas.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllas.c; \ + at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllas.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo `test -f 'ldap/servers/plugins/acl/acllas.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllas.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllas.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllas.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllas.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/plugins/acl/acllas.c' object='ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo `test -f 'ldap/servers/plugins/acl/acllas.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllas.c + at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo `test -f 'ldap/servers/plugins/acl/acllas.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllas.c ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo: ldap/servers/plugins/acl/acllist.c - at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllist.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo `test -f 'ldap/servers/plugins/acl/acllist.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllist.c; \ + at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllist.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo `test -f 'ldap/servers/plugins/acl/acllist.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllist.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllist.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllist.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllist.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/plugins/acl/acllist.c' object='ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo `test -f 'ldap/servers/plugins/acl/acllist.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllist.c + at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo `test -f 'ldap/servers/plugins/acl/acllist.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllist.c ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo: ldap/servers/plugins/acl/aclparse.c - at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclparse.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo `test -f 'ldap/servers/plugins/acl/aclparse.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclparse.c; \ + at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclparse.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo `test -f 'ldap/servers/plugins/acl/aclparse.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclparse.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclparse.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclparse.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclparse.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/plugins/acl/aclparse.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo `test -f 'ldap/servers/plugins/acl/aclparse.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclparse.c + at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo `test -f 'ldap/servers/plugins/acl/aclparse.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclparse.c ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo: ldap/servers/plugins/acl/aclplugin.c - at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclplugin.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo `test -f 'ldap/servers/plugins/acl/aclplugin.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclplugin.c; \ + at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclplugin.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo `test -f 'ldap/servers/plugins/acl/aclplugin.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclplugin.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclplugin.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclplugin.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclplugin.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/plugins/acl/aclplugin.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo `test -f 'ldap/servers/plugins/acl/aclplugin.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclplugin.c + at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo `test -f 'ldap/servers/plugins/acl/aclplugin.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclplugin.c ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo: ldap/servers/plugins/acl/aclproxy.c - at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclproxy.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo `test -f 'ldap/servers/plugins/acl/aclproxy.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclproxy.c; \ + at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclproxy.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo `test -f 'ldap/servers/plugins/acl/aclproxy.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclproxy.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclproxy.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclproxy.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclproxy.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/plugins/acl/aclproxy.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo `test -f 'ldap/servers/plugins/acl/aclproxy.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclproxy.c + at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo `test -f 'ldap/servers/plugins/acl/aclproxy.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclproxy.c ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo: ldap/servers/plugins/acl/aclutil.c - at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclutil.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo `test -f 'ldap/servers/plugins/acl/aclutil.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclutil.c; \ + at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclutil.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo `test -f 'ldap/servers/plugins/acl/aclutil.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclutil.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclutil.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclutil.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclutil.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/plugins/acl/aclutil.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo `test -f 'ldap/servers/plugins/acl/aclutil.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclutil.c + at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo `test -f 'ldap/servers/plugins/acl/aclutil.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclutil.c ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-7bit.lo: ldap/servers/plugins/uiduniq/7bit.c - at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libattr_unique_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-7bit.lo -MD -MP -MF "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-7bit.Tpo" -c -o ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-7bit.lo `test -f 'ldap/servers/plugins/uiduniq/7bit.c' || echo '$(srcdir)/'`ldap/servers/plugins/uiduniq/7bit.c; \ + at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libattr_unique_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-7bit.lo -MD -MP -MF "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-7bit.Tpo" -c -o ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-7bit.lo `test -f 'ldap/servers/plugins/uiduniq/7bit.c' || echo '$(srcdir)/'`ldap/servers/plugins/uiduniq/7bit.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-7bit.Tpo" "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-7bit.Plo"; else rm -f "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-7bit.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/plugins/uiduniq/7bit.c' object='ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-7bit.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libattr_unique_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-7bit.lo `test -f 'ldap/servers/plugins/uiduniq/7bit.c' || echo '$(srcdir)/'`ldap/servers/plugins/uiduniq/7bit.c + at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libattr_unique_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-7bit.lo `test -f 'ldap/servers/plugins/uiduniq/7bit.c' || echo '$(srcdir)/'`ldap/servers/plugins/uiduniq/7bit.c ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-uid.lo: ldap/servers/plugins/uiduniq/uid.c - at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libattr_unique_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-uid.lo -MD -MP -MF "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-uid.Tpo" -c -o ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-uid.lo `test -f 'ldap/servers/plugins/uiduniq/uid.c' || echo '$(srcdir)/'`ldap/servers/plugins/uiduniq/uid.c; \ + at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libattr_unique_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-uid.lo -MD -MP -MF "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-uid.Tpo" -c -o ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-uid.lo `test -f 'ldap/servers/plugins/uiduniq/uid.c' || echo '$(srcdir)/'`ldap/servers/plugins/uiduniq/uid.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-uid.Tpo" "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-uid.Plo"; else rm -f "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-uid.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/plugins/uiduniq/uid.c' object='ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-uid.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libattr_unique_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-uid.lo `test -f 'ldap/servers/plugins/uiduniq/uid.c' || echo '$(srcdir)/'`ldap/servers/plugins/uiduniq/uid.c + at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libattr_unique_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-uid.lo `test -f 'ldap/servers/plugins/uiduniq/uid.c' || echo '$(srcdir)/'`ldap/servers/plugins/uiduniq/uid.c ldap/servers/plugins/shared/libattr_unique_plugin_la-utils.lo: ldap/servers/plugins/shared/utils.c - at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libattr_unique_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/shared/libattr_unique_plugin_la-utils.lo -MD -MP -MF "ldap/servers/plugins/shared/$(DEPDIR)/libattr_unique_plugin_la-utils.Tpo" -c -o ldap/servers/plugins/shared/libattr_unique_plugin_la-utils.lo `test -f 'ldap/servers/plugins/shared/utils.c' || echo '$(srcdir)/'`ldap/servers/plugins/shared/utils.c; \ + at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libattr_unique_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/shared/libattr_unique_plugin_la-utils.lo -MD -MP -MF "ldap/servers/plugins/shared/$(DEPDIR)/libattr_unique_plugin_la-utils.Tpo" -c -o ldap/servers/plugins/shared/libattr_unique_plugin_la-utils.lo `test -f 'ldap/servers/plugins/shared/utils.c' || echo '$(srcdir)/'`ldap/servers/plugins/shared/utils.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/shared/$(DEPDIR)/libattr_unique_plugin_la-utils.Tpo" "ldap/servers/plugins/shared/$(DEPDIR)/libattr_unique_plugin_la-utils.Plo"; else rm -f "ldap/servers/plugins/shared/$(DEPDIR)/libattr_unique_plugin_la-utils.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/plugins/shared/utils.c' object='ldap/servers/plugins/shared/libattr_unique_plugin_la-utils.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libattr_unique_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/shared/libattr_unique_plugin_la-utils.lo `test -f 'ldap/servers/plugins/shared/utils.c' || echo '$(srcdir)/'`ldap/servers/plugins/shared/utils.c + at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libattr_unique_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/shared/libattr_unique_plugin_la-utils.lo `test -f 'ldap/servers/plugins/shared/utils.c' || echo '$(srcdir)/'`ldap/servers/plugins/shared/utils.c ldap/servers/slapd/back-ldbm/libback_ldbm_la-ancestorid.lo: ldap/servers/slapd/back-ldbm/ancestorid.c - at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libback_ldbm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/slapd/back-ldbm/libback_ldbm_la-ancestorid.lo -MD -MP -MF "ldap/servers/slapd/back-ldbm/$(DEPDIR)/libback_ldbm_la-ancestorid.Tpo" -c -o ldap/servers/slapd/back-ldbm/libback_ldbm_la-ancestorid.lo `test -f 'ldap/servers/slapd/back-ldbm/ancestorid.c' || echo '$(srcdir)/'`ldap/servers/slapd/back-ldbm/ancestorid.c; \ + at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libback_ldbm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/slapd/back-ldbm/libback_ldbm_la-ancestorid.lo -MD -MP -MF "ldap/servers/slapd/back-ldbm/$(DEPDIR)/libback_ldbm_la-ancestorid.Tpo" -c -o ldap/servers/slapd/back-ldbm/libback_ldbm_la-ancestorid.lo `test -f 'ldap/servers/slapd/back-ldbm/ancestorid.c' || echo '$(srcdir)/'`ldap/servers/slapd/back-ldbm/ancestorid.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/slapd/back-ldbm/$(DEPDIR)/libback_ldbm_la-ancestorid.Tpo" "ldap/servers/slapd/back-ldbm/$(DEPDIR)/libback_ldbm_la-ancestorid.Plo"; else rm -f "ldap/servers/slapd/back-ldbm/$(DEPDIR)/libback_ldbm_la-ancestorid.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/slapd/back-ldbm/ancestorid.c' object='ldap/servers/slapd/back-ldbm/libback_ldbm_la-ancestorid.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libback_ldbm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/slapd/back-ldbm/libback_ldbm_la-ancestorid.lo `test -f 'ldap/servers/slapd/back-ldbm/ancestorid.c' || echo '$(srcdir)/'`ldap/servers/slapd/back-ldbm/ancestorid.c + at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libback_ldbm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/slapd/back-ldbm/libback_ldbm_la-ancestorid.lo `test -f 'ldap/servers/slapd/back-ldbm/ancestorid.c' || echo '$(srcdir)/'`ldap/servers/slapd/back-ldbm/ancestorid.c ldap/servers/slapd/back-ldbm/libback_ldbm_la-archive.lo: ldap/servers/slapd/back-ldbm/archive.c [...2957 lines suppressed...] - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-nsautherr.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nsautherr.Tpo" -c -o lib/libaccess/libns_dshttpd_la-nsautherr.lo `test -f 'lib/libaccess/nsautherr.cpp' || echo '$(srcdir)/'`lib/libaccess/nsautherr.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-nsautherr.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nsautherr.Tpo" -c -o lib/libaccess/libns_dshttpd_la-nsautherr.lo `test -f 'lib/libaccess/nsautherr.cpp' || echo '$(srcdir)/'`lib/libaccess/nsautherr.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nsautherr.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nsautherr.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nsautherr.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/libaccess/nsautherr.cpp' object='lib/libaccess/libns_dshttpd_la-nsautherr.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-nsautherr.lo `test -f 'lib/libaccess/nsautherr.cpp' || echo '$(srcdir)/'`lib/libaccess/nsautherr.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-nsautherr.lo `test -f 'lib/libaccess/nsautherr.cpp' || echo '$(srcdir)/'`lib/libaccess/nsautherr.cpp lib/libaccess/libns_dshttpd_la-oneeval.lo: lib/libaccess/oneeval.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-oneeval.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-oneeval.Tpo" -c -o lib/libaccess/libns_dshttpd_la-oneeval.lo `test -f 'lib/libaccess/oneeval.cpp' || echo '$(srcdir)/'`lib/libaccess/oneeval.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-oneeval.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-oneeval.Tpo" -c -o lib/libaccess/libns_dshttpd_la-oneeval.lo `test -f 'lib/libaccess/oneeval.cpp' || echo '$(srcdir)/'`lib/libaccess/oneeval.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-oneeval.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-oneeval.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-oneeval.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/libaccess/oneeval.cpp' object='lib/libaccess/libns_dshttpd_la-oneeval.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-oneeval.lo `test -f 'lib/libaccess/oneeval.cpp' || echo '$(srcdir)/'`lib/libaccess/oneeval.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-oneeval.lo `test -f 'lib/libaccess/oneeval.cpp' || echo '$(srcdir)/'`lib/libaccess/oneeval.cpp lib/libaccess/libns_dshttpd_la-register.lo: lib/libaccess/register.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-register.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-register.Tpo" -c -o lib/libaccess/libns_dshttpd_la-register.lo `test -f 'lib/libaccess/register.cpp' || echo '$(srcdir)/'`lib/libaccess/register.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-register.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-register.Tpo" -c -o lib/libaccess/libns_dshttpd_la-register.lo `test -f 'lib/libaccess/register.cpp' || echo '$(srcdir)/'`lib/libaccess/register.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-register.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-register.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-register.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/libaccess/register.cpp' object='lib/libaccess/libns_dshttpd_la-register.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-register.lo `test -f 'lib/libaccess/register.cpp' || echo '$(srcdir)/'`lib/libaccess/register.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-register.lo `test -f 'lib/libaccess/register.cpp' || echo '$(srcdir)/'`lib/libaccess/register.cpp lib/libaccess/libns_dshttpd_la-symbols.lo: lib/libaccess/symbols.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-symbols.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-symbols.Tpo" -c -o lib/libaccess/libns_dshttpd_la-symbols.lo `test -f 'lib/libaccess/symbols.cpp' || echo '$(srcdir)/'`lib/libaccess/symbols.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-symbols.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-symbols.Tpo" -c -o lib/libaccess/libns_dshttpd_la-symbols.lo `test -f 'lib/libaccess/symbols.cpp' || echo '$(srcdir)/'`lib/libaccess/symbols.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-symbols.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-symbols.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-symbols.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/libaccess/symbols.cpp' object='lib/libaccess/libns_dshttpd_la-symbols.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-symbols.lo `test -f 'lib/libaccess/symbols.cpp' || echo '$(srcdir)/'`lib/libaccess/symbols.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-symbols.lo `test -f 'lib/libaccess/symbols.cpp' || echo '$(srcdir)/'`lib/libaccess/symbols.cpp lib/libaccess/libns_dshttpd_la-usi.lo: lib/libaccess/usi.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-usi.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usi.Tpo" -c -o lib/libaccess/libns_dshttpd_la-usi.lo `test -f 'lib/libaccess/usi.cpp' || echo '$(srcdir)/'`lib/libaccess/usi.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-usi.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usi.Tpo" -c -o lib/libaccess/libns_dshttpd_la-usi.lo `test -f 'lib/libaccess/usi.cpp' || echo '$(srcdir)/'`lib/libaccess/usi.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usi.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usi.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usi.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/libaccess/usi.cpp' object='lib/libaccess/libns_dshttpd_la-usi.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-usi.lo `test -f 'lib/libaccess/usi.cpp' || echo '$(srcdir)/'`lib/libaccess/usi.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-usi.lo `test -f 'lib/libaccess/usi.cpp' || echo '$(srcdir)/'`lib/libaccess/usi.cpp lib/libaccess/libns_dshttpd_la-usrcache.lo: lib/libaccess/usrcache.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-usrcache.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usrcache.Tpo" -c -o lib/libaccess/libns_dshttpd_la-usrcache.lo `test -f 'lib/libaccess/usrcache.cpp' || echo '$(srcdir)/'`lib/libaccess/usrcache.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-usrcache.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usrcache.Tpo" -c -o lib/libaccess/libns_dshttpd_la-usrcache.lo `test -f 'lib/libaccess/usrcache.cpp' || echo '$(srcdir)/'`lib/libaccess/usrcache.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usrcache.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usrcache.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usrcache.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/libaccess/usrcache.cpp' object='lib/libaccess/libns_dshttpd_la-usrcache.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-usrcache.lo `test -f 'lib/libaccess/usrcache.cpp' || echo '$(srcdir)/'`lib/libaccess/usrcache.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-usrcache.lo `test -f 'lib/libaccess/usrcache.cpp' || echo '$(srcdir)/'`lib/libaccess/usrcache.cpp lib/base/libns_dshttpd_la-crit.lo: lib/base/crit.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-crit.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-crit.Tpo" -c -o lib/base/libns_dshttpd_la-crit.lo `test -f 'lib/base/crit.cpp' || echo '$(srcdir)/'`lib/base/crit.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-crit.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-crit.Tpo" -c -o lib/base/libns_dshttpd_la-crit.lo `test -f 'lib/base/crit.cpp' || echo '$(srcdir)/'`lib/base/crit.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-crit.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-crit.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-crit.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/crit.cpp' object='lib/base/libns_dshttpd_la-crit.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-crit.lo `test -f 'lib/base/crit.cpp' || echo '$(srcdir)/'`lib/base/crit.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-crit.lo `test -f 'lib/base/crit.cpp' || echo '$(srcdir)/'`lib/base/crit.cpp lib/base/libns_dshttpd_la-dns.lo: lib/base/dns.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-dns.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-dns.Tpo" -c -o lib/base/libns_dshttpd_la-dns.lo `test -f 'lib/base/dns.cpp' || echo '$(srcdir)/'`lib/base/dns.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-dns.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-dns.Tpo" -c -o lib/base/libns_dshttpd_la-dns.lo `test -f 'lib/base/dns.cpp' || echo '$(srcdir)/'`lib/base/dns.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-dns.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-dns.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-dns.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/dns.cpp' object='lib/base/libns_dshttpd_la-dns.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-dns.lo `test -f 'lib/base/dns.cpp' || echo '$(srcdir)/'`lib/base/dns.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-dns.lo `test -f 'lib/base/dns.cpp' || echo '$(srcdir)/'`lib/base/dns.cpp lib/base/libns_dshttpd_la-dnsdmain.lo: lib/base/dnsdmain.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-dnsdmain.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-dnsdmain.Tpo" -c -o lib/base/libns_dshttpd_la-dnsdmain.lo `test -f 'lib/base/dnsdmain.cpp' || echo '$(srcdir)/'`lib/base/dnsdmain.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-dnsdmain.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-dnsdmain.Tpo" -c -o lib/base/libns_dshttpd_la-dnsdmain.lo `test -f 'lib/base/dnsdmain.cpp' || echo '$(srcdir)/'`lib/base/dnsdmain.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-dnsdmain.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-dnsdmain.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-dnsdmain.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/dnsdmain.cpp' object='lib/base/libns_dshttpd_la-dnsdmain.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-dnsdmain.lo `test -f 'lib/base/dnsdmain.cpp' || echo '$(srcdir)/'`lib/base/dnsdmain.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-dnsdmain.lo `test -f 'lib/base/dnsdmain.cpp' || echo '$(srcdir)/'`lib/base/dnsdmain.cpp lib/base/libns_dshttpd_la-ereport.lo: lib/base/ereport.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-ereport.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-ereport.Tpo" -c -o lib/base/libns_dshttpd_la-ereport.lo `test -f 'lib/base/ereport.cpp' || echo '$(srcdir)/'`lib/base/ereport.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-ereport.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-ereport.Tpo" -c -o lib/base/libns_dshttpd_la-ereport.lo `test -f 'lib/base/ereport.cpp' || echo '$(srcdir)/'`lib/base/ereport.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-ereport.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-ereport.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-ereport.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/ereport.cpp' object='lib/base/libns_dshttpd_la-ereport.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-ereport.lo `test -f 'lib/base/ereport.cpp' || echo '$(srcdir)/'`lib/base/ereport.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-ereport.lo `test -f 'lib/base/ereport.cpp' || echo '$(srcdir)/'`lib/base/ereport.cpp lib/base/libns_dshttpd_la-file.lo: lib/base/file.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-file.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Tpo" -c -o lib/base/libns_dshttpd_la-file.lo `test -f 'lib/base/file.cpp' || echo '$(srcdir)/'`lib/base/file.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-file.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Tpo" -c -o lib/base/libns_dshttpd_la-file.lo `test -f 'lib/base/file.cpp' || echo '$(srcdir)/'`lib/base/file.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/file.cpp' object='lib/base/libns_dshttpd_la-file.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-file.lo `test -f 'lib/base/file.cpp' || echo '$(srcdir)/'`lib/base/file.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-file.lo `test -f 'lib/base/file.cpp' || echo '$(srcdir)/'`lib/base/file.cpp lib/base/libns_dshttpd_la-fsmutex.lo: lib/base/fsmutex.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-fsmutex.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Tpo" -c -o lib/base/libns_dshttpd_la-fsmutex.lo `test -f 'lib/base/fsmutex.cpp' || echo '$(srcdir)/'`lib/base/fsmutex.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-fsmutex.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Tpo" -c -o lib/base/libns_dshttpd_la-fsmutex.lo `test -f 'lib/base/fsmutex.cpp' || echo '$(srcdir)/'`lib/base/fsmutex.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/fsmutex.cpp' object='lib/base/libns_dshttpd_la-fsmutex.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-fsmutex.lo `test -f 'lib/base/fsmutex.cpp' || echo '$(srcdir)/'`lib/base/fsmutex.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-fsmutex.lo `test -f 'lib/base/fsmutex.cpp' || echo '$(srcdir)/'`lib/base/fsmutex.cpp lib/base/libns_dshttpd_la-lexer.lo: lib/base/lexer.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-lexer.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Tpo" -c -o lib/base/libns_dshttpd_la-lexer.lo `test -f 'lib/base/lexer.cpp' || echo '$(srcdir)/'`lib/base/lexer.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-lexer.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Tpo" -c -o lib/base/libns_dshttpd_la-lexer.lo `test -f 'lib/base/lexer.cpp' || echo '$(srcdir)/'`lib/base/lexer.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/lexer.cpp' object='lib/base/libns_dshttpd_la-lexer.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-lexer.lo `test -f 'lib/base/lexer.cpp' || echo '$(srcdir)/'`lib/base/lexer.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-lexer.lo `test -f 'lib/base/lexer.cpp' || echo '$(srcdir)/'`lib/base/lexer.cpp lib/base/libns_dshttpd_la-net.lo: lib/base/net.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-net.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Tpo" -c -o lib/base/libns_dshttpd_la-net.lo `test -f 'lib/base/net.cpp' || echo '$(srcdir)/'`lib/base/net.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-net.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Tpo" -c -o lib/base/libns_dshttpd_la-net.lo `test -f 'lib/base/net.cpp' || echo '$(srcdir)/'`lib/base/net.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/net.cpp' object='lib/base/libns_dshttpd_la-net.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-net.lo `test -f 'lib/base/net.cpp' || echo '$(srcdir)/'`lib/base/net.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-net.lo `test -f 'lib/base/net.cpp' || echo '$(srcdir)/'`lib/base/net.cpp lib/base/libns_dshttpd_la-plist.lo: lib/base/plist.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-plist.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Tpo" -c -o lib/base/libns_dshttpd_la-plist.lo `test -f 'lib/base/plist.cpp' || echo '$(srcdir)/'`lib/base/plist.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-plist.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Tpo" -c -o lib/base/libns_dshttpd_la-plist.lo `test -f 'lib/base/plist.cpp' || echo '$(srcdir)/'`lib/base/plist.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/plist.cpp' object='lib/base/libns_dshttpd_la-plist.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-plist.lo `test -f 'lib/base/plist.cpp' || echo '$(srcdir)/'`lib/base/plist.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-plist.lo `test -f 'lib/base/plist.cpp' || echo '$(srcdir)/'`lib/base/plist.cpp lib/base/libns_dshttpd_la-pool.lo: lib/base/pool.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-pool.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Tpo" -c -o lib/base/libns_dshttpd_la-pool.lo `test -f 'lib/base/pool.cpp' || echo '$(srcdir)/'`lib/base/pool.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-pool.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Tpo" -c -o lib/base/libns_dshttpd_la-pool.lo `test -f 'lib/base/pool.cpp' || echo '$(srcdir)/'`lib/base/pool.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/pool.cpp' object='lib/base/libns_dshttpd_la-pool.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-pool.lo `test -f 'lib/base/pool.cpp' || echo '$(srcdir)/'`lib/base/pool.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-pool.lo `test -f 'lib/base/pool.cpp' || echo '$(srcdir)/'`lib/base/pool.cpp lib/base/libns_dshttpd_la-rwlock.lo: lib/base/rwlock.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-rwlock.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Tpo" -c -o lib/base/libns_dshttpd_la-rwlock.lo `test -f 'lib/base/rwlock.cpp' || echo '$(srcdir)/'`lib/base/rwlock.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-rwlock.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Tpo" -c -o lib/base/libns_dshttpd_la-rwlock.lo `test -f 'lib/base/rwlock.cpp' || echo '$(srcdir)/'`lib/base/rwlock.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/rwlock.cpp' object='lib/base/libns_dshttpd_la-rwlock.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-rwlock.lo `test -f 'lib/base/rwlock.cpp' || echo '$(srcdir)/'`lib/base/rwlock.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-rwlock.lo `test -f 'lib/base/rwlock.cpp' || echo '$(srcdir)/'`lib/base/rwlock.cpp lib/base/libns_dshttpd_la-shexp.lo: lib/base/shexp.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-shexp.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Tpo" -c -o lib/base/libns_dshttpd_la-shexp.lo `test -f 'lib/base/shexp.cpp' || echo '$(srcdir)/'`lib/base/shexp.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-shexp.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Tpo" -c -o lib/base/libns_dshttpd_la-shexp.lo `test -f 'lib/base/shexp.cpp' || echo '$(srcdir)/'`lib/base/shexp.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/shexp.cpp' object='lib/base/libns_dshttpd_la-shexp.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-shexp.lo `test -f 'lib/base/shexp.cpp' || echo '$(srcdir)/'`lib/base/shexp.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-shexp.lo `test -f 'lib/base/shexp.cpp' || echo '$(srcdir)/'`lib/base/shexp.cpp lib/base/libns_dshttpd_la-system.lo: lib/base/system.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-system.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Tpo" -c -o lib/base/libns_dshttpd_la-system.lo `test -f 'lib/base/system.cpp' || echo '$(srcdir)/'`lib/base/system.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-system.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Tpo" -c -o lib/base/libns_dshttpd_la-system.lo `test -f 'lib/base/system.cpp' || echo '$(srcdir)/'`lib/base/system.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/system.cpp' object='lib/base/libns_dshttpd_la-system.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-system.lo `test -f 'lib/base/system.cpp' || echo '$(srcdir)/'`lib/base/system.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-system.lo `test -f 'lib/base/system.cpp' || echo '$(srcdir)/'`lib/base/system.cpp lib/base/libns_dshttpd_la-systhr.lo: lib/base/systhr.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-systhr.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Tpo" -c -o lib/base/libns_dshttpd_la-systhr.lo `test -f 'lib/base/systhr.cpp' || echo '$(srcdir)/'`lib/base/systhr.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-systhr.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Tpo" -c -o lib/base/libns_dshttpd_la-systhr.lo `test -f 'lib/base/systhr.cpp' || echo '$(srcdir)/'`lib/base/systhr.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/systhr.cpp' object='lib/base/libns_dshttpd_la-systhr.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-systhr.lo `test -f 'lib/base/systhr.cpp' || echo '$(srcdir)/'`lib/base/systhr.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-systhr.lo `test -f 'lib/base/systhr.cpp' || echo '$(srcdir)/'`lib/base/systhr.cpp lib/base/libns_dshttpd_la-util.lo: lib/base/util.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-util.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Tpo" -c -o lib/base/libns_dshttpd_la-util.lo `test -f 'lib/base/util.cpp' || echo '$(srcdir)/'`lib/base/util.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-util.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Tpo" -c -o lib/base/libns_dshttpd_la-util.lo `test -f 'lib/base/util.cpp' || echo '$(srcdir)/'`lib/base/util.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/util.cpp' object='lib/base/libns_dshttpd_la-util.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-util.lo `test -f 'lib/base/util.cpp' || echo '$(srcdir)/'`lib/base/util.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-util.lo `test -f 'lib/base/util.cpp' || echo '$(srcdir)/'`lib/base/util.cpp mostlyclean-libtool: -rm -f *.lo @@ -8961,7 +8963,8 @@ ns-slapd.properties: makstrdb ./makstrdb -% : %.in +%: %.in + mkdir -p $(dir $@) $(fixupcmd) $^ > $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.3 -r 1.4 aclocal.m4 Index: aclocal.m4 =================================================================== RCS file: /cvs/dirsec/ldapserver/aclocal.m4,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- aclocal.m4 2 Nov 2006 03:11:39 -0000 1.3 +++ aclocal.m4 3 Nov 2006 22:33:16 -0000 1.4 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.9.6 -*- Autoconf -*- +# generated automatically by aclocal 1.9.2 -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +# Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,7 +13,7 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# serial 48 AC_PROG_LIBTOOL +# serial 47 AC_PROG_LIBTOOL # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) @@ -123,7 +123,7 @@ # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. -Xsed='sed -e 1s/^X//' +Xsed='sed -e s/^X//' [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] # Same as above, but do not quote variable references. @@ -143,7 +143,7 @@ default_ofile=libtool can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except MSVC, +# All known linkers require a `.a' archive for static linking (except M$VC, # which needs '.lib'). libext=a ltmain="$ac_aux_dir/ltmain.sh" @@ -163,7 +163,6 @@ test -z "$AS" && AS=as test -z "$CC" && CC=cc test -z "$LTCC" && LTCC=$CC -test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS test -z "$DLLTOOL" && DLLTOOL=dlltool test -z "$LD" && LD=ld test -z "$LN_S" && LN_S="ln -s" @@ -183,17 +182,15 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" ;; esac old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" fi -_LT_CC_BASENAME([$compiler]) - # Only perform the check for file, if the check method requires it case $deplibs_check_method in file_magic*) @@ -234,56 +231,11 @@ # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - # Allow CC to be a program name with arguments. compiler=$CC ])# _LT_AC_SYS_COMPILER -# _LT_CC_BASENAME(CC) -# ------------------- -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -AC_DEFUN([_LT_CC_BASENAME], -[for cc_temp in $1""; do - case $cc_temp in - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -]) - - -# _LT_COMPILER_BOILERPLATE -# ------------------------ -# Check for compiler boilerplate output or warnings with -# the simple compiler test code. -AC_DEFUN([_LT_COMPILER_BOILERPLATE], -[ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$rm conftest* -])# _LT_COMPILER_BOILERPLATE - - -# _LT_LINKER_BOILERPLATE -# ---------------------- -# Check for linker boilerplate output or warnings with -# the simple link test code. -AC_DEFUN([_LT_LINKER_BOILERPLATE], -[ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$rm conftest* -])# _LT_LINKER_BOILERPLATE - - # _LT_AC_SYS_LIBPATH_AIX # ---------------------- # Links a minimal program and checks the executable @@ -356,15 +308,15 @@ # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH +if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi if test -z "$ECHO"; then if test "X${echo_test_string+set}" != Xset; then # find a string as large as possible, as long as the shell can cope with it for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if (echo_test_string=`eval $cmd`) 2>/dev/null && - echo_test_string=`eval $cmd` && + if (echo_test_string="`eval $cmd`") 2>/dev/null && + echo_test_string="`eval $cmd`" && (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null then break @@ -533,7 +485,7 @@ # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in + case "`/usr/bin/file conftest.o`" in *32-bit*) case $host in x86_64-*linux*) @@ -584,22 +536,6 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in - *64-bit*) - case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; - *) LD="${LD-ld} -64" ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; - AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], [*-*-cygwin* | *-*-mingw* | *-*-pw32*) AC_CHECK_TOOL(DLLTOOL, dlltool, false) @@ -631,7 +567,7 @@ # with a dollar sign (not a hyphen), so the echo should work correctly. # The option is referenced via a variable to avoid confusing sed. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) @@ -641,10 +577,8 @@ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + # So say no if there are warnings [...3311 lines suppressed...] -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. -# serial 4 +# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 3 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ @@ -7027,16 +6694,27 @@ fi ]) -# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - # AM_PROG_MKDIR_P # --------------- # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. -# + +# Copyright (C) 2003, 2004 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories # created by `make install' are always world readable, even if the # installer happens to have an overly restrictive umask (e.g. 077). @@ -7090,15 +6768,26 @@ fi AC_SUBST([mkdir_p])]) -# Helper functions for option handling. -*- Autoconf -*- +# Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. -# serial 3 +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 2 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -7123,16 +6812,28 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Check to make sure that the build environment is sane. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. # -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# Check to make sure that the build environment is sane. +# + +# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. -# serial 4 +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 3 # AM_SANITY_CHECK # --------------- @@ -7175,14 +6876,25 @@ fi AC_MSG_RESULT(yes)]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - # AM_PROG_INSTALL_STRIP -# --------------------- + +# Copyright (C) 2001, 2003 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + # One issue with vendor `install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip @@ -7205,13 +6917,25 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# Copyright (C) 2004 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 1 -# serial 2 # _AM_PROG_TAR(FORMAT) # -------------------- Index: compile =================================================================== RCS file: /cvs/dirsec/ldapserver/compile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- compile 2 Nov 2006 03:11:39 -0000 1.2 +++ compile 3 Nov 2006 22:33:16 -0000 1.3 @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand `-c -o'. -scriptversion=2005-05-14.22 +scriptversion=2004-09-10.20 -# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -18,7 +18,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -47,11 +47,11 @@ Report bugs to . EOF - exit $? + exit 0 ;; -v | --v*) echo "compile $scriptversion" - exit $? + exit 0 ;; esac @@ -125,8 +125,6 @@ if test -f "$cofile"; then mv "$cofile" "$ofile" -elif test -f "${cofile}bj"; then - mv "${cofile}bj" "$ofile" fi rmdir "$lockdir" Index: config.guess =================================================================== RCS file: /cvs/dirsec/ldapserver/config.guess,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- config.guess 2 Nov 2006 03:11:39 -0000 1.2 +++ config.guess 3 Nov 2006 22:33:16 -0000 1.3 @@ -1,9 +1,9 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -timestamp='2005-07-08' +timestamp='2004-09-07' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -17,15 +17,13 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. - # Originally written by Per Bothner . # Please send patches to . Submit a context # diff and a properly formatted ChangeLog entry. @@ -55,7 +53,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -68,11 +66,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; + echo "$timestamp" ; exit 0 ;; --version | -v ) - echo "$version" ; exit ;; + echo "$version" ; exit 0 ;; --help | --h* | -h ) - echo "$usage"; exit ;; + echo "$usage"; exit 0 ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -125,7 +123,7 @@ ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ; set_cc_for_build= ;' +esac ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi at noc.rutgers.edu 1994-08-24) @@ -198,20 +196,55 @@ # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" - exit ;; + exit 0 ;; + amd64:OpenBSD:*:*) + echo x86_64-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + amiga:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + cats:OpenBSD:*:*) + echo arm-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + hp300:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + luna88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mac68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + macppc:OpenBSD:*:*) + echo powerpc-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvmeppc:OpenBSD:*:*) + echo powerpc-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + sgi:OpenBSD:*:*) + echo mips64-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + sun3:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} - exit ;; + echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit ;; + exit 0 ;; macppc:MirBSD:*:*) echo powerppc-unknown-mirbsd${UNAME_RELEASE} - exit ;; + exit 0 ;; *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} - exit ;; + exit 0 ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -264,43 +297,37 @@ # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; + exit 0 ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead # of the specific Alpha model? echo alpha-pc-interix - exit ;; + exit 0 ;; 21064:Windows_NT:50:3) echo alpha-dec-winnt3.5 - exit ;; + exit 0 ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 - exit ;; + exit 0;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos - exit ;; + exit 0 ;; *:[Mm]orph[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-morphos - exit ;; + exit 0 ;; *:OS/390:*:*) echo i370-ibm-openedition - exit ;; - *:z/VM:*:*) - echo s390-ibm-zvmoe - exit ;; + exit 0 ;; *:OS400:*:*) echo powerpc-ibm-os400 - exit ;; + exit 0 ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} - exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; + exit 0;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp - exit ;; + exit 0;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. if test "`(/bin/universe) 2>/dev/null`" = att ; then @@ -308,32 +335,32 @@ else echo pyramid-pyramid-bsd fi - exit ;; + exit 0 ;; NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 - exit ;; + exit 0 ;; DRS?6000:unix:4.0:6*) echo sparc-icl-nx6 - exit ;; - DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) + exit 0 ;; + DRS?6000:UNIX_SV:4.2*:7*) case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7; exit ;; + sparc) echo sparc-icl-nx7 && exit 0 ;; esac ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + exit 0 ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + exit 0 ;; i86pc:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + exit 0 ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + exit 0 ;; sun4*:SunOS:*:*) case "`/usr/bin/arch -k`" in Series*|S4*) @@ -342,10 +369,10 @@ esac # Japanese Language versions have a version number like `4.1.3-JL'. echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit ;; + exit 0 ;; sun3*:SunOS:*:*) echo m68k-sun-sunos${UNAME_RELEASE} - exit ;; + exit 0 ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 @@ -357,10 +384,10 @@ echo sparc-sun-sunos${UNAME_RELEASE} ;; esac - exit ;; + exit 0 ;; aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} - exit ;; + exit 0 ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -371,40 +398,40 @@ # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit 0 ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit 0 ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit 0 ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) echo m68k-milan-mint${UNAME_RELEASE} - exit ;; + exit 0 ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) echo m68k-hades-mint${UNAME_RELEASE} - exit ;; + exit 0 ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; + exit 0 ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} - exit ;; + exit 0 ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} - exit ;; + exit 0 ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 - exit ;; + exit 0 ;; RISC*:ULTRIX:*:*) echo mips-dec-ultrix${UNAME_RELEASE} - exit ;; + exit 0 ;; VAX*:ULTRIX*:*:*) echo vax-dec-ultrix${UNAME_RELEASE} - exit ;; + exit 0 ;; 2020:CLIX:*:* | 2430:CLIX:*:*) echo clipper-intergraph-clix${UNAME_RELEASE} - exit ;; + exit 0 ;; mips:*:*:UMIPS | mips:*:*:RISCos) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -428,33 +455,32 @@ exit (-1); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && - dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && - SYSTEM_NAME=`$dummy $dummyarg` && - { echo "$SYSTEM_NAME"; exit; } + $CC_FOR_BUILD -o $dummy $dummy.c \ + && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ + && exit 0 echo mips-mips-riscos${UNAME_RELEASE} - exit ;; + exit 0 ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax - exit ;; + exit 0 ;; Motorola:*:4.3:PL8-*) echo powerpc-harris-powermax - exit ;; + exit 0 ;; Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) echo powerpc-harris-powermax - exit ;; + exit 0 ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix - exit ;; + exit 0 ;; m88k:CX/UX:7*:*) echo m88k-harris-cxux7 - exit ;; + exit 0 ;; m88k:*:4*:R4*) echo m88k-motorola-sysv4 - exit ;; + exit 0 ;; m88k:*:3*:R3*) echo m88k-motorola-sysv3 - exit ;; + exit 0 ;; AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` @@ -470,29 +496,29 @@ else echo i586-dg-dgux${UNAME_RELEASE} fi - exit ;; + exit 0 ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 - exit ;; + exit 0 ;; M88*:*:R3*:*) # Delta 88k system running SVR3 echo m88k-motorola-sysv3 - exit ;; + exit 0 ;; XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) echo m88k-tektronix-sysv3 - exit ;; + exit 0 ;; Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) echo m68k-tektronix-bsd - exit ;; + exit 0 ;; *:IRIX*:*:*) echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit ;; + exit 0 ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' i*86:AIX:*:*) echo i386-ibm-aix - exit ;; + exit 0 ;; ia64:AIX:*:*) if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` @@ -500,7 +526,7 @@ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit ;; + exit 0 ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then eval $set_cc_for_build @@ -515,18 +541,14 @@ exit(0); } EOF - if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` - then - echo "$SYSTEM_NAME" - else - echo rs6000-ibm-aix3.2.5 - fi + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 + echo rs6000-ibm-aix3.2.5 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 else echo rs6000-ibm-aix3.2 fi - exit ;; + exit 0 ;; *:AIX:*:[45]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then @@ -540,28 +562,28 @@ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit ;; + exit 0 ;; *:AIX:*:*) echo rs6000-ibm-aix - exit ;; + exit 0 ;; ibmrt:4.4BSD:*|romp-ibm:BSD:*) echo romp-ibm-bsd4.4 - exit ;; + exit 0 ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit ;; # report: romp-ibm BSD 4.3 + exit 0 ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx - exit ;; + exit 0 ;; DPX/2?00:B.O.S.:*:*) echo m68k-bull-sysv3 - exit ;; + exit 0 ;; 9000/[34]??:4.3bsd:1.*:*) echo m68k-hp-bsd - exit ;; + exit 0 ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) echo m68k-hp-bsd4.4 - exit ;; + exit 0 ;; 9000/[34678]??:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` case "${UNAME_MACHINE}" in @@ -623,19 +645,9 @@ esac if [ ${HP_ARCH} = "hppa2.0w" ] then - eval $set_cc_for_build - - # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating - # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler - # generating 64-bit code. GNU and HP use different nomenclature: - # - # $ CC_FOR_BUILD=cc ./config.guess - # => hppa2.0w-hp-hpux11.23 - # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess - # => hppa64-hp-hpux11.23 - - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | - grep __LP64__ >/dev/null + # avoid double evaluation of $set_cc_for_build + test -n "$CC_FOR_BUILD" || eval $set_cc_for_build + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null then HP_ARCH="hppa2.0w" else @@ -643,11 +655,11 @@ fi fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit ;; + exit 0 ;; ia64:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` echo ia64-hp-hpux${HPUX_REV} - exit ;; + exit 0 ;; 3050*:HI-UX:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -675,166 +687,158 @@ exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 echo unknown-hitachi-hiuxwe2 - exit ;; + exit 0 ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) echo hppa1.1-hp-bsd - exit ;; + exit 0 ;; 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd - exit ;; + exit 0 ;; *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix - exit ;; + exit 0 ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) echo hppa1.1-hp-osf - exit ;; + exit 0 ;; hp8??:OSF1:*:*) echo hppa1.0-hp-osf - exit ;; + exit 0 ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then echo ${UNAME_MACHINE}-unknown-osf1mk else echo ${UNAME_MACHINE}-unknown-osf1 fi - exit ;; + exit 0 ;; parisc*:Lites*:*:*) echo hppa1.1-hp-lites - exit ;; + exit 0 ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit ;; + exit 0 ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit 0 ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit ;; + exit 0 ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit ;; + exit 0 ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit ;; + exit 0 ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + exit 0 ;; CRAY*[A-Z]90:*:*:*) echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ -e 's/\.[^.]*$/.X/' - exit ;; + exit 0 ;; CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + exit 0 ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + exit 0 ;; CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + exit 0 ;; *:UNICOS/mp:*:*) echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + exit 0 ;; 5000:UNIX_System_V:4.*:*) FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + exit 0 ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit ;; + exit 0 ;; sparc*:BSD/OS:*:*) echo sparc-unknown-bsdi${UNAME_RELEASE} - exit ;; + exit 0 ;; *:BSD/OS:*:*) echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit ;; + exit 0 ;; *:FreeBSD:*:*) echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit ;; + exit 0 ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin - exit ;; + exit 0 ;; i*:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; - i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 - exit ;; + exit 0 ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 - exit ;; + exit 0 ;; x86:Interix*:[34]*) echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' - exit ;; + exit 0 ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks - exit ;; + exit 0 ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we # UNAME_MACHINE based on the output of uname instead of i386? echo i586-pc-interix - exit ;; + exit 0 ;; i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin - exit ;; - amd64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin - exit ;; + exit 0 ;; p*:CYGWIN*:*) echo powerpcle-unknown-cygwin - exit ;; + exit 0 ;; prep*:SunOS:5.*:*) echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + exit 0 ;; *:GNU:*:*) # the GNU system echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit ;; + exit 0 ;; *:GNU/*:*:*) # other systems with GNU libc and userland echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu - exit ;; + exit 0 ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix - exit ;; + exit 0 ;; arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; cris:Linux:*:*) echo cris-axis-linux-gnu - exit ;; + exit 0 ;; crisv32:Linux:*:*) echo crisv32-axis-linux-gnu - exit ;; + exit 0 ;; frv:Linux:*:*) echo frv-unknown-linux-gnu - exit ;; + exit 0 ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; m32r*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; mips:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -852,7 +856,7 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 ;; mips64:Linux:*:*) eval $set_cc_for_build @@ -871,14 +875,14 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 ;; ppc:Linux:*:*) echo powerpc-unknown-linux-gnu - exit ;; + exit 0 ;; ppc64:Linux:*:*) echo powerpc64-unknown-linux-gnu - exit ;; + exit 0 ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -892,7 +896,7 @@ objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit ;; + exit 0 ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -900,25 +904,25 @@ PA8*) echo hppa2.0-unknown-linux-gnu ;; *) echo hppa-unknown-linux-gnu ;; esac - exit ;; + exit 0 ;; parisc64:Linux:*:* | hppa64:Linux:*:*) echo hppa64-unknown-linux-gnu - exit ;; + exit 0 ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux - exit ;; + exit 0 ;; sh64*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu - exit ;; + exit 0 ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent @@ -936,15 +940,15 @@ ;; a.out-i386-linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit ;; + exit 0 ;; coff-i386) echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit ;; + exit 0 ;; "") # Either a pre-BFD a.out linker (linux-gnuoldld) or # one that does not give us useful --help. echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit ;; + exit 0 ;; esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build @@ -972,18 +976,15 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - test x"${LIBC}" != x && { - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" - exit - } - test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } + test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 + test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both # sysname and nodename. echo i386-sequent-sysv4 - exit ;; + exit 0 ;; i*86:UNIX_SV:4.2MP:2.*) # Unixware is an offshoot of SVR4, but it has its own version # number series starting with 2... @@ -991,27 +992,27 @@ # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit ;; + exit 0 ;; i*86:OS/2:*:*) # If we were able to find `uname', then EMX Unix compatibility # is probably installed. echo ${UNAME_MACHINE}-pc-os2-emx - exit ;; + exit 0 ;; i*86:XTS-300:*:STOP) echo ${UNAME_MACHINE}-unknown-stop - exit ;; + exit 0 ;; i*86:atheos:*:*) echo ${UNAME_MACHINE}-unknown-atheos - exit ;; - i*86:syllable:*:*) + exit 0 ;; + i*86:syllable:*:*) echo ${UNAME_MACHINE}-pc-syllable - exit ;; + exit 0 ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) echo i386-unknown-lynxos${UNAME_RELEASE} - exit ;; + exit 0 ;; i*86:*DOS:*:*) echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit ;; + exit 0 ;; i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then @@ -1019,16 +1020,15 @@ else echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi - exit ;; - i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. + exit 0 ;; + i*86:*:5:[78]*) case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit ;; + exit 0 ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null 2>&1 ; then echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 fi - exit ;; + exit 0 ;; mini*:CTIX:SYS*5:*) # "miniframe" echo m68010-convergent-sysv - exit ;; + exit 0 ;; mc68k:UNIX:SYSTEM5:3.51m) echo m68k-convergent-sysv - exit ;; + exit 0 ;; M680?0:D-NIX:5.3:*) echo m68k-diab-dnix - exit ;; + exit 0 ;; M68*:*:R3V[5678]*:*) - test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; + test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + && echo i486-ncr-sysv4.3${OS_REL} && exit 0 /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; + && echo i486-ncr-sysv4 && exit 0 ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} - exit ;; + exit 0 ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 - exit ;; + exit 0 ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} - exit ;; + exit 0 ;; rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit ;; + exit 0 ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit ;; + exit 0 ;; SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} - exit ;; + exit 0 ;; RM*:ReliantUNIX-*:*:*) echo mips-sni-sysv4 - exit ;; + exit 0 ;; RM*:SINIX-*:*:*) echo mips-sni-sysv4 - exit ;; + exit 0 ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` @@ -1120,65 +1120,61 @@ else echo ns32k-sni-sysv fi - exit ;; + exit 0 ;; PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort # says echo i586-unisys-sysv4 - exit ;; + exit 0 ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm echo hppa1.1-stratus-sysv4 - exit ;; + exit 0 ;; *:*:*:FTX*) # From seanf at swdc.stratus.com. echo i860-stratus-sysv4 - exit ;; - i*86:VOS:*:*) - # From Paul.Green at stratus.com. - echo ${UNAME_MACHINE}-stratus-vos - exit ;; + exit 0 ;; *:VOS:*:*) # From Paul.Green at stratus.com. echo hppa1.1-stratus-vos - exit ;; + exit 0 ;; mc68*:A/UX:*:*) echo m68k-apple-aux${UNAME_RELEASE} - exit ;; + exit 0 ;; news*:NEWS-OS:6*:*) echo mips-sony-newsos6 - exit ;; + exit 0 ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then echo mips-nec-sysv${UNAME_RELEASE} else echo mips-unknown-sysv${UNAME_RELEASE} fi - exit ;; + exit 0 ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos - exit ;; + exit 0 ;; BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. echo powerpc-apple-beos - exit ;; + exit 0 ;; BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos - exit ;; + exit 0 ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} - exit ;; + exit 0 ;; SX-5:SUPER-UX:*:*) echo sx5-nec-superux${UNAME_RELEASE} - exit ;; + exit 0 ;; SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} - exit ;; + exit 0 ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit ;; + exit 0 ;; *:Rhapsody:*:*) echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit ;; + exit 0 ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown case $UNAME_PROCESSOR in @@ -1186,7 +1182,7 @@ unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit ;; + exit 0 ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` if test "$UNAME_PROCESSOR" = "x86"; then @@ -1194,25 +1190,22 @@ UNAME_MACHINE=pc fi echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit ;; + exit 0 ;; *:QNX:*:4*) echo i386-pc-qnx - exit ;; - NSE-?:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} - exit ;; + exit 0 ;; NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} - exit ;; + exit 0 ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux - exit ;; + exit 0 ;; BS2000:POSIX*:*:*) echo bs2000-siemens-sysv - exit ;; + exit 0 ;; DS/*:UNIX_System_V:*:*) echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit ;; + exit 0 ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 @@ -1223,44 +1216,38 @@ UNAME_MACHINE="$cputype" fi echo ${UNAME_MACHINE}-unknown-plan9 - exit ;; + exit 0 ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 - exit ;; + exit 0 ;; *:TENEX:*:*) echo pdp10-unknown-tenex - exit ;; + exit 0 ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) echo pdp10-dec-tops20 - exit ;; + exit 0 ;; XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) echo pdp10-xkl-tops20 - exit ;; + exit 0 ;; *:TOPS-20:*:*) echo pdp10-unknown-tops20 - exit ;; + exit 0 ;; *:ITS:*:*) echo pdp10-unknown-its - exit ;; + exit 0 ;; SEI:*:*:SEIUX) echo mips-sei-seiux${UNAME_RELEASE} - exit ;; + exit 0 ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit ;; + exit 0 ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms ; exit ;; - I*) echo ia64-dec-vms ; exit ;; - V*) echo vax-dec-vms ; exit ;; - esac ;; - *:XENIX:*:SysV) - echo i386-pc-xenix - exit ;; - i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' - exit ;; + A*) echo alpha-dec-vms && exit 0 ;; + I*) echo ia64-dec-vms && exit 0 ;; + V*) echo vax-dec-vms && exit 0 ;; + esac esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1292,7 +1279,7 @@ #endif #if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); + printf ("arm-acorn-riscix"); exit (0); #endif #if defined (hp300) && !defined (hpux) @@ -1381,12 +1368,11 @@ } EOF -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 # Apollos put the system type in the environment. -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } # Convex versions that predate uname can use getsysinfo(1) @@ -1395,22 +1381,22 @@ case `getsysinfo -f cpu_type` in c1*) echo c1-convex-bsd - exit ;; + exit 0 ;; c2*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit 0 ;; c34*) echo c34-convex-bsd - exit ;; + exit 0 ;; c38*) echo c38-convex-bsd - exit ;; + exit 0 ;; c4*) echo c4-convex-bsd - exit ;; + exit 0 ;; esac fi @@ -1421,9 +1407,7 @@ the operating system you are using. It is advised that you download the most up to date version of the config scripts from - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess -and - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub + ftp://ftp.gnu.org/pub/gnu/config/ If the version you run ($0) is already up to date, please send the following data and any information you think might be Index: config.sub =================================================================== RCS file: /cvs/dirsec/ldapserver/config.sub,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- config.sub 2 Nov 2006 03:11:39 -0000 1.2 +++ config.sub 3 Nov 2006 22:33:16 -0000 1.3 @@ -1,9 +1,9 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -timestamp='2005-07-08' +timestamp='2004-08-29' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,15 +21,14 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. -# +# Foundation, Inc., 59 Temple Place - Suite 330, +# Boston, MA 02111-1307, USA. + # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. - # Please send patches to . Submit a context # diff and a properly formatted ChangeLog entry. # @@ -71,7 +70,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -84,11 +83,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; + echo "$timestamp" ; exit 0 ;; --version | -v ) - echo "$version" ; exit ;; + echo "$version" ; exit 0 ;; --help | --h* | -h ) - echo "$usage"; exit ;; + echo "$usage"; exit 0 ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -100,7 +99,7 @@ *local*) # First pass through any local machine types. echo $1 - exit ;; + exit 0;; * ) break ;; @@ -232,14 +231,13 @@ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ - | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ + | m32r | m32rle | m68000 | m68k | m88k | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -248,7 +246,6 @@ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ - | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ | mipsisa64 | mipsisa64el \ @@ -257,28 +254,23 @@ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ - | ms1 \ | msp430 \ | ns16k | ns32k \ - | or32 \ + | openrisc | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b \ + | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xscale | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; - m32c) - basic_machine=$basic_machine-unknown - ;; m6811 | m68hc11 | m6812 | m68hc12) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown @@ -306,7 +298,7 @@ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* \ - | bfin-* | bs2000-* \ + | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ @@ -318,7 +310,7 @@ | ip2k-* | iq2000-* \ | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* \ + | m88110-* | m88k-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -327,7 +319,6 @@ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ - | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ | mipsisa64-* | mipsisa64el-* \ @@ -336,7 +327,6 @@ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ - | ms1-* \ | msp430-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ @@ -344,23 +334,20 @@ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ - | sparclite-* \ + | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ - | xstormy16-* | xtensa-* \ + | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ + | xtensa-* \ | ymp-* \ | z8k-*) ;; - m32c-*) - ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) @@ -502,10 +489,6 @@ basic_machine=m88k-motorola os=-sysv3 ;; - djgpp) - basic_machine=i586-pc - os=-msdosdjgpp - ;; dpx20 | dpx20-*) basic_machine=rs6000-bull os=-bosx @@ -771,8 +754,9 @@ basic_machine=hppa1.1-oki os=-proelf ;; - openrisc | openrisc-*) + or32 | or32-*) basic_machine=or32-unknown + os=-coff ;; os400) basic_machine=powerpc-ibm @@ -1045,10 +1029,6 @@ basic_machine=hppa1.1-winbond os=-proelf ;; - xbox) - basic_machine=i686-pc - os=-mingw32 - ;; xps | xps100) basic_machine=xps100-honeywell ;; @@ -1098,9 +1078,12 @@ we32k) basic_machine=we32k-att ;; - sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) + sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; + sh64) + basic_machine=sh64-unknown + ;; sparc | sparcv8 | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; @@ -1187,8 +1170,7 @@ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku*) + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1206,7 +1188,7 @@ os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; -mac*) @@ -1315,9 +1297,6 @@ -kaos*) os=-kaos ;; - -zvmoe) - os=-zvmoe - ;; -none) ;; *) @@ -1395,9 +1374,6 @@ *-be) os=-beos ;; - *-haiku) - os=-haiku - ;; *-ibm) os=-aix ;; @@ -1569,7 +1545,7 @@ esac echo $basic_machine$os -exit +exit 0 # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.7 -r 1.8 configure Index: configure =================================================================== RCS file: /cvs/dirsec/ldapserver/configure,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- configure 2 Nov 2006 03:11:39 -0000 1.7 +++ configure 3 Nov 2006 22:33:16 -0000 1.8 @@ -280,15 +280,15 @@ # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH +if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi if test -z "$ECHO"; then if test "X${echo_test_string+set}" != Xset; then # find a string as large as possible, as long as the shell can cope with it for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if (echo_test_string=`eval $cmd`) 2>/dev/null && - echo_test_string=`eval $cmd` && + if (echo_test_string="`eval $cmd`") 2>/dev/null && + echo_test_string="`eval $cmd`" && (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null then break @@ -3820,7 +3820,7 @@ # Add /usr/xpg4/bin/sed as it is typically found on Solaris # along with /bin/sed that truncates output. for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && continue + test ! -f $lt_ac_sed && break cat /dev/null > conftest.in lt_ac_count=0 echo $ECHO_N "0123456789$ECHO_C" >conftest.in @@ -3845,10 +3845,10 @@ fi done done +SED=$lt_cv_path_SED fi -SED=$lt_cv_path_SED echo "$as_me:$LINENO: result: $SED" >&5 echo "${ECHO_T}$SED" >&6 @@ -3925,7 +3925,7 @@ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then lt_cv_path_LD="$ac_dir/$ac_prog" # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. + # but apparently some GNU ld's only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 &6 else - # I'd rather use --version here, but apparently some GNU lds only accept -v. + # I'd rather use --version here, but apparently some GNU ld's only accept -v. case `$LD -v 2>&1 &5 echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6 @@ -4008,43 +3999,36 @@ # Let the user override the test. lt_cv_path_NM="$NM" else - lt_nm_to_check="${ac_tool_prefix}nm" - if test -n "$ac_tool_prefix" && test "$build" = "$host"; then - lt_nm_to_check="$lt_nm_to_check nm" - fi - for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) - lt_cv_path_NM="$tmp_nm -B" + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + tmp_nm="$ac_dir/${ac_tool_prefix}nm" + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + # Check to see if the nm accepts a BSD-compat flag. + # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # nm: unknown option "B" ignored + # Tru64's nm complains that /dev/null is an invalid object file + case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in + */dev/null* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" + break + ;; + *) + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" break ;; *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in - */dev/null*) - lt_cv_path_NM="$tmp_nm -p" - break - ;; - *) - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags - ;; - esac + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but + continue # so that we can try to find one that supports BSD flags ;; esac - fi - done - IFS="$lt_save_ifs" + esac + fi done + IFS="$lt_save_ifs" test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm fi fi @@ -4091,7 +4075,7 @@ lt_cv_deplibs_check_method=pass_all ;; -bsdi[45]*) +bsdi4*) lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' lt_cv_file_magic_cmd='/usr/bin/file -L' lt_cv_file_magic_test_file=/shlib/libc.so @@ -4114,13 +4098,13 @@ lt_cv_deplibs_check_method=pass_all ;; -freebsd* | kfreebsd*-gnu | dragonfly*) +freebsd* | kfreebsd*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library' lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; @@ -4136,7 +4120,7 @@ hpux10.20* | hpux11*) lt_cv_file_magic_cmd=/usr/bin/file - case $host_cpu in + case "$host_cpu" in ia64*) lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so @@ -4152,11 +4136,6 @@ esac ;; -interix3*) - # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' - ;; - irix5* | irix6* | nonstopux*) case $LD in *-32|*"-32 ") libmagic=32-bit;; @@ -4169,6 +4148,15 @@ # This must be Linux ELF. linux*) [...11373 lines suppressed...] + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; + x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; + x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;; + esac + else : + # compilation failed + lt_cv_dlopen_self_static=no + fi fi +rm -fr conftest* -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 -hardcode_action_GCJ= -if test -n "$hardcode_libdir_flag_spec_GCJ" || \ - test -n "$runpath_var_GCJ" || \ - test "X$hardcode_automatic_GCJ" = "Xyes" ; then - # We can hardcode non-existant directories. - if test "$hardcode_direct_GCJ" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no && - test "$hardcode_minus_L_GCJ" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action_GCJ=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action_GCJ=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action_GCJ=unsupported fi -echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 -echo "${ECHO_T}$hardcode_action_GCJ" >&6 +echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 +echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 + fi -if test "$hardcode_action_GCJ" = relink; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless + CPPFLAGS="$save_CPPFLAGS" + LDFLAGS="$save_LDFLAGS" + LIBS="$save_LIBS" + ;; + esac + + case $lt_cv_dlopen_self in + yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; + *) enable_dlopen_self=unknown ;; + esac + + case $lt_cv_dlopen_self_static in + yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; + *) enable_dlopen_self_static=unknown ;; + esac fi @@ -17806,7 +18389,7 @@ # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \ SED SHELL STRIP \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ @@ -17907,12 +18490,6 @@ # The host system. host_alias=$host_alias host=$host -host_os=$host_os - -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os # An echo program that does not interpret backslashes. echo=$lt_echo @@ -17924,9 +18501,6 @@ # A C compiler. LTCC=$lt_LTCC -# LTCC compiler flags. -LTCFLAGS=$lt_LTCFLAGS - # A language-specific compiler. CC=$lt_compiler_GCJ @@ -17992,7 +18566,7 @@ # Does compiler simultaneously support -c and -o options? compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ -# Must we lock files when doing compilation? +# Must we lock files when doing compilation ? need_locks=$lt_need_locks # Do we need the lib prefix for modules? @@ -18236,42 +18810,15 @@ # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - # Allow CC to be a program name with arguments. compiler=$CC -# save warnings/boilerplate of simple test code -ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$rm conftest* - -ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$rm conftest* - - # Allow CC to be a program name with arguments. lt_save_CC="$CC" CC=${RC-"windres"} compiler=$CC compiler_RC=$CC -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - lt_cv_prog_compiler_c_o_RC=yes # The else clause should only fire when bootstrapping the @@ -18287,7 +18834,7 @@ # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \ SED SHELL STRIP \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ @@ -18388,12 +18935,6 @@ # The host system. host_alias=$host_alias host=$host -host_os=$host_os - -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os # An echo program that does not interpret backslashes. echo=$lt_echo @@ -18405,9 +18946,6 @@ # A C compiler. LTCC=$lt_LTCC -# LTCC compiler flags. -LTCFLAGS=$lt_LTCFLAGS - # A language-specific compiler. CC=$lt_compiler_RC @@ -18473,7 +19011,7 @@ # Does compiler simultaneously support -c and -o options? compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC -# Must we lock files when doing compilation? +# Must we lock files when doing compilation ? need_locks=$lt_need_locks # Do we need the lib prefix for modules? Index: depcomp =================================================================== RCS file: /cvs/dirsec/ldapserver/depcomp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- depcomp 2 Nov 2006 03:11:39 -0000 1.2 +++ depcomp 3 Nov 2006 22:33:16 -0000 1.3 @@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2005-07-09.11 +scriptversion=2004-05-31.23 -# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -50,11 +50,11 @@ Report bugs to . EOF - exit $? + exit 0 ;; -v | --v*) echo "depcomp $scriptversion" - exit $? + exit 0 ;; esac @@ -287,43 +287,36 @@ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mecanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 + # Dependencies are output in .lo.d with libtool 1.4. + # With libtool 1.5 they are output both in $dir.libs/$base.o.d + # and in $dir.libs/$base.o.d and $dir$base.o.d. We process the + # latter, because the former will be cleaned when $dir.libs is + # erased. + tmpdepfile1="$dir.libs/$base.lo.d" + tmpdepfile2="$dir$base.o.d" + tmpdepfile3="$dir.libs/$base.d" "$@" -Wc,-MD else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d + tmpdepfile1="$dir$base.o.d" + tmpdepfile2="$dir$base.d" + tmpdepfile3="$dir$base.d" "$@" -MD fi stat=$? if test $stat -eq 0; then : else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done + if test -f "$tmpdepfile1"; then + tmpdepfile="$tmpdepfile1" + elif test -f "$tmpdepfile2"; then + tmpdepfile="$tmpdepfile2" + else + tmpdepfile="$tmpdepfile3" + fi if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" # That's a tab and a space in the []. @@ -467,8 +460,7 @@ done "$@" -E | - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | + sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" Index: install-sh =================================================================== RCS file: /cvs/dirsec/ldapserver/install-sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- install-sh 2 Nov 2006 03:11:39 -0000 1.2 +++ install-sh 3 Nov 2006 22:33:16 -0000 1.3 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2005-05-14.22 +scriptversion=2004-09-10.20 # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -109,7 +109,7 @@ shift continue;; - --help) echo "$usage"; exit $?;; + --help) echo "$usage"; exit 0;; -m) chmodcmd="$chmodprog $2" shift @@ -134,7 +134,7 @@ shift continue;; - --version) echo "$0 $scriptversion"; exit $?;; + --version) echo "$0 $scriptversion"; exit 0;; *) # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. @@ -213,7 +213,7 @@ fi # This sed command emulates the dirname command. - dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` + dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` # Make sure that the destination directory exists. @@ -226,8 +226,7 @@ oIFS=$IFS # Some sh's can't handle IFS=/ for some reason. IFS='%' - set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` - shift + set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` IFS=$oIFS pathcomp= @@ -296,7 +295,7 @@ || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ || { echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 - (exit 1); exit 1 + (exit 1); exit } else : @@ -307,12 +306,12 @@ $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" } } - fi || { (exit 1); exit 1; } + fi || { (exit 1); exit; } done # The final little trick to "correctly" pass the exit status to the exit trap. { - (exit 0); exit 0 + (exit 0); exit } # Local variables: Index: missing =================================================================== RCS file: /cvs/dirsec/ldapserver/missing,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- missing 2 Nov 2006 03:11:39 -0000 1.2 +++ missing 3 Nov 2006 22:33:16 -0000 1.3 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-06-08.21 +scriptversion=2004-09-07.08 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. @@ -19,8 +19,8 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -87,12 +87,12 @@ yacc create \`y.tab.[ch]', if possible, from existing .[ch] Send bug reports to ." - exit $? + exit 0 ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) echo "missing $scriptversion (GNU Automake)" - exit $? + exit 0 ;; -*) @@ -288,18 +288,11 @@ call might also be the consequence of using a buggy \`make' (AIX, DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 + file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` + file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file` + fi touch $file ;; From fedora-directory-commits at redhat.com Mon Nov 6 19:33:44 2006 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Mon, 6 Nov 2006 12:33:44 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src create_instance.c, 1.32, 1.33 create_instance.h, 1.9, 1.10 Message-ID: <200611061933.kA6JXiad010212@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/ldapserver/ldap/admin/src In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10171/ldap/admin/src Modified Files: create_instance.c create_instance.h Log Message: Resolves: 214238 Summary: Added new config parameter for setting the SASL plug-in path. Index: create_instance.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- create_instance.c 26 Oct 2006 17:45:27 -0000 1.32 +++ create_instance.c 6 Nov 2006 19:33:41 -0000 1.33 @@ -2700,6 +2700,10 @@ fprintf(f, "nsslapd-lockdir: %s\n", cf->lock_dir); fprintf(f, "nsslapd-tmpdir: %s\n", cf->tmp_dir); fprintf(f, "nsslapd-certdir: %s\n", cf->cert_dir); +/* We use the system SASL by default on Linux, so we don't need to set sasl path */ +#if !defined( LINUX ) + fprintf(f, "nsslapd-saslpath: %s\n", cf->sasl_path); +#endif fprintf(f, "nsslapd-accesslog-logging-enabled: on\n"); fprintf(f, "nsslapd-accesslog-maxlogsperdir: 10\n"); fprintf(f, "nsslapd-accesslog-mode: 600\n"); @@ -4293,6 +4297,7 @@ * cf->tmp_dir: /tmp/slapd- * cf->ldif_dir: //ldif * cf->cert_dir: /BRAND_DS/slapd- + * cf->sasl_path: /sasl2 * cf->plugin_dir: /plugins * * NOTES: @@ -4342,6 +4347,7 @@ cf->sroot = PR_smprintf("%s%cusr%clib%c%s", prefix, FILE_PATHSEP, FILE_PATHSEP, FILE_PATHSEP, cf->brand_ds); + cf->sasl_path = PR_smprintf("%s%csasl2", cf->sroot, FILE_PATHSEP); cf->plugin_dir = PR_smprintf("%s%cplugins", cf->sroot, FILE_PATHSEP); if (!(cf->servname = ds_a_get_cgi_var("servname", "Server Name", Index: create_instance.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- create_instance.h 25 Oct 2006 00:04:41 -0000 1.9 +++ create_instance.h 6 Nov 2006 19:33:41 -0000 1.10 @@ -136,6 +136,7 @@ char *plugin_dir; char *tmp_dir; char *cert_dir; + char *sasl_path; char *prefix; } server_config_s; From fedora-directory-commits at redhat.com Mon Nov 6 19:33:45 2006 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Mon, 6 Nov 2006 12:33:45 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd config.c, 1.8, 1.9 libglobs.c, 1.11, 1.12 main.c, 1.13, 1.14 proto-slap.h, 1.22, 1.23 saslbind.c, 1.17, 1.18 slap.h, 1.16, 1.17 Message-ID: <200611061933.kA6JXjXL010221@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10171/ldap/servers/slapd Modified Files: config.c libglobs.c main.c proto-slap.h saslbind.c slap.h Log Message: Resolves: 214238 Summary: Added new config parameter for setting the SASL plug-in path. Index: config.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/config.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- config.c 13 Oct 2006 01:06:28 -0000 1.8 +++ config.c 6 Nov 2006 19:33:42 -0000 1.9 @@ -358,6 +358,19 @@ } } + /* set the sasl path; needed in main */ + workpath[0] = '\0'; + if (entry_has_attr_and_value(e, CONFIG_SASLPATH_ATTRIBUTE, + workpath, sizeof(workpath))) + { + if (config_set_saslpath(CONFIG_SASLPATH_ATTRIBUTE, + workpath, errorbuf, CONFIG_APPLY) != LDAP_SUCCESS) + { + LDAPDebug(LDAP_DEBUG_ANY, "%s: %s: %s. \n", configfile, + CONFIG_SASLPATH_ATTRIBUTE, errorbuf); + } + } + /* see if the entry is a child of the plugin base dn */ if (slapi_sdn_isparent(&plug_dn, slapi_entry_get_sdn_const(e))) Index: libglobs.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/libglobs.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- libglobs.c 13 Oct 2006 01:06:28 -0000 1.11 +++ libglobs.c 6 Nov 2006 19:33:42 -0000 1.12 @@ -529,6 +529,10 @@ {CONFIG_CERTDIR_ATTRIBUTE, config_set_certdir, NULL, 0, (void**)&global_slapdFrontendConfig.certdir, CONFIG_STRING, config_get_certdir}, + /* parameterizing sasl plugin path */ + {CONFIG_SASLPATH_ATTRIBUTE, config_set_saslpath, + NULL, 0, + (void**)&global_slapdFrontendConfig.saslpath, CONFIG_STRING, config_get_saslpath}, {CONFIG_REWRITE_RFC1274_ATTRIBUTE, config_set_rewrite_rfc1274, NULL, 0, (void**)&global_slapdFrontendConfig.rewrite_rfc1274, CONFIG_ON_OFF, NULL}, @@ -4305,6 +4309,42 @@ return retVal; } +char * +config_get_saslpath() +{ + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); + char *retVal; + + CFG_LOCK_READ(slapdFrontendConfig); + retVal = config_copy_strval(slapdFrontendConfig->saslpath); + CFG_UNLOCK_READ(slapdFrontendConfig); + + return retVal; +} + +int +config_set_saslpath(const char *attrname, char *value, char *errorbuf, int apply) +{ + int retVal = LDAP_SUCCESS; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); + + if ( config_value_is_null( attrname, value, errorbuf, 0 )) { + return LDAP_OPERATIONS_ERROR; + } + + if (!apply) { + return retVal; + } + + CFG_LOCK_WRITE(slapdFrontendConfig); + slapi_ch_free((void **)&slapdFrontendConfig->saslpath); + + slapdFrontendConfig->saslpath = slapi_ch_strdup(value); + + CFG_UNLOCK_WRITE(slapdFrontendConfig); + return retVal; +} + char ** config_get_errorlog_list() { Index: main.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/main.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- main.c 13 Oct 2006 01:06:28 -0000 1.13 +++ main.c 6 Nov 2006 19:33:42 -0000 1.14 @@ -748,7 +748,6 @@ * THE FIX: Move the two calls below before a call to * setup_internal_backends (down in this same function) */ - init_saslmechanisms(); ldapi_init_extended_ops(); @@ -777,6 +776,11 @@ exit(1); } + /* We need to init sasl after we load the bootstrap config since + * the config may be setting the sasl plugin path. + */ + init_saslmechanisms(); + /* -sduloutre: must be done before any internal search */ /* do it before splitting off to other modes too -robey */ /* -richm: must be done before reading config files */ Index: proto-slap.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/proto-slap.h,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- proto-slap.h 13 Oct 2006 01:06:28 -0000 1.22 +++ proto-slap.h 6 Nov 2006 19:33:42 -0000 1.23 @@ -304,6 +304,7 @@ int config_set_lockdir( const char *attrname, char *value, char *errorbuf, int apply ); int config_set_tmpdir( const char *attrname, char *value, char *errorbuf, int apply ); int config_set_certdir( const char *attrname, char *value, char *errorbuf, int apply ); +int config_set_saslpath( const char *attrname, char *value, char *errorbuf, int apply ); int config_set_attrname_exceptions( const char *attrname, char *value, char *errorbuf, int apply ); int config_set_hash_filters( const char *attrname, char *value, char *errorbuf, int apply ); int config_set_rewrite_rfc1274( const char *attrname, char *value, char *errorbuf, int apply ); @@ -404,6 +405,7 @@ char *config_get_lockdir(); char *config_get_tmpdir(); char *config_get_certdir(); +char *config_get_saslpath(); char **config_get_errorlog_list(); char **config_get_accesslog_list(); char **config_get_auditlog_list(); Index: saslbind.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/saslbind.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- saslbind.c 17 Aug 2006 15:33:03 -0000 1.17 +++ saslbind.c 6 Nov 2006 19:33:42 -0000 1.18 @@ -552,15 +552,21 @@ } #ifdef CYRUS_SASL -#if !defined(LINUX) static int ids_sasl_getpluginpath(sasl_conn_t *conn, const char **path) { - static char *pluginpath = "../../../lib/sasl2"; + /* Try to get path from config, otherwise check for SASL_PATH environment + * variable. If neither of these are set, just default to /usr/lib/sasl2 + */ + char *pluginpath = config_get_saslpath(); + if ((!pluginpath) || (*pluginpath == '\0')) { + if (!(pluginpath = getenv("SASL_PATH"))) { + pluginpath = "/usr/lib/sasl2"; + } + } *path = pluginpath; return SASL_OK; } #endif -#endif static sasl_callback_t ids_sasl_callbacks[] = { @@ -589,18 +595,12 @@ NULL }, #ifdef CYRUS_SASL - /* On Linux: we use system sasl and plugins are found in the default path - * /usr/lib/sasl2 - * On other platforms: we need to tell cyrus sasl where they are localted. - */ -#if !defined(LINUX) { SASL_CB_GETPATH, (IFP) ids_sasl_getpluginpath, NULL }, #endif -#endif { SASL_CB_LIST_END, (IFP) NULL, @@ -751,7 +751,7 @@ } PR_Unlock(pb->pb_conn->c_mutex); - LDAPDebug( LDAP_DEBUG_TRACE, ">= ids_sasl_listmech\n", 0, 0, 0 ); + LDAPDebug( LDAP_DEBUG_TRACE, "<= ids_sasl_listmech\n", 0, 0, 0 ); return ret; } Index: slap.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/slap.h,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- slap.h 13 Oct 2006 01:06:28 -0000 1.16 +++ slap.h 6 Nov 2006 19:33:42 -0000 1.17 @@ -1711,6 +1711,7 @@ #define CONFIG_LOCKDIR_ATTRIBUTE "nsslapd-lockdir" #define CONFIG_TMPDIR_ATTRIBUTE "nsslapd-tmpdir" #define CONFIG_CERTDIR_ATTRIBUTE "nsslapd-certdir" +#define CONFIG_SASLPATH_ATTRIBUTE "nsslapd-saslpath" #define CONFIG_SSLCLIENTAUTH_ATTRIBUTE "nsslapd-SSLclientAuth" #define CONFIG_SSL_CHECK_HOSTNAME_ATTRIBUTE "nsslapd-ssl-check-hostname" #define CONFIG_HASH_FILTERS_ATTRIBUTE "nsslapd-hash-filters" @@ -1888,6 +1889,7 @@ char *lockdir; /* full path name of directory containing lock files */ char *tmpdir; /* full path name of directory containing tmp files */ char *certdir; /* full path name of directory containing cert files */ + char *saslpath; /* full path name of directory containing sasl plugins */ int attrname_exceptions; /* if true, allow questionable attribute names */ int rewrite_rfc1274; /* return attrs for both v2 and v3 names */ char *schemareplace; /* see CONFIG_SCHEMAREPLACE_* #defines below */ From fedora-directory-commits at redhat.com Mon Nov 6 20:39:04 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Mon, 6 Nov 2006 13:39:04 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/cm/newinst ux-dialog.cc, 1.9, 1.10 ux-dialog.h, 1.4, 1.5 Message-ID: <200611062039.kA6Kd4Ms014345@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/cm/newinst In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14326 Modified Files: ux-dialog.cc ux-dialog.h Log Message: Bug(s) fixed: 214243 Bug Description: Advanced install loops at install sample entries Reviewed by: nhosoi (Thanks!) Fix Description: There were a couple of problems. The first problem is that askPopulate is not a YesNo dialog, it is just a general Input dialog. The second problem is that askPopulateSetup sets the input buffer size greater than the static buffer used to hold the input in the Dialog class, which is defined as char _buf[MED_BUF]. So the solution is to set the InputLen to be MED_BUF-1, which allows for the trailing null as well. Platforms tested: FC5 Flag Day: no Doc impact: no Index: ux-dialog.cc =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/ux-dialog.cc,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ux-dialog.cc 7 Apr 2006 01:33:37 -0000 1.9 +++ ux-dialog.cc 6 Nov 2006 20:39:01 -0000 1.10 @@ -1034,7 +1034,7 @@ return DIALOG_NEXT; } -DialogYesNo askPopulate( +DialogInput askPopulate( "You may wish to populate your new directory instance with some data.\n" "You may already have a file in LDIF format to use or some suggested\n" "entries can be added. If you want to import entries from an LDIF\n" @@ -1074,7 +1074,9 @@ } dialogSetup(me, SLAPD_KEY_INSTALL_LDIF_FILE, "none"); - me->setInputLen(1024); // it seems to get reset somewhere . . . + // max input buffer size is sizeof(Dialog::_buf)-1 + // Dialog::_buf is defined as char[MED_BUF] + me->setInputLen(MED_BUF-1); // it seems to get reset somewhere . . . long setupval = 0; if (me->getUserData(SETUP_DEFAULTS, setupval) == SETUP_ONLY || Index: ux-dialog.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/ux-dialog.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ux-dialog.h 19 Apr 2005 22:07:21 -0000 1.4 +++ ux-dialog.h 6 Nov 2006 20:39:01 -0000 1.5 @@ -54,7 +54,7 @@ extern DialogInput askSlapdRootDN; extern DialogYesNo askReplication; extern DialogYesNo askSample; -extern DialogYesNo askPopulate; +extern DialogInput askPopulate; extern DialogInput askOrgSize; extern DialogYesNo askCIR; extern DialogInput askCIRHost; From fedora-directory-commits at redhat.com Mon Nov 6 20:51:39 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Mon, 6 Nov 2006 13:51:39 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/back-ldbm back-ldbm.h, 1.6, 1.7 import-threads.c, 1.9, 1.10 index.c, 1.8, 1.9 ldbm_add.c, 1.4, 1.5 ldbm_delete.c, 1.5, 1.6 ldbm_modrdn.c, 1.4, 1.5 Message-ID: <200611062051.kA6Kpdwc015235@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14694/servers/slapd/back-ldbm Modified Files: back-ldbm.h import-threads.c index.c ldbm_add.c ldbm_delete.c ldbm_modrdn.c Log Message: Resolves: #199923 Summary: subtree search fails to find items under a db containing special characters (Comment#16) Description: When dn contains rdn which includes '\\', it was escaped twice to generate a key for entrydn and caused mismatch in forming ancestorid index. It ends up the subtree search fail. Index: back-ldbm.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/back-ldbm.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- back-ldbm.h 12 Aug 2005 05:49:55 -0000 1.6 +++ back-ldbm.h 6 Nov 2006 20:51:31 -0000 1.7 @@ -638,6 +638,7 @@ #define BE_INDEX_TOMBSTONE 8 /* Index entry as a tombstone */ #define BE_INDEX_DONT_ENCRYPT 16 /* Disable any encryption if this flag is set */ #define BE_INDEX_EQUALITY 32 /* (w/DEL) remove the equality index */ +#define BE_INDEX_NORMALIZED SLAPI_ATTR_FLAG_NORMALIZED /* value already normalized */ /* Name of attribute type used for binder-based look through limit */ #define LDBM_LOOKTHROUGHLIMIT_AT "nsLookThroughLimit" Index: import-threads.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/import-threads.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- import-threads.c 6 Dec 2005 18:28:14 -0000 1.9 +++ import-threads.c 6 Nov 2006 20:51:32 -0000 1.10 @@ -933,7 +933,7 @@ /* insert into the entrydn index */ bv.bv_val = (void*)backentry_get_ndn(fi->entry); /* jcm - Had to cast away const */ - bv.bv_len = strlen(backentry_get_ndn(fi->entry)); + bv.bv_len = strlen(bv.bv_val); /* We need to check here whether the DN is already present in * the entrydn index. If it is then the input ldif @@ -960,7 +960,7 @@ if ((ret = index_addordel_string(be, "entrydn", bv.bv_val, fi->entry->ep_id, - BE_INDEX_ADD, NULL)) != 0) { + BE_INDEX_ADD|BE_INDEX_NORMALIZED, NULL)) != 0) { import_log_notice(job, "Error writing entrydn index " "(error %d: %s)", ret, dblayer_strerror(ret)); Index: index.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/index.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- index.c 15 Aug 2005 20:59:27 -0000 1.8 +++ index.c 6 Nov 2006 20:51:32 -0000 1.9 @@ -381,10 +381,10 @@ /* if we are adding a tombstone entry (see ldbm_add.c) */ if ((flags & BE_INDEX_TOMBSTONE) && (flags & BE_INDEX_ADD)) { - Slapi_DN parent; - Slapi_DN *sdn = slapi_entry_get_sdn(e->ep_entry); - slapi_sdn_init(&parent); - slapi_sdn_get_parent(sdn, &parent); + Slapi_DN parent; + Slapi_DN *sdn = slapi_entry_get_sdn(e->ep_entry); + slapi_sdn_init(&parent); + slapi_sdn_get_parent(sdn, &parent); /* * Just index the "nstombstone" attribute value from the objectclass * attribute, and the nsuniqueid attribute value, and the entrydn value of the deleted entry. @@ -404,7 +404,7 @@ ldbm_nasty(errmsg, 1020, result); return( result ); } - slapi_sdn_done(&parent); + slapi_sdn_done(&parent); } else { @@ -414,8 +414,11 @@ rc = slapi_entry_next_attr( e->ep_entry, attr, &attr ) ) { slapi_attr_get_type( attr, &type ); svals = attr_get_present_values(attr); - result = index_addordel_values_sv( be, type, svals, NULL, e->ep_id, - flags, txn ); + if ( 0 == strcmp( type, "entrydn" )) { + slapi_values_set_flags(svals, SLAPI_ATTR_FLAG_NORMALIZED); + } + result = index_addordel_values_sv( be, type, svals, NULL, + e->ep_id, flags, txn ); if ( result != 0 ) { ldbm_nasty(errmsg, 1030, result); return( result ); @@ -423,13 +426,13 @@ } /* update ancestorid index . . . */ - /* . . . only if we are not deleting a tombstone entry - tombstone entries are not in the ancestor id index - see bug 603279 */ - if (!((flags & BE_INDEX_TOMBSTONE) && (flags & BE_INDEX_DEL))) { - result = ldbm_ancestorid_index_entry(be, e, flags, txn); - if ( result != 0 ) { - return( result ); - } - } + /* . . . only if we are not deleting a tombstone entry - tombstone entries are not in the ancestor id index - see bug 603279 */ + if (!((flags & BE_INDEX_TOMBSTONE) && (flags & BE_INDEX_DEL))) { + result = ldbm_ancestorid_index_entry(be, e, flags, txn); + if ( result != 0 ) { + return( result ); + } + } } LDAPDebug( LDAP_DEBUG_TRACE, "<= index_%s_entry%s %d\n", @@ -1643,6 +1646,8 @@ sv.bv.bv_val= (void*)s; svp[0] = &sv; svp[1] = NULL; + if (flags & BE_INDEX_NORMALIZED) + slapi_value_set_flags(&sv, BE_INDEX_NORMALIZED); return index_addordel_values_ext_sv(be,type,svp,NULL,id,flags,txn,NULL,NULL); } Index: ldbm_add.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/ldbm_add.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ldbm_add.c 19 Apr 2005 22:07:38 -0000 1.4 +++ ldbm_add.c 6 Nov 2006 20:51:32 -0000 1.5 @@ -195,7 +195,7 @@ slapi_isbitset_int(rc,SLAPI_RTN_BIT_FETCH_PARENT_ENTRY)) { done_with_pblock_entry(pb,SLAPI_ADD_PARENT_ENTRY); /* Could be through this multiple times */ - addr.dn = (char*)slapi_sdn_get_ndn (&parentsdn); + addr.dn = (char*)slapi_sdn_get_dn (&parentsdn); /* get_copy_of_entry assumes the DN is not normalized */ addr.uniqueid = operation->o_params.p.p_add.parentuniqueid; ldap_result_code= get_copy_of_entry(pb, &addr, &txn, SLAPI_ADD_PARENT_ENTRY, !is_replicated_operation); /* need to set parentsdn or parentuniqueid if either is not set? */ @@ -234,7 +234,7 @@ */ if(have_parent_address(&parentsdn, operation->o_params.p.p_add.parentuniqueid)) { - addr.dn = (char*)slapi_sdn_get_ndn (&parentsdn); + addr.dn = (char*)slapi_sdn_get_dn (&parentsdn); addr.uniqueid = operation->o_params.p.p_add.parentuniqueid; parententry = find_entry2modify_only(pb,be,&addr,&txn); if (parententry && parententry->ep_entry) { @@ -898,7 +898,7 @@ bvp[1] = NULL; bv.bv_val = (void*)backentry_get_ndn(ep); bv.bv_len = strlen( bv.bv_val ); - entry_replace_values( ep->ep_entry, "entrydn", bvp ); + entry_replace_values_with_flags( ep->ep_entry, "entrydn", bvp, SLAPI_ATTR_FLAG_NORMALIZED ); } /* Index: ldbm_delete.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/ldbm_delete.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ldbm_delete.c 12 Aug 2005 22:52:29 -0000 1.5 +++ ldbm_delete.c 6 Nov 2006 20:51:32 -0000 1.6 @@ -250,7 +250,7 @@ struct backentry *parent = NULL; entry_address parent_addr; - parent_addr.dn = (char*)slapi_sdn_get_ndn (&parentsdn); + parent_addr.dn = (char*)slapi_sdn_get_dn (&parentsdn); parent_addr.uniqueid = NULL; parent = find_entry2modify_only(pb,be,&parent_addr,&txn); if (NULL != parent) { Index: ldbm_modrdn.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ldbm_modrdn.c 19 Apr 2005 22:07:38 -0000 1.4 +++ ldbm_modrdn.c 6 Nov 2006 20:51:32 -0000 1.5 @@ -271,7 +271,7 @@ } /* Fetch and lock the parent of the entry that is moving */ - oldparent_addr.dn = (char*)slapi_sdn_get_ndn (&dn_parentdn); + oldparent_addr.dn = (char*)slapi_sdn_get_dn (&dn_parentdn); oldparent_addr.uniqueid = NULL; parententry = find_entry2modify_only( pb, be, &oldparent_addr, NULL ); modify_init(&parent_modify_context,parententry); @@ -360,10 +360,17 @@ if(!(slapi_dn_isbesuffix(pb,slapi_sdn_get_ndn(&dn_olddn)) && isroot)) { /* Here means that we didn't find the parent */ - ldap_result_matcheddn = slapi_ch_strdup((char *) slapi_entry_get_dn(parententry->ep_entry)); + if (parententry && parententry->ep_entry) + { + ldap_result_matcheddn = slapi_ch_strdup((char *) slapi_entry_get_dn(parententry->ep_entry)); + } + else + { + ldap_result_matcheddn = "NULL"; + } ldap_result_code= LDAP_NO_SUCH_OBJECT; LDAPDebug( LDAP_DEBUG_TRACE, "Parent does not exist matched %s, parentdn = %s\n", - ldap_result_matcheddn == NULL ? "NULL" : ldap_result_matcheddn, slapi_sdn_get_ndn(&dn_parentdn), 0 ); + ldap_result_matcheddn, slapi_sdn_get_ndn(&dn_parentdn), 0 ); goto error_return; } } @@ -818,7 +825,8 @@ moddn_unlock_and_return_entries(be,&e,&existingentry); slapi_ch_free((void**)&child_entries); slapi_ch_free((void**)&child_entry_copies); - slapi_ch_free((void**)&ldap_result_matcheddn); + if (ldap_result_matcheddn && 0 != strcmp(ldap_result_matcheddn, "NULL")) + slapi_ch_free((void**)&ldap_result_matcheddn); idl_free(children); slapi_sdn_done(&dn_olddn); slapi_sdn_done(&dn_newdn); From fedora-directory-commits at redhat.com Mon Nov 6 20:51:33 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Mon, 6 Nov 2006 13:51:33 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/syntaxes string.c, 1.5, 1.6 Message-ID: <200611062052.kA6Kq3kk015280@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/syntaxes In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14694/servers/plugins/syntaxes Modified Files: string.c Log Message: Resolves: #199923 Summary: subtree search fails to find items under a db containing special characters (Comment#16) Description: When dn contains rdn which includes '\\', it was escaped twice to generate a key for entrydn and caused mismatch in forming ancestorid index. It ends up the subtree search fail. Index: string.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/syntaxes/string.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- string.c 19 Apr 2005 22:07:35 -0000 1.5 +++ string.c 6 Nov 2006 20:51:30 -0000 1.6 @@ -319,8 +319,10 @@ for ( i = 0; i < numbvals; i++ ) { - c = slapi_ch_strdup(slapi_value_get_string(bvals[i])); - value_normalize( c, syntax, 1 /* trim leading blanks */ ); + c = slapi_ch_strdup(slapi_value_get_string(bvals[i])); + /* if the NORMALIZED flag is set, skip normalizing */ + if (!(slapi_value_get_flags(bvals[i]) & SLAPI_ATTR_FLAG_NORMALIZED)) + value_normalize( c, syntax, 1 /* trim leading blanks */ ); nbvals[i] = slapi_value_new_string_passin(c); } nbvals[i] = NULL; From fedora-directory-commits at redhat.com Mon Nov 6 20:51:33 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Mon, 6 Nov 2006 13:51:33 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd attrlist.c, 1.5, 1.6 entry.c, 1.10, 1.11 proto-slap.h, 1.23, 1.24 slap.h, 1.17, 1.18 slapi-plugin.h, 1.11, 1.12 value.c, 1.4, 1.5 valueset.c, 1.5, 1.6 Message-ID: <200611062052.kA6Kq4RS015287@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14694/servers/slapd Modified Files: attrlist.c entry.c proto-slap.h slap.h slapi-plugin.h value.c valueset.c Log Message: Resolves: #199923 Summary: subtree search fails to find items under a db containing special characters (Comment#16) Description: When dn contains rdn which includes '\\', it was escaped twice to generate a key for entrydn and caused mismatch in forming ancestorid index. It ends up the subtree search fail. Index: attrlist.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/attrlist.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- attrlist.c 25 Aug 2005 00:58:27 -0000 1.5 +++ attrlist.c 6 Nov 2006 20:51:31 -0000 1.6 @@ -289,3 +289,26 @@ return rc; } +/* + * attrlist_replace_with_flags - replace the attribute value(s) with this value(s) + * + * Returns + * LDAP_SUCCESS - OK (including the attr not found) + * LDAP_OPERATIONS_ERROR - Existing duplicates in attribute. + */ +int attrlist_replace_with_flags(Slapi_Attr **alist, const char *type, struct berval **vals, int flags) +{ + Slapi_Attr **a = NULL; + Slapi_Value **values = NULL; + int rc = LDAP_SUCCESS; + + if (vals == NULL || vals[0] == NULL) { + (void)attrlist_delete(alist, type); + } else { + attrlist_find_or_create(alist, type, &a); + valuearray_init_bervalarray_with_flags(vals, &values, flags); + rc = attr_replace(*a, values); + } + return rc; +} + Index: entry.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/entry.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- entry.c 25 Aug 2005 00:58:27 -0000 1.10 +++ entry.c 6 Nov 2006 20:51:31 -0000 1.11 @@ -2796,6 +2796,17 @@ } int +entry_replace_values_with_flags( + Slapi_Entry *e, + const char *type, + struct berval **vals, + int flags +) +{ + return attrlist_replace_with_flags( &e->e_attrs, type, vals, flags ); +} + +int slapi_entry_flag_is_set( const Slapi_Entry *e, unsigned char flag ) { return( e->e_flags & flag ); Index: proto-slap.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/proto-slap.h,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- proto-slap.h 6 Nov 2006 19:33:42 -0000 1.23 +++ proto-slap.h 6 Nov 2006 20:51:31 -0000 1.24 @@ -81,6 +81,7 @@ int attrlist_count_subtypes(Slapi_Attr *a, const char *type); Slapi_Attr *attrlist_find_ex( Slapi_Attr *a, const char *type, int *type_name_disposition, char** actual_type_name, void **hint ); int attrlist_replace(Slapi_Attr **alist, const char *type, struct berval **vals); +int attrlist_replace_with_flags(Slapi_Attr **alist, const char *type, struct berval **vals, int flags); /* * attrsyntax.c @@ -121,6 +122,7 @@ * valueset.c */ int valuearray_init_bervalarray(struct berval **bvals, Slapi_Value ***cvals); +int valuearray_init_bervalarray_with_flags(struct berval **bvals, Slapi_Value ***cvals, unsigned long flags); int valuearray_get_bervalarray(Slapi_Value **cvals, struct berval ***bvals); /* JCM SLOW FUNCTION */ void valuearray_free(Slapi_Value ***va); Slapi_Value *valuearray_remove_value(const Slapi_Attr *a, Slapi_Value **va, const Slapi_Value *v); @@ -642,6 +644,7 @@ * modutil.c */ int entry_replace_values( Slapi_Entry *e, const char *type, struct berval **vals ); +int entry_replace_values_with_flags( Slapi_Entry *e, const char *type, struct berval **vals, int flags ); int entry_apply_mods( Slapi_Entry *e, LDAPMod **mods ); int entry_apply_mod( Slapi_Entry *e, const LDAPMod *mod ); void freepmods( LDAPMod **pmods ); Index: slap.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/slap.h,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- slap.h 6 Nov 2006 19:33:42 -0000 1.17 +++ slap.h 6 Nov 2006 20:51:31 -0000 1.18 @@ -379,6 +379,7 @@ { struct berval bv; CSNSet *v_csnset; + unsigned long v_flags; }; /* Index: slapi-plugin.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/slapi-plugin.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- slapi-plugin.h 17 Aug 2006 15:33:03 -0000 1.11 +++ slapi-plugin.h 6 Nov 2006 20:51:31 -0000 1.12 @@ -61,6 +61,7 @@ #define SLAPI_ATTR_FLAG_OBSOLETE 0x0040 /* an outdated definition */ #define SLAPI_ATTR_FLAG_COLLECTIVE 0x0080 /* collective (not supported) */ #define SLAPI_ATTR_FLAG_NOUSERMOD 0x0100 /* can't be modified over LDAP */ +#define SLAPI_ATTR_FLAG_NORMALIZED 0x0200 /* the attr value is normalized */ /* operation flags */ #define SLAPI_OP_FLAG_NEVER_CHAIN 0x00800 /* Do not chain the operation */ @@ -429,6 +430,9 @@ Slapi_Value *slapi_value_init_string(Slapi_Value *v,const char *s); Slapi_Value *slapi_value_init_string_passin(Slapi_Value *v, char *s); Slapi_Value *slapi_value_dup(const Slapi_Value *v); +void slapi_value_set_flags(Slapi_Value *v, unsigned long flags); +void slapi_values_set_flags(Slapi_Value **vs, unsigned long flags); +unsigned long slapi_value_get_flags(Slapi_Value *v); void slapi_value_free(Slapi_Value **value); const struct berval *slapi_value_get_berval( const Slapi_Value *value ); Slapi_Value *slapi_value_set_berval( Slapi_Value *value, const struct berval *bval ); Index: value.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/value.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- value.c 19 Apr 2005 22:07:37 -0000 1.4 +++ value.c 6 Nov 2006 20:51:31 -0000 1.5 @@ -190,6 +190,30 @@ return v; } +void +slapi_value_set_flags(Slapi_Value *v, unsigned long flags) +{ + PR_ASSERT(v!=NULL); + v->v_flags = flags; +} + +void +slapi_values_set_flags(Slapi_Value **vs, unsigned long flags) +{ + PR_ASSERT(vs!=NULL); + Slapi_Value **v; + for (v = vs; v && *v; v++) { + slapi_value_set_flags(*v, flags); + } +} + +unsigned long +slapi_value_get_flags(Slapi_Value *v) +{ + PR_ASSERT(v!=NULL); + return v->v_flags; +} + void slapi_value_free(Slapi_Value **v) { Index: valueset.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/valueset.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- valueset.c 25 Aug 2005 00:58:27 -0000 1.5 +++ valueset.c 6 Nov 2006 20:51:31 -0000 1.6 @@ -250,6 +250,36 @@ /* * JCM SLOW FUNCTION * + * WARNING: Use only if you absolutley need to... + * This function mostly exists to map from the old slapi berval + * based interface to the new Slapi_Value based interfaces. + */ +int +valuearray_init_bervalarray_with_flags(struct berval **bvals, Slapi_Value ***cvals, unsigned long flags) +{ + int n; + for(n=0; bvals != NULL && bvals[n] != NULL; n++); + if(n==0) + { + *cvals = NULL; + } + else + { + int i; + *cvals = (Slapi_Value **) slapi_ch_malloc((n + 1) * sizeof(Slapi_Value *)); + for(i=0;i Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/mod_admserv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21498/dsbuild/ds/mod_admserv Modified Files: Makefile Log Message: initial checkin of upgrades for Fedora DS 1.0.4 - use adminutil 1.0.4 - added patch file for ldapserver/ldap/cm/Makefile because trunk version is too FHS-ized to use anymore - use fedora-ds 1.0.4 Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/mod_admserv/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Makefile 11 Oct 2006 14:36:19 -0000 1.4 +++ Makefile 6 Nov 2006 21:51:29 -0000 1.5 @@ -17,7 +17,7 @@ MOZILLA_DIST = $(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla/dist -ADMINUTIL = $(ABS_GARDIR)/$(CATEGORIES)/adminutil/work/fedora-adminutil-1.0.3/built/adminutil/$(OBJDIR_NAME) +ADMINUTIL = $(ABS_GARDIR)/$(CATEGORIES)/adminutil/work/fedora-adminutil-1.0.4/built/adminutil/$(OBJDIR_NAME) ICU = $(ABS_GARDIR)/$(CATEGORIES)/icu/work/icu-3.4/built INSTALL_SCRIPTS = custom From fedora-directory-commits at redhat.com Mon Nov 6 21:51:30 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Mon, 6 Nov 2006 14:51:30 -0700 Subject: [Fedora-directory-commits] dsbuild/ds/adminserver Makefile,1.8,1.9 Message-ID: <200611062152.kA6Lq0tI021567@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/adminserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21498/dsbuild/ds/adminserver Modified Files: Makefile Log Message: initial checkin of upgrades for Fedora DS 1.0.4 - use adminutil 1.0.4 - added patch file for ldapserver/ldap/cm/Makefile because trunk version is too FHS-ized to use anymore - use fedora-ds 1.0.4 Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/adminserver/Makefile,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Makefile 17 Oct 2006 17:31:11 -0000 1.8 +++ Makefile 6 Nov 2006 21:51:27 -0000 1.9 @@ -23,7 +23,7 @@ BUILD_ARGS = MOZILLA_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla \ MOZ_OBJDIR_NAME=$(MOZ_OBJDIR_NAME) \ ICU_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/icu/work/icu-3.4 \ - ADMINUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/adminutil/work/fedora-adminutil-1.0.3 \ + ADMINUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/adminutil/work/fedora-adminutil-1.0.4 \ SETUPUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/setuputil/work/fedora-setuputil-1.0.3 \ ONLINEHELP_SOURCE_DIR=$(ABS_GARDIR)/$(CATEGORIES)/onlinehelp/work/fedora-onlinehelp-1.0.3 \ MOD_ADMSERV_LIBPATH=$(ABS_GARDIR)/$(CATEGORIES)/mod_admserv/work/mod_admserv-1.0.3/.libs \ From fedora-directory-commits at redhat.com Mon Nov 6 21:51:30 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Mon, 6 Nov 2006 14:51:30 -0700 Subject: [Fedora-directory-commits] dsbuild/ds/adminutil Makefile, 1.5, 1.6 checksums, 1.7, 1.8 Message-ID: <200611062152.kA6Lq0l9021571@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/adminutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21498/dsbuild/ds/adminutil Modified Files: Makefile checksums Log Message: initial checkin of upgrades for Fedora DS 1.0.4 - use adminutil 1.0.4 - added patch file for ldapserver/ldap/cm/Makefile because trunk version is too FHS-ized to use anymore - use fedora-ds 1.0.4 Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/adminutil/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Makefile 11 Oct 2006 14:36:11 -0000 1.5 +++ Makefile 6 Nov 2006 21:51:28 -0000 1.6 @@ -1,7 +1,7 @@ include ../../objdirname.mk GARNAME = fedora-adminutil -GARVERSION = 1.0.3 +GARVERSION = 1.0.4 CATEGORIES = ds PATCHFILES = Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/adminutil/checksums,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- checksums 13 Oct 2006 23:31:28 -0000 1.7 +++ checksums 6 Nov 2006 21:51:28 -0000 1.8 @@ -1 +1 @@ -d63fbb0fb6b14e7cd961b4b4274ded51 download/fedora-adminutil-1.0.3.tar.gz +7e0f3fa9e397e40faa14e4b9804dd5dc download/fedora-adminutil-1.0.4.tar.gz From fedora-directory-commits at redhat.com Mon Nov 6 21:51:31 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Mon, 6 Nov 2006 14:51:31 -0700 Subject: [Fedora-directory-commits] dsbuild/ds/ldapserver Makefile, 1.7, 1.8 checksums, 1.12, 1.13 Message-ID: <200611062152.kA6Lq1Vr021575@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21498/dsbuild/ds/ldapserver Modified Files: Makefile checksums Log Message: initial checkin of upgrades for Fedora DS 1.0.4 - use adminutil 1.0.4 - added patch file for ldapserver/ldap/cm/Makefile because trunk version is too FHS-ized to use anymore - use fedora-ds 1.0.4 Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/ldapserver/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Makefile 12 Oct 2006 20:08:12 -0000 1.7 +++ Makefile 6 Nov 2006 21:51:28 -0000 1.8 @@ -1,12 +1,12 @@ include ../../objdirname.mk GARNAME = fedora-ds -GARVERSION = 1.0.3 +GARVERSION = 1.0.4 CATEGORIES = ds # have the regular download rule download the patch rather than listing it in PATCHFILES # this is so we can override the default patch rule #MYPATCH = ldapserver-gcc4.patch -PATCHFILES = +PATCHFILES = ldap_cm_Makefile_104.patch PKGDIR = $(ABS_GARDIR)/$(CATEGORIES)/ldapserver/work/pkg @@ -30,7 +30,7 @@ MOZILLA_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla \ MOZ_OBJDIR_NAME=$(MOZ_OBJDIR_NAME) \ ICU_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/icu/work/icu-3.4 \ - ADMINUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/adminutil/work/fedora-adminutil-1.0.3 \ + ADMINUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/adminutil/work/fedora-adminutil-1.0.4 \ SETUPUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/setuputil/work/fedora-setuputil-1.0.3 \ DB_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/db/work/db-4.2.52.NC \ ADMINSERVER_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/adminserver/work/fedora-adminserver-1.0.3 \ Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/ldapserver/checksums,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- checksums 17 Oct 2006 15:24:31 -0000 1.12 +++ checksums 6 Nov 2006 21:51:28 -0000 1.13 @@ -1 +1,2 @@ -23bcc3a47cba03e82520cbcd31b25d1d download/fedora-ds-1.0.3.tar.gz +88b5f8799d6d92caab5a32e340372bdc download/fedora-ds-1.0.4.tar.gz +657d4f7cca9c3a4ea65012ae8203d395 download/ldap_cm_Makefile_104.patch From fedora-directory-commits at redhat.com Mon Nov 6 21:54:27 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Mon, 6 Nov 2006 14:54:27 -0700 Subject: [Fedora-directory-commits] dsbuild/ds/adminutil checksums,1.8,1.9 Message-ID: <200611062154.kA6LsRdm021623@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/adminutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21606 Modified Files: checksums Log Message: update adminutil checksums Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/adminutil/checksums,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- checksums 6 Nov 2006 21:51:28 -0000 1.8 +++ checksums 6 Nov 2006 21:54:25 -0000 1.9 @@ -1 +1 @@ -7e0f3fa9e397e40faa14e4b9804dd5dc download/fedora-adminutil-1.0.4.tar.gz +e98dd6f0f4f812f2fc4418edb4bed326 download/fedora-adminutil-1.0.4.tar.gz From fedora-directory-commits at redhat.com Mon Nov 6 22:43:25 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Mon, 6 Nov 2006 15:43:25 -0700 Subject: [Fedora-directory-commits] dsbuild/meta/ds Makefile,1.9,1.10 Message-ID: <200611062243.kA6MhPC8024937@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/meta/ds In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24919 Modified Files: Makefile Log Message: bump version to 1.0.4 Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/meta/ds/Makefile,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Makefile 13 Oct 2006 23:31:29 -0000 1.9 +++ Makefile 6 Nov 2006 22:43:22 -0000 1.10 @@ -1,5 +1,5 @@ GARNAME = ds -GARVERSION = 1.0.3 +GARVERSION = 1.0.4 CATEGORIES = meta # assume that if someone defines DEBUG=1 they mean DEBUG=full From fedora-directory-commits at redhat.com Tue Nov 7 04:20:21 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Mon, 6 Nov 2006 21:20:21 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/back-ldbm dblayer.c, 1.11, 1.12 Message-ID: <200611070420.kA74KLvs012975@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12915/ldapserver/ldap/servers/slapd/back-ldbm Modified Files: dblayer.c Log Message: 1) Fedora Core 6 build fixes FC 6 does not have /usr/include/linux/sys.h. The two files in the diff below include it, but I'm not sure why. If you look at the file on an earlier system, it appears that there is nothing in it. All it seems to do is define NR_syscalls, which is not used anywhere in any include file that I can find, nor in any ds code. So I propose changing the code not to include this file. 2) Change version to 1.0.4 I already got the other files, except for ldap/cm/Makefile Index: dblayer.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/dblayer.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- dblayer.c 18 Apr 2006 18:25:02 -0000 1.11 +++ dblayer.c 7 Nov 2006 04:20:14 -0000 1.12 @@ -683,7 +683,6 @@ #endif #ifdef LINUX #include -#include #include /* undocumented (?) */ #include #endif From fedora-directory-commits at redhat.com Tue Nov 7 04:20:22 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Mon, 6 Nov 2006 21:20:22 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/systools idsktune.c, 1.12, 1.13 Message-ID: <200611070420.kA74KMZF012981@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/systools In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12915/ldapserver/ldap/systools Modified Files: idsktune.c Log Message: 1) Fedora Core 6 build fixes FC 6 does not have /usr/include/linux/sys.h. The two files in the diff below include it, but I'm not sure why. If you look at the file on an earlier system, it appears that there is nothing in it. All it seems to do is define NR_syscalls, which is not used anywhere in any include file that I can find, nor in any ds code. So I propose changing the code not to include this file. 2) Change version to 1.0.4 I already got the other files, except for ldap/cm/Makefile Index: idsktune.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/systools/idsktune.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- idsktune.c 19 Apr 2005 22:07:44 -0000 1.12 +++ idsktune.c 7 Nov 2006 04:20:19 -0000 1.13 @@ -108,7 +108,6 @@ #include #include #include -#include #include #include #include From fedora-directory-commits at redhat.com Tue Nov 7 04:20:16 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Mon, 6 Nov 2006 21:20:16 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/cm Makefile,1.68,1.69 Message-ID: <200611070420.kA74KkST012988@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/cm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12915/ldapserver/ldap/cm Modified Files: Makefile Log Message: 1) Fedora Core 6 build fixes FC 6 does not have /usr/include/linux/sys.h. The two files in the diff below include it, but I'm not sure why. If you look at the file on an earlier system, it appears that there is nothing in it. All it seems to do is define NR_syscalls, which is not used anywhere in any include file that I can find, nor in any ds code. So I propose changing the code not to include this file. 2) Change version to 1.0.4 I already got the other files, except for ldap/cm/Makefile Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- Makefile 3 Nov 2006 19:49:52 -0000 1.68 +++ Makefile 7 Nov 2006 04:20:13 -0000 1.69 @@ -110,9 +110,9 @@ endif ifdef USE_64 -VERSION=-ver 1.0.3-64bit +VERSION=-ver 1.0.4-64bit else -VERSION=-ver 1.0.3 +VERSION=-ver 1.0.4 endif ifeq ($(ARCH), HPUX) @@ -276,7 +276,7 @@ ifdef BUILD_RPM # name and version of RPM - must correspond to the spec file - these get branded RPM_BASE_NAME=fedora - RPM_VERSION=1.0.3 + RPM_VERSION=1.0.4 RPM_FILE_BASE=$(RPM_BASE_NAME)-ds-$(RPM_VERSION) RPM_ARCH = $(shell uname -i) # root dir for RPM built and temp files From fedora-directory-commits at redhat.com Tue Nov 7 04:28:27 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Mon, 6 Nov 2006 21:28:27 -0700 Subject: [Fedora-directory-commits] dsbuild/ds/ldapserver checksums, 1.13, 1.14 Message-ID: <200611070428.kA74SRw0013058@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13041 Modified Files: checksums Log Message: updated fedora-ds-1.0.4.tar.gz Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/ldapserver/checksums,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- checksums 6 Nov 2006 21:51:28 -0000 1.13 +++ checksums 7 Nov 2006 04:28:24 -0000 1.14 @@ -1,2 +1,2 @@ -88b5f8799d6d92caab5a32e340372bdc download/fedora-ds-1.0.4.tar.gz +fca8c94d2bfdc3a762c0e8b09ab04b09 download/fedora-ds-1.0.4.tar.gz 657d4f7cca9c3a4ea65012ae8203d395 download/ldap_cm_Makefile_104.patch From fedora-directory-commits at redhat.com Tue Nov 7 04:42:58 2006 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Mon, 6 Nov 2006 21:42:58 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd charray.c, 1.4, 1.5 saslbind.c, 1.18, 1.19 slapi-private.h, 1.11, 1.12 Message-ID: <200611070442.kA74gwJF013176@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13155/ldap/servers/slapd Modified Files: charray.c saslbind.c slapi-private.h Log Message: Related: 214238 Summary: Make fallback SASL path work for 64-bit Linux default location. Index: charray.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/charray.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- charray.c 19 Apr 2005 22:07:36 -0000 1.4 +++ charray.c 7 Nov 2006 04:42:55 -0000 1.5 @@ -270,9 +270,20 @@ char ** str2charray( char *str, char *brkstr ) { + return( str2charray_ext( str, brkstr, 1 )); +} + +/* + * extended version of str2charray lets you disallow + * duplicate values into the array. + */ +char ** +str2charray_ext( char *str, char *brkstr, int allow_dups ) +{ char **res; char *s; - int i; + int i, j; + int dup_found = 0; char * iter = NULL; i = 1; @@ -284,9 +295,22 @@ res = (char **) slapi_ch_malloc( (i + 1) * sizeof(char *) ); i = 0; - for ( s = ldap_utf8strtok_r( str, brkstr , &iter); s != NULL; + for ( s = ldap_utf8strtok_r( str, brkstr , &iter); s != NULL; s = ldap_utf8strtok_r( NULL, brkstr , &iter) ) { - res[i++] = slapi_ch_strdup( s ); + dup_found = 0; + /* Always copy the first value into the array */ + if ( (!allow_dups) && (i != 0) ) { + /* Check for duplicates */ + for ( j = 0; j < i; j++ ) { + if ( strncmp( res[j], s, strlen( s ) ) == 0 ) { + dup_found = 1; + break; + } + } + } + + if ( !dup_found ) + res[i++] = slapi_ch_strdup( s ); } res[i] = NULL; Index: saslbind.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/saslbind.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- saslbind.c 6 Nov 2006 19:33:42 -0000 1.18 +++ saslbind.c 7 Nov 2006 04:42:55 -0000 1.19 @@ -560,7 +560,7 @@ char *pluginpath = config_get_saslpath(); if ((!pluginpath) || (*pluginpath == '\0')) { if (!(pluginpath = getenv("SASL_PATH"))) { - pluginpath = "/usr/lib/sasl2"; + pluginpath = "/usr/lib64/sasl2:/usr/lib/sasl2"; } } *path = pluginpath; @@ -744,7 +744,7 @@ LDAPDebug(LDAP_DEBUG_TRACE, "sasl library mechs: %s\n", str, 0, 0); /* merge into result set */ dupstr = slapi_ch_strdup(str); - others = str2charray(dupstr, ","); + others = str2charray_ext(dupstr, ",", 0 /* don't list duplicate mechanisms */); charray_merge(&ret, others, 1); charray_free(others); slapi_ch_free((void**)&dupstr); Index: slapi-private.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/slapi-private.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- slapi-private.h 15 Sep 2006 22:45:11 -0000 1.11 +++ slapi-private.h 7 Nov 2006 04:42:55 -0000 1.12 @@ -760,6 +760,7 @@ int charray_utf8_inlist( char **a, char *s ); char ** charray_dup( char **a ); char ** str2charray( char *str, char *brkstr ); +char ** str2charray_ext( char *str, char *brkstr, int allow_dups ); int charray_remove(char **a,const char *s); char ** cool_charray_dup( char **a ); void cool_charray_free( char **array ); From fedora-directory-commits at redhat.com Tue Nov 7 19:59:04 2006 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Tue, 7 Nov 2006 12:59:04 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd add.c, 1.8, 1.9 Message-ID: <200611071959.kA7Jx4W7031394@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31377 Modified Files: add.c Log Message: Resolves: 214463 Summary: Corrected ACI checking for userPassword during an add operation. Index: add.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/add.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- add.c 31 Aug 2006 22:52:07 -0000 1.8 +++ add.c 7 Nov 2006 19:59:02 -0000 1.9 @@ -484,9 +484,9 @@ /* Check ACI before checking password syntax */ if ( (err = slapi_access_allowed(pb, e, SLAPI_USERPWD_ATTR, NULL, - SLAPI_ACL_WRITE)) != LDAP_SUCCESS) { + SLAPI_ACL_ADD)) != LDAP_SUCCESS) { send_ldap_result(pb, err, NULL, - "Insufficient 'write' privilege to the " + "Insufficient 'add' privilege to the " "'userPassword' attribute", 0, NULL); goto done; } From fedora-directory-commits at redhat.com Wed Nov 8 04:13:44 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Tue, 7 Nov 2006 21:13:44 -0700 Subject: [Fedora-directory-commits] dsbuild/ds/adminutil checksums,1.9,1.10 Message-ID: <200611080413.kA84DiJS001094@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/adminutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1077 Modified Files: checksums Log Message: updated for 1.0.4 Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/adminutil/checksums,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- checksums 6 Nov 2006 21:54:25 -0000 1.9 +++ checksums 8 Nov 2006 04:13:41 -0000 1.10 @@ -1 +1 @@ -e98dd6f0f4f812f2fc4418edb4bed326 download/fedora-adminutil-1.0.4.tar.gz +8bafc54cdc08e3886b6a68d0ac9367a0 download/fedora-adminutil-1.0.4.tar.gz From fedora-directory-commits at redhat.com Wed Nov 8 21:23:45 2006 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Wed, 8 Nov 2006 14:23:45 -0700 Subject: [Fedora-directory-commits] ldapserver/lib/libaccess lasdns.cpp, 1.6, 1.7 Message-ID: <200611082123.kA8LNjip000578@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/ldapserver/lib/libaccess In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv561 Modified Files: lasdns.cpp Log Message: Resolves: 214682 Summary: Fixed usage of PL_strncpyz that was causing DNS-based ACIs to behave incorrectly. Index: lasdns.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/lasdns.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- lasdns.cpp 11 Apr 2006 02:14:53 -0000 1.6 +++ lasdns.cpp 8 Nov 2006 21:23:42 -0000 1.7 @@ -168,7 +168,7 @@ if (delimiter >= maxsize) { delimiter = maxsize-1; } - PL_strncpyz(token, attr_pattern, delimiter); + PL_strncpyz(token, attr_pattern, delimiter + 1); token[delimiter] = '\0'; /* Skip any white space after the token */ From fedora-directory-commits at redhat.com Thu Nov 9 15:41:44 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 9 Nov 2006 08:41:44 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src ds_newinst.pl, 1.9, 1.10 Message-ID: <200611091541.kA9FfiQB003383@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/admin/src In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3366 Modified Files: ds_newinst.pl Log Message: Bug: 214733 Description: be able to pass in all configurable paths to ds_newinst Reviewed by: nhosoi (Thanks!) Fix Description: Just add all of the paths that are set-able in create_instance.c to ds_newinst.pl. The paths will be parsed from the input .inf file e.g. config_dir= /path/to/config sysconfdir= /path/to/sysconf etc. in the [slapd] section. I also added sasl_path as suggested by Noriko: + $cgiargs{"sasl_path"} = $table{"slapd"}->{"sasl_path"}; Tested on: RHEL4 Index: ds_newinst.pl =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/ds_newinst.pl,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ds_newinst.pl 25 Oct 2006 00:04:41 -0000 1.9 +++ ds_newinst.pl 9 Nov 2006 15:41:40 -0000 1.10 @@ -179,6 +179,25 @@ # the following items are optional +$cgiargs{"prefix"} = $table{"slapd"}->{"prefix"}; +$cgiargs{"lock_dir"} = $table{"slapd"}->{"lock_dir"}; +$cgiargs{"log_dir"} = $table{"slapd"}->{"log_dir"}; +$cgiargs{"run_dir"} = $table{"slapd"}->{"run_dir"}; +$cgiargs{"db_dir"} = $table{"slapd"}->{"db_dir"}; +$cgiargs{"bak_dir"} = $table{"slapd"}->{"bak_dir"}; +$cgiargs{"ldif_dir"} = $table{"slapd"}->{"ldif_dir"}; +$cgiargs{"tmp_dir"} = $table{"slapd"}->{"tmp_dir"}; +$cgiargs{"cert_dir"} = $table{"slapd"}->{"cert_dir"}; +$cgiargs{"localstatedir"} = $table{"slapd"}->{"localstatedir"}; +$cgiargs{"sysconfdir"} = $table{"slapd"}->{"sysconfdir"}; +$cgiargs{"bindir"} = $table{"slapd"}->{"bindir"}; +$cgiargs{"datadir"} = $table{"slapd"}->{"datadir"}; +$cgiargs{"docdir"} = $table{"slapd"}->{"docdir"}; +$cgiargs{"inst_dir"} = $table{"slapd"}->{"inst_dir"}; +$cgiargs{"config_dir"} = $table{"slapd"}->{"config_dir"}; +$cgiargs{"schema_dir"} = $table{"slapd"}->{"schema_dir"}; +$cgiargs{"sasl_path"} = $table{"slapd"}->{"sasl_path"}; + # port number for Admin Server - used to configure some web apps $cgiargs{adminport} = $table{admin}->{Port}; From fedora-directory-commits at redhat.com Thu Nov 9 18:24:55 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 11:24:55 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src create_instance.c, 1.33, 1.34 Message-ID: <200611091824.kA9IOtWj015381@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/admin/src In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15347 Modified Files: create_instance.c Log Message: Resolves: #214840 Summary: modify sasl_path to accept the string set in the inf file Changes: If sasl_path is set in [slapd] section in the inf file, it's put in dse.ldif like this: dn: cn=config [...] nsslapd-saslpath: /usr/local/lib If the inf file does not have the line, the default path /usr/lib//sasl2 is put in dse.ldif on non-Linux platform. Index: create_instance.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- create_instance.c 6 Nov 2006 19:33:41 -0000 1.33 +++ create_instance.c 9 Nov 2006 18:24:52 -0000 1.34 @@ -305,18 +305,20 @@ conf->disable_schema_checking = NULL; conf->install_ldif_file = NULL; - conf->sysconfdir = NULL; + conf->bak_dir = NULL; + conf->config_dir = NULL; conf->datadir = NULL; + conf->db_dir = NULL; conf->docdir = NULL; conf->inst_dir = NULL; - conf->config_dir = NULL; - conf->schema_dir = NULL; + conf->ldif_dir = NULL; conf->lock_dir = NULL; conf->log_dir = NULL; + conf->plugin_dir = NULL; conf->run_dir = NULL; - conf->db_dir = NULL; - conf->bak_dir = NULL; - conf->ldif_dir = NULL; + conf->sasl_path = NULL; + conf->schema_dir = NULL; + conf->sysconfdir = NULL; conf->tmp_dir = NULL; } @@ -2342,7 +2344,6 @@ t = CREATE_DB2BAK(); if(t) return t; -#if defined(UPGRADEDB) t = gen_script(cs_path, "db2index.bat", "@echo off\n" "setlocal\n" @@ -2375,7 +2376,6 @@ "exit /b %%rc%%\n", server, cs_path, server, cs_path, server, cs_path); if(t) return t; -#endif t = gen_script(cs_path, "vlvindex.bat", "@echo off\n" @@ -2431,7 +2431,6 @@ server, cs_path, server, cs_path); if(t) return t; -#if defined(UPGRADEDB) t = gen_script(cs_path, "upgradedb.bat", "@echo off\n" "setlocal\n" @@ -2455,7 +2454,6 @@ "exit /b %%rc%%\n", server, cs_path, server, cs_path); if(t) return t; -#endif t = CREATE_BAK2DB(); if(t) return t; @@ -2701,9 +2699,9 @@ fprintf(f, "nsslapd-tmpdir: %s\n", cf->tmp_dir); fprintf(f, "nsslapd-certdir: %s\n", cf->cert_dir); /* We use the system SASL by default on Linux, so we don't need to set sasl path */ -#if !defined( LINUX ) - fprintf(f, "nsslapd-saslpath: %s\n", cf->sasl_path); -#endif + if (NULL != cf->sasl_path) { + fprintf(f, "nsslapd-saslpath: %s\n", cf->sasl_path); + } fprintf(f, "nsslapd-accesslog-logging-enabled: on\n"); fprintf(f, "nsslapd-accesslog-maxlogsperdir: 10\n"); fprintf(f, "nsslapd-accesslog-mode: 600\n"); @@ -3412,13 +3410,11 @@ fprintf(f, "cn: restore\n"); fprintf(f, "\n"); -#if defined(UPGRADEDB) fprintf(f, "dn: cn=upgradedb,cn=tasks,cn=config\n"); fprintf(f, "objectclass: top\n"); fprintf(f, "objectclass: extensibleObject\n"); fprintf(f, "cn: upgradedb\n"); fprintf(f, "\n"); -#endif /* END of tasks */ @@ -4347,7 +4343,20 @@ cf->sroot = PR_smprintf("%s%cusr%clib%c%s", prefix, FILE_PATHSEP, FILE_PATHSEP, FILE_PATHSEP, cf->brand_ds); - cf->sasl_path = PR_smprintf("%s%csasl2", cf->sroot, FILE_PATHSEP); + temp = ds_a_get_cgi_var("sasl_path", NULL, NULL); + if (NULL != temp) { + /* if sasl_path is given, we set it in the conf file regardless of + * the platform. */ + cf->sasl_path = PL_strdup(temp); + } +#if !defined( LINUX ) + /* if not linux, we package sasl2 with DS, + and always set it in the conf file. */ + else + { + cf->sasl_path = PR_smprintf("%s%csasl2", cf->sroot, FILE_PATHSEP); + } +#endif cf->plugin_dir = PR_smprintf("%s%cplugins", cf->sroot, FILE_PATHSEP); if (!(cf->servname = ds_a_get_cgi_var("servname", "Server Name", From fedora-directory-commits at redhat.com Fri Nov 10 01:03:57 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:03:57 -0700 Subject: [Fedora-directory-commits] ldapserver nsconfig.mk,1.25,1.26 Message-ID: <200611100103.kAA13vpG010480@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10359 Modified Files: nsconfig.mk Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NS_DS (Comment #3, #5, #9, #13, #15, #17) Index: nsconfig.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/nsconfig.mk,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- nsconfig.mk 15 Sep 2006 14:59:47 -0000 1.25 +++ nsconfig.mk 10 Nov 2006 01:03:54 -0000 1.26 @@ -382,8 +382,6 @@ MAKE=gmake $(BUILDOPT) NO_JAVA=1 -export NSPR20=1 - LWDEFS = LIVEWIRE=1 JSDEFS = JSFILE=1 JS_THREADSAFE=1 @@ -425,15 +423,15 @@ ifdef PRODUCT_IS_DIRECTORY_SERVER ifeq ($(SECURITY), export) - MCC_SERVER=-DMCC_HTTPD -DNS_EXPORT -DNET_SSL -DCLIENT_AUTH $(NSPR_DEFINES) + MCC_SERVER=-DNS_EXPORT $(NSPR_DEFINES) endif ifeq ($(SECURITY), domestic) - MCC_SERVER=-DMCC_HTTPD -DNS_DOMESTIC -DNET_SSL -DCLIENT_AUTH $(NSPR_DEFINES) + MCC_SERVER=$(NSPR_DEFINES) endif ifeq ($(SECURITY), none) - MCC_SERVER=-DMCC_HTTPD -DNS_UNSECURE $(NSPR_DEFINES) + MCC_SERVER=-DNS_UNSECURE $(NSPR_DEFINES) endif - DS_SERVER_DEFS = -DNS_DS + DS_SERVER_DEFS = ifeq ($(BUILD_DEBUG),full) MODULE_CFLAGS += -DDEBUG endif @@ -444,7 +442,7 @@ endif endif -MCC_SERVER += -DSPAPI20 -DBUILD_NUM=$(GET_BUILD_NUM) +MCC_SERVER += -DBUILD_NUM=$(GET_BUILD_NUM) # ----------- Default Flags, may be overridden below ------------ @@ -534,7 +532,6 @@ else DL_LIB =-ldl endif -NSPR_DEFINES += -DNSPR20 RWTOOLS_VERSION = latest #HTTPDSO_NAME=libdsnshttpd PEER_ARCH=aix @@ -650,7 +647,7 @@ NSAPI_CAPABLE=true VERITY_ARCH=_hp800 USE_PTHREADS=1 -NSPR_DEFINES += -DNSPR20 -D_PR_NTHREAD -D_PR_USECPU -D_REENTRANT +NSPR_DEFINES += -D_PR_NTHREAD -D_PR_USECPU -D_REENTRANT LINK_DLL=$(CCC) $(DLL_LDFLAGS) $(ARCH_CFLAGS) -o $@ PEER_ARCH=hp RWTOOLS_VERSION = latest @@ -688,7 +685,7 @@ ifeq (6.5,$(OSVERSION)) ARCH_CFLAGS+=-DIRIX6_5 -mips3 endif -NSPR_DEFINES += -DNSPR20 -D_PR_NTHREAD -D_SGI_MP_SOURCE +NSPR_DEFINES += -D_PR_NTHREAD -D_SGI_MP_SOURCE LINK_DLL=$(CCC) $(DLL_LDFLAGS) -o $@ PEER_ARCH=irix @@ -708,7 +705,6 @@ RANLIB=ranlib DLL_LDFLAGS=-shared LINK_DLL=$(CC) $(DLL_LDFLAGS) -o $@ -NSPR_DEFINES += -DNSPR20 NLIST=-lelf NSAPI_CAPABLE=true EXTRA_LIBS=-ldl -lcrypt -lpthread @@ -759,7 +755,6 @@ NO_MSOFT_OBJ=1 BUILD_WEBPUB=no BUILD_IIOPLIB=no -NSPR_DEFINES += -DNSPR20 PEER_ARCH=unixware export NO_INFORMIX=1 @@ -821,7 +816,6 @@ NO_MSOFT_OBJ=1 BUILD_WEBPUB=no BUILD_IIOPLIB=no -NSPR_DEFINES += -DNSPR20 PEER_ARCH=unixware5 DB_VERSION=oem @@ -857,7 +851,6 @@ AUTOCATALOG_VERSION = oem BUILD_WEBPUB = no NO_MSOFT_OBJ = 1 -NSPR_DEFINES += -DNSPR20 PEER_ARCH=sco else @@ -916,7 +909,6 @@ BUILD_WEBPUB = no BUILD_IIOPLIB = no DL_LIB =-ldl -NSPR_DEFINES += -DNSPR20 # svr4-x86 compatible PEER_ARCH=unixware @@ -1037,7 +1029,6 @@ #this is no longer needed #NEED_NSPR_MALLOC=yes -NSPR_DEFINES += -DNSPR20 PEER_ARCH=reliantunix RWTOOLS_VERSION = latest @@ -1073,7 +1064,6 @@ #EXTRA_LIBS=-lcxxstd -lcxx endif USE_PTHREADS=1 -NSPR_DEFINES += -DNSPR20 RWTOOLS_VERSION = latest PEER_ARCH=osf PEERDIR=$(DEVROOT)/osf/dev @@ -1156,7 +1146,7 @@ NSAPI_CAPABLE=true NLIST=-lelf VERITY_ARCH=_solaris -NSPR_DEFINES += -DNSPR20 -D_PR_NTHREAD -D_REENTRANT +NSPR_DEFINES += -D_PR_NTHREAD -D_REENTRANT PEER_ARCH=solaris ifndef NS_USE_NATIVE NSPR_DEFINES += -DSOLARIS_GCC @@ -1200,7 +1190,7 @@ NO_MSOFT_OBJ=1 BUILD_WEBPUB=no BUILD_IIOPLIB=no -NSPR_DEFINES += -DNSPR20 -D_PR_NTHREAD -D_REENTRANT +NSPR_DEFINES += -D_PR_NTHREAD -D_REENTRANT export NO_INFORMIX=1 export NO_ORACLE=1 export NO_SYBASE=1 @@ -1269,7 +1259,7 @@ NONSHARED_FLAG= NSAPI_CAPABLE=true NO_MSOFT_OBJ=1 -NSPR_DEFINES += -DNSPR20 -D_PR_NTHREAD -D_PR_USECPU +NSPR_DEFINES += -D_PR_NTHREAD -D_PR_USECPU else From fedora-directory-commits at redhat.com Fri Nov 10 01:05:15 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:05:15 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/cm/newinstnt Makefile, 1.7, 1.8 Message-ID: <200611100105.kAA15FB2010605@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/cm/newinstnt In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10493/ldap/cm/newinstnt Modified Files: Makefile Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NS_DS (Comment #2, #3) Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinstnt/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Makefile 2 Sep 2005 20:40:54 -0000 1.7 +++ Makefile 10 Nov 2006 01:05:11 -0000 1.8 @@ -84,7 +84,7 @@ LIBINSTOBJS = \ $(OUTDIR)/libinst.obj -CFLAGS+= /I "$(BUILD_ROOT)/include/nt" /I "$(BUILD_ROOT)/ldap/include" /I "$(BUILD_ROOT)/include" $(ADMINUTIL_INCLUDE) $(NSPR_INCLUDE) /D "NS_DS" /D "XP_WIN32" +CFLAGS+= /I "$(BUILD_ROOT)/include/nt" /I "$(BUILD_ROOT)/ldap/include" /I "$(BUILD_ROOT)/include" $(ADMINUTIL_INCLUDE) $(NSPR_INCLUDE) /D "XP_WIN32" CC=cl.exe LD=link.exe From fedora-directory-commits at redhat.com Fri Nov 10 01:05:05 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:05:05 -0700 Subject: [Fedora-directory-commits] ldapserver/include/nt regparms.h, 1.7, 1.8 Message-ID: <200611100105.kAA15Z6B010611@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/include/nt In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10493/include/nt Modified Files: regparms.h Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NS_DS (Comment #2, #3) Index: regparms.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/nt/regparms.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- regparms.h 29 Oct 2005 02:26:01 -0000 1.7 +++ regparms.h 10 Nov 2006 01:05:00 -0000 1.8 @@ -91,10 +91,8 @@ #define ADM_DIR_ROOT "admin" #define ADM_NAME_UNINSTALL "Uninstall Administration Server 1.0" -#if defined( NS_DS ) #define ADMIN_SERVICE_NAME "Admin Server" #define ADMIN_ICON_NAME "Administer Netscape Servers" -#endif /* Enterprise IDs */ #define ENT_ID_PRODUCT "https" From fedora-directory-commits at redhat.com Fri Nov 10 01:05:12 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:05:12 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/ntwdog Makefile, 1.5, 1.6 Message-ID: <200611100105.kAA15g7j010624@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/ntwdog In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10493/ldap/servers/slapd/ntwdog Modified Files: Makefile Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NS_DS (Comment #2, #3) Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/ntwdog/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Makefile 19 Apr 2005 22:07:40 -0000 1.5 +++ Makefile 10 Nov 2006 01:05:07 -0000 1.6 @@ -46,7 +46,6 @@ NOSTDCLEAN=true # don't let nsconfig.mk define target clean NOSTDSTRIP=true # don't let nsconfig.mk define target strip -NSPR20=true # probably should be defined somewhere else (not sure where) OBJDEST = $(OBJDIR)/ntwdog/obj SLAPD_OBJDEST= $(OBJDIR)/obj @@ -62,7 +61,7 @@ #INCLUDES += -I$(BUILD_ROOT)/include/libadmin -DS_SERVER_DEFS = -DNS_DS +DS_SERVER_DEFS = NTWDOG_OBJS= ntwatchdog.o From fedora-directory-commits at redhat.com Fri Nov 10 01:05:09 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:05:09 -0700 Subject: [Fedora-directory-commits] ldapserver/lib/libsi18n makstrdb.c, 1.7, 1.8 Message-ID: <200611100105.kAA15dBE010621@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/lib/libsi18n In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10493/lib/libsi18n Modified Files: makstrdb.c Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NS_DS (Comment #2, #3) Index: makstrdb.c =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libsi18n/makstrdb.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- makstrdb.c 11 Apr 2006 02:14:54 -0000 1.7 +++ makstrdb.c 10 Nov 2006 01:05:06 -0000 1.8 @@ -52,10 +52,8 @@ /* Begin: Application dependent information */ /********************************************/ -#ifdef NS_DS #include "gsslapd.h" #define GSXXX_H_INCLUDED -#endif #ifdef buildAnotherServer #include "gsanother.h" From fedora-directory-commits at redhat.com Fri Nov 10 01:05:09 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:05:09 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd errormap.c, 1.4, 1.5 prerrstrs.h, 1.4, 1.5 secerrstrs.h, 1.4, 1.5 sslerrstrs.h, 1.4, 1.5 Message-ID: <200611100105.kAA15dEm010619@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10493/ldap/servers/slapd Modified Files: errormap.c prerrstrs.h secerrstrs.h sslerrstrs.h Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NS_DS (Comment #2, #3) Index: errormap.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/errormap.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- errormap.c 19 Apr 2005 22:07:36 -0000 1.4 +++ errormap.c 10 Nov 2006 01:05:04 -0000 1.5 @@ -114,9 +114,6 @@ * Netscape Certificate Server team on 27-March-1998. * Taken from the file ns/security/cmd/lib/secerror.c on NSS_1_BRANCH. * Last updated from there: 24-July-1998 by Mark Smith - * - * All of the Directory Server specific changes are enclosed inside - * #ifdef NS_DS. **************************************************************************** */ #include "nspr.h" @@ -137,17 +134,11 @@ static const tuple_str errStrings[] = { /* keep this list in ascending order of error numbers */ -#ifdef NS_DS #include "dberrstrs.h" #include "sslerrstrs.h" #include "secerrstrs.h" #include "prerrstrs.h" #include "disconnect_error_strings.h" -#else /* NS_DS */ -#include "SSLerrs.h" -#include "SECerrs.h" -#include "NSPRerrs.h" -#endif /* NS_DS */ }; @@ -156,10 +147,7 @@ /* Returns a UTF-8 encoded constant error string for "errNum". * Returns NULL of errNum is unknown. */ -#ifdef NS_DS -static -#endif /* NS_DS */ -const char * +static const char * SECU_Strerror(PRErrorCode errNum) { PRInt32 low = 0; PRInt32 high = numStrings - 1; @@ -175,7 +163,6 @@ for (i = low + 1; i <= high; ++i) { num = errStrings[i].errNum; if (num <= lastNum) { -#ifdef NS_DS LDAPDebug( LDAP_DEBUG_ANY, "sequence error in error strings at item %d\n" "error %d (%s)\n", @@ -184,15 +171,6 @@ "should come after \n" "error %d (%s)\n", num, errStrings[i].errString, 0 ); -#else /* NS_DS */ - fprintf(stderr, -"sequence error in error strings at item %d\n" -"error %d (%s)\n" -"should come after \n" -"error %d (%s)\n", - i, lastNum, errStrings[i-1].errString, - num, errStrings[i].errString); -#endif /* NS_DS */ } lastNum = num; } Index: prerrstrs.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/prerrstrs.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- prerrstrs.h 19 Apr 2005 22:07:36 -0000 1.4 +++ prerrstrs.h 10 Nov 2006 01:05:04 -0000 1.5 @@ -42,13 +42,8 @@ /* **************************************************************************** - * The code below this point was provided by Nelson Bolyard of the - * Netscape Certificate Server team on 27-March-1998. - * Taken from the file ns/security/cmd/lib/NSPRerrs.h on NSS_1_BRANCH. - * Last updated from there: 24-July-1998 by Mark Smith - * - * All of the Directory Server specific changes are enclosed inside - * #ifdef NS_DS. + * The code below this point was taken from the file + * mozilla/security/nss/security/nss/cmd/lib/NSPRerrs.h on NSS_3_11_3_RTM. **************************************************************************** */ /* General NSPR 2.0 errors */ @@ -138,16 +133,34 @@ ER2( PR_END_OF_FILE_ERROR, "Encountered end of file." ) ER2( PR_FILE_SEEK_ERROR, "Seek error." ) ER2( PR_FILE_IS_BUSY_ERROR, "The file is busy." ) -ER2( PR_OPERATION_ABORTED_ERROR, "The I/O operation was aborted" ) ER2( PR_IN_PROGRESS_ERROR, "Operation is still in progress (probably a non-blocking connect)." ) ER2( PR_ALREADY_INITIATED_ERROR, "Operation has already been initiated (probably a non-blocking connect)." ) + +#ifdef PR_GROUP_EMPTY_ERROR ER2( PR_GROUP_EMPTY_ERROR, "The wait group is empty." ) +#endif + +#ifdef PR_INVALID_STATE_ERROR ER2( PR_INVALID_STATE_ERROR, "Object state improper for request." ) -ER2( PR_NETWORK_DOWN_ERROR, "Network is down" ) -ER2( PR_SOCKET_SHUTDOWN_ERROR, "Socket shutdown" ) -ER2( PR_CONNECT_ABORTED_ERROR, "Connection aborted" ) -ER2( PR_HOST_UNREACHABLE_ERROR, "Host is unreachable" ) +#endif + +#ifdef PR_NETWORK_DOWN_ERROR +ER2( PR_NETWORK_DOWN_ERROR, "Network is down." ) +#endif + +#ifdef PR_SOCKET_SHUTDOWN_ERROR +ER2( PR_SOCKET_SHUTDOWN_ERROR, "The socket was previously shut down." ) +#endif + +#ifdef PR_CONNECT_ABORTED_ERROR +ER2( PR_CONNECT_ABORTED_ERROR, "TCP Connection aborted." ) +#endif + +#ifdef PR_HOST_UNREACHABLE_ERROR +ER2( PR_HOST_UNREACHABLE_ERROR, "Host is unreachable." ) +#endif +/* always last */ ER2( PR_MAX_ERROR, "Placeholder for the end of the list" ) Index: secerrstrs.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/secerrstrs.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- secerrstrs.h 19 Apr 2005 22:07:37 -0000 1.4 +++ secerrstrs.h 10 Nov 2006 01:05:04 -0000 1.5 @@ -42,20 +42,14 @@ /* **************************************************************************** - * The code below this point was provided by Nelson Bolyard of the - * Netscape Certificate Server team on 27-March-1998. - * Taken from the file ns/security/cmd/lib/SECerrs.h on NSS_1_BRANCH. - * Last updated from there: 24-July-1998 by Mark Smith - * - * All of the Directory Server specific changes are enclosed inside - * #ifdef NS_DS. + * The code below this point was taken from the file + * mozilla/security/nss/security/nss/cmd/lib/SECerrs.h on NSS_3_11_3_RTM. **************************************************************************** */ /* General security error codes */ /* Caller must #include "secerr.h" */ - ER3(SEC_ERROR_IO, SEC_ERROR_BASE + 0, "An I/O error occurred during security authorization.") @@ -377,7 +371,8 @@ ER3(SEC_ERROR_NOT_FORTEZZA_ISSUER, (SEC_ERROR_BASE + 104), "Peer FORTEZZA chain has a non-FORTEZZA Certificate.") -/* ER3(SEC_ERROR_UNKNOWN, (SEC_ERROR_BASE + 105), */ +ER3(SEC_ERROR_CANNOT_MOVE_SENSITIVE_KEY, (SEC_ERROR_BASE + 105), +"A sensitive key cannot be moved to the slot where it is needed.") ER3(SEC_ERROR_JS_INVALID_MODULE_NAME, (SEC_ERROR_BASE + 106), "Invalid module name.") @@ -461,3 +456,74 @@ ER3(SEC_ERROR_OCSP_OLD_RESPONSE, (SEC_ERROR_BASE + 132), "The OCSP response contains out-of-date information.") + +ER3(SEC_ERROR_DIGEST_NOT_FOUND, (SEC_ERROR_BASE + 133), +"The CMS or PKCS #7 Digest was not found in signed message.") + +ER3(SEC_ERROR_UNSUPPORTED_MESSAGE_TYPE, (SEC_ERROR_BASE + 134), +"The CMS or PKCS #7 Message type is unsupported.") + +ER3(SEC_ERROR_MODULE_STUCK, (SEC_ERROR_BASE + 135), +"PKCS #11 module could not be removed because it is still in use.") + +ER3(SEC_ERROR_BAD_TEMPLATE, (SEC_ERROR_BASE + 136), +"Could not decode ASN.1 data. Specified template was invalid.") + +ER3(SEC_ERROR_CRL_NOT_FOUND, (SEC_ERROR_BASE + 137), +"No matching CRL was found.") + +ER3(SEC_ERROR_REUSED_ISSUER_AND_SERIAL, (SEC_ERROR_BASE + 138), +"You are attempting to import a cert with the same issuer/serial as \ +an existing cert, but that is not the same cert.") + +ER3(SEC_ERROR_BUSY, (SEC_ERROR_BASE + 139), +"NSS could not shutdown. Objects are still in use.") + +ER3(SEC_ERROR_EXTRA_INPUT, (SEC_ERROR_BASE + 140), +"DER-encoded message contained extra unused data.") + +ER3(SEC_ERROR_UNSUPPORTED_ELLIPTIC_CURVE, (SEC_ERROR_BASE + 141), +"Unsupported elliptic curve.") + +ER3(SEC_ERROR_UNSUPPORTED_EC_POINT_FORM, (SEC_ERROR_BASE + 142), +"Unsupported elliptic curve point form.") + +ER3(SEC_ERROR_UNRECOGNIZED_OID, (SEC_ERROR_BASE + 143), +"Unrecognized Object IDentifier.") + +ER3(SEC_ERROR_OCSP_INVALID_SIGNING_CERT, (SEC_ERROR_BASE + 144), +"Invalid OCSP signing certificate in OCSP response.") + +ER3(SEC_ERROR_REVOKED_CERTIFICATE_CRL, (SEC_ERROR_BASE + 145), +"Certificate is revoked in issuer's certificate revocation list.") + +ER3(SEC_ERROR_REVOKED_CERTIFICATE_OCSP, (SEC_ERROR_BASE + 146), +"Issuer's OCSP responder reports certificate is revoked.") + +ER3(SEC_ERROR_CRL_INVALID_VERSION, (SEC_ERROR_BASE + 147), +"Issuer's Certificate Revocation List has an unknown version number.") + +ER3(SEC_ERROR_CRL_V1_CRITICAL_EXTENSION, (SEC_ERROR_BASE + 148), +"Issuer's V1 Certificate Revocation List has a critical extension.") + +ER3(SEC_ERROR_CRL_UNKNOWN_CRITICAL_EXTENSION, (SEC_ERROR_BASE + 149), +"Issuer's V2 Certificate Revocation List has an unknown critical extension.") + +ER3(SEC_ERROR_UNKNOWN_OBJECT_TYPE, (SEC_ERROR_BASE + 150), +"Unknown object type specified.") + +ER3(SEC_ERROR_INCOMPATIBLE_PKCS11, (SEC_ERROR_BASE + 151), +"PKCS #11 driver violates the spec in an incompatible way.") + +ER3(SEC_ERROR_NO_EVENT, (SEC_ERROR_BASE + 152), +"No new slot event is available at this time.") + +ER3(SEC_ERROR_CRL_ALREADY_EXISTS, (SEC_ERROR_BASE + 153), +"CRL already exists.") + +ER3(SEC_ERROR_NOT_INITIALIZED, (SEC_ERROR_BASE + 154), +"NSS is not initialized.") + +ER3(SEC_ERROR_TOKEN_NOT_LOGGED_IN, (SEC_ERROR_BASE + 155), +"The operation failed because the PKCS#11 token is not logged in.") + Index: sslerrstrs.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/sslerrstrs.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sslerrstrs.h 19 Apr 2005 22:07:37 -0000 1.4 +++ sslerrstrs.h 10 Nov 2006 01:05:04 -0000 1.5 @@ -42,13 +42,8 @@ /* **************************************************************************** - * The code below this point was provided by Nelson Bolyard of the - * Netscape Certificate Server team on 27-March-1998. - * Taken from the file ns/security/cmd/lib/SSLerrs.h on NSS_1_BRANCH. - * Last updated from there: 24-July-1998 by Mark Smith - * - * All of the Directory Server specific changes are enclosed inside - * #ifdef NS_DS. + * The code below this point was taken from the file + * mozilla/security/nss/security/nss/cmd/lib/SSLerrs.h on NSS_3_11_3_RTM. **************************************************************************** */ @@ -385,3 +380,20 @@ ER3(SSL_ERROR_NO_RENEGOTIATION_ALERT , (SSL_ERROR_BASE + 102), "Peer does not permit renegotiation of SSL security parameters.") +ER3(SSL_ERROR_SERVER_CACHE_NOT_CONFIGURED , (SSL_ERROR_BASE + 103), +"SSL server cache not configured and not disabled for this socket.") + +ER3(SSL_ERROR_UNSUPPORTED_EXTENSION_ALERT , (SSL_ERROR_BASE + 104), +"SSL peer does not support requested TLS hello extension.") + +ER3(SSL_ERROR_CERTIFICATE_UNOBTAINABLE_ALERT , (SSL_ERROR_BASE + 105), +"SSL peer could not obtain your certificate from the supplied URL.") + +ER3(SSL_ERROR_UNRECOGNIZED_NAME_ALERT , (SSL_ERROR_BASE + 106), +"SSL peer has no certificate for the requested DNS name.") + +ER3(SSL_ERROR_BAD_CERT_STATUS_RESPONSE_ALERT , (SSL_ERROR_BASE + 107), +"SSL peer was unable to get an OCSP response for its certificate.") + +ER3(SSL_ERROR_BAD_CERT_HASH_VALUE_ALERT , (SSL_ERROR_BASE + 108), +"SSL peer reported bad certificate hash value.") From fedora-directory-commits at redhat.com Fri Nov 10 01:05:06 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:05:06 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/clients/dsgw dsgwutil.c, 1.7, 1.8 Message-ID: <200611100105.kAA15a7v010614@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/clients/dsgw In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10493/ldap/clients/dsgw Modified Files: dsgwutil.c Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NS_DS (Comment #2, #3) Index: dsgwutil.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/dsgwutil.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- dsgwutil.c 22 May 2006 17:28:36 -0000 1.7 +++ dsgwutil.c 10 Nov 2006 01:05:03 -0000 1.8 @@ -42,11 +42,7 @@ #include /* PATH_MAX */ #include "dsgw.h" #include "dbtdsgw.h" -#ifdef NS_DS #include "../lib/libsi18n/gsslapd.h" -#else /* Admin Server */ -#include "../lib/libsi18n/gsadmserv.h" -#endif #ifdef DSGW_DEBUG #include @@ -96,11 +92,7 @@ /* initialize the string database */ XP_InitStringDatabase( -#ifdef NS_DS SERVER_ROOT_PATH "/bin/slapd/property" /* Directory Server Gateway */ -#else - SERVER_ROOT_PATH "/admin" /* Admin Server */ -#endif , DATABASE_NAME); /* set default default languages for string database */ SetLanguage(CLIENT_LANGUAGE, ""); From fedora-directory-commits at redhat.com Fri Nov 10 01:05:13 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:05:13 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/ntperfdll Makefile, 1.5, 1.6 Message-ID: <200611100105.kAA15hGw010627@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/ntperfdll In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10493/ldap/servers/slapd/ntperfdll Modified Files: Makefile Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NS_DS (Comment #2, #3) Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/ntperfdll/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Makefile 19 Apr 2005 22:07:40 -0000 1.5 +++ Makefile 10 Nov 2006 01:05:09 -0000 1.6 @@ -56,7 +56,7 @@ DLLS = nsldapctr # -D's get all screwed up: we need to fix them: -CFLAGS+= -UNS_PERSONAL -DNS_DS +CFLAGS+= -UNS_PERSONAL # this lets us pickup regparms.h CFLAGS += -I $(BUILD_ROOT)/include From fedora-directory-commits at redhat.com Fri Nov 10 01:09:28 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:09:28 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap nsldap.mk,1.13,1.14 Message-ID: <200611100109.kAA19S3R010728@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10706/ldap Modified Files: nsldap.mk Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NET_SSL and UPGRADEDB (Comment #5, #7) Index: nsldap.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/nsldap.mk,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- nsldap.mk 25 Oct 2006 00:04:38 -0000 1.13 +++ nsldap.mk 10 Nov 2006 01:09:26 -0000 1.14 @@ -173,9 +173,6 @@ #CFLAGS += -xwe #endif -# turn on convidl: new idl upgrade tool -CFLAGS+=-DUPGRADEDB - # # Dynamic library for LDAP Server Admin interface # @@ -872,7 +869,7 @@ SECURITY_EXTN=us endif -SSL = -DNET_SSL -DUSE_NSPR_MT +SSL = -DUSE_NSPR_MT EXTRASSLLIBS = $(LIBARES) ifeq ($(ARCH), WINNT) From fedora-directory-commits at redhat.com Fri Nov 10 01:10:59 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:10:59 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/pwdstorage pwdstorage.h, 1.7, 1.8 sha_pwd.c, 1.6, 1.7 ssha_pwd.c, 1.7, 1.8 Message-ID: <200611100110.kAA1AxKx010975@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/pwdstorage In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10781/ldap/servers/plugins/pwdstorage Modified Files: pwdstorage.h sha_pwd.c ssha_pwd.c Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NET_SSL (Comment #5) Index: pwdstorage.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/pwdstorage/pwdstorage.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- pwdstorage.h 6 Sep 2005 21:15:15 -0000 1.7 +++ pwdstorage.h 10 Nov 2006 01:10:51 -0000 1.8 @@ -103,64 +103,4 @@ int md5_pw_cmp( char *userpwd, char *dbpwd ); char *md5_pw_enc( char *pwd ); - -#if !defined(NET_SSL) -/******************************************/ -/* - * Some of the stuff below depends on a definition for uint32, so - * we include one here. Other definitions appear in nspr/prtypes.h, - * at least. All the platforms we support use 32-bit ints. - */ -typedef unsigned int uint32; - - -/******************************************/ -/* - * The following is from ds.h, which the libsec sec.h stuff depends on (see - * comment below). - */ -/* -** A status code. Status's are used by procedures that return status -** values. Again the motivation is so that a compiler can generate -** warnings when return values are wrong. Correct testing of status codes: -** -** DSStatus rv; -** rv = some_function (some_argument); -** if (rv != DSSuccess) -** do_an_error_thing(); -** -*/ -typedef enum DSStatusEnum { - DSWouldBlock = -2, - DSFailure = -1, - DSSuccess = 0 -} DSStatus; - - -/******************************************/ -/* - * All of the SHA1-related defines are from libsec's "sec.h" -- including - * it directly pulls in way too much stuff that we conflict with. Ugh. - */ - -/* - * Number of bytes each hash algorithm produces - */ -#define SHA1_LENGTH 20 -#define SHA256_LENGTH 32 -#define SHA384_LENGTH 48 -#define SHA512_LENGTH 64 - -/******************************************/ -/* -** SHA-1 secure hash function -*/ - -/* -** Hash a null terminated string "src" into "dest" using SHA-1 -*/ -DSStatus SHA1_Hash(unsigned char *dest, char *src); - -#endif /* !defined(NET_SSL) */ - #endif /* _PWDSTORAGE_H */ Index: sha_pwd.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/pwdstorage/sha_pwd.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sha_pwd.c 9 Oct 2006 21:42:57 -0000 1.6 +++ sha_pwd.c 10 Nov 2006 01:10:51 -0000 1.7 @@ -46,9 +46,7 @@ #include "pwdstorage.h" -#if defined(NET_SSL) #include -#endif /* NET_SSL */ #define SHA_SALT_LENGTH 8 /* number of bytes of data in salt */ #define NOT_FIRST_TIME (time_t)1 /* not the first logon */ Index: ssha_pwd.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/pwdstorage/ssha_pwd.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ssha_pwd.c 14 Sep 2005 23:37:37 -0000 1.7 +++ ssha_pwd.c 10 Nov 2006 01:10:51 -0000 1.8 @@ -48,10 +48,8 @@ #include "prtime.h" #include "prlong.h" -#if defined(NET_SSL) #include #include -#endif /* NET_SSL */ #define SHA_SALT_LENGTH 8 /* number of bytes of data in salt */ From fedora-directory-commits at redhat.com Fri Nov 10 01:11:00 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:11:00 -0700 Subject: [Fedora-directory-commits] ldapserver/lib/base file.cpp,1.6,1.7 Message-ID: <200611100111.kAA1B0HT010999@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/lib/base In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10781/lib/base Modified Files: file.cpp Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NET_SSL (Comment #5) Index: file.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/base/file.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- file.cpp 11 Apr 2006 02:14:52 -0000 1.6 +++ file.cpp 10 Nov 2006 01:10:57 -0000 1.7 @@ -528,8 +528,6 @@ #endif /* SNI */ #endif -#ifdef NET_SSL - #define ERRMSG_SIZE 35 #ifdef THREAD_ANY static int errmsg_key = -1; @@ -537,19 +535,16 @@ /* Removed for ns security integration #include "xp_error.h" */ -#else +#else /* THREAD_ANY */ static char errmsg[ERRMSG_SIZE]; -#endif +#endif /* THREAD_ANY */ #include "util.h" -#endif - - void system_errmsg_init(void) { if (errmsg_key == -1) { -#if defined(THREAD_ANY) && defined(NET_SSL) +#if defined(THREAD_ANY) errmsg_key = systhread_newkey(); #endif #ifdef XP_WIN32 From fedora-directory-commits at redhat.com Fri Nov 10 01:10:59 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:10:59 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd daemon.c, 1.9, 1.10 globals.c, 1.4, 1.5 libglobs.c, 1.12, 1.13 localhost.c, 1.7, 1.8 main.c, 1.14, 1.15 ntuserpin.c, 1.7, 1.8 plugin_internal_op.c, 1.5, 1.6 pw.c, 1.11, 1.12 result.c, 1.8, 1.9 slap.h, 1.18, 1.19 ssl.c, 1.9, 1.10 Message-ID: <200611100110.kAA1AxEM010987@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10781/ldap/servers/slapd Modified Files: daemon.c globals.c libglobs.c localhost.c main.c ntuserpin.c plugin_internal_op.c pw.c result.c slap.h ssl.c Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NET_SSL (Comment #5) Index: daemon.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/daemon.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- daemon.c 15 Sep 2006 22:45:11 -0000 1.9 +++ daemon.c 10 Nov 2006 01:10:57 -0000 1.10 @@ -83,9 +83,7 @@ #include "snmp_collator.h" #include -#if defined( NET_SSL ) #include -#endif /* defined(NET_SSL) */ #include "fe.h" @@ -1895,7 +1893,6 @@ */ } -#if defined(NET_SSL) if( secure && config_get_SSLclientAuth() != SLAPD_SSLCLIENTAUTH_OFF ) { /* Prepare to handle the client's certificate (if any): */ int rv; @@ -1917,7 +1914,6 @@ conn->c_sd, rv, prerr); } } -#endif connection_reset(conn, ns, &from, sizeof(from), secure); Index: globals.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/globals.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- globals.c 19 Apr 2005 22:07:36 -0000 1.4 +++ globals.c 10 Nov 2006 01:10:57 -0000 1.5 @@ -42,7 +42,6 @@ * SLAPD globals.c -- SLAPD library global variables */ -#if defined(NET_SSL) #include "ldap.h" #include /* cipher suite names */ #include @@ -50,8 +49,6 @@ #undef OFF #undef LITTLE_ENDIAN -#endif - #include #include #include Index: libglobs.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/libglobs.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libglobs.c 6 Nov 2006 19:33:42 -0000 1.12 +++ libglobs.c 10 Nov 2006 01:10:57 -0000 1.13 @@ -45,7 +45,6 @@ */ #define DONT_DECLARE_SLAPD_LDAP_DEBUG /* see ldaplog.h */ -#if defined(NET_SSL) #include "ldap.h" #include #include @@ -53,8 +52,6 @@ #undef OFF #undef LITTLE_ENDIAN -#endif - #include #include #include Index: localhost.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/localhost.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- localhost.c 19 Apr 2005 22:07:36 -0000 1.7 +++ localhost.c 10 Nov 2006 01:10:57 -0000 1.8 @@ -56,10 +56,8 @@ #include #endif /* USE_SYSCONF */ -#if defined( NET_SSL ) #include #include "fe.h" -#endif /* defined(NET_SSL) */ #ifndef _PATH_RESCONF /* usually defined in */ #define _PATH_RESCONF "/etc/resolv.conf" Index: main.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/main.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- main.c 6 Nov 2006 19:33:42 -0000 1.14 +++ main.c 10 Nov 2006 01:10:57 -0000 1.15 @@ -36,11 +36,9 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ -#if defined(NET_SSL) #include #undef OFF #undef LITTLE_ENDIAN -#endif #include #include @@ -108,9 +106,7 @@ static int slapd_exemode_db2index(); static int slapd_exemode_archive2db(); static int slapd_exemode_db2archive(); -#if defined(UPGRADEDB) static int slapd_exemode_upgradedb(); -#endif static int slapd_exemode_dbtest(); static int slapd_exemode_suffix2instance(); static int slapd_debug_level_string2level( const char *s ); @@ -365,21 +361,15 @@ } else if ( strcmp( s, "suffix2instance" ) == 0 ) { exemode = SLAPD_EXEMODE_SUFFIX2INSTANCE; } -#if defined(UPGRADEDB) else if ( strcmp( s, "upgradedb" ) == 0 ) { exemode = SLAPD_EXEMODE_UPGRADEDB; } -#endif else if ( exit_if_unknown ) { fprintf( stderr, "usage: %s -D configdir " "[ldif2db | db2ldif | archive2db " "| db2archive | db2index | refer | suffix2instance" -#if defined(UPGRADEDB) " | upgradedb] " -#else - "] " -#endif "[options]\n", progname ); exit( 1 ); } else { @@ -436,11 +426,9 @@ case SLAPD_EXEMODE_SUFFIX2INSTANCE: usagestr = "usage: %s %s%s -D configdir {-s suffix}*\n"; break; -#if defined(UPGRADEDB) case SLAPD_EXEMODE_UPGRADEDB: usagestr = "usage: %s %s%s-D configdir [-d debuglevel] [-f] -a archivedir\n"; break; -#endif default: /* SLAPD_EXEMODE_SLAPD */ usagestr = "usage: %s %s%s-D configdir [-d debuglevel] " @@ -480,9 +468,7 @@ static int ldif2db_load_state= 1; static char *ldif2db_namespaceid = NULL; int importexport_encrypt = 0; -#if defined(UPGRADEDB) static int upgradedb_force = 0; -#endif /* taken from idsktune */ #if defined(__sun) @@ -956,10 +942,8 @@ case SLAPD_EXEMODE_SUFFIX2INSTANCE: return slapd_exemode_suffix2instance(); -#if defined(UPGRADEDB) case SLAPD_EXEMODE_UPGRADEDB: return slapd_exemode_upgradedb(); -#endif case SLAPD_EXEMODE_PRINTVERSION: slapd_print_version(1); @@ -1085,9 +1069,7 @@ normalize_oc(); if (n_port) { -#if defined(NET_SSL) } else if ( config_get_security()) { -#endif } else { #ifdef _WIN32 if( SlapdIsAService() ) @@ -1327,7 +1309,6 @@ {"exclude",ArgRequired,'x'}, {0,0,0}}; -#if defined(UPGRADEDB) char *opts_upgradedb = "vfd:a:D:"; struct opt_ext long_options_upgradedb[] = { {"version",ArgNone,'v'}, @@ -1336,7 +1317,6 @@ {"archive",ArgRequired,'a'}, {"configDir",ArgRequired,'D'}, {0,0,0}}; -#endif char *opts_referral = "vd:p:r:SD:"; struct opt_ext long_options_referral[] = { @@ -1430,12 +1410,10 @@ opts = opts_suffix2instance; long_opts = long_options_suffix2instance; break; -#if defined(UPGRADEDB) case SLAPD_EXEMODE_UPGRADEDB: opts = opts_upgradedb; long_opts = long_options_upgradedb; break; -#endif default: /* SLAPD_EXEMODE_SLAPD */ opts = opts_slapd; long_opts = long_options_slapd; @@ -1755,7 +1733,6 @@ } importexport_encrypt = 1; break; -#if defined(UPGRADEDB) case 'f': /* upgradedb only */ if ( slapd_exemode != SLAPD_EXEMODE_UPGRADEDB ) { usage( myname, *extraname ); @@ -1763,7 +1740,6 @@ } upgradedb_force = SLAPI_UPGRADEDB_FORCE; break; -#endif case '1': /* db2ldif only */ if ( slapd_exemode != SLAPD_EXEMODE_DB2LDIF ) { usage( myname, *extraname ); @@ -2500,7 +2476,6 @@ return return_value; } -#if defined(UPGRADEDB) /* * functions to convert idl from the old format to the new one * (604921) Support a database uprev process any time post-install @@ -2575,7 +2550,6 @@ slapi_ch_free((void**)&myname ); return( return_value ); } -#endif static int Index: ntuserpin.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/ntuserpin.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ntuserpin.c 19 Apr 2005 22:07:36 -0000 1.7 +++ ntuserpin.c 10 Nov 2006 01:10:57 -0000 1.8 @@ -42,7 +42,7 @@ * ******************************************************/ -#if defined( _WIN32 ) && defined ( NET_SSL ) +#if defined( _WIN32 ) #include #include "ntwatchdog.h" @@ -206,4 +206,4 @@ */ static const SVRCOREPinMethods vtable = { 0, 0, destroyObject, getPin }; -#endif /* defined( _WIN32 ) && defined ( NET_SSL ) */ +#endif /* defined( _WIN32 ) */ Index: plugin_internal_op.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/plugin_internal_op.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- plugin_internal_op.c 19 Apr 2005 22:07:36 -0000 1.5 +++ plugin_internal_op.c 10 Nov 2006 01:10:57 -0000 1.6 @@ -42,9 +42,7 @@ #include "slapi-plugin.h" #include "slap.h" -#if defined(NET_SSL) #include -#endif /* entry list node */ typedef struct Entry_Node{ Index: pw.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/pw.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- pw.c 1 Sep 2006 21:25:08 -0000 1.11 +++ pw.c 10 Nov 2006 01:10:57 -0000 1.12 @@ -43,7 +43,6 @@ #include #include #include -#if defined(NET_SSL) #include #if defined( _WIN32 ) #undef DEBUG @@ -52,8 +51,6 @@ #undef LDAPDebug #endif /* _WIN32 */ -#endif /* NET_SSL */ - #include "slap.h" Index: result.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/result.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- result.c 31 Aug 2006 22:52:07 -0000 1.8 +++ result.c 10 Nov 2006 01:10:57 -0000 1.9 @@ -53,10 +53,7 @@ #include "fe.h" #include "vattr_spi.h" - -#if defined( NET_SSL ) #include -#endif PRUint64 num_entries_sent; PRUint64 num_bytes_sent; Index: slap.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/slap.h,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- slap.h 6 Nov 2006 20:51:31 -0000 1.18 +++ slap.h 10 Nov 2006 01:10:57 -0000 1.19 @@ -61,9 +61,7 @@ #define SLAPD_EXEMODE_REFERRAL 8 #define SLAPD_EXEMODE_SUFFIX2INSTANCE 9 #define SLAPD_EXEMODE_PRINTVERSION 10 -#if defined(UPGRADEDB) #define SLAPD_EXEMODE_UPGRADEDB 11 -#endif #ifdef _WIN32 #ifndef DONT_DECLARE_SLAPD_LDAP_DEBUG @@ -119,7 +117,6 @@ #define SLAPD_TYPICAL_ATTRIBUTE_NAME_MAX_LENGTH 256 -#if defined(NET_SSL) typedef struct symbol_t { const char* name; unsigned number; @@ -129,7 +126,6 @@ #define SLAPD_SSLCLIENTAUTH_ALLOWED 1 /* server asks for cert, but client need not send one */ #define SLAPD_SSLCLIENTAUTH_REQUIRED 2 /* server will refuse SSL session unless client sends cert */ #define SLAPD_SSLCLIENTAUTH_DEFAULT SLAPD_SSLCLIENTAUTH_ALLOWED -#endif /* NET_SSL */ #define SLAPD_LOGGING 1 #define NUM_SNMP_INT_TBL_ROWS 5 @@ -768,9 +764,7 @@ IFP plg_un_db_db2index; /* database 2 index */ IFP plg_un_db_archive2db; /* ldif 2 database */ IFP plg_un_db_db2archive; /* database 2 ldif */ -#if defined(UPGRADEDB) IFP plg_un_db_upgradedb; /* convert old idl to new */ -#endif IFP plg_un_db_begin; /* dbase txn begin */ IFP plg_un_db_commit; /* dbase txn commit */ IFP plg_un_db_abort; /* dbase txn abort */ @@ -805,9 +799,7 @@ #define plg_db2index plg_un.plg_un_db.plg_un_db_db2index #define plg_archive2db plg_un.plg_un_db.plg_un_db_archive2db #define plg_db2archive plg_un.plg_un_db.plg_un_db_db2archive -#if defined(UPGRADEDB) #define plg_upgradedb plg_un.plg_un_db.plg_un_db_upgradedb -#endif #define plg_dbsize plg_un.plg_un_db.plg_un_db_dbsize #define plg_dbtest plg_un.plg_un_db.plg_un_db_dbtest #define plg_rmdb plg_un.plg_un_db.plg_un_db_rmdb @@ -1051,9 +1043,7 @@ #define be_poststart be_database->plg_poststart #define be_seq be_database->plg_seq #define be_ldif2db be_database->plg_ldif2db -#if defined(UPGRADEDB) #define be_upgradedb be_database->plg_upgradedb -#endif #define be_db2ldif be_database->plg_db2ldif #define be_db2index be_database->plg_db2index #define be_archive2db be_database->plg_archive2db Index: ssl.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/ssl.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ssl.c 13 Oct 2006 01:06:28 -0000 1.9 +++ ssl.c 10 Nov 2006 01:10:57 -0000 1.10 @@ -37,8 +37,6 @@ * END COPYRIGHT BLOCK **/ /* SSL-related stuff for slapd */ -#if defined(NET_SSL) - #if defined( _WINDOWS ) #include #include @@ -102,8 +100,6 @@ /* ----------------------- Multiple cipher support ------------------------ */ -#ifdef NET_SSL - static char **cipher_names = NULL; typedef struct { char *version; @@ -182,9 +178,7 @@ if(active && !strcmp(_conf_ciphers[x].name, "rsa_null_md5")) { continue; } -#ifdef NET_SSL SSL_CipherPrefSetDefault(_conf_ciphers[x].num, active ? PR_TRUE : PR_FALSE); -#endif } } @@ -253,24 +247,12 @@ SECStatus s = 0; - -#ifdef NS_DOMESTIC - - s = NSS_SetDomesticPolicy(); - -#else - s = NSS_SetExportPolicy(); - -#endif - + s = NSS_SetDomesticPolicy(); return s?PR_FAILURE:PR_SUCCESS; } - -#endif /* NET_SSL */ - static void slapd_SSL_report(int degree, char *fmt, va_list args) { @@ -1144,11 +1126,7 @@ SSL_OptionSetDefault(SSL_ENABLE_SSL2, PR_FALSE); SSL_OptionSetDefault(SSL_ENABLE_SSLdirs 3, PR_TRUE); -#ifdef NS_DOMESTIC s = NSS_SetDomesticPolicy(); -#elif NS_EXPORT - s = NSS_SetExportPolicy(); - We already do pr_init, we don't need pr_setconcurrency, we already do nss_init and the rest */ @@ -1511,5 +1489,3 @@ #endif return ( tmpdir ); } - -#endif /* NET_SSL */ From fedora-directory-commits at redhat.com Fri Nov 10 01:10:46 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:10:46 -0700 Subject: [Fedora-directory-commits] ldapserver/httpd/src ntnsapi.c,1.8,1.9 Message-ID: <200611100111.kAA1BGI4011038@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/httpd/src In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10781/httpd/src Modified Files: ntnsapi.c Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NET_SSL (Comment #5) Index: ntnsapi.c =================================================================== RCS file: /cvs/dirsec/ldapserver/httpd/src/ntnsapi.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ntnsapi.c 19 Apr 2005 22:06:43 -0000 1.8 +++ ntnsapi.c 10 Nov 2006 01:10:43 -0000 1.9 @@ -94,7 +94,6 @@ /* Functions from ereport.h */ SafTable[EREPORT] = (SafFunction *)ereport ; -#ifdef NET_SSL /* Functions from minissl.h */ SafTable[SSL_CLOSE] = (SafFunction *)PR_Close; SafTable[SSL_SOCKET] = (SafFunction *)PR_NewTCPSocket; @@ -106,7 +105,6 @@ SafTable[SSL_READ] = (SafFunction *)PR_Read; SafTable[SSL_WRITE] = (SafFunction *)PR_Write; SafTable[SSL_GETPEERNAME] = (SafFunction *)PR_GetPeerName; -#endif /* NET_SSL */ /* Functions from shexp.h */ From fedora-directory-commits at redhat.com Fri Nov 10 01:10:47 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:10:47 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/clients/dsgw dsgw.h, 1.7, 1.8 Message-ID: <200611100111.kAA1BH6m011042@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/clients/dsgw In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10781/ldap/clients/dsgw Modified Files: dsgw.h Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NET_SSL (Comment #5) Index: dsgw.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/dsgw.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- dsgw.h 11 Apr 2006 02:14:32 -0000 1.7 +++ dsgw.h 10 Nov 2006 01:10:45 -0000 1.8 @@ -39,10 +39,6 @@ * dsgw.h -- defines for HTTP gateway */ -#if !defined( DSGW_NO_SSL ) && !defined( NET_SSL ) -#define DSGW_NO_SSL -#endif - #include #include #include From fedora-directory-commits at redhat.com Fri Nov 10 01:10:47 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:10:47 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/admin/lib dsalib_pw.c, 1.5, 1.6 Message-ID: <200611100111.kAA1BHio011041@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/admin/lib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10781/ldap/admin/lib Modified Files: dsalib_pw.c Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NET_SSL (Comment #5) Index: dsalib_pw.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/lib/dsalib_pw.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- dsalib_pw.c 19 Apr 2005 22:06:54 -0000 1.5 +++ dsalib_pw.c 10 Nov 2006 01:10:44 -0000 1.6 @@ -56,10 +56,8 @@ #include "prlong.h" #include "prmem.h" -#if defined(NET_SSL) #include #include -#endif /* NET_SSL */ #define SHA1_SALT_LENGTH 8 /* number of bytes of data in salt */ #define PWD_HASH_PREFIX_START '{' From fedora-directory-commits at redhat.com Fri Nov 10 01:10:53 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:10:53 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/include proto-ntutil.h, 1.5, 1.6 Message-ID: <200611100111.kAA1BNvI011047@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/include In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10781/ldap/include Modified Files: proto-ntutil.h Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NET_SSL (Comment #5) Index: proto-ntutil.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/include/proto-ntutil.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- proto-ntutil.h 3 Oct 2005 19:53:55 -0000 1.5 +++ proto-ntutil.h 10 Nov 2006 01:10:45 -0000 1.6 @@ -94,10 +94,8 @@ * ntgetpassword.c * */ -#ifdef NET_SSL extern char *Slapd_GetPassword(); extern void CenterDialog(HWND hwndParent, HWND hwndDialog); -#endif /* NET_SSL */ #ifdef __cplusplus } From fedora-directory-commits at redhat.com Fri Nov 10 01:10:53 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:10:53 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/libraries/libutil ntstubs.c, 1.4, 1.5 Message-ID: <200611100111.kAA1BNU9011050@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/libraries/libutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10781/ldap/libraries/libutil Modified Files: ntstubs.c Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NET_SSL (Comment #5) Index: ntstubs.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/libraries/libutil/ntstubs.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ntstubs.c 19 Apr 2005 22:07:27 -0000 1.4 +++ ntstubs.c 10 Nov 2006 01:10:51 -0000 1.5 @@ -45,7 +45,7 @@ * ******************************************************/ -#if defined( _WIN32 ) && defined ( NET_SSL ) +#if defined( _WIN32 ) #include #include @@ -68,5 +68,5 @@ { return NULL; } -#endif /* WIN32 && NET_SSL */ +#endif /* WIN32 */ From fedora-directory-commits at redhat.com Fri Nov 10 01:13:49 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:13:49 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/back-ldbm dblayer.c, 1.12, 1.13 import.c, 1.6, 1.7 import.h, 1.6, 1.7 import-threads.c, 1.10, 1.11 init.c, 1.6, 1.7 ldif2ldbm.c, 1.9, 1.10 proto-back-ldbm.h, 1.7, 1.8 upgrade.c, 1.4, 1.5 Message-ID: <200611100113.kAA1DnKI011297@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11098/ldap/servers/slapd/back-ldbm Modified Files: dblayer.c import.c import.h import-threads.c init.c ldif2ldbm.c proto-back-ldbm.h upgrade.c Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro UPGRADEDB (Comment #6) Index: dblayer.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/dblayer.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- dblayer.c 7 Nov 2006 04:20:14 -0000 1.12 +++ dblayer.c 10 Nov 2006 01:13:47 -0000 1.13 @@ -1719,12 +1719,10 @@ "file in %s\n", inst->inst_dir_name, 0, 0); } else { int rval = 0; -#if defined(UPGRADEDB) /* check the DBVERSION and reset idl-switch if needed (DS6.2) */ /* from the next major rel, we won't do this and just upgrade */ if (!(li->li_flags & LI_FORCE_MOD_CONFIG)) adjust_idl_switch(ldbmversion, li); -#endif /* check to make sure these instance was made with the correct * version. */ @@ -2022,7 +2020,6 @@ return 0; } -#ifdef UPGRADEDB /* * dblayer_get_aux_id2entry: * - create a dedicated db env and db handler for id2entry. @@ -2222,7 +2219,6 @@ slapi_ch_free_string(&inst_dirp); return 0; } -#endif int dblayer_close_indexes(backend *be) { @@ -5387,7 +5383,6 @@ } /* We're done ! */ -#if defined(UPGRADEDB) /* [605024] check the DBVERSION and reset idl-switch if needed */ if (dbversion_exists(li, home_dir)) { @@ -5404,7 +5399,6 @@ adjust_idl_switch(ldbmversion, li); } } -#endif return_value = check_db_version(li, &action); if (action & DBVERSION_UPGRADE_3_4) Index: import.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/import.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import.c 6 Dec 2005 18:28:14 -0000 1.6 +++ import.c 10 Nov 2006 01:13:47 -0000 1.7 @@ -1116,7 +1116,6 @@ /* start the producer */ import_init_worker_info(producer, job); producer->work_type = PRODUCER; -#if defined(UPGRADEDB) if (job->flags & FLAG_REINDEXING) { if (! CREATE_THREAD(PR_USER_THREAD, (VFP)index_producer, producer, @@ -1132,7 +1131,6 @@ } } else -#endif { import_log_notice(job, "Beginning import job..."); if (! CREATE_THREAD(PR_USER_THREAD, (VFP)import_producer, producer, @@ -1427,10 +1425,8 @@ } job->flags = FLAG_USE_FILES; -#if defined(UPGRADEDB) if (NULL == name_array) /* no ldif file is given -> reindexing */ job->flags |= FLAG_REINDEXING; -#endif if (!noattrindexes) job->flags |= FLAG_INDEX_ATTRS; for (i = 0; name_array && name_array[i] != NULL; i++) Index: import.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/import.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import.h 11 Apr 2006 02:14:45 -0000 1.6 +++ import.h 10 Nov 2006 01:13:47 -0000 1.7 @@ -157,9 +157,7 @@ * for replica initialization */ #define FLAG_ABORT 0x08 /* import has been aborted */ #define FLAG_ONLINE 0x10 /* bring backend online when done */ -#if defined(UPGRADEDB) #define FLAG_REINDEXING 0x20 /* read from id2entry and do indexing */ -#endif /* Structure holding stuff about a worker thread and what it's up to */ @@ -229,9 +227,7 @@ /* import-threads.c */ void import_producer(void *param); -#if defined(UPGRADEDB) void index_producer(void *param); -#endif void import_foreman(void *param); void import_worker(void *param); static void import_wait_for_space_in_fifo(ImportJob *job, size_t new_esize); Index: import-threads.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/import-threads.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- import-threads.c 6 Nov 2006 20:51:32 -0000 1.10 +++ import-threads.c 10 Nov 2006 01:13:47 -0000 1.11 @@ -620,7 +620,6 @@ info->state = ABORTED; } -#if defined(UPGRADEDB) /* producer thread for re-indexing: * read id2entry, parsing entries (str2entry) (needed???), assigning * them IDs (again, needed???) and queueing them on the entry FIFO. @@ -855,7 +854,6 @@ dblayer_release_aux_id2entry( be, db, env ); info->state = ABORTED; } -#endif static void import_wait_for_space_in_fifo(ImportJob *job, size_t new_esize) @@ -1090,9 +1088,7 @@ goto error; } -#if defined (UPGRADEDB) if (!(job->flags & FLAG_REINDEXING))/* reindex reads data from id2entry */ -#endif { /* insert into the id2entry index * (that isn't really an index -- it's the storehouse of the entries @@ -1144,9 +1140,7 @@ /* Remove the entry from the cache (caused by id2entry_add) */ -#if defined (UPGRADEDB) if (!(job->flags & FLAG_REINDEXING))/* reindex reads data from id2entry */ -#endif cache_remove(&inst->inst_cache, fi->entry); fi->entry->ep_refcnt = job->number_indexers; Index: init.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/init.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- init.c 19 Apr 2005 22:07:38 -0000 1.6 +++ init.c 10 Nov 2006 01:13:47 -0000 1.7 @@ -202,10 +202,8 @@ (void *) ldbm_back_archive2ldbm ); rc |= slapi_pblock_set( pb, SLAPI_PLUGIN_DB_DB2ARCHIVE_FN, (void *) ldbm_back_ldbm2archive ); -#if defined(UPGRADEDB) rc |= slapi_pblock_set( pb, SLAPI_PLUGIN_DB_UPGRADEDB_FN, (void *) ldbm_back_upgradedb ); -#endif rc |= slapi_pblock_set( pb, SLAPI_PLUGIN_DB_BEGIN_FN, (void *) dblayer_plugin_begin ); rc |= slapi_pblock_set( pb, SLAPI_PLUGIN_DB_COMMIT_FN, Index: ldif2ldbm.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/ldif2ldbm.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ldif2ldbm.c 11 Apr 2006 02:14:45 -0000 1.9 +++ ldif2ldbm.c 10 Nov 2006 01:13:47 -0000 1.10 @@ -1927,7 +1927,6 @@ return( rc ); } -#if defined(UPGRADEDB) /* * ldbm_back_upgradedb - * @@ -2468,4 +2467,3 @@ ldbm_back_ldif2ldbm_deluxe(pb); } -#endif /* UPGRADEDB */ Index: proto-back-ldbm.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- proto-back-ldbm.h 1 Sep 2006 21:25:14 -0000 1.7 +++ proto-back-ldbm.h 10 Nov 2006 01:13:47 -0000 1.8 @@ -433,9 +433,7 @@ int ldbm_back_ldbm2index( Slapi_PBlock *pb ); int ldbm_back_archive2ldbm( Slapi_PBlock *pb ); int ldbm_back_ldbm2archive( Slapi_PBlock *pb ); -#if defined(UPGRADEDB) int ldbm_back_upgradedb( Slapi_PBlock *pb ); -#endif int ldbm_back_next_search_entry( Slapi_PBlock *pb ); int ldbm_back_next_search_entry_ext( Slapi_PBlock *pb, int use_extension ); int ldbm_back_db_test( Slapi_PBlock *pb ); @@ -536,9 +534,7 @@ */ int check_db_version(struct ldbminfo *li, int *action); int check_db_inst_version(ldbm_instance *inst); -#if defined(UPGRADEDB) int adjust_idl_switch(char *ldbmversion, struct ldbminfo *li); -#endif int ldbm_upgrade(ldbm_instance *inst, int action); int lookup_dbversion(char *dbversion, int flag); Index: upgrade.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/upgrade.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- upgrade.c 19 Apr 2005 22:07:38 -0000 1.4 +++ upgrade.c 10 Nov 2006 01:13:47 -0000 1.5 @@ -205,7 +205,6 @@ return rval; } -#if defined(UPGRADEDB) /* * adjust_idl_switch * if the current nsslapd-idl-switch is different from ldbmversion, @@ -264,7 +263,6 @@ li->li_flags &= ~LI_FORCE_MOD_CONFIG; return rval; } -#endif /* Do the work to upgrade a database if needed */ /* When we're called, the database files have been opened, and any From fedora-directory-commits at redhat.com Fri Nov 10 01:13:50 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:13:50 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd pblock.c, 1.6, 1.7 protect_db.c, 1.7, 1.8 protect_db.h, 1.4, 1.5 slapi-private.h, 1.12, 1.13 task.c, 1.7, 1.8 Message-ID: <200611100113.kAA1DoVX011311@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11098/ldap/servers/slapd Modified Files: pblock.c protect_db.c protect_db.h slapi-private.h task.c Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro UPGRADEDB (Comment #6) Index: pblock.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/pblock.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- pblock.c 5 Oct 2006 21:14:02 -0000 1.6 +++ pblock.c 10 Nov 2006 01:13:47 -0000 1.7 @@ -604,14 +604,12 @@ } (*(IFP *)value) = pblock->pb_plugin->plg_db2archive; break; -#if defined(UPGRADEDB) case SLAPI_PLUGIN_DB_UPGRADEDB_FN: if ( pblock->pb_plugin->plg_type != SLAPI_PLUGIN_DATABASE ) { return( -1 ); } (*(IFP *)value) = pblock->pb_plugin->plg_upgradedb; break; -#endif case SLAPI_PLUGIN_DB_BEGIN_FN: if ( pblock->pb_plugin->plg_type != SLAPI_PLUGIN_DATABASE ) { return( -1 ); @@ -1875,14 +1873,12 @@ } pblock->pb_plugin->plg_db2archive = (IFP) value; break; -#if defined(UPGRADEDB) case SLAPI_PLUGIN_DB_UPGRADEDB_FN: if ( pblock->pb_plugin->plg_type != SLAPI_PLUGIN_DATABASE ) { return( -1 ); } pblock->pb_plugin->plg_upgradedb = (IFP) value; break; -#endif case SLAPI_PLUGIN_DB_BEGIN_FN: if ( pblock->pb_plugin->plg_type != SLAPI_PLUGIN_DATABASE ) { return( -1 ); Index: protect_db.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/protect_db.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- protect_db.c 13 Oct 2006 01:06:28 -0000 1.7 +++ protect_db.c 10 Nov 2006 01:13:47 -0000 1.8 @@ -479,7 +479,6 @@ result = 0; } break; -#if defined(UPGRADEDB) case SLAPD_EXEMODE_UPGRADEDB: if (running || importing || exporting) { LDAPDebug(LDAP_DEBUG_ANY, NO_UPGRADEDB_DUE_TO_USE, 0, 0, 0); @@ -489,7 +488,6 @@ result = 0; } break; -#endif case SLAPD_EXEMODE_DBTEST: if (running || importing || exporting) { LDAPDebug(LDAP_DEBUG_ANY, NO_DBTEST_DUE_TO_USE, 0, 0, 0); @@ -750,7 +748,6 @@ result = 0; } break; -#if defined(UPGRADEDB) case SLAPD_EXEMODE_UPGRADEDB: if ( mutex_exists( serverMutexName ) || mutex_exists( importMutexName ) || @@ -762,7 +759,6 @@ result = 0; } break; -#endif case SLAPD_EXEMODE_DBTEST: if ( mutex_exists( serverMutexName ) || mutex_exists( importMutexName ) || Index: protect_db.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/protect_db.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- protect_db.h 19 Apr 2005 22:07:36 -0000 1.4 +++ protect_db.h 10 Nov 2006 01:13:47 -0000 1.5 @@ -95,9 +95,7 @@ #define NO_DB2INDEX_DUE_TO_USE "Unable to create an index because the database is being used by another slapd process.\n" -#if defined(UPGRADEDB) #define NO_UPGRADEDB_DUE_TO_USE "Unable to recreate index files because the database is being used by another slapd process.\n" -#endif #define CREATE_MUTEX_ERROR "Error - CreateMutex failed: %s\n" /* reason for failure */ Index: slapi-private.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/slapi-private.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- slapi-private.h 7 Nov 2006 04:42:55 -0000 1.12 +++ slapi-private.h 10 Nov 2006 01:13:47 -0000 1.13 @@ -825,9 +825,7 @@ #define SLAPI_PLUGIN_DB_ENTRY_RELEASE_FN 230 #define SLAPI_PLUGIN_DB_INIT_INSTANCE_FN 231 #define SLAPI_PLUGIN_DB_WIRE_IMPORT_FN 234 -#if defined(UPGRADEDB) #define SLAPI_PLUGIN_DB_UPGRADEDB_FN 235 -#endif /* database plugin-specific parameters */ #define SLAPI_PLUGIN_DB_NO_ACL 250 #define SLAPI_PLUGIN_DB_RMDB_FN 280 @@ -1231,11 +1229,9 @@ void DS_Sleep(PRIntervalTime ticks); -#if defined(UPGRADEDB) /* macro to specify the behavior of upgradedb */ #define SLAPI_UPGRADEDB_FORCE 0x1 /* reindex all (no check w/ idl switch) */ #define SLAPI_UPGRADEDB_SKIPINIT 0x2 /* call upgradedb as part of other op */ -#endif /* * Macro to set port to the 'port' field of a NSPR PRNetAddr union. Index: task.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/task.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- task.c 19 Apr 2005 22:07:37 -0000 1.7 +++ task.c 10 Nov 2006 01:13:47 -0000 1.8 @@ -56,9 +56,7 @@ #define TASK_BACKUP_DN "cn=backup, cn=tasks, cn=config" #define TASK_RESTORE_DN "cn=restore, cn=tasks, cn=config" #define TASK_INDEX_DN "cn=index, cn=tasks, cn=config" -#if defined(UPGRADEDB) #define TASK_UPGRADEDB_DN "cn=upgradedb, cn=tasks, cn=config" -#endif #define TASK_LOG_NAME "nsTaskLog" #define TASK_STATUS_NAME "nsTaskStatus" @@ -1367,7 +1365,6 @@ return rv; } -#if defined(UPGRADEDB) static int task_upgradedb_add(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter, int *returncode, char *returntext, void *arg) @@ -1465,7 +1462,6 @@ *returncode = LDAP_SUCCESS; return SLAPI_DSE_CALLBACK_OK; } -#endif /* update attributes in the entry under "cn=tasks" to match the current * status of the task. @@ -1697,9 +1693,7 @@ slapi_task_register_handler("backup", task_backup_add); slapi_task_register_handler("restore", task_restore_add); slapi_task_register_handler("index", task_index_add); -#if defined(UPGRADEDB) slapi_task_register_handler("upgradedb", task_upgradedb_add); -#endif } /* called when the server is shutting down -- abort all existing tasks */ From fedora-directory-commits at redhat.com Fri Nov 10 01:28:53 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:28:53 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/systools Makefile, 1.6, 1.7 Message-ID: <200611100128.kAA1SrYX012557@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/systools In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/ldap/systools Modified Files: Makefile Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #9) Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/systools/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Makefile 29 Mar 2006 19:47:06 -0000 1.6 +++ Makefile 10 Nov 2006 01:28:45 -0000 1.7 @@ -46,7 +46,6 @@ NOSTDCLEAN=true # don't let nsconfig.mk define target clean NOSTDSTRIP=true # don't let nsconfig.mk define target strip -NSPR20=true # probably should be defined somewhere else (not sure where) OBJDEST = $(OBJDIR)/servers/tools/obj BINDIR = $(LDAP_SERVER_RELDIR) From fedora-directory-commits at redhat.com Fri Nov 10 01:28:23 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:28:23 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/passthru Makefile, 1.7, 1.8 Message-ID: <200611100128.kAA1Ssq9012561@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/passthru In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/ldap/servers/plugins/passthru Modified Files: Makefile Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #9) Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/passthru/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Makefile 25 Oct 2006 00:04:59 -0000 1.7 +++ Makefile 10 Nov 2006 01:28:21 -0000 1.8 @@ -47,7 +47,6 @@ NOSTDCLEAN=true # don't let nsconfig.mk define target clean NOSTDSTRIP=true # don't let nsconfig.mk define target strip -NSPR20=true # probably should be defined somewhere else (not sure where) OBJDEST = $(OBJDIR)/lib/libpassthru LIBDIR = $(LDAP_PLUGIN_RELDIR) From fedora-directory-commits at redhat.com Fri Nov 10 01:27:54 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:27:54 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/libraries/libavl Makefile, 1.6, 1.7 Message-ID: <200611100128.kAA1SsnH012564@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/libraries/libavl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/ldap/libraries/libavl Modified Files: Makefile Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #9) Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/libraries/libavl/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Makefile 19 Apr 2005 22:07:26 -0000 1.6 +++ Makefile 10 Nov 2006 01:27:47 -0000 1.7 @@ -46,7 +46,6 @@ NOSTDCLEAN=true # don't let nsconfig.mk define target clean NOSTDSTRIP=true # don't let nsconfig.mk define target strip -NSPR20=true # probably should be defined somewhere else (not sure where) OBJDEST = $(OBJDIR)/lib/libavl LIBDIR = $(LDAP_LIBDIR) From fedora-directory-commits at redhat.com Fri Nov 10 01:28:25 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:28:25 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/referint Makefile, 1.6, 1.7 Message-ID: <200611100128.kAA1StUu012572@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/referint In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/ldap/servers/plugins/referint Modified Files: Makefile Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #9) Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/referint/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Makefile 25 Oct 2006 00:05:02 -0000 1.6 +++ Makefile 10 Nov 2006 01:28:23 -0000 1.7 @@ -42,7 +42,6 @@ NOSTDCLEAN=true # don't let nsconfig.mk define target clean NOSTDSTRIP=true # don't let nsconfig.mk define target strip -NSPR20=true # probably should be defined somewhere else (not sure where) OBJDEST = $(OBJDIR)/lib/referint-plugin LIBDIR = $(LDAP_PLUGIN_RELDIR) From fedora-directory-commits at redhat.com Fri Nov 10 01:28:22 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:28:22 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/http Makefile, 1.8, 1.9 Message-ID: <200611100128.kAA1Sqir012550@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/http In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/ldap/servers/plugins/http Modified Files: Makefile Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #9) Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/http/Makefile,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Makefile 25 Oct 2006 00:04:56 -0000 1.8 +++ Makefile 10 Nov 2006 01:28:19 -0000 1.9 @@ -41,7 +41,6 @@ NOSTDCLEAN=true # don't let nsconfig.mk define target clean NOSTDSTRIP=true # don't let nsconfig.mk define target strip -NSPR20=true # probably should be defined somewhere else (not sure where) OBJDEST = $(OBJDIR)/lib/libhttpclient LIBDIR = $(LDAP_PLUGIN_RELDIR) From fedora-directory-commits at redhat.com Fri Nov 10 01:28:27 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:28:27 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/rever Makefile, 1.7, 1.8 Message-ID: <200611100128.kAA1Sv6D012582@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/rever In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/ldap/servers/plugins/rever Modified Files: Makefile Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #9) Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/rever/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Makefile 25 Oct 2006 00:05:05 -0000 1.7 +++ Makefile 10 Nov 2006 01:28:24 -0000 1.8 @@ -46,7 +46,6 @@ NOSTDCLEAN=true # don't let nsconfig.mk define target clean NOSTDSTRIP=true # don't let nsconfig.mk define target strip -NSPR20=true # probably should be defined somewhere else (not sure where) OBJDEST = $(OBJDIR)/lib/libdes LIBDIR = $(LDAP_PLUGIN_RELDIR) From fedora-directory-commits at redhat.com Fri Nov 10 01:28:28 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:28:28 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/roles Makefile, 1.8, 1.9 Message-ID: <200611100128.kAA1SwoQ012585@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/roles In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/ldap/servers/plugins/roles Modified Files: Makefile Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #9) Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/roles/Makefile,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Makefile 25 Oct 2006 00:05:07 -0000 1.8 +++ Makefile 10 Nov 2006 01:28:25 -0000 1.9 @@ -42,7 +42,6 @@ NOSTDCLEAN=true # don't let nsconfig.mk define target clean NOSTDSTRIP=true # don't let nsconfig.mk define target strip -NSPR20=true # probably should be defined somewhere else (not sure where) OBJDEST = $(OBJDIR)/lib/libroles LIBDIR = $(LDAP_PLUGIN_RELDIR) From fedora-directory-commits at redhat.com Fri Nov 10 01:28:28 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:28:28 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/shared Makefile, 1.5, 1.6 Message-ID: <200611100128.kAA1SwWE012590@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/shared In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/ldap/servers/plugins/shared Modified Files: Makefile Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #9) Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/shared/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Makefile 19 Apr 2005 22:07:34 -0000 1.5 +++ Makefile 10 Nov 2006 01:28:26 -0000 1.6 @@ -49,10 +49,9 @@ NOSTDCLEAN=true # don't let nsconfig.mk define target clean NOSTDSTRIP=true # don't let nsconfig.mk define target strip -#NSPR20=true # probably should be defined somewhere else (not sure where) OBJDEST = $(OBJDIR)/lib/$(SHARED) -LIBDIR = $(LDAP_LIBDIR) +LIBDIR = $(LDAP_PLUGIN_RELDIR) include $(BUILD_ROOT)/nsdefs.mk include $(BUILD_ROOT)/nsconfig.mk From fedora-directory-commits at redhat.com Fri Nov 10 01:28:24 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:28:24 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/presence Makefile, 1.7, 1.8 Message-ID: <200611100128.kAA1SsBl012565@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/presence In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/ldap/servers/plugins/presence Modified Files: Makefile Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #9) Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/presence/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Makefile 25 Oct 2006 00:05:00 -0000 1.7 +++ Makefile 10 Nov 2006 01:28:21 -0000 1.8 @@ -42,7 +42,6 @@ NOSTDCLEAN=true # don't let nsconfig.mk define target clean NOSTDSTRIP=true # don't let nsconfig.mk define target strip -NSPR20=true # probably should be defined somewhere else (not sure where) OBJDEST = $(OBJDIR)/lib/libpresence LIBDIR = $(LDAP_PLUGIN_RELDIR) From fedora-directory-commits at redhat.com Fri Nov 10 01:28:25 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:28:25 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/pwdstorage Makefile, 1.9, 1.10 Message-ID: <200611100128.kAA1StNf012568@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/pwdstorage In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/ldap/servers/plugins/pwdstorage Modified Files: Makefile Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #9) Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/pwdstorage/Makefile,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Makefile 25 Oct 2006 00:05:01 -0000 1.9 +++ Makefile 10 Nov 2006 01:28:22 -0000 1.10 @@ -46,7 +46,6 @@ NOSTDCLEAN=true # don't let nsconfig.mk define target clean NOSTDSTRIP=true # don't let nsconfig.mk define target strip -NSPR20=true # probably should be defined somewhere else (not sure where) OBJDEST = $(OBJDIR)/lib/libpwdstorage LIBDIR = $(LDAP_PLUGIN_RELDIR) From fedora-directory-commits at redhat.com Fri Nov 10 01:28:01 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:28:01 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/libraries/libutil Makefile, 1.6, 1.7 Message-ID: <200611100129.kAA1T1Yo012601@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/libraries/libutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/ldap/libraries/libutil Modified Files: Makefile Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #9) Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/libraries/libutil/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Makefile 20 Apr 2005 18:10:29 -0000 1.6 +++ Makefile 10 Nov 2006 01:27:53 -0000 1.7 @@ -46,7 +46,6 @@ NOSTDCLEAN=true # don't let nsconfig.mk define target clean NOSTDSTRIP=true # don't let nsconfig.mk define target strip -NSPR20=true # probably should be defined somewhere else (not sure where) OBJDEST = $(OBJDIR)/lib/libutil LIBDIR = $(LDAP_LIBDIR) From fedora-directory-commits at redhat.com Fri Nov 10 01:28:26 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:28:26 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/replication Makefile, 1.11, 1.12 Message-ID: <200611100128.kAA1Suib012576@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/replication In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/ldap/servers/plugins/replication Modified Files: Makefile Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #9) Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/Makefile,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- Makefile 25 Oct 2006 00:05:03 -0000 1.11 +++ Makefile 10 Nov 2006 01:28:23 -0000 1.12 @@ -47,7 +47,6 @@ NOSTDCLEAN=true # don't let nsconfig.mk define target clean NOSTDSTRIP=true # don't let nsconfig.mk define target strip -NSPR20=true # probably should be defined somewhere else (not sure where) OBJDEST = $(OBJDIR)/lib/replication-plugin LIBDIR = $(LDAP_PLUGIN_RELDIR) From fedora-directory-commits at redhat.com Fri Nov 10 01:28:26 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:28:26 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/retrocl Makefile, 1.8, 1.9 Message-ID: <200611100128.kAA1SuDv012579@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/retrocl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/ldap/servers/plugins/retrocl Modified Files: Makefile Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #9) Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/retrocl/Makefile,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Makefile 25 Oct 2006 00:05:04 -0000 1.8 +++ Makefile 10 Nov 2006 01:28:24 -0000 1.9 @@ -45,7 +45,6 @@ NOSTDCLEAN=true # don't let nsconfig.mk define target clean NOSTDSTRIP=true # don't let nsconfig.mk define target strip -NSPR20=true # probably should be defined somewhere else (not sure where) OBJDEST = $(OBJDIR)/lib/retrocl-plugin BINDIR = $(LDAP_SERVER_RELDIR) From fedora-directory-commits at redhat.com Fri Nov 10 01:28:02 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:28:02 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap Makefile,1.12,1.13 Message-ID: <200611100129.kAA1T2ct012605@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/ldap Modified Files: Makefile Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #9) Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/Makefile,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- Makefile 15 Feb 2006 22:53:51 -0000 1.12 +++ Makefile 10 Nov 2006 01:28:00 -0000 1.13 @@ -46,7 +46,6 @@ NOSTDCLEAN=true # don't let nsconfig.mk define target clean NOSTDSTRIP=true # don't let nsconfig.mk define target strip -NSPR20=true # probably should be defined somewhere else (not sure where) include $(BUILD_ROOT)/nsdefs.mk include $(BUILD_ROOT)/nsconfig.mk From fedora-directory-commits at redhat.com Fri Nov 10 01:28:22 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:28:22 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins Makefile, 1.10, 1.11 Message-ID: <200611100128.kAA1SqJT012553@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/ldap/servers/plugins Modified Files: Makefile Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #9) Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/Makefile,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- Makefile 17 Oct 2006 13:58:59 -0000 1.10 +++ Makefile 10 Nov 2006 01:28:20 -0000 1.11 @@ -46,7 +46,6 @@ NOSTDCLEAN=true # don't let nsconfig.mk define target clean NOSTDSTRIP=true # don't let nsconfig.mk define target strip -NSPR20=true # probably should be defined somewhere else (not sure where) include $(BUILD_ROOT)/nsconfig.mk include $(LDAP_SRC)/nsldap.mk From fedora-directory-commits at redhat.com Fri Nov 10 01:27:55 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:27:55 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/libraries/libldif Makefile, 1.6, 1.7 Message-ID: <200611100129.kAA1Stl6012569@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/libraries/libldif In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/ldap/libraries/libldif Modified Files: Makefile Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #9) Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/libraries/libldif/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Makefile 19 Apr 2005 22:07:26 -0000 1.6 +++ Makefile 10 Nov 2006 01:27:52 -0000 1.7 @@ -46,7 +46,6 @@ NOSTDCLEAN=true # don't let nsconfig.mk define target clean NOSTDSTRIP=true # don't let nsconfig.mk define target strip -NSPR20=true # probably should be defined somewhere else (not sure where) OBJDEST = $(OBJDIR)/lib/libldif LIBDIR = $(LDAP_LIBDIR) From fedora-directory-commits at redhat.com Fri Nov 10 01:28:35 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:28:35 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/uiduniq Makefile, 1.8, 1.9 Message-ID: <200611100129.kAA1T5JQ012613@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/uiduniq In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/ldap/servers/plugins/uiduniq Modified Files: Makefile Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #9) Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/uiduniq/Makefile,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Makefile 25 Oct 2006 00:05:11 -0000 1.8 +++ Makefile 10 Nov 2006 01:28:28 -0000 1.9 @@ -47,7 +47,6 @@ NOSTDCLEAN=true # don't let nsconfig.mk define target clean NOSTDSTRIP=true # don't let nsconfig.mk define target strip -NSPR20=true # probably should be defined somewhere else (not sure where) OBJDEST = $(OBJDIR)/lib/libuidunique LIBDIR = $(LDAP_PLUGIN_RELDIR) From fedora-directory-commits at redhat.com Fri Nov 10 01:28:02 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:28:02 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/libraries Makefile, 1.7, 1.8 Message-ID: <200611100129.kAA1T2OS012604@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/libraries In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/ldap/libraries Modified Files: Makefile Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #9) Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/libraries/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Makefile 19 Apr 2005 22:07:26 -0000 1.7 +++ Makefile 10 Nov 2006 01:27:59 -0000 1.8 @@ -46,7 +46,6 @@ NOSTDCLEAN=true # don't let nsconfig.mk define target clean NOSTDSTRIP=true # don't let nsconfig.mk define target strip -NSPR20=true # probably should be defined somewhere else (not sure where) OBJDEST = $(OBJDIR)/lib LIBDIR = $(LDAP_LIBDIR) From fedora-directory-commits at redhat.com Fri Nov 10 01:28:08 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:28:08 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers Makefile, 1.10, 1.11 Message-ID: <200611100129.kAA1T8Zb012627@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/ldap/servers Modified Files: Makefile Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #9) Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/Makefile,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- Makefile 28 Aug 2006 18:16:50 -0000 1.10 +++ Makefile 10 Nov 2006 01:28:00 -0000 1.11 @@ -45,7 +45,6 @@ NOSTDCLEAN=true # don't let nsconfig.mk define target clean NOSTDSTRIP=true # don't let nsconfig.mk define target strip -NSPR20=true # probably should be defined somewhere else (not sure where) include $(BUILD_ROOT)/nsdefs.mk include $(BUILD_ROOT)/nsconfig.mk From fedora-directory-commits at redhat.com Fri Nov 10 01:28:23 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:28:23 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/pam_passthru Makefile, 1.6, 1.7 Message-ID: <200611100129.kAA1SrAU012558@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/pam_passthru In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/ldap/servers/plugins/pam_passthru Modified Files: Makefile Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #9) Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/pam_passthru/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Makefile 25 Oct 2006 00:04:57 -0000 1.6 +++ Makefile 10 Nov 2006 01:28:20 -0000 1.7 @@ -46,7 +46,6 @@ NOSTDCLEAN=true # don't let nsconfig.mk define target clean NOSTDSTRIP=true # don't let nsconfig.mk define target strip -NSPR20=true # probably should be defined somewhere else (not sure where) OBJDEST = $(OBJDIR)/lib/libpam_passthru LIBDIR = $(LDAP_PLUGIN_RELDIR) From fedora-directory-commits at redhat.com Fri Nov 10 01:28:29 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:28:29 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/statechange Makefile, 1.8, 1.9 Message-ID: <200611100129.kAA1SxcA012593@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/statechange In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/ldap/servers/plugins/statechange Modified Files: Makefile Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #9) Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/statechange/Makefile,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Makefile 25 Oct 2006 00:05:08 -0000 1.8 +++ Makefile 10 Nov 2006 01:28:26 -0000 1.9 @@ -42,7 +42,6 @@ NOSTDCLEAN=true # don't let nsconfig.mk define target clean NOSTDSTRIP=true # don't let nsconfig.mk define target strip -NSPR20=true # probably should be defined somewhere else (not sure where) OBJDEST = $(OBJDIR)/lib/libstatechange LIBDIR = $(LDAP_PLUGIN_RELDIR) From fedora-directory-commits at redhat.com Fri Nov 10 01:28:30 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:28:30 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/syntaxes Makefile, 1.7, 1.8 Message-ID: <200611100129.kAA1T0TO012596@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/syntaxes In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/ldap/servers/plugins/syntaxes Modified Files: Makefile Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #9) Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/syntaxes/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Makefile 25 Oct 2006 00:05:09 -0000 1.7 +++ Makefile 10 Nov 2006 01:28:27 -0000 1.8 @@ -46,7 +46,6 @@ NOSTDCLEAN=true # don't let nsconfig.mk define target clean NOSTDSTRIP=true # don't let nsconfig.mk define target strip -NSPR20=true # probably should be defined somewhere else (not sure where) OBJDEST = $(OBJDIR)/lib/libsyntax LIBDIR = $(LDAP_PLUGIN_RELDIR) From fedora-directory-commits at redhat.com Fri Nov 10 01:28:41 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:28:41 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/vattrsp_template Makefile, 1.7, 1.8 Message-ID: <200611100129.kAA1TBgo012634@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/vattrsp_template In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/ldap/servers/plugins/vattrsp_template Modified Files: Makefile Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #9) Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/vattrsp_template/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Makefile 25 Oct 2006 00:05:12 -0000 1.7 +++ Makefile 10 Nov 2006 01:28:33 -0000 1.8 @@ -42,7 +42,6 @@ NOSTDCLEAN=true # don't let nsconfig.mk define target clean NOSTDSTRIP=true # don't let nsconfig.mk define target strip -NSPR20=true # probably should be defined somewhere else (not sure where) OBJDEST = $(OBJDIR)/lib/libvattrsp LIBDIR = $(LDAP_PLUGIN_RELDIR) From fedora-directory-commits at redhat.com Fri Nov 10 01:27:36 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:27:36 -0700 Subject: [Fedora-directory-commits] ldapserver nsdefs.mk,1.21,1.22 Message-ID: <200611100129.kAA1T6fJ012618@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830 Modified Files: nsdefs.mk Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #9) Index: nsdefs.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/nsdefs.mk,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- nsdefs.mk 3 Nov 2006 21:15:30 -0000 1.21 +++ nsdefs.mk 10 Nov 2006 01:27:34 -0000 1.22 @@ -205,11 +205,7 @@ endif BASIC_OBJDIR=$(BUILD_ROOT)/built/$(FULL_RTL_OBJDIR) -ifdef NSPR20 - NSPR_DIR=nspr20 -else - NSPR_DIR=nspr -endif +NSPR_DIR=nspr NSPR_BASENAME=libnspr21 PRODUCTCORE=Fedora Directory Server PRODUCT="$(PRODUCTCORE)" From fedora-directory-commits at redhat.com Fri Nov 10 01:27:37 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:27:37 -0700 Subject: [Fedora-directory-commits] ldapserver/config config.mk, 1.8, 1.9 SunOS5.mk, 1.4, 1.5 Message-ID: <200611100129.kAA1T7Yo012622@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/config In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/config Modified Files: config.mk SunOS5.mk Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #9) Index: config.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/config/config.mk,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- config.mk 3 Oct 2005 19:53:40 -0000 1.8 +++ config.mk 10 Nov 2006 01:27:34 -0000 1.9 @@ -411,7 +411,7 @@ # Platform dependent switching off of NSPR and JAVA # ifndef NO_NSPR -DEFINES += -DNSPR -DNSPR20 +DEFINES += -DNSPR endif ifndef NO_JAVA Index: SunOS5.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/config/SunOS5.mk,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- SunOS5.mk 19 Apr 2005 22:06:42 -0000 1.4 +++ SunOS5.mk 10 Nov 2006 01:27:34 -0000 1.5 @@ -77,11 +77,7 @@ # Purify doesn't like -MDupdate ifeq ($(USE_KERNEL_THREADS), 1) -ifdef NSPR20 -NOMD_OS_CFLAGS = $(MOZ_CFLAGS) -DNSPR20 -D_PR_NTHREAD -D_REENTRANT $(SOL_CFLAGS) -else -NOMD_OS_CFLAGS = $(MOZ_CFLAGS) -DHW_THREADS -D_REENTRANT $(SOL_CFLAGS) -endif +NOMD_OS_CFLAGS = $(MOZ_CFLAGS) -D_PR_NTHREAD -D_REENTRANT $(SOL_CFLAGS) OS_LIBS = -lthread -lposix4 -lsocket -lnsl -ldl else NOMD_OS_CFLAGS = $(MOZ_CFLAGS) -DSW_THREADS $(SOL_CFLAGS) From fedora-directory-commits at redhat.com Fri Nov 10 01:28:42 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:28:42 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/back-ldbm Makefile, 1.9, 1.10 Message-ID: <200611100129.kAA1TCV8012639@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/ldap/servers/slapd/back-ldbm Modified Files: Makefile Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #9) Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/Makefile,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Makefile 25 Oct 2006 00:05:14 -0000 1.9 +++ Makefile 10 Nov 2006 01:28:39 -0000 1.10 @@ -45,7 +45,6 @@ NOSTDCLEAN=true # don't let nsconfig.mk define target clean NOSTDSTRIP=true # don't let nsconfig.mk define target strip -NSPR20=true # probably should be defined somewhere else (not sure where) OBJDEST = $(OBJDIR)/lib/libback-ldbm From fedora-directory-commits at redhat.com Fri Nov 10 01:28:08 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:28:08 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/acl Makefile, 1.9, 1.10 Message-ID: <200611100129.kAA1T8A5012632@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/acl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/ldap/servers/plugins/acl Modified Files: Makefile Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #9) Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/acl/Makefile,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Makefile 25 Oct 2006 00:04:48 -0000 1.9 +++ Makefile 10 Nov 2006 01:28:06 -0000 1.10 @@ -46,7 +46,6 @@ NOSTDCLEAN=true # don't let nsconfig.mk define target clean NOSTDSTRIP=true # don't let nsconfig.mk define target strip -NSPR20=true # probably should be defined somewhere else (not sure where) OBJDEST = $(OBJDIR)/lib/libacl LIBDIR = $(LDAP_PLUGIN_RELDIR) From fedora-directory-commits at redhat.com Fri Nov 10 01:28:44 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:28:44 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/test-plugins Makefile, 1.6, 1.7 Message-ID: <200611100129.kAA1TFlt012685@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/ldap/servers/slapd/test-plugins Modified Files: Makefile Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #9) Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Makefile 19 Apr 2005 22:07:41 -0000 1.6 +++ Makefile 10 Nov 2006 01:28:42 -0000 1.7 @@ -46,7 +46,6 @@ NOSTDCLEAN=true # don't let nsconfig.mk define target clean NOSTDSTRIP=true # don't let nsconfig.mk define target strip -NSPR20=true # probably should be defined somewhere else (not sure where) OBJDEST = $(OBJDIR)/servers/obj BINDIR = $(OBJDIR)/bin From fedora-directory-commits at redhat.com Fri Nov 10 01:28:15 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:28:15 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/cos Makefile, 1.8, 1.9 Message-ID: <200611100129.kAA1TFcC012690@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/cos In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/ldap/servers/plugins/cos Modified Files: Makefile Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #9) Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/cos/Makefile,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Makefile 25 Oct 2006 00:04:53 -0000 1.8 +++ Makefile 10 Nov 2006 01:28:13 -0000 1.9 @@ -42,7 +42,6 @@ NOSTDCLEAN=true # don't let nsconfig.mk define target clean NOSTDSTRIP=true # don't let nsconfig.mk define target strip -NSPR20=true # probably should be defined somewhere else (not sure where) OBJDEST = $(OBJDIR)/lib/libcos LIBDIR = $(LDAP_PLUGIN_RELDIR) From fedora-directory-commits at redhat.com Fri Nov 10 01:28:46 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:28:46 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/tools/rsearch Makefile, 1.4, 1.5 Message-ID: <200611100129.kAA1TGBm012697@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/rsearch In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/ldap/servers/slapd/tools/rsearch Modified Files: Makefile Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #9) Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/rsearch/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Makefile 25 Oct 2006 00:05:17 -0000 1.4 +++ Makefile 10 Nov 2006 01:28:43 -0000 1.5 @@ -46,7 +46,6 @@ NOSTDCLEAN=true # don't let nsconfig.mk define target clean NOSTDSTRIP=true # don't let nsconfig.mk define target strip -NSPR20=true # probably should be defined somewhere else (not sure where) OBJDEST = $(OBJDIR)/servers/tools/obj BINDIR = $(RELDIR)/usr/bin From fedora-directory-commits at redhat.com Fri Nov 10 01:28:47 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:28:47 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/snmp/ntagt Makefile, 1.6, 1.7 Message-ID: <200611100129.kAA1TH5U012706@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/snmp/ntagt In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/ldap/servers/snmp/ntagt Modified Files: Makefile Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #9) Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/snmp/ntagt/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Makefile 29 Oct 2005 02:28:24 -0000 1.6 +++ Makefile 10 Nov 2006 01:28:45 -0000 1.7 @@ -50,7 +50,6 @@ NOSTDCLEAN = true # don't let nsconfig.mk define target clean NOSTDSTRIP = true # don't let nsconfig.mk define target strip -NSPR20 = true include $(BUILD_ROOT)/nsconfig.mk include $(MSRV_ROOT)/nsldap.mk From fedora-directory-commits at redhat.com Fri Nov 10 01:28:42 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:28:42 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/back-ldif Makefile, 1.5, 1.6 Message-ID: <200611100129.kAA1TDko012643@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldif In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/ldap/servers/slapd/back-ldif Modified Files: Makefile Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #9) Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldif/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Makefile 19 Apr 2005 22:07:39 -0000 1.5 +++ Makefile 10 Nov 2006 01:28:40 -0000 1.6 @@ -46,7 +46,6 @@ NOSTDCLEAN=true # don't let nsconfig.mk define target clean NOSTDSTRIP=true # don't let nsconfig.mk define target strip -NSPR20=true # probably should be defined somewhere else (not sure where) OBJDEST = $(OBJDIR)/lib/libback-ldif LIBDIR = $(LDAP_LIBDIR) From fedora-directory-commits at redhat.com Fri Nov 10 01:27:43 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:27:43 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/admin Makefile,1.5,1.6 Message-ID: <200611100129.kAA1TDaT012645@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/admin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/ldap/admin Modified Files: Makefile Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #9) Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Makefile 19 Apr 2005 22:06:53 -0000 1.5 +++ Makefile 10 Nov 2006 01:27:40 -0000 1.6 @@ -46,7 +46,6 @@ NOSTDCLEAN=true # don't let nsconfig.mk define target clean NOSTDSTRIP=true # don't let nsconfig.mk define target strip -NSPR20=true # probably should be defined somewhere else (not sure where) include $(BUILD_ROOT)/nsdefs.mk include $(BUILD_ROOT)/nsconfig.mk From fedora-directory-commits at redhat.com Fri Nov 10 01:28:43 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:28:43 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd Makefile, 1.13, 1.14 Message-ID: <200611100129.kAA1TDCk012649@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/ldap/servers/slapd Modified Files: Makefile Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #9) Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/Makefile,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- Makefile 7 Apr 2006 22:22:18 -0000 1.13 +++ Makefile 10 Nov 2006 01:28:41 -0000 1.14 @@ -46,7 +46,6 @@ NOSTDCLEAN=true # don't let nsconfig.mk define target clean NOSTDSTRIP=true # don't let nsconfig.mk define target strip -NSPR20=true # probably should be defined somewhere else (not sure where) OBJDEST = $(OBJDIR)/servers/obj BINDIR = $(LDAP_SERVER_RELDIR) From fedora-directory-commits at redhat.com Fri Nov 10 01:28:14 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:28:14 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/chainingdb Makefile, 1.7, 1.8 Message-ID: <200611100129.kAA1TESc012678@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/chainingdb In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/ldap/servers/plugins/chainingdb Modified Files: Makefile Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #9) Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/chainingdb/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Makefile 25 Oct 2006 00:04:50 -0000 1.7 +++ Makefile 10 Nov 2006 01:28:06 -0000 1.8 @@ -47,7 +47,6 @@ NOSTDCLEAN=true # don't let nsconfig.mk define target clean NOSTDSTRIP=true # don't let nsconfig.mk define target strip -NSPR20=true # probably should be defined somewhere else (not sure where) OBJDEST = $(OBJDIR)/lib/libcb LIBDIR = $(LDAP_PLUGIN_RELDIR) From fedora-directory-commits at redhat.com Fri Nov 10 01:28:44 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:28:44 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/ntmsgdll Makefile, 1.5, 1.6 Message-ID: <200611100129.kAA1TEhD012654@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/ntmsgdll In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/ldap/servers/slapd/ntmsgdll Modified Files: Makefile Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #9) Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/ntmsgdll/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Makefile 19 Apr 2005 22:07:39 -0000 1.5 +++ Makefile 10 Nov 2006 01:28:41 -0000 1.6 @@ -46,7 +46,6 @@ NOSTDCLEAN=true # don't let nsconfig.mk define target clean NOSTDSTRIP=true # don't let nsconfig.mk define target strip -NSPR20=true # probably should be defined somewhere else (not sure where) OBJDEST = $(OBJDIR)/ntmsgdll/obj BINDIR = $(LDAP_SERVER_RELDIR) From fedora-directory-commits at redhat.com Fri Nov 10 01:28:21 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:28:21 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/distrib Makefile, 1.7, 1.8 Message-ID: <200611100129.kAA1TLtu012723@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/distrib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/ldap/servers/plugins/distrib Modified Files: Makefile Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #9) Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/distrib/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Makefile 25 Oct 2006 00:04:54 -0000 1.7 +++ Makefile 10 Nov 2006 01:28:13 -0000 1.8 @@ -45,7 +45,6 @@ NOSTDCLEAN=true # don't let nsconfig.mk define target clean NOSTDSTRIP=true # don't let nsconfig.mk define target strip -NSPR20=true # probably should be defined somewhere else (not sure where) OBJDEST = $(OBJDIR)/lib/libdistrib LIBDIR = $(LDAP_PLUGIN_RELDIR) From fedora-directory-commits at redhat.com Fri Nov 10 01:27:55 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:27:55 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/libraries/liblitekey Makefile, 1.6, 1.7 Message-ID: <200611100129.kAA1SuJp012573@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/libraries/liblitekey In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/ldap/libraries/liblitekey Modified Files: Makefile Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #9) Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/libraries/liblitekey/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Makefile 19 Apr 2005 22:07:27 -0000 1.6 +++ Makefile 10 Nov 2006 01:27:53 -0000 1.7 @@ -46,7 +46,6 @@ NOSTDCLEAN=true # don't let nsconfig.mk define target clean NOSTDSTRIP=true # don't let nsconfig.mk define target strip -NSPR20=true # probably should be defined somewhere else (not sure where) OBJDEST = $(OBJDIR)/lib/liblitekey LIBDIR = $(LDAP_LIBDIR) From fedora-directory-commits at redhat.com Fri Nov 10 01:28:47 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:28:47 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/snmp Makefile, 1.13, 1.14 Message-ID: <200611100129.kAA1THw3012700@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/snmp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/ldap/servers/snmp Modified Files: Makefile Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #9) Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/snmp/Makefile,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- Makefile 25 Oct 2006 00:05:18 -0000 1.13 +++ Makefile 10 Nov 2006 01:28:44 -0000 1.14 @@ -52,7 +52,6 @@ NOSTDCLEAN=true # don't let nsconfig.mk define target clean NOSTDSTRIP=true # don't let nsconfig.mk define target strip -NSPR20=true # probably should be defined somewhere else (not sure where) OBJDEST = $(OBJDIR)/ldap-agent BINDIR = $(LDAP_SERVER_RELDIR) From fedora-directory-commits at redhat.com Fri Nov 10 01:27:42 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:27:42 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/admin/lib Makefile, 1.10, 1.11 Message-ID: <200611100129.kAA1TCcC012640@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/admin/lib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/ldap/admin/lib Modified Files: Makefile Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #9) Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/lib/Makefile,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- Makefile 29 Mar 2006 19:43:46 -0000 1.10 +++ Makefile 10 Nov 2006 01:27:35 -0000 1.11 @@ -46,7 +46,6 @@ NOSTDCLEAN=true # don't let nsconfig.mk define target clean NOSTDSTRIP=true # don't let nsconfig.mk define target strip -NSPR20=true # probably should be defined somewhere else (not sure where) OBJDEST = $(LDAP_ADMOBJDIR) LIBDIR = $(LDAP_LIBDIR) From fedora-directory-commits at redhat.com Fri Nov 10 01:27:48 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:27:48 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src Makefile, 1.19, 1.20 Message-ID: <200611100129.kAA1TIBb012712@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/admin/src In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/ldap/admin/src Modified Files: Makefile Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #9) Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/Makefile,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- Makefile 25 Oct 2006 00:04:41 -0000 1.19 +++ Makefile 10 Nov 2006 01:27:41 -0000 1.20 @@ -44,7 +44,6 @@ NOSTDCLEAN=true # don't let nsconfig.mk define target clean NOSTDSTRIP=true # don't let nsconfig.mk define target strip -NSPR20=true # probably should be defined somewhere else (not sure where) BINDIR=$(LDAP_ADMIN_BIN_RELDIR) OBJDEST=$(LDAP_ADMOBJDIR) From fedora-directory-commits at redhat.com Fri Nov 10 01:28:15 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:28:15 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/collation Makefile, 1.7, 1.8 Message-ID: <200611100129.kAA1TFt0012686@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/collation In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/ldap/servers/plugins/collation Modified Files: Makefile Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #9) Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/collation/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Makefile 25 Oct 2006 00:04:51 -0000 1.7 +++ Makefile 10 Nov 2006 01:28:12 -0000 1.8 @@ -42,7 +42,6 @@ NOSTDCLEAN=true # don't let nsconfig.mk define target clean NOSTDSTRIP=true # don't let nsconfig.mk define target strip -NSPR20=true # probably should be defined somewhere else (not sure where) OBJDEST= $(OBJDIR)/lib/libcollation-plugin LIBDIR = $(LDAP_PLUGIN_RELDIR) From fedora-directory-commits at redhat.com Fri Nov 10 01:28:41 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:28:41 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/views Makefile, 1.8, 1.9 Message-ID: <200611100129.kAA1TB1v012638@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/views In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/ldap/servers/plugins/views Modified Files: Makefile Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #9) Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/views/Makefile,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Makefile 25 Oct 2006 00:05:13 -0000 1.8 +++ Makefile 10 Nov 2006 01:28:39 -0000 1.9 @@ -42,7 +42,6 @@ NOSTDCLEAN=true # don't let nsconfig.mk define target clean NOSTDSTRIP=true # don't let nsconfig.mk define target strip -NSPR20=true # probably should be defined somewhere else (not sure where) OBJDEST = $(OBJDIR)/lib/libviews LIBDIR = $(LDAP_PLUGIN_RELDIR) From fedora-directory-commits at redhat.com Fri Nov 10 01:27:49 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:27:49 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/include Makefile, 1.6, 1.7 Message-ID: <200611100129.kAA1TJo9012718@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/include In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/ldap/include Modified Files: Makefile Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #9) Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/include/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Makefile 19 Apr 2005 22:07:25 -0000 1.6 +++ Makefile 10 Nov 2006 01:27:46 -0000 1.7 @@ -46,7 +46,6 @@ NOSTDCLEAN=true # don't let nsconfig.mk define target clean NOSTDSTRIP=true # don't let nsconfig.mk define target strip -NSPR20=true # probably should be defined somewhere else (not sure where) include $(BUILD_ROOT)/nsdefs.mk include $(BUILD_ROOT)/nsconfig.mk From fedora-directory-commits at redhat.com Fri Nov 10 01:28:45 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:28:45 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/tools Makefile, 1.12, 1.13 Message-ID: <200611100129.kAA1TFZ1012691@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/tools In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/ldap/servers/slapd/tools Modified Files: Makefile Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #9) Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/Makefile,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- Makefile 28 Aug 2006 23:23:58 -0000 1.12 +++ Makefile 10 Nov 2006 01:28:43 -0000 1.13 @@ -46,7 +46,6 @@ NOSTDCLEAN=true # don't let nsconfig.mk define target clean NOSTDSTRIP=true # don't let nsconfig.mk define target strip -NSPR20=true # probably should be defined somewhere else (not sure where) OBJDEST = $(OBJDIR)/servers/tools/obj BINDIR = $(LDAP_SERVER_RELDIR) From fedora-directory-commits at redhat.com Fri Nov 10 01:34:18 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:34:18 -0700 Subject: [Fedora-directory-commits] ldapserver/lib/base systhr.cpp,1.7,1.8 Message-ID: <200611100134.kAA1YIWD012941@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/lib/base In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12854/lib/base Modified Files: systhr.cpp Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #8) Index: systhr.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/base/systhr.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- systhr.cpp 28 Feb 2006 03:00:14 -0000 1.7 +++ systhr.cpp 10 Nov 2006 01:34:11 -0000 1.8 @@ -216,20 +216,6 @@ NSAPI_PUBLIC void systhread_dummy(void) { -#ifndef NSPR20 - /* nspr/gc.c */ - PR_InitGC(0,0); - /* nspr/prsystem.c */ - PR_GetSystemInfo(PR_SI_SYSNAME, 0, 0); - /* nspr/linker.c */ - PR_GetLibName(0, 0); - /* nspr/file.c */ - PR_Mkdir(0, 0); - /* nspr/prnetdb.c */ - PR_gethostbyname(0, 0, 0, 0, 0); - /* nspr/longlong.c */ - LL_TO_S(LL_ZERO, 0, NULL, 0); -#endif /* NSPR20 */ } #elif defined(THREAD_WIN32) From fedora-directory-commits at redhat.com Fri Nov 10 01:34:19 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:34:19 -0700 Subject: [Fedora-directory-commits] ldapserver/lib/libaccess aclerror.cpp, 1.6, 1.7 authdb.cpp, 1.5, 1.6 Message-ID: <200611100134.kAA1YJ8N012948@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/lib/libaccess In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12854/lib/libaccess Modified Files: aclerror.cpp authdb.cpp Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #8) Index: aclerror.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/aclerror.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- aclerror.cpp 19 Apr 2005 22:07:47 -0000 1.6 +++ aclerror.cpp 10 Nov 2006 01:34:16 -0000 1.7 @@ -45,11 +45,7 @@ #include "base/systems.h" #include "public/nsapi.h" -#ifdef NSPR20 #include "prprf.h" -#else -#include "nspr/prprf.h" -#endif #include "prlog.h" #include "libaccess/nserror.h" #include "libaccess/nsautherr.h" Index: authdb.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/authdb.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- authdb.cpp 11 Apr 2006 02:14:53 -0000 1.5 +++ authdb.cpp 10 Nov 2006 01:34:16 -0000 1.6 @@ -231,11 +231,7 @@ if (ACLDbNameHash) { info = (AuthdbInfo_t *)PR_HashTableLookup(ACLDbNameHash, -#ifdef NSPR20 name -#else - (char *)name -#endif ); if (info) { From fedora-directory-commits at redhat.com Fri Nov 10 01:34:20 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:34:20 -0700 Subject: [Fedora-directory-commits] ldapserver/lib/libaccess/utest ustubs.cpp, 1.5, 1.6 Message-ID: <200611100134.kAA1YKKs012952@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/lib/libaccess/utest In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12854/lib/libaccess/utest Modified Files: ustubs.cpp Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #8) Index: ustubs.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/utest/ustubs.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ustubs.cpp 19 Apr 2005 22:07:48 -0000 1.5 +++ ustubs.cpp 10 Nov 2006 01:34:17 -0000 1.6 @@ -47,11 +47,7 @@ #include #include #include -#ifdef NSPR20 #include -#else -#include -#endif NSPR_BEGIN_EXTERN_C extern char * ACL_Program; From fedora-directory-commits at redhat.com Fri Nov 10 01:34:11 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:34:11 -0700 Subject: [Fedora-directory-commits] ldapserver/include/libaccess usrcache.h, 1.4, 1.5 Message-ID: <200611100134.kAA1Yfix012957@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/include/libaccess In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12854/include/libaccess Modified Files: usrcache.h Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #8) Index: usrcache.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/libaccess/usrcache.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- usrcache.h 19 Apr 2005 22:06:45 -0000 1.4 +++ usrcache.h 10 Nov 2006 01:34:08 -0000 1.5 @@ -39,11 +39,7 @@ #ifndef ACL_USER_CACHE_H #define ACL_USER_CACHE_H -#ifdef NSPR20 #include -#else -#include -#endif #include #include From fedora-directory-commits at redhat.com Fri Nov 10 01:34:12 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:34:12 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd detach.c, 1.4, 1.5 Message-ID: <200611100134.kAA1Ygpa012960@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12854/ldap/servers/slapd Modified Files: detach.c Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #8) Index: detach.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/detach.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- detach.c 19 Apr 2005 22:07:36 -0000 1.4 +++ detach.c 10 Nov 2006 01:34:09 -0000 1.5 @@ -85,7 +85,7 @@ #ifndef _WIN32 if ( should_detach ) { for ( i = 0; i < 5; i++ ) { -#if defined( sunos5 ) && ( defined( THREAD_SUNOS5_LWP ) || defined( NSPR20 )) +#if defined( sunos5 ) switch ( fork1() ) { #else switch ( fork() ) { From fedora-directory-commits at redhat.com Fri Nov 10 01:34:13 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:34:13 -0700 Subject: [Fedora-directory-commits] ldapserver/lib/ldaputil ldapdb.c, 1.4, 1.5 Message-ID: <200611100134.kAA1YhnX012963@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/lib/ldaputil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12854/lib/ldaputil Modified Files: ldapdb.c Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro NSPR20 (Comment #8) Index: ldapdb.c =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/ldaputil/ldapdb.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ldapdb.c 19 Apr 2005 22:07:45 -0000 1.4 +++ ldapdb.c 10 Nov 2006 01:34:10 -0000 1.5 @@ -44,14 +44,9 @@ #include #include -#ifdef LDAPDB_THREAD_SAFE #include #include #include -/* removed for new ns security integration -#include -*/ -#endif /* LDAPDB_THREAD_SAFE */ #include "ldaputil/errors.h" #include "ldaputil/certmap.h" @@ -72,16 +67,7 @@ #define LDAPDB_PREFIX_WITH_SLASHES "ldapdb://" #define LDAPDB_PREFIX_WITH_SLASHES_LEN 9 -#ifndef LDAPDB_THREAD_SAFE -#define ldb_crit_init(x) -#define ldb_crit_enter(x) -#define ldb_crit_exit(x) -#else -#ifdef NSPR20 uintn tsdindex; -#else -int32 tsdindex; -#endif static void ldb_crit_init (LDAPDatabase_t *ldb) { @@ -109,15 +95,11 @@ { struct ldap_error *le; -#ifdef NSPR20 if (!(le = (struct ldap_error *) PR_GetThreadPrivate(tsdindex))) { le = (struct ldap_error *) malloc(sizeof(struct ldap_error)); memset((void *)le, 0, sizeof(struct ldap_error)); PR_SetThreadPrivate(tsdindex, (void *)le); } -#else - le = (struct ldap_error *) PR_GetThreadPrivate( PR_CurrentThread(), tsdindex ); -#endif le->le_errno = err; if ( le->le_matched != NULL ) { ldap_memfree( le->le_matched ); @@ -133,11 +115,7 @@ { struct ldap_error *le; -#ifdef NSPR20 le = (struct ldap_error *) PR_GetThreadPrivate( tsdindex); -#else - le = (struct ldap_error *) PR_GetThreadPrivate( PR_CurrentThread(), tsdindex ); -#endif if ( matched != NULL ) { *matched = le->le_matched; } @@ -191,7 +169,6 @@ return( (LDAPHostEnt *)PR_GetError() ); } #endif /* LDAP_OPT_DNS_FN_PTRS */ -#endif /* LDAPDB_THREAD_SAFE */ static void unescape_ldap_basedn (char *str) @@ -460,15 +437,10 @@ return LDAPU_ERR_LDAP_INIT_FAILED; } -#ifdef LDAPDB_THREAD_SAFE { struct ldap_thread_fns tfns; -#ifdef NSPR20 PR_NewThreadPrivateIndex(&tsdindex, NULL); -#else - tsdindex = PR_NewThreadPrivateID(); -#endif /* set mutex pointers */ memset( &tfns, '\0', sizeof(struct ldap_thread_fns) ); @@ -502,7 +474,6 @@ } } #endif /* LDAP_OPT_DNS_FN_PTRS */ -#endif /* LDAPDB_THREAD_SAFE */ if (ldapu_is_local_db(ldb)) { /* No more Local db support, force error! */ From fedora-directory-commits at redhat.com Fri Nov 10 01:37:48 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:37:48 -0700 Subject: [Fedora-directory-commits] ldapserver/include/ldaputil ldapdb.h, 1.4, 1.5 Message-ID: <200611100137.kAA1bmRj012991@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/include/ldaputil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12969/include/ldaputil Modified Files: ldapdb.h Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro LDAPDB_THREAD_SAFE (Comment #10) Index: ldapdb.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/ldaputil/ldapdb.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ldapdb.h 19 Apr 2005 22:06:45 -0000 1.4 +++ ldapdb.h 10 Nov 2006 01:37:46 -0000 1.5 @@ -39,17 +39,10 @@ #define _LDAPU_LDAPDB_H #include -/* removed for LDAPSDK31 integration -#include -*/ -#ifdef LDAPDB_THREAD_SAFE /* In the past, we used CRITICAL objects from lib/base/crit.cpp. * Now we use PRMonitor to avoid ldapu to depend on lib/base. */ #include -#else -#define PRMonitor void -#endif /* LDAPDB_THREAD_SAFE */ #ifndef NSAPI_PUBLIC #ifdef XP_WIN32 From fedora-directory-commits at redhat.com Fri Nov 10 01:39:05 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:39:05 -0700 Subject: [Fedora-directory-commits] ldapserver/lib/ldaputil Makefile, 1.7, 1.8 Message-ID: <200611100139.kAA1d5Be013024@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/lib/ldaputil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13007/lib/ldaputil Modified Files: Makefile Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro LDAPDB_THREAD_SAFE (Comment #11) Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/ldaputil/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Makefile 15 Sep 2006 19:33:43 -0000 1.7 +++ Makefile 10 Nov 2006 01:39:03 -0000 1.8 @@ -80,7 +80,7 @@ ) MODULE_CFLAGS+= $(TESTFLAGS) -MODULE_CFLAGS+= -DLDAPDB_THREAD_SAFE -I. +MODULE_CFLAGS+= -I. ifeq ($(LDAP_NO_LIBLCACHE),1) MODULE_CFLAGS+=-DNO_LIBLCACHE From fedora-directory-commits at redhat.com Fri Nov 10 01:40:47 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:40:47 -0700 Subject: [Fedora-directory-commits] ldapserver/include/libaccess nsauth.h, 1.4, 1.5 nsautherr.h, 1.4, 1.5 Message-ID: <200611100140.kAA1el1n013066@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/include/libaccess In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13040/include/libaccess Modified Files: nsauth.h nsautherr.h Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro CLIENT_AUTH (Comment #12) Index: nsauth.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/libaccess/nsauth.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nsauth.h 19 Apr 2005 22:06:45 -0000 1.4 +++ nsauth.h 10 Nov 2006 01:40:44 -0000 1.5 @@ -48,16 +48,9 @@ * into and out of authentication interface functions. */ -#ifdef CLIENT_AUTH - #include "ssl.h" -#if 0 -/* Removed for new ns security */ -#include "sec.h" /* SECCertificate */ -#endif #include "cert.h" /* CERTCertificate for new ns security bin */ -#endif /* CLIENT_AUTH */ #include "usi.h" /* identifier list support */ #include "attrec.h" /* attribute record types */ @@ -308,13 +301,7 @@ char * cla_dns; /* DNS name string pointer */ UserObj_t * cla_uoptr; /* authenticated user object pointer */ GroupObj_t * cla_goptr; /* pointer to list of group objects */ -#ifdef CLIENT_AUTH -#if 0 - /* Removed for new ns security */ - SECCertificate * cla_cert; /* certificate from SSL client auth */ -#endif CERTCertificate * cla_cert; /* certificate from SSL client auth */ -#endif /* CLIENT_AUTH */ }; #endif /* __nsauth_h */ Index: nsautherr.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/libaccess/nsautherr.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nsautherr.h 19 Apr 2005 22:06:45 -0000 1.4 +++ nsautherr.h 10 Nov 2006 01:40:44 -0000 1.5 @@ -71,7 +71,6 @@ #define NSAUERR3320 3320 /* insufficient dynamic memory */ #define NSAUERR3340 3340 /* error opening group database */ -#if defined(CLIENT_AUTH) /* nsadbOpenClients() */ #define NSAUERR3400 3400 /* invalid function argument */ #define NSAUERR3420 3420 /* insufficient dynamic memory */ @@ -94,8 +93,6 @@ /* nsadbRemoveCertUser() */ #define NSAUERR3900 3900 /* error deleting entry in database */ -#endif /* defined(CLIENT_AUTH) */ - /* Define error ids generated by nsamgmt.c */ /* nsadbRemoveUser() */ From fedora-directory-commits at redhat.com Fri Nov 10 01:42:40 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:42:40 -0700 Subject: [Fedora-directory-commits] ldapserver/include/base systems.h, 1.6, 1.7 Message-ID: <200611100142.kAA1geuX013123@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/include/base In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13082/include/base Modified Files: systems.h Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro MCC_HTTPD (Comment #14) Index: systems.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/base/systems.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- systems.h 19 Apr 2005 22:06:44 -0000 1.6 +++ systems.h 10 Nov 2006 01:42:37 -0000 1.7 @@ -509,7 +509,7 @@ /* NS_MAIL builds sec-key.c which calls systhread_init, which requires */ /* that USE_NSPR is defined when systhr.c is compiled. --lachman */ /* MCC_PROXY does the same thing now --nbreslow -- LIKE HELL --ari */ -#if (defined(MCC_HTTPD) || defined(MCC_ADMSERV) || defined(MCC_PROXY) || defined(NS_MAIL)) && defined(XP_UNIX) +#if defined(XP_UNIX) #define USE_NSPR /* XXXrobm This is UNIX-only for the moment */ #define LOG_BUFFERING @@ -520,10 +520,10 @@ #ifdef IRIX #undef SEM_FLOCK #define SEM_IRIX -#endif -#endif +#endif /* IRIX */ +#endif /* SW_THREADS */ #define THREAD_ANY -#endif +#endif /* XP_UNIX */ /* --- End the great debate --- */ From fedora-directory-commits at redhat.com Fri Nov 10 01:42:41 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:42:41 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/clients/dsgw Versiongw.c, 1.5, 1.6 Message-ID: <200611100142.kAA1gfYm013129@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/clients/dsgw In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13082/ldap/clients/dsgw Modified Files: Versiongw.c Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro MCC_HTTPD (Comment #14) Index: Versiongw.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/Versiongw.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Versiongw.c 9 Oct 2006 20:38:37 -0000 1.5 +++ Versiongw.c 10 Nov 2006 01:42:38 -0000 1.6 @@ -36,10 +36,6 @@ * All rights reserved. --- END COPYRIGHT BLOCK --- */ -#if defined( XP_WIN32 ) -#undef MCC_HTTPD -#endif - #include "netsite.h" /* to get MAGNUS_VERSION_STRING */ #ifdef MAGNUS_VERSION_STRING From fedora-directory-commits at redhat.com Fri Nov 10 01:42:41 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:42:41 -0700 Subject: [Fedora-directory-commits] ldapserver/lib/base system.cpp,1.7,1.8 Message-ID: <200611100142.kAA1gfql013135@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/lib/base In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13082/lib/base Modified Files: system.cpp Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro MCC_HTTPD (Comment #14) Index: system.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/base/system.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- system.cpp 19 Apr 2005 22:07:45 -0000 1.7 +++ system.cpp 10 Nov 2006 01:42:39 -0000 1.8 @@ -53,7 +53,7 @@ static int thread_malloc_key = -1; -#if defined(MALLOC_POOLS) && defined(MCC_HTTPD) && defined(THREAD_ANY) +#if defined(MALLOC_POOLS) && defined(THREAD_ANY) #include "base/pool.h" #include "base/systhr.h" @@ -85,7 +85,7 @@ NSAPI_PUBLIC void *system_malloc(int size) { -#if defined(MALLOC_POOLS) && defined(MCC_HTTPD) && defined(THREAD_ANY) +#if defined(MALLOC_POOLS) && defined(THREAD_ANY) return pool_malloc(MALLOC_KEY, size); #else return malloc(size); @@ -96,7 +96,7 @@ NSAPI_PUBLIC void *system_calloc(int size) { void *ret; -#if defined(MALLOC_POOLS) && defined(MCC_HTTPD) && defined(THREAD_ANY) +#if defined(MALLOC_POOLS) && defined(THREAD_ANY) ret = pool_malloc(MALLOC_KEY, size); #else ret = malloc(size); @@ -109,7 +109,7 @@ NSAPI_PUBLIC void *system_realloc(void *ptr, int size) { -#if defined(MALLOC_POOLS) && defined(MCC_HTTPD) && defined(THREAD_ANY) +#if defined(MALLOC_POOLS) && defined(THREAD_ANY) return pool_realloc(MALLOC_KEY, ptr, size); #else return realloc(ptr, size); @@ -119,7 +119,7 @@ NSAPI_PUBLIC void system_free(void *ptr) { -#if defined(MALLOC_POOLS) && defined(MCC_HTTPD) && defined(THREAD_ANY) +#if defined(MALLOC_POOLS) && defined(THREAD_ANY) pool_free(MALLOC_KEY, ptr); #else PR_ASSERT(ptr); @@ -130,7 +130,7 @@ NSAPI_PUBLIC char *system_strdup(const char *ptr) { PR_ASSERT(ptr); -#if defined(MALLOC_POOLS) && defined(MCC_HTTPD) && defined(THREAD_ANY) +#if defined(MALLOC_POOLS) && defined(THREAD_ANY) return pool_strdup(MALLOC_KEY, ptr); #else return strdup(ptr); From fedora-directory-commits at redhat.com Fri Nov 10 01:47:01 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:47:01 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd saslbind.c, 1.19, 1.20 sasl_io.c, 1.8, 1.9 Message-ID: <200611100147.kAA1l1CM013221@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13201/ldap/servers/slapd Modified Files: saslbind.c sasl_io.c Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macro CYRUS_SASL and BUILD_GSSAPI (Comment #23) Index: saslbind.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/saslbind.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- saslbind.c 7 Nov 2006 04:42:55 -0000 1.19 +++ saslbind.c 10 Nov 2006 01:46:59 -0000 1.20 @@ -36,24 +36,14 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ -#define CYRUS_SASL 1 - #include #include #include #include -#ifndef CYRUS_SASL -#include -#endif #ifndef _WIN32 #include #endif -/* No GSSAPI on Windows */ -#if !defined(_WIN32) -#define BUILD_GSSAPI 1 -#endif - static char *serverfqdn; /* @@ -427,14 +417,8 @@ sasl_conn_t *conn, void *context, const char *userbuf, unsigned ulen, -#ifndef CYRUS_SASL - const char *authidbuf, unsigned alen, -#endif unsigned flags, const char *user_realm, char *out_user, unsigned out_umax, unsigned *out_ulen -#ifndef CYRUS_SASL - ,char *out_authid, unsigned out_amax, unsigned *out_alen -#endif ) { struct propctx *propctx = sasl_auxprop_getctx(conn); @@ -442,9 +426,6 @@ Slapi_DN *sdn = NULL; char *pw = NULL; char *user = NULL; -#ifndef CYRUS_SASL - char *authid = NULL; -#endif const char *dn; int isroot = 0; char *clear = NULL; @@ -454,17 +435,9 @@ if (user == NULL) { goto fail; } -#ifdef CYRUS_SASL LDAPDebug(LDAP_DEBUG_TRACE, "ids_sasl_canon_user(user=%s, realm=%s)\n", user, user_realm ? user_realm : "", 0); -#else - authid = buf2str(authidbuf, alen); - - LDAPDebug(LDAP_DEBUG_TRACE, - "ids_sasl_canon_user(user=%s, authzid=%s, realm=%s)\n", - user, authid, user_realm ? user_realm : ""); -#endif if (strncasecmp(user, "dn:", 3) == 0) { sdn = slapi_sdn_new(); @@ -480,11 +453,9 @@ /* map the sasl username into an entry */ entry = ids_sasl_user_to_entry(conn, context, user, user_realm); if (entry == NULL) { -#ifdef CYRUS_SASL /* Specific return value is supposed to be set instead of an generic error (SASL_FAIL) for Cyrus SASL */ returnvalue = SASL_NOAUTHZ; -#endif goto fail; } dn = slapi_entry_get_ndn(entry); @@ -515,22 +486,8 @@ /* TODO: canonicalize */ PL_strncpyz(out_user, dn, out_umax); -#ifdef CYRUS_SASL /* the length of out_user needs to be set for Cyrus SASL */ *out_ulen = strlen(out_user); -#else - if (authid ) - { - int offset = 0; - /* The authid can start with dn:. In such case remove it */ - if (strncasecmp(authid,"dn:",3) == 0 ) - offset = 3; - PL_strncpyz(out_authid, authid+offset, out_amax); - } - *out_ulen = -1; - *out_alen = -1; - slapi_ch_free((void**)&authid); -#endif slapi_entry_free(entry); slapi_ch_free((void**)&user); @@ -542,16 +499,12 @@ fail: slapi_entry_free(entry); slapi_ch_free((void**)&user); -#ifndef CYRUS_SASL - slapi_ch_free((void**)&authid); -#endif slapi_ch_free((void**)&pw); slapi_sdn_free(&sdn); return returnvalue; } -#ifdef CYRUS_SASL static int ids_sasl_getpluginpath(sasl_conn_t *conn, const char **path) { /* Try to get path from config, otherwise check for SASL_PATH environment @@ -566,7 +519,6 @@ *path = pluginpath; return SASL_OK; } -#endif static sasl_callback_t ids_sasl_callbacks[] = { @@ -586,21 +538,15 @@ NULL }, { -#ifdef CYRUS_SASL SASL_CB_CANON_USER, -#else - SASL_CB_SERVER_CANON_USER, -#endif (IFP) ids_sasl_canon_user, NULL }, -#ifdef CYRUS_SASL { SASL_CB_GETPATH, (IFP) ids_sasl_getpluginpath, NULL }, -#endif { SASL_CB_LIST_END, (IFP) NULL, @@ -636,25 +582,6 @@ return result; } -#ifndef CYRUS_SASL - result = sasl_server_add_plugin("USERDB", sasl_userdb_init); - - if (result != SASL_OK) { - LDAPDebug(LDAP_DEBUG_TRACE, "failed to add LDAP sasl plugin\n", - 0, 0, 0); - return result; - } - -#if defined(BUILD_GSSAPI) - result = sasl_server_add_plugin("GSSAPI", sasl_gssapi_init); - - if (result != SASL_OK) { - LDAPDebug(LDAP_DEBUG_TRACE, "failed to add LDAP gssapi plugin\n", - 0, 0, 0); - } -#endif -#endif - result = sasl_auxprop_add_plugin("iDS", ids_auxprop_plug_init); LDAPDebug( LDAP_DEBUG_TRACE, "<= ids_sasl_init\n", 0, 0, 0 ); Index: sasl_io.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/sasl_io.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sasl_io.c 26 Sep 2006 22:08:17 -0000 1.8 +++ sasl_io.c 10 Nov 2006 01:46:59 -0000 1.9 @@ -35,8 +35,6 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ -#define CYRUS_SASL 1 - #include "slap.h" #include "slapi-plugin.h" #include "fe.h" @@ -201,7 +199,6 @@ return -1; } -#ifdef CYRUS_SASL if (ret == sizeof(buffer)) { /* Decode the length (could use ntohl here ??) */ packet_length = buffer[0] << 24 | buffer[1] << 16 | buffer[2] << 8 | buffer[3]; @@ -217,17 +214,6 @@ c->c_sasl_io_private->encrypted_buffer_count = packet_length; c->c_sasl_io_private->encrypted_buffer_offset = 4; } -#else - if (ret == sizeof(buffer)) { - /* Decode the length (could use ntohl here ??) */ - packet_length = buffer[0] << 24 | buffer[1] << 16 | buffer[2] << 8 | buffer[3]; - LDAPDebug( LDAP_DEBUG_CONNS, - "read sasl packet length %ld on connection %d\n", packet_length, c->c_connid, 0 ); - sasl_io_resize_encrypted_buffer(c->c_sasl_io_private, packet_length); - c->c_sasl_io_private->encrypted_buffer_count = packet_length; - c->c_sasl_io_private->encrypted_buffer_offset = 0; - } -#endif return 0; } static int From fedora-directory-commits at redhat.com Fri Nov 10 01:50:14 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 9 Nov 2006 18:50:14 -0700 Subject: [Fedora-directory-commits] ldapserver Makefile.am, 1.10, 1.11 Makefile.in, 1.11, 1.12 Message-ID: <200611100150.kAA1oEXt013262@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13243 Modified Files: Makefile.am Makefile.in Log Message: Resolves: #214728 Summary: Cleaning up obsolete macros in the build Changes: eliminated macros(Comment #24) NS_DS, NET_SSL, DUPGRADEDB, NSPR20, LDAPDB_THREAD_SAFE, CLIENT_AUTH, MCC_HTTPD, NS_DOMESTIC, SPAPI20, SERVER_BUILD Index: Makefile.am =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.am,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- Makefile.am 3 Nov 2006 22:33:15 -0000 1.10 +++ Makefile.am 10 Nov 2006 01:50:11 -0000 1.11 @@ -7,10 +7,7 @@ BUILDNUM := $(shell perl $(srcdir)/buildnum.pl) PLATFORM_DEFINES = @platform_defs@ DEBUG_DEFINES = @debug_defs@ -DS_DEFINES = -DNS_DS -DNET_SSL -DLDAP_DEBUG -DLDAP_DONT_USE_SMARTHEAP \ - -DUPGRADEDB -DNSPR20 -DLDAPDB_THREAD_SAFE -DCLIENT_AUTH \ - -DMCC_HTTPD -DNS_DOMESTIC -DSPAPI20 -DSERVER_BUILD \ - -DBUILD_NUM=$(BUILDNUM) +DS_DEFINES = -DLDAP_DEBUG -DLDAP_DONT_USE_SMARTHEAP -DBUILD_NUM=$(BUILDNUM) DS_INCLUDES = -I$(srcdir)/ldap/include -I$(srcdir)/ldap/servers/slapd -I$(srcdir)/include -I. AM_CPPFLAGS = $(PLATFORM_DEFINES) $(DEBUG_DEFINES) $(DS_DEFINES) $(DS_INCLUDES) PLUGIN_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@ Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.in,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- Makefile.in 3 Nov 2006 22:33:15 -0000 1.11 +++ Makefile.in 10 Nov 2006 01:50:11 -0000 1.12 @@ -911,11 +911,7 @@ BUILDNUM := $(shell perl $(srcdir)/buildnum.pl) PLATFORM_DEFINES = @platform_defs@ DEBUG_DEFINES = @debug_defs@ -DS_DEFINES = -DNS_DS -DNET_SSL -DLDAP_DEBUG -DLDAP_DONT_USE_SMARTHEAP \ - -DUPGRADEDB -DNSPR20 -DLDAPDB_THREAD_SAFE -DCLIENT_AUTH \ - -DMCC_HTTPD -DNS_DOMESTIC -DSPAPI20 -DSERVER_BUILD \ - -DBUILD_NUM=$(BUILDNUM) - +DS_DEFINES = -DLDAP_DEBUG -DLDAP_DONT_USE_SMARTHEAP -DBUILD_NUM=$(BUILDNUM) DS_INCLUDES = -I$(srcdir)/ldap/include -I$(srcdir)/ldap/servers/slapd -I$(srcdir)/include -I. AM_CPPFLAGS = $(PLATFORM_DEFINES) $(DEBUG_DEFINES) $(DS_DEFINES) $(DS_INCLUDES) PLUGIN_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@ @@ -8964,7 +8960,7 @@ ./makstrdb %: %.in - mkdir -p $(dir $@) + mkdir -p $(dir $@) $(fixupcmd) $^ > $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. From fedora-directory-commits at redhat.com Fri Nov 10 04:24:28 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 9 Nov 2006 21:24:28 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src ds_newinst.pl, 1.10, 1.11 Message-ID: <200611100424.kAA4OS5d022970@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/admin/src In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22953 Modified Files: ds_newinst.pl Log Message: Bug: 214733 Description: be able to pass in all configurable paths to ds_newinst Fix Description: There were a couple of other minor problems with ds_newinst.pl 1) Should only set cgi parameters for those items which have a value 2) Should not setenv NETSITE_ROOT - this overrides prefix settings 3) Should not set prefix here - it is set elsewhere Index: ds_newinst.pl =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/ds_newinst.pl,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ds_newinst.pl 9 Nov 2006 15:41:40 -0000 1.10 +++ ds_newinst.pl 10 Nov 2006 04:24:25 -0000 1.11 @@ -53,6 +53,7 @@ my $content = ""; my $firsttime = 1; while (my ($kk, $vv) = each %{$args}) { + next if (!$kk || !$vv); if ($firsttime) { $firsttime = 0; } else { @@ -73,7 +74,6 @@ # setup CGI environment $ENV{REQUEST_METHOD} = "POST"; - $ENV{NETSITE_ROOT} = $sroot; $ENV{CONTENT_LENGTH} = $length; $ENV{SERVER_NAMES} = 'slapd-' . $args->{servid}; @@ -179,7 +179,6 @@ # the following items are optional -$cgiargs{"prefix"} = $table{"slapd"}->{"prefix"}; $cgiargs{"lock_dir"} = $table{"slapd"}->{"lock_dir"}; $cgiargs{"log_dir"} = $table{"slapd"}->{"log_dir"}; $cgiargs{"run_dir"} = $table{"slapd"}->{"run_dir"}; From fedora-directory-commits at redhat.com Fri Nov 10 18:12:03 2006 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Fri, 10 Nov 2006 11:12:03 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/cm Makefile,1.69,1.70 Message-ID: <200611101812.kAAIC336007063@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/ldapserver/ldap/cm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7046 Modified Files: Makefile Log Message: Package libsasl in core libdir for old style build Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- Makefile 7 Nov 2006 04:20:13 -0000 1.69 +++ Makefile 10 Nov 2006 18:12:01 -0000 1.70 @@ -570,6 +570,7 @@ # if not Linux, we need package sasl library and supported plugins ifneq ($(ARCH), Linux) $(INSTALL) -m 755 $(SASL_LIBPATH)/*.$(DLL_SUFFIX)* $(RELDIR)/$(DS_LIBDIR) + $(INSTALL) -m 755 $(SASL_LIBPATH)/*.$(DLL_SUFFIX)* $(RELDIR)/$(CORE_LIBDIR) -mkdir $(DS_LIBDIR)/sasl2 $(INSTALL) -m 755 $(SASL_LIBPATH)/sasl2/libdigestmd5.$(DLL_SUFFIX)* $(RELDIR)/$(DS_LIBDIR)/sasl2 $(INSTALL) -m 755 $(SASL_LIBPATH)/sasl2/libgssapiv2.$(DLL_SUFFIX)* $(RELDIR)/$(DS_LIBDIR)/sasl2 From fedora-directory-commits at redhat.com Fri Nov 10 19:08:10 2006 From: fedora-directory-commits at redhat.com (Robert Relyea (rrelyea)) Date: Fri, 10 Nov 2006 12:08:10 -0700 Subject: [Fedora-directory-commits] coolkey/src/coolkey slot.cpp, 1.2, 1.3 log.h, 1.1, 1.2 Message-ID: <200611101908.kAAJ8AGK011818@cvs-int.fedora.redhat.com> Author: rrelyea Update of /cvs/dirsec/coolkey/src/coolkey In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11789 Modified Files: slot.cpp log.h Log Message: Add syslog support. Add CAC support Index: slot.cpp =================================================================== RCS file: /cvs/dirsec/coolkey/src/coolkey/slot.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- slot.cpp 25 Jul 2006 23:37:11 -0000 1.2 +++ slot.cpp 10 Nov 2006 19:08:07 -0000 1.3 @@ -585,16 +585,41 @@ } Transaction trans; - trans.begin(conn); + status = trans.begin(conn); + + /* CAC card are cranky after they are first inserted. + * don't continue until we can convince the tranaction to work */ + for (int count = 0; count < 10 && status == CKYSCARDERR + && CKYCardConnection_GetLastError(conn) == SCARD_W_RESET_CARD; count++) { + log->log("CAC Card Reset detected retry %d: time %d ms\n", count, + OSTimeNow() - time); + CKYCardConnection_Disconnect(conn); + OSSleep(100000); /* 100 ms */ + status = CKYCardConnection_Connect(conn, readerName); + if (status != CKYSUCCESS) { + continue; + } + status = trans.begin(conn); + } + + /* Can't get a transaction, give up */ + if (status != CKYSUCCESS) { + log->log("Transaction Failed 0x%x\n", status); + handleConnectionError(); + } // see if the applet is selectable log->log("time connnect: Begin transaction %d ms\n", OSTimeNow() - time); status = CKYApplet_SelectCoolKeyManager(conn, NULL); if (status != CKYSUCCESS) { + log->log("CoolKey Select failed 0x%x\n", status); status = CACApplet_SelectPKI(conn, 0, NULL); if (status != CKYSUCCESS) { + log->log("CAC Select failed 0x%x\n", status); if (status == CKYSCARDERR) { + log->log("CAC Card Failure 0x%x\n", + CKYCardConnection_GetLastError(conn)); disconnect(); } return; @@ -1121,6 +1146,8 @@ { long error = CKYCardConnection_GetLastError(conn); + log->log("Connection Error = 0x%x\n", error); + // Force a reconnect after a token operation fails. The most // common reason for it to fail is that it has been removed, but // it doesn't hurt to do it in other cases either (such as a reset). @@ -1966,7 +1993,7 @@ Slot::loadCACCert(CKYByte instance) { CKYISOStatus apduRC; - CKYStatus status; + CKYStatus status = CKYSUCCESS; CKYBuffer cert; CKYBuffer rawCert; CKYBuffer shmCert; Index: log.h =================================================================== RCS file: /cvs/dirsec/coolkey/src/coolkey/log.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- log.h 9 Jun 2006 18:39:11 -0000 1.1 +++ log.h 10 Nov 2006 19:08:07 -0000 1.2 @@ -53,4 +53,14 @@ virtual ~FileLog(); }; +class SysLog : public Log { + private: + SysLog(SysLog &) {} + SysLog * operator=(SysLog &) { return *this; } + public: + SysLog() { } + void log(const char *msg, ...); + virtual ~SysLog() { } +}; + #endif From fedora-directory-commits at redhat.com Fri Nov 10 23:44:40 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:44:40 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src addindex.c, 1.6, 1.7 cfg_sspt.c, 1.10, 1.11 cfg_sspt.h, 1.4, 1.5 configure_instance.h, 1.4, 1.5 create_instance.c, 1.34, 1.35 create_instance.h, 1.10, 1.11 ds_bak2db.c, 1.4, 1.5 ds_db2bak.c, 1.5, 1.6 ds_db2ldif.c, 1.4, 1.5 ds_ldif2db.c, 1.6, 1.7 ds_listdb.c, 1.4, 1.5 ds_newinst.c, 1.5, 1.6 ds_remove.c, 1.7, 1.8 ds_remove_uninst.h, 1.4, 1.5 ds_rmdb.c, 1.6, 1.7 ds_snmpctrl.c, 1.5, 1.6 init_ds_env.c, 1.6, 1.7 init_ds_env.h, 1.4, 1.5 install_keywords.h, 1.4, 1.5 latest_file.c, 1.7, 1.8 namegen.c, 1.6, 1.7 restart.c, 1.4, 1.5 script-gen.c, 1.6, 1.7 shutdown.c, 1.4, 1.5 start.c, 1.5, 1.6 vlvindex.c, 1.4, 1.5 configure_instance.cpp, 1.10, 1.11 ds_remove_uninst.cpp, 1.7, 1.8 instindex.cpp, 1.10, 1.11 Message-ID: <200611102346.kAANkAmd032185@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/admin/src In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/admin/src Modified Files: addindex.c cfg_sspt.c cfg_sspt.h configure_instance.h create_instance.c create_instance.h ds_bak2db.c ds_db2bak.c ds_db2ldif.c ds_ldif2db.c ds_listdb.c ds_newinst.c ds_remove.c ds_remove_uninst.h ds_rmdb.c ds_snmpctrl.c init_ds_env.c init_ds_env.h install_keywords.h latest_file.c namegen.c restart.c script-gen.c shutdown.c start.c vlvindex.c configure_instance.cpp ds_remove_uninst.cpp instindex.cpp Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: addindex.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/addindex.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- addindex.c 19 Apr 2005 22:06:55 -0000 1.6 +++ addindex.c 10 Nov 2006 23:44:33 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * addindex.c: Creates one or more indexes for specified attributes * Index: cfg_sspt.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/cfg_sspt.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- cfg_sspt.c 27 Sep 2006 23:40:50 -0000 1.10 +++ cfg_sspt.c 10 Nov 2006 23:44:33 -0000 1.11 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include #include #include Index: cfg_sspt.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/cfg_sspt.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cfg_sspt.h 19 Apr 2005 22:06:55 -0000 1.4 +++ cfg_sspt.h 10 Nov 2006 23:44:33 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef __cfg_sspt_h #define __cfg_sspt_h Index: configure_instance.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/configure_instance.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- configure_instance.h 19 Apr 2005 22:06:55 -0000 1.4 +++ configure_instance.h 10 Nov 2006 23:44:33 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /*********************************************************************** ** ** Index: create_instance.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- create_instance.c 9 Nov 2006 18:24:52 -0000 1.34 +++ create_instance.c 10 Nov 2006 23:44:33 -0000 1.35 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * create_instance.c: Routines for creating an instance of a Directory Server * Index: create_instance.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- create_instance.h 6 Nov 2006 19:33:41 -0000 1.10 +++ create_instance.h 10 Nov 2006 23:44:33 -0000 1.11 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * create_instance.h: create an instance of a directory server * Index: ds_bak2db.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/ds_bak2db.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ds_bak2db.c 19 Apr 2005 22:06:55 -0000 1.4 +++ ds_bak2db.c 10 Nov 2006 23:44:33 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Restores a database. * Index: ds_db2bak.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/ds_db2bak.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ds_db2bak.c 19 Apr 2005 22:06:55 -0000 1.5 +++ ds_db2bak.c 10 Nov 2006 23:44:33 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Backs up the database. * Index: ds_db2ldif.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/ds_db2ldif.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ds_db2ldif.c 19 Apr 2005 22:06:55 -0000 1.4 +++ ds_db2ldif.c 10 Nov 2006 23:44:33 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Converts the database into an ldif file. * Index: ds_ldif2db.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/ds_ldif2db.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ds_ldif2db.c 19 Apr 2005 22:06:55 -0000 1.6 +++ ds_ldif2db.c 10 Nov 2006 23:44:33 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * ds_ldif2db.c: Converts an ldif file into a database. * Index: ds_listdb.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/ds_listdb.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ds_listdb.c 19 Apr 2005 22:06:55 -0000 1.4 +++ ds_listdb.c 10 Nov 2006 23:44:33 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * List the database backup directories. * No HTML - this is for DS 4.0. Index: ds_newinst.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/ds_newinst.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ds_newinst.c 27 Sep 2006 23:40:50 -0000 1.5 +++ ds_newinst.c 10 Nov 2006 23:44:33 -0000 1.6 @@ -34,6 +34,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * ds_newinst.c - creates a new instance of directory server, scripts, * configuration, etc. Does not create any Admin Server stuff or Index: ds_remove.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/ds_remove.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ds_remove.c 13 Oct 2006 01:06:21 -0000 1.7 +++ ds_remove.c 10 Nov 2006 23:44:33 -0000 1.8 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Remove the server * Index: ds_remove_uninst.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/ds_remove_uninst.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ds_remove_uninst.h 19 Apr 2005 22:06:55 -0000 1.4 +++ ds_remove_uninst.h 10 Nov 2006 23:44:33 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* ds_remove_uninst.h */ Index: ds_rmdb.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/ds_rmdb.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ds_rmdb.c 19 Apr 2005 22:06:55 -0000 1.6 +++ ds_rmdb.c 10 Nov 2006 23:44:33 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Delete backed-up database files. * Index: ds_snmpctrl.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/ds_snmpctrl.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ds_snmpctrl.c 19 Apr 2005 22:06:55 -0000 1.5 +++ ds_snmpctrl.c 10 Nov 2006 23:44:33 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * snmpctrl.c - start/stop/restart LDAP-based SNMP subagent * Index: init_ds_env.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/init_ds_env.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- init_ds_env.c 11 Apr 2006 02:14:31 -0000 1.6 +++ init_ds_env.c 10 Nov 2006 23:44:33 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Set up environment for CGIs. * Index: init_ds_env.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/init_ds_env.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- init_ds_env.h 19 Apr 2005 22:06:55 -0000 1.4 +++ init_ds_env.h 10 Nov 2006 23:44:33 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Set up environment for CGIs. * Index: install_keywords.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/install_keywords.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- install_keywords.h 19 Apr 2005 22:06:55 -0000 1.4 +++ install_keywords.h 10 Nov 2006 23:44:33 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /********************************************************************* ** ** Index: latest_file.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/latest_file.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- latest_file.c 19 Apr 2005 22:06:55 -0000 1.7 +++ latest_file.c 10 Nov 2006 23:44:33 -0000 1.8 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /*********************************************************************** ** ** NAME Index: namegen.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/namegen.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- namegen.c 19 Apr 2005 22:06:55 -0000 1.6 +++ namegen.c 10 Nov 2006 23:44:33 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* namegen.c - utility program to generate name * * of backup files in the format YYYY_MM_DD_HMS * * and set it up as an environment variable to * Index: restart.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/restart.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- restart.c 19 Apr 2005 22:06:55 -0000 1.4 +++ restart.c 10 Nov 2006 23:44:33 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * restart.c: Stops and the starts up the server. * Index: script-gen.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/script-gen.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- script-gen.c 19 Apr 2005 22:06:55 -0000 1.6 +++ script-gen.c 10 Nov 2006 23:44:33 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * this is used for generating the (large) scripts during create_instance. */ Index: shutdown.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/shutdown.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- shutdown.c 19 Apr 2005 22:06:55 -0000 1.4 +++ shutdown.c 10 Nov 2006 23:44:33 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * shutdown.c: Kills the server. * Index: start.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/start.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- start.c 19 Apr 2005 22:06:55 -0000 1.5 +++ start.c 10 Nov 2006 23:44:33 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * start.c: Starts up the server. * Index: vlvindex.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/vlvindex.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- vlvindex.c 19 Apr 2005 22:06:55 -0000 1.4 +++ vlvindex.c 10 Nov 2006 23:44:33 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * vlvindex.c: Creates a VLV index for a given search * Index: configure_instance.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/configure_instance.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- configure_instance.cpp 29 Mar 2006 19:44:08 -0000 1.10 +++ configure_instance.cpp 10 Nov 2006 23:44:33 -0000 1.11 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /********************************************************************* ** ** Index: ds_remove_uninst.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/ds_remove_uninst.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ds_remove_uninst.cpp 11 Apr 2006 02:14:31 -0000 1.7 +++ ds_remove_uninst.cpp 10 Nov 2006 23:44:33 -0000 1.8 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + // ds_remove_uninst.cpp // // ds_remove routines that use c++ calls in adminutil Index: instindex.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/instindex.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- instindex.cpp 11 Apr 2006 02:14:31 -0000 1.10 +++ instindex.cpp 10 Nov 2006 23:44:33 -0000 1.11 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * index.c: Shows the first page you see on install * From fedora-directory-commits at redhat.com Fri Nov 10 23:45:41 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:45:41 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/back-ldbm/tools/index_dump index_dump.c, 1.4, 1.5 Message-ID: <200611102346.kAANkBDI032211@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/tools/index_dump In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/servers/slapd/back-ldbm/tools/index_dump Modified Files: index_dump.c Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: index_dump.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/tools/index_dump/index_dump.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- index_dump.c 19 Apr 2005 22:07:39 -0000 1.4 +++ index_dump.c 10 Nov 2006 23:45:33 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + void configure __P((char *)); DB_ENV *db_init __P((char *)); void pheader __P((DB *, int)); From fedora-directory-commits at redhat.com Fri Nov 10 23:44:42 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:44:42 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/clients/orgchart wrapper.c, 1.5, 1.6 Message-ID: <200611102346.kAANkCJ0032243@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/clients/orgchart In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/clients/orgchart Modified Files: wrapper.c Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: wrapper.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/orgchart/wrapper.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- wrapper.c 11 Apr 2006 02:14:33 -0000 1.5 +++ wrapper.c 10 Nov 2006 23:44:39 -0000 1.6 @@ -35,6 +35,11 @@ * All rights reserved. * --- END COPYRIGHT BLOCK --- */ +#ifdef HAVE_CONFIG_H +# include +#endif + + /*********************************************************************** ** Includes ***********************************************************************/ From fedora-directory-commits at redhat.com Fri Nov 10 23:45:42 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:45:42 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/back-ldbm ancestorid.c, 1.4, 1.5 archive.c, 1.10, 1.11 attrcrypt.h, 1.4, 1.5 back-ldbm.h, 1.7, 1.8 cache.c, 1.4, 1.5 cleanup.c, 1.4, 1.5 close.c, 1.4, 1.5 dbhelp.c, 1.5, 1.6 dblayer.c, 1.13, 1.14 dblayer.h, 1.5, 1.6 dbsize.c, 1.4, 1.5 dbtest.c, 1.4, 1.5 dbversion.c, 1.6, 1.7 dllmain.c, 1.5, 1.6 dn2entry.c, 1.5, 1.6 entrystore.c, 1.4, 1.5 filterindex.c, 1.5, 1.6 findentry.c, 1.4, 1.5 haschildren.c, 1.4, 1.5 id2entry.c, 1.5, 1.6 idl.c, 1.4, 1.5 idl_common.c, 1.4, 1.5 idl_new.c, 1.5, 1.6 idl_shim.c, 1.4, 1.5 idlapi.h, 1.4, 1.5 import-merge.c, 1.6, 1.7 import-threads.c, 1.11, 1.12 import.c, 1.7, 1.8 import.h, 1.7, 1.8 index.c, 1.9, 1.10 init.c, 1.7, 1.8 instance.c, 1.4, 1.5 ldbm_abandon.c, 1.4, 1.5 ldbm_add.c, 1.5, 1.6 ldbm_attr.c, 1.6, 1.7 ldbm_attrcrypt.c, 1.8, 1.9 ldbm_attrcrypt_config.c, 1.5, 1.6 ldbm_bind.c, 1.4, 1.5 ldbm_compare.c, 1.4, 1.5 ldbm_config.c, 1.8, 1.9 ldbm_config.h, 1.5, 1.6 ldbm_delete.c, 1.6, 1.7 ldbm_index_config.c, 1.6, 1.7 ldbm_instance_config.c, 1.5, 1.6 ldbm_modify.c, 1.4, 1.5 ldbm_modrdn.c, 1.5, 1.6 ldbm! _unbind.c, 1.4, 1.5 backentry.c, 1.4, 1.5 matchrule.c, 1.4, 1.5 misc.c, 1.5, 1.6 monitor.c, 1.6, 1.7 nextid.c, 1.4, 1.5 parents.c, 1.4, 1.5 perfctrs.c, 1.4, 1.5 perfctrs.h, 1.4, 1.5 proto-back-ldbm.h, 1.8, 1.9 rmdb.c, 1.4, 1.5 seq.c, 1.4, 1.5 sort.c, 1.8, 1.9 start.c, 1.5, 1.6 uniqueid2entry.c, 1.5, 1.6 upgrade.c, 1.5, 1.6 vlv.c, 1.9, 1.10 vlv_key.c, 1.4, 1.5 vlv_key.h, 1.4, 1.5 vlv_srch.c, 1.6, 1.7 vlv_srch.h, 1.4, 1.5 ldbm_search.c, 1.8, 1.9 ldif2ldbm.c, 1.10, 1.11 Message-ID: <200611102346.kAANkCe0032251@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/servers/slapd/back-ldbm Modified Files: ancestorid.c archive.c attrcrypt.h back-ldbm.h cache.c cleanup.c close.c dbhelp.c dblayer.c dblayer.h dbsize.c dbtest.c dbversion.c dllmain.c dn2entry.c entrystore.c filterindex.c findentry.c haschildren.c id2entry.c idl.c idl_common.c idl_new.c idl_shim.c idlapi.h import-merge.c import-threads.c import.c import.h index.c init.c instance.c ldbm_abandon.c ldbm_add.c ldbm_attr.c ldbm_attrcrypt.c ldbm_attrcrypt_config.c ldbm_bind.c ldbm_compare.c ldbm_config.c ldbm_config.h ldbm_delete.c ldbm_index_config.c ldbm_instance_config.c ldbm_modify.c ldbm_modrdn.c ldbm_unbind.c backentry.c matchrule.c misc.c monitor.c nextid.c parents.c perfctrs.c perfctrs.h proto-back-ldbm.h rmdb.c seq.c sort.c start.c uniqueid2entry.c upgrade.c vlv.c vlv_key.c vlv_key.h vlv_srch.c vlv_srch.h ldbm_search.c ldif2ldbm.c Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: ancestorid.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/ancestorid.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ancestorid.c 19 Apr 2005 22:07:37 -0000 1.4 +++ ancestorid.c 10 Nov 2006 23:45:39 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include "back-ldbm.h" static char *sourcefile = "ancestorid"; Index: archive.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/archive.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- archive.c 13 Oct 2006 01:06:29 -0000 1.10 +++ archive.c 10 Nov 2006 23:45:39 -0000 1.11 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* archive.c - ldap ldbm back-end archive and restore entry points */ #include "back-ldbm.h" Index: attrcrypt.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/attrcrypt.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- attrcrypt.h 19 Apr 2005 22:07:37 -0000 1.4 +++ attrcrypt.h 10 Nov 2006 23:45:39 -0000 1.5 @@ -34,6 +34,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* Private tructures and #defines used in the attribute encryption code. */ #ifndef _ATTRCRYPT_H_ Index: back-ldbm.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/back-ldbm.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- back-ldbm.h 6 Nov 2006 20:51:31 -0000 1.7 +++ back-ldbm.h 10 Nov 2006 23:45:39 -0000 1.8 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* back-ldbm.h - ldap ldbm back-end header file */ #ifndef _BACK_LDBM_H_ Index: cache.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/cache.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cache.c 19 Apr 2005 22:07:37 -0000 1.4 +++ cache.c 10 Nov 2006 23:45:39 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* cache.c - routines to maintain an in-core cache of entries */ #include "back-ldbm.h" Index: cleanup.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/cleanup.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cleanup.c 19 Apr 2005 22:07:37 -0000 1.4 +++ cleanup.c 10 Nov 2006 23:45:39 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* cleanup.c - cleans up ldbm backend */ #include "back-ldbm.h" Index: close.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/close.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- close.c 19 Apr 2005 22:07:37 -0000 1.4 +++ close.c 10 Nov 2006 23:45:39 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* close.c - close ldbm backend */ #include "back-ldbm.h" Index: dbhelp.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/dbhelp.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- dbhelp.c 11 Apr 2006 02:14:45 -0000 1.5 +++ dbhelp.c 10 Nov 2006 23:45:39 -0000 1.6 @@ -35,6 +35,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* * File for helper functions related to BerkeleyDB. * This exists because dblayer.c is 5k+ lines long, Index: dblayer.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/dblayer.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- dblayer.c 10 Nov 2006 01:13:47 -0000 1.13 +++ dblayer.c 10 Nov 2006 23:45:39 -0000 1.14 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* Abstraction layer which sits between db2.0 and higher layers in the directory server---typically Index: dblayer.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/dblayer.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- dblayer.h 19 Apr 2005 22:07:38 -0000 1.5 +++ dblayer.h 10 Nov 2006 23:45:39 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* Structures and #defines used in the dblayer. */ #ifndef _DBLAYER_H_ Index: dbsize.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/dbsize.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dbsize.c 19 Apr 2005 22:07:38 -0000 1.4 +++ dbsize.c 10 Nov 2006 23:45:39 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * dbsize.c - ldbm backend routine which returns the size (in bytes) * that the database occupies on disk. Index: dbtest.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/dbtest.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dbtest.c 19 Apr 2005 22:07:38 -0000 1.4 +++ dbtest.c 10 Nov 2006 23:45:39 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* dbtest.c - ldbm database test program */ #include "back-ldbm.h" Index: dbversion.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/dbversion.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- dbversion.c 19 Apr 2005 22:07:38 -0000 1.6 +++ dbversion.c 10 Nov 2006 23:45:39 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "back-ldbm.h" Index: dllmain.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/dllmain.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- dllmain.c 11 Apr 2006 02:14:45 -0000 1.5 +++ dllmain.c 10 Nov 2006 23:45:39 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Microsoft Windows specifics for BACK-LDBM DLL */ Index: dn2entry.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/dn2entry.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- dn2entry.c 23 Feb 2006 20:48:05 -0000 1.5 +++ dn2entry.c 10 Nov 2006 23:45:39 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* dn2entry.c - given a dn return an entry */ #include "back-ldbm.h" Index: entrystore.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/entrystore.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- entrystore.c 19 Apr 2005 22:07:38 -0000 1.4 +++ entrystore.c 10 Nov 2006 23:45:39 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* entrystore.c --- functions dealing with entries and their storage. Put computed attributes, compression etc here */ Index: filterindex.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/filterindex.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- filterindex.c 16 Dec 2005 17:40:03 -0000 1.5 +++ filterindex.c 10 Nov 2006 23:45:39 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* filterindex.c - generate the list of candidate entries from a filter */ #include "back-ldbm.h" Index: findentry.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/findentry.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- findentry.c 19 Apr 2005 22:07:38 -0000 1.4 +++ findentry.c 10 Nov 2006 23:45:39 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* findentry.c - find a database entry, obeying referrals (& aliases?) */ #include "back-ldbm.h" Index: haschildren.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/haschildren.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- haschildren.c 19 Apr 2005 22:07:38 -0000 1.4 +++ haschildren.c 10 Nov 2006 23:45:39 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* haschildren.c - tell if an entry has kids or not */ Index: id2entry.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/id2entry.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- id2entry.c 19 Apr 2005 22:07:38 -0000 1.5 +++ id2entry.c 10 Nov 2006 23:45:39 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* id2entry.c - routines to deal with the id2entry index */ #include "back-ldbm.h" Index: idl.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/idl.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- idl.c 19 Apr 2005 22:07:38 -0000 1.4 +++ idl.c 10 Nov 2006 23:45:39 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* idl.c - ldap id list handling routines */ #include "back-ldbm.h" Index: idl_common.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/idl_common.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- idl_common.c 19 Apr 2005 22:07:38 -0000 1.4 +++ idl_common.c 10 Nov 2006 23:45:39 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* Common IDL code, used in both old and new indexing schemes */ #include "back-ldbm.h" Index: idl_new.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/idl_new.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- idl_new.c 15 Mar 2006 00:51:14 -0000 1.5 +++ idl_new.c 10 Nov 2006 23:45:39 -0000 1.6 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* New IDL code for new indexing scheme */ /* Note to future editors: Index: idl_shim.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/idl_shim.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- idl_shim.c 19 Apr 2005 22:07:38 -0000 1.4 +++ idl_shim.c 10 Nov 2006 23:45:39 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* Shim which forwards IDL calls to the appropriate implementation */ #include "back-ldbm.h" Index: idlapi.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/idlapi.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- idlapi.h 19 Apr 2005 22:07:38 -0000 1.4 +++ idlapi.h 10 Nov 2006 23:45:39 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #ifndef _IDL_API_H_ #define _IDL_API_H_ Index: import-merge.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/import-merge.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import-merge.c 11 Apr 2006 02:14:45 -0000 1.6 +++ import-merge.c 10 Nov 2006 23:45:39 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * this is a bunch of routines for merging groups of db files together -- * currently it's only used for imports (when we import into several small Index: import-threads.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/import-threads.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- import-threads.c 10 Nov 2006 01:13:47 -0000 1.11 +++ import-threads.c 10 Nov 2006 23:45:39 -0000 1.12 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * the threads that make up an import: * producer (1) Index: import.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/import.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- import.c 10 Nov 2006 01:13:47 -0000 1.7 +++ import.c 10 Nov 2006 23:45:39 -0000 1.8 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * the "new" ("deluxe") backend import code * Index: import.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/import.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- import.h 10 Nov 2006 01:13:47 -0000 1.7 +++ import.h 10 Nov 2006 23:45:39 -0000 1.8 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * structures & constants used for the import code */ Index: index.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/index.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- index.c 6 Nov 2006 20:51:32 -0000 1.9 +++ index.c 10 Nov 2006 23:45:39 -0000 1.10 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* index.c - routines for dealing with attribute indexes */ #include "back-ldbm.h" Index: init.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/init.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- init.c 10 Nov 2006 01:13:47 -0000 1.7 +++ init.c 10 Nov 2006 23:45:39 -0000 1.8 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* init.c - initialize ldbm backend */ #include "back-ldbm.h" Index: instance.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/instance.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- instance.c 19 Apr 2005 22:07:38 -0000 1.4 +++ instance.c 10 Nov 2006 23:45:39 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "back-ldbm.h" /* Forward declarations */ Index: ldbm_abandon.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/ldbm_abandon.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ldbm_abandon.c 19 Apr 2005 22:07:38 -0000 1.4 +++ ldbm_abandon.c 10 Nov 2006 23:45:39 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* abandon.c - ldbm backend abandon routine */ #include "back-ldbm.h" Index: ldbm_add.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/ldbm_add.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ldbm_add.c 6 Nov 2006 20:51:32 -0000 1.5 +++ ldbm_add.c 10 Nov 2006 23:45:39 -0000 1.6 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* add.c - ldap ldbm back-end add routine */ #include "back-ldbm.h" Index: ldbm_attr.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/ldbm_attr.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ldbm_attr.c 30 Aug 2005 21:21:20 -0000 1.6 +++ ldbm_attr.c 10 Nov 2006 23:45:39 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* attr.c - backend routines for dealing with attributes */ #include "back-ldbm.h" Index: ldbm_attrcrypt.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ldbm_attrcrypt.c 11 Apr 2006 02:14:45 -0000 1.8 +++ ldbm_attrcrypt.c 10 Nov 2006 23:45:39 -0000 1.9 @@ -34,6 +34,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* This file handles attribute encryption. */ Index: ldbm_attrcrypt_config.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt_config.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ldbm_attrcrypt_config.c 19 Apr 2005 22:07:38 -0000 1.5 +++ ldbm_attrcrypt_config.c 10 Nov 2006 23:45:39 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* This file handles configuration information that is specific * to ldbm instance attribute encryption configuration. */ Index: ldbm_bind.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/ldbm_bind.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ldbm_bind.c 19 Apr 2005 22:07:38 -0000 1.4 +++ ldbm_bind.c 10 Nov 2006 23:45:39 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* bind.c - ldbm backend bind and unbind routines */ #include "back-ldbm.h" Index: ldbm_compare.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/ldbm_compare.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ldbm_compare.c 19 Apr 2005 22:07:38 -0000 1.4 +++ ldbm_compare.c 10 Nov 2006 23:45:39 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* compare.c - ldbm backend compare routine */ #include "back-ldbm.h" Index: ldbm_config.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/ldbm_config.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ldbm_config.c 13 Oct 2006 01:06:29 -0000 1.8 +++ ldbm_config.c 10 Nov 2006 23:45:39 -0000 1.9 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* ldbm_config.c - Handles configuration information that is global to all ldbm instances. */ #include "back-ldbm.h" Index: ldbm_config.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/ldbm_config.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ldbm_config.h 13 Oct 2006 01:06:29 -0000 1.5 +++ ldbm_config.h 10 Nov 2006 23:45:39 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef _LDBM_CONFIG_H_ #define _LDBM_CONFIG_H_ Index: ldbm_delete.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/ldbm_delete.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ldbm_delete.c 6 Nov 2006 20:51:32 -0000 1.6 +++ ldbm_delete.c 10 Nov 2006 23:45:39 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* delete.c - ldbm backend delete routine */ Index: ldbm_index_config.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/ldbm_index_config.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ldbm_index_config.c 19 Apr 2005 22:07:38 -0000 1.6 +++ ldbm_index_config.c 10 Nov 2006 23:45:39 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* This file handles configuration information that is specific * to ldbm instance indexes. */ Index: ldbm_instance_config.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/ldbm_instance_config.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ldbm_instance_config.c 19 Apr 2005 22:07:38 -0000 1.5 +++ ldbm_instance_config.c 10 Nov 2006 23:45:39 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* This file handles configuration information that is specific * to ldbm instances. */ Index: ldbm_modify.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/ldbm_modify.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ldbm_modify.c 19 Apr 2005 22:07:38 -0000 1.4 +++ ldbm_modify.c 10 Nov 2006 23:45:39 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* modify.c - ldbm backend modify routine */ #include "back-ldbm.h" Index: ldbm_modrdn.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ldbm_modrdn.c 6 Nov 2006 20:51:32 -0000 1.5 +++ ldbm_modrdn.c 10 Nov 2006 23:45:39 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* modrdn.c - ldbm backend modrdn routine */ #include "back-ldbm.h" Index: ldbm_unbind.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/ldbm_unbind.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ldbm_unbind.c 19 Apr 2005 22:07:38 -0000 1.4 +++ ldbm_unbind.c 10 Nov 2006 23:45:39 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* unbind.c - handle an ldap unbind operation */ #include "back-ldbm.h" Index: backentry.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/backentry.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- backentry.c 19 Apr 2005 22:07:37 -0000 1.4 +++ backentry.c 10 Nov 2006 23:45:39 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* backentry.c - wrapper routines to deal with entries */ #include "back-ldbm.h" Index: matchrule.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/matchrule.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- matchrule.c 19 Apr 2005 22:07:38 -0000 1.4 +++ matchrule.c 10 Nov 2006 23:45:39 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* matchrule.c */ Index: misc.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/misc.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- misc.c 19 Apr 2005 22:07:38 -0000 1.5 +++ misc.c 10 Nov 2006 23:45:39 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* misc.c - backend misc routines */ #include "back-ldbm.h" Index: monitor.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/monitor.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- monitor.c 19 Apr 2005 22:07:38 -0000 1.6 +++ monitor.c 10 Nov 2006 23:45:39 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* monitor.c - ldbm backend monitor function */ #include "back-ldbm.h" Index: nextid.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/nextid.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nextid.c 19 Apr 2005 22:07:38 -0000 1.4 +++ nextid.c 10 Nov 2006 23:45:39 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* id.c - keep track of the next id to be given out */ #include "back-ldbm.h" Index: parents.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/parents.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- parents.c 19 Apr 2005 22:07:38 -0000 1.4 +++ parents.c 10 Nov 2006 23:45:39 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* parents.c - where the adults live */ #include "back-ldbm.h" Index: perfctrs.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/perfctrs.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perfctrs.c 19 Apr 2005 22:07:38 -0000 1.4 +++ perfctrs.c 10 Nov 2006 23:45:39 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* Database performance counters stuff */ #include "back-ldbm.h" Index: perfctrs.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/perfctrs.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perfctrs.h 19 Apr 2005 22:07:38 -0000 1.4 +++ perfctrs.h 10 Nov 2006 23:45:39 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* Structure definition for performance data */ /* This stuff goes in shared memory, so make sure the packing is consistent */ Index: proto-back-ldbm.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- proto-back-ldbm.h 10 Nov 2006 01:13:47 -0000 1.8 +++ proto-back-ldbm.h 10 Nov 2006 23:45:39 -0000 1.9 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef _PROTO_BACK_LDBM #define _PROTO_BACK_LDBM Index: rmdb.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/rmdb.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rmdb.c 19 Apr 2005 22:07:38 -0000 1.4 +++ rmdb.c 10 Nov 2006 23:45:39 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * rmdb.c - ldbm backend routine which deletes an entire database. * This routine is not exposed in the public SLAPI interface. It Index: seq.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/seq.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- seq.c 19 Apr 2005 22:07:38 -0000 1.4 +++ seq.c 10 Nov 2006 23:45:39 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* seq.c - ldbm backend sequential access function */ #include "back-ldbm.h" Index: sort.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/sort.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sort.c 1 Sep 2006 21:25:14 -0000 1.8 +++ sort.c 10 Nov 2006 23:45:39 -0000 1.9 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* Code to implement result sorting */ #include "back-ldbm.h" Index: start.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/start.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- start.c 17 Jan 2006 01:01:02 -0000 1.5 +++ start.c 10 Nov 2006 23:45:39 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * start.c */ Index: uniqueid2entry.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/uniqueid2entry.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- uniqueid2entry.c 19 Apr 2005 22:07:38 -0000 1.5 +++ uniqueid2entry.c 10 Nov 2006 23:45:39 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* uniqueid2entry.c - given a dn return an entry */ #include "back-ldbm.h" Index: upgrade.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/upgrade.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- upgrade.c 10 Nov 2006 01:13:47 -0000 1.5 +++ upgrade.c 10 Nov 2006 23:45:39 -0000 1.6 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* upgrade.c --- upgrade from a previous version of the database */ #include "back-ldbm.h" Index: vlv.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/vlv.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- vlv.c 1 Sep 2006 21:25:14 -0000 1.9 +++ vlv.c 10 Nov 2006 23:45:39 -0000 1.10 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* vlv.c */ Index: vlv_key.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/vlv_key.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- vlv_key.c 19 Apr 2005 22:07:38 -0000 1.4 +++ vlv_key.c 10 Nov 2006 23:45:39 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* vlv_key.c */ Index: vlv_key.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/vlv_key.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- vlv_key.h 19 Apr 2005 22:07:38 -0000 1.4 +++ vlv_key.h 10 Nov 2006 23:45:39 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* vlv_key.h */ Index: vlv_srch.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/vlv_srch.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- vlv_srch.c 19 Apr 2005 22:07:38 -0000 1.6 +++ vlv_srch.c 10 Nov 2006 23:45:39 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* vlv_srch.c */ Index: vlv_srch.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/vlv_srch.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- vlv_srch.h 19 Apr 2005 22:07:38 -0000 1.4 +++ vlv_srch.h 10 Nov 2006 23:45:39 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* vlv_srch.h */ Index: ldbm_search.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/ldbm_search.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ldbm_search.c 14 Oct 2006 06:18:37 -0000 1.8 +++ ldbm_search.c 10 Nov 2006 23:45:39 -0000 1.9 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* search.c - ldbm backend search function */ /* view with ts=4 */ Index: ldif2ldbm.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/ldif2ldbm.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ldif2ldbm.c 10 Nov 2006 01:13:47 -0000 1.10 +++ ldif2ldbm.c 10 Nov 2006 23:45:39 -0000 1.11 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* ldif2ldbm.c * * common functions for import (old and new) and export From fedora-directory-commits at redhat.com Fri Nov 10 23:44:43 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:44:43 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/cm/newinst ux-config.h, 1.6, 1.7 ux-dialog.h, 1.5, 1.6 ux-dsalib_dn.c, 1.4, 1.5 ux-config.cc, 1.10, 1.11 ux-dialog.cc, 1.10, 1.11 ux-guesses.cc, 1.5, 1.6 Message-ID: <200611102346.kAANkDPo032353@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/cm/newinst In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/cm/newinst Modified Files: ux-config.h ux-dialog.h ux-dsalib_dn.c ux-config.cc ux-dialog.cc ux-guesses.cc Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: ux-config.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/ux-config.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ux-config.h 19 Apr 2005 22:07:21 -0000 1.6 +++ ux-config.h 10 Nov 2006 23:44:40 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /********************************************************************* ** ** @@ -48,6 +53,16 @@ ** ** HISTORY: ** $Log$ +** Revision 1.7 2006/11/10 23:44:40 nhosoi +** Resolves: #214533 +** Summary: configure needs to support --with-fhs (Comment #6) +** Changes: Added the following include next to the end of the copyright block. +** + +** +#ifdef HAVE_CONFIG_H +** +# include +** +#endif +** + +** ** Revision 1.6 2005/04/19 22:07:21 nkinder ** Fixed licensing typo ** Index: ux-dialog.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/ux-dialog.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ux-dialog.h 6 Nov 2006 20:39:01 -0000 1.5 +++ ux-dialog.h 10 Nov 2006 23:44:40 -0000 1.6 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #ifndef _UX_DIALOG_H_ #define _UX_DIALOG_H_ Index: ux-dsalib_dn.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/ux-dsalib_dn.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ux-dsalib_dn.c 19 Apr 2005 22:07:21 -0000 1.4 +++ ux-dsalib_dn.c 10 Nov 2006 23:44:40 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #ifdef __cplusplus extern "C" { #endif Index: ux-config.cc =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/ux-config.cc,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ux-config.cc 29 Mar 2006 19:45:37 -0000 1.10 +++ ux-config.cc 10 Nov 2006 23:44:40 -0000 1.11 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /********************************************************************* ** ** NAME: Index: ux-dialog.cc =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/ux-dialog.cc,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ux-dialog.cc 6 Nov 2006 20:39:01 -0000 1.10 +++ ux-dialog.cc 10 Nov 2006 23:44:40 -0000 1.11 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /********************************************************************* ** ** NAME: Index: ux-guesses.cc =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/ux-guesses.cc,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ux-guesses.cc 19 Apr 2005 22:07:21 -0000 1.5 +++ ux-guesses.cc 10 Nov 2006 23:44:40 -0000 1.6 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* Print guesses of host and domain name as made by the setup SDK. */ @@ -43,6 +48,16 @@ /* $RCSfile$ $Revision$ $Date$ $State$ */ /* * $Log$ + * Revision 1.6 2006/11/10 23:44:40 nhosoi + * Resolves: #214533 + * Summary: configure needs to support --with-fhs (Comment #6) + * Changes: Added the following include next to the end of the copyright block. + * + + * +#ifdef HAVE_CONFIG_H + * +# include + * +#endif + * + + * * Revision 1.5 2005/04/19 22:07:21 nkinder * Fixed licensing typo * From fedora-directory-commits at redhat.com Fri Nov 10 23:45:44 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:45:44 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/back-ldif add.c, 1.4, 1.5 back-ldif.h, 1.4, 1.5 bind.c, 1.4, 1.5 close.c, 1.4, 1.5 compare.c, 1.4, 1.5 config.c, 1.4, 1.5 delete.c, 1.4, 1.5 dllmain.c, 1.5, 1.6 init.c, 1.4, 1.5 modify.c, 1.4, 1.5 modrdn.c, 1.4, 1.5 monitor.c, 1.5, 1.6 search.c, 1.5, 1.6 start.c, 1.4, 1.5 unbind.c, 1.4, 1.5 Message-ID: <200611102346.kAANkEbP032470@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldif In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/servers/slapd/back-ldif Modified Files: add.c back-ldif.h bind.c close.c compare.c config.c delete.c dllmain.c init.c modify.c modrdn.c monitor.c search.c start.c unbind.c Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: add.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldif/add.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- add.c 19 Apr 2005 22:07:39 -0000 1.4 +++ add.c 10 Nov 2006 23:45:41 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * File: add.c * Index: back-ldif.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldif/back-ldif.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- back-ldif.h 19 Apr 2005 22:07:39 -0000 1.4 +++ back-ldif.h 10 Nov 2006 23:45:41 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * File: back-ldif.h * Index: bind.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldif/bind.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- bind.c 19 Apr 2005 22:07:39 -0000 1.4 +++ bind.c 10 Nov 2006 23:45:41 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * File: bind.c * Index: close.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldif/close.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- close.c 19 Apr 2005 22:07:39 -0000 1.4 +++ close.c 10 Nov 2006 23:45:41 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * File: close.c * Index: compare.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldif/compare.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- compare.c 19 Apr 2005 22:07:39 -0000 1.4 +++ compare.c 10 Nov 2006 23:45:41 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * File: compare.c * Index: config.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldif/config.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- config.c 19 Apr 2005 22:07:39 -0000 1.4 +++ config.c 10 Nov 2006 23:45:41 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * File: config.c * Index: delete.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldif/delete.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- delete.c 19 Apr 2005 22:07:39 -0000 1.4 +++ delete.c 10 Nov 2006 23:45:41 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * File: delete.c * Index: dllmain.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldif/dllmain.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- dllmain.c 11 Apr 2006 02:14:45 -0000 1.5 +++ dllmain.c 10 Nov 2006 23:45:41 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Microsoft Windows specifics for LIBLDAP DLL */ Index: init.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldif/init.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- init.c 19 Apr 2005 22:07:39 -0000 1.4 +++ init.c 10 Nov 2006 23:45:41 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * File: init.c * Index: modify.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldif/modify.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- modify.c 19 Apr 2005 22:07:39 -0000 1.4 +++ modify.c 10 Nov 2006 23:45:41 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * File: modify.c * Index: modrdn.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldif/modrdn.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- modrdn.c 19 Apr 2005 22:07:39 -0000 1.4 +++ modrdn.c 10 Nov 2006 23:45:41 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * File: modrdn.c * Index: monitor.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldif/monitor.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- monitor.c 19 Apr 2005 22:07:39 -0000 1.5 +++ monitor.c 10 Nov 2006 23:45:41 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * File: monitor.c * Index: search.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldif/search.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- search.c 5 Oct 2006 21:14:02 -0000 1.5 +++ search.c 10 Nov 2006 23:45:41 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * File: search.c * Index: start.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldif/start.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- start.c 19 Apr 2005 22:07:39 -0000 1.4 +++ start.c 10 Nov 2006 23:45:41 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * File: start.c * Index: unbind.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldif/unbind.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- unbind.c 19 Apr 2005 22:07:39 -0000 1.4 +++ unbind.c 10 Nov 2006 23:45:41 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * File: unbind.c * From fedora-directory-commits at redhat.com Fri Nov 10 23:44:45 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:44:45 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/libraries/libavl avl.c, 1.4, 1.5 testavl.c, 1.4, 1.5 Message-ID: <200611102346.kAANkFwQ032556@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/libraries/libavl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/libraries/libavl Modified Files: avl.c testavl.c Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: avl.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/libraries/libavl/avl.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- avl.c 19 Apr 2005 22:07:26 -0000 1.4 +++ avl.c 10 Nov 2006 23:44:42 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* avl.c - routines to implement an avl tree */ /* * Copyright (c) 1993 Regents of the University of Michigan. Index: testavl.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/libraries/libavl/testavl.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- testavl.c 19 Apr 2005 22:07:26 -0000 1.4 +++ testavl.c 10 Nov 2006 23:44:42 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* testavl.c - Test Tim Howes AVL code */ #ifdef _WIN32 #include From fedora-directory-commits at redhat.com Fri Nov 10 23:45:43 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:45:43 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd abandon.c, 1.6, 1.7 add.c, 1.9, 1.10 agtmmap.c, 1.9, 1.10 agtmmap.h, 1.9, 1.10 apibroker.c, 1.4, 1.5 attr.c, 1.7, 1.8 attrlist.c, 1.6, 1.7 attrsyntax.c, 1.4, 1.5 auditlog.c, 1.5, 1.6 auth.c, 1.8, 1.9 auth.h, 1.4, 1.5 ava.c, 1.5, 1.6 backend.c, 1.5, 1.6 backend_manager.c, 1.6, 1.7 bind.c, 1.8, 1.9 bitset.c, 1.4, 1.5 bulk_import.c, 1.4, 1.5 ch_malloc.c, 1.8, 1.9 charray.c, 1.5, 1.6 compare.c, 1.5, 1.6 computed.c, 1.4, 1.5 config.c, 1.9, 1.10 configdse.c, 1.5, 1.6 connection.c, 1.12, 1.13 conntable.c, 1.6, 1.7 control.c, 1.6, 1.7 counters.c, 1.4, 1.5 csn.c, 1.5, 1.6 csngen.c, 1.6, 1.7 csngen.h, 1.4, 1.5 csnset.c, 1.4, 1.5 daemon.c, 1.10, 1.11 defbackend.c, 1.4, 1.5 delete.c, 1.6, 1.7 detach.c, 1.5, 1.6 disconnect_error_strings.h, 1.4, 1.5 disconnect_errors.h, 1.4, 1.5 dl.c, 1.4, 1.5 dn.c, 1.8, 1.9 dse.c, 1.6, 1.7 dynalib.c, 1.5, 1.6 entry.c, 1.11, 1.12 entrywsi.c, 1.4, 1.5 errormap.c, 1.5, 1.6 eventq.c, 1.5, 1.6 extendop.c, 1.7, 1.8 factory.c, 1.5, 1.6 fe.h, 1.4, 1.5 fedse.c, 1.8, 1.9 fileio.c, 1.4, 1.5 filter.c, 1.8, 1.9 filter.h, 1.4, 1.5 ! filtercmp.c, 1.5, 1.6 filterentry.c, 1.4, 1.5 generation.c, 1.5, 1.6 getfilelist.c, 1.6, 1.7 getopt_ext.c, 1.4, 1.5 getopt_ext.h, 1.4, 1.5 globals.c, 1.5, 1.6 house.c, 1.4, 1.5 http.h, 1.4, 1.5 index_subsys.h, 1.4, 1.5 index_subsystem.c, 1.5, 1.6 init.c, 1.5, 1.6 intrinsics.h, 1.4, 1.5 ldbmlinktest.c, 1.4, 1.5 lenstr.c, 1.4, 1.5 libglobs.c, 1.13, 1.14 lite_entries.c, 1.4, 1.5 localhost.c, 1.8, 1.9 lock.c, 1.5, 1.6 log.c, 1.14, 1.15 log.h, 1.6, 1.7 main.c, 1.15, 1.16 mapping_tree.c, 1.6, 1.7 match.c, 1.4, 1.5 modify.c, 1.13, 1.14 modrdn.c, 1.7, 1.8 modutil.c, 1.6, 1.7 monitor.c, 1.5, 1.6 ntuserpin.c, 1.8, 1.9 object.c, 1.4, 1.5 objset.c, 1.4, 1.5 operation.c, 1.5, 1.6 opshared.c, 1.7, 1.8 passwd_extop.c, 1.12, 1.13 pblock.c, 1.7, 1.8 plugin.c, 1.10, 1.11 plugin_acl.c, 1.4, 1.5 plugin_internal_op.c, 1.6, 1.7 plugin_mr.c, 1.4, 1.5 plugin_role.c, 1.4, 1.5 plugin_syntax.c, 1.4, 1.5 poll_using_select.c, 1.4, 1.5 poll_using_select.h, 1.4, 1.5 prerrstrs.h, 1.5, 1.6 protect_db.c, 1.8, 1.9 protect_db.h, 1.5, 1.6 psearch.c, 1.7, 1.8 pw.c, 1.12, 1.13 pw.h, 1.5, 1.6 pw_mgmt.c, 1.6, 1.! 7 pw_retry.c,1.5,1.6 rdn.c,1.4,1.5 referral.c,1.6,1.7 regex.c,! 1.4,1. Message-ID: <200611102345.kAANjhrD031728@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/servers/slapd Modified Files: abandon.c add.c agtmmap.c agtmmap.h apibroker.c attr.c attrlist.c attrsyntax.c auditlog.c auth.c auth.h ava.c backend.c backend_manager.c bind.c bitset.c bulk_import.c ch_malloc.c charray.c compare.c computed.c config.c configdse.c connection.c conntable.c control.c counters.c csn.c csngen.c csngen.h csnset.c daemon.c defbackend.c delete.c detach.c disconnect_error_strings.h disconnect_errors.h dl.c dn.c dse.c dynalib.c entry.c entrywsi.c errormap.c eventq.c extendop.c factory.c fe.h fedse.c fileio.c filter.c filter.h filtercmp.c filterentry.c generation.c getfilelist.c getopt_ext.c getopt_ext.h globals.c house.c http.h index_subsys.h index_subsystem.c init.c intrinsics.h ldbmlinktest.c lenstr.c libglobs.c lite_entries.c localhost.c lock.c log.c log.h main.c mapping_tree.c match.c modify.c modrdn.c modutil.c monitor.c ntuserpin.c object.c objset.c operation.c opshared.c passwd_extop.c pblock.c plugin.c plugin_acl.c plugin_internal_op.c plugin_mr.c plugin_role.c plugin_syntax.c poll_using_select.c poll_using_select.h prerrstrs.h protect_db.c protect_db.h psearch.c pw.c pw.h pw_mgmt.c pw_retry.c rdn.c referral.c regex.c resourcelimit.c result.c rootdse.c rwlock.c rwlock.h sasl_io.c sasl_map.c saslbind.c schema.c schemaparse.c search.c secerrstrs.h security_wrappers.c slap.h slapd_plhash.c slapi-plugin-compat4.h slapi-plugin.h slapi2nspr.c snmp_collator.c snmp_collator.h snoop.c sslerrstrs.h start_tls_extop.c statechange.h str2filter.c strdup.c stubrepl.c stubs.c subentry.c task.c tempnam.c time.c unbind.c uniqueid.c uniqueidgen.c utf8compare.c util.c uuid.c uuid.h value.c vattr.c vattr_spi.h views.h slapi-private.h ssl.c proto-slap.h valueset.c Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: abandon.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/abandon.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- abandon.c 31 Aug 2006 22:52:07 -0000 1.6 +++ abandon.c 10 Nov 2006 23:45:40 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* abandon.c - decode and handle an ldap abandon operation */ /* Index: add.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/add.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- add.c 7 Nov 2006 19:59:02 -0000 1.9 +++ add.c 10 Nov 2006 23:45:40 -0000 1.10 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Copyright (c) 1995 Regents of the University of Michigan. * All rights reserved. Index: agtmmap.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/agtmmap.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- agtmmap.c 19 Apr 2005 22:07:36 -0000 1.9 +++ agtmmap.c 10 Nov 2006 23:45:40 -0000 1.10 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /******************************************************************** * * agtmmap.c: Memory Map interface for SNMP sub-agent for Index: agtmmap.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/agtmmap.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- agtmmap.h 19 Apr 2005 22:07:36 -0000 1.9 +++ agtmmap.h 10 Nov 2006 23:45:40 -0000 1.10 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /******************************************************************** * * agtmmap.h: Memory Map interface for SNMP sub-agent for Index: apibroker.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/apibroker.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- apibroker.c 19 Apr 2005 22:07:36 -0000 1.4 +++ apibroker.c 10 Nov 2006 23:45:40 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* ABAPI Broker */ /* Pete Rowley */ Index: attr.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/attr.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- attr.c 23 Feb 2006 20:55:53 -0000 1.7 +++ attr.c 10 Nov 2006 23:45:40 -0000 1.8 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* attr.c - routines for dealing with attributes */ #include Index: attrlist.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/attrlist.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- attrlist.c 6 Nov 2006 20:51:31 -0000 1.6 +++ attrlist.c 10 Nov 2006 23:45:40 -0000 1.7 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include "slap.h" void Index: attrsyntax.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/attrsyntax.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- attrsyntax.c 19 Apr 2005 22:07:36 -0000 1.4 +++ attrsyntax.c 10 Nov 2006 23:45:40 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* attrsyntax.c */ #include "slap.h" Index: auditlog.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/auditlog.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- auditlog.c 19 Apr 2005 22:07:36 -0000 1.5 +++ auditlog.c 10 Nov 2006 23:45:40 -0000 1.6 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include "slap.h" /* Index: auth.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/auth.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- auth.c 13 Oct 2006 01:06:28 -0000 1.8 +++ auth.c 10 Nov 2006 23:45:40 -0000 1.9 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include /* getenv */ #include /* memcpy */ #include /* LDAPU_SUCCESS, ldapu_VTable_set */ Index: auth.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/auth.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- auth.h 19 Apr 2005 22:07:36 -0000 1.4 +++ auth.h 10 Nov 2006 23:45:40 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef _SLDAPD_AUTH_H_ #define _SLDAPD_AUTH_H_ Index: ava.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/ava.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ava.c 23 Feb 2006 20:45:16 -0000 1.5 +++ ava.c 10 Nov 2006 23:45:40 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* ava.c - routines for dealing with attribute value assertions */ #include Index: backend.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/backend.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- backend.c 19 Apr 2005 22:07:36 -0000 1.5 +++ backend.c 10 Nov 2006 23:45:40 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* backend.c - Slapi_Backend methods */ #include "slap.h" Index: backend_manager.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/backend_manager.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- backend_manager.c 19 Apr 2005 22:07:36 -0000 1.6 +++ backend_manager.c 10 Nov 2006 23:45:40 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* backend_manager.c - routines for dealing with back-end databases */ #include "slap.h" Index: bind.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/bind.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- bind.c 31 Aug 2006 22:52:07 -0000 1.8 +++ bind.c 10 Nov 2006 23:45:40 -0000 1.9 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* bind.c - decode an ldap bind operation and pass it to a backend db */ /* Index: bitset.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/bitset.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- bitset.c 19 Apr 2005 22:07:36 -0000 1.4 +++ bitset.c 10 Nov 2006 23:45:40 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + unsigned char slapi_setbit_uchar(unsigned char f,unsigned char bitnum) { Index: bulk_import.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/bulk_import.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- bulk_import.c 19 Apr 2005 22:07:36 -0000 1.4 +++ bulk_import.c 10 Nov 2006 23:45:40 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Copyright (c) 1995 Regents of the University of Michigan. * All rights reserved. Index: ch_malloc.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/ch_malloc.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ch_malloc.c 13 Oct 2006 01:06:28 -0000 1.8 +++ ch_malloc.c 10 Nov 2006 23:45:40 -0000 1.9 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* slapi_ch_malloc.c - malloc routines that test returns from malloc and friends */ #include Index: charray.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/charray.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- charray.c 7 Nov 2006 04:42:55 -0000 1.5 +++ charray.c 10 Nov 2006 23:45:40 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* charray.c - routines for dealing with char * arrays */ #include Index: compare.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/compare.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- compare.c 23 Feb 2006 20:45:16 -0000 1.5 +++ compare.c 10 Nov 2006 23:45:40 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Copyright (c) 1995 Regents of the University of Michigan. * All rights reserved. Index: computed.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/computed.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- computed.c 19 Apr 2005 22:07:36 -0000 1.4 +++ computed.c 10 Nov 2006 23:45:40 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* Handles computed attributes for entries as they're returned to the client */ #include "slap.h" Index: config.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/config.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- config.c 6 Nov 2006 19:33:42 -0000 1.9 +++ config.c 10 Nov 2006 23:45:40 -0000 1.10 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* config.c - configuration file handling routines */ #include Index: configdse.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/configdse.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- configdse.c 19 Apr 2005 22:07:36 -0000 1.5 +++ configdse.c 10 Nov 2006 23:45:40 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* configdse.c - routines to manage the config DSE */ #include Index: connection.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/connection.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- connection.c 24 Sep 2006 00:30:50 -0000 1.12 +++ connection.c 10 Nov 2006 23:45:40 -0000 1.13 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include #include #include Index: conntable.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/conntable.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- conntable.c 31 Aug 2006 22:52:07 -0000 1.6 +++ conntable.c 10 Nov 2006 23:45:40 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* Connection Table */ #include "fe.h" Index: control.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/control.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- control.c 31 Aug 2006 22:52:07 -0000 1.6 +++ control.c 10 Nov 2006 23:45:40 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* control.c - routines for dealing with LDAPMessage controls */ #include Index: counters.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/counters.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- counters.c 19 Apr 2005 22:07:36 -0000 1.4 +++ counters.c 10 Nov 2006 23:45:40 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include #include "slap.h" Index: csn.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/csn.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- csn.c 11 Apr 2006 02:14:44 -0000 1.5 +++ csn.c 10 Nov 2006 23:45:40 -0000 1.6 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* * csn.c - CSN */ Index: csngen.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/csngen.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- csngen.c 11 Apr 2006 02:14:44 -0000 1.6 +++ csngen.c 10 Nov 2006 23:45:40 -0000 1.7 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* * csngen.c - CSN Generator */ Index: csngen.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/csngen.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- csngen.h 19 Apr 2005 22:07:36 -0000 1.4 +++ csngen.h 10 Nov 2006 23:45:40 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #ifndef _REPL_CSNGEN_H #define _REPL_CSNGEN_H Index: csnset.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/csnset.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- csnset.c 19 Apr 2005 22:07:36 -0000 1.4 +++ csnset.c 10 Nov 2006 23:45:40 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include "slap.h" #include "slapi-private.h" Index: daemon.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/daemon.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- daemon.c 10 Nov 2006 01:10:57 -0000 1.10 +++ daemon.c 10 Nov 2006 23:45:40 -0000 1.11 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include #include #ifdef _WIN32 Index: defbackend.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/defbackend.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- defbackend.c 19 Apr 2005 22:07:36 -0000 1.4 +++ defbackend.c 10 Nov 2006 23:45:40 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * defbackend.c - implement a "backend of last resort" which is used only * when a request's basedn does not match one of the suffixes of any of the Index: delete.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/delete.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- delete.c 1 Sep 2006 21:25:08 -0000 1.6 +++ delete.c 10 Nov 2006 23:45:40 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Copyright (c) 1995 Regents of the University of Michigan. * All rights reserved. Index: detach.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/detach.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- detach.c 10 Nov 2006 01:34:09 -0000 1.5 +++ detach.c 10 Nov 2006 23:45:40 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Copyright (c) 1990, 1994 Regents of the University of Michigan. * All rights reserved. Index: disconnect_error_strings.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/disconnect_error_strings.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- disconnect_error_strings.h 19 Apr 2005 22:07:36 -0000 1.4 +++ disconnect_error_strings.h 10 Nov 2006 23:45:40 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* disconnect_error_strings.h * * Strings describing the errors used in logging the reason a connection Index: disconnect_errors.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/disconnect_errors.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- disconnect_errors.h 19 Apr 2005 22:07:36 -0000 1.4 +++ disconnect_errors.h 10 Nov 2006 23:45:40 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* disconnect_errors.h * * Errors used in logging the reason a connection was closed. Index: dl.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/dl.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dl.c 19 Apr 2005 22:07:36 -0000 1.4 +++ dl.c 10 Nov 2006 23:45:40 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* DataList access functions */ #define INIT_ALLOC 8 #define ALLOC_INCREMENT 4 Index: dn.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/dn.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- dn.c 23 Feb 2006 20:47:59 -0000 1.8 +++ dn.c 10 Nov 2006 23:45:40 -0000 1.9 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* dn.c - routines for dealing with distinguished names */ #include Index: dse.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/dse.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- dse.c 27 Sep 2006 23:40:51 -0000 1.6 +++ dse.c 10 Nov 2006 23:45:40 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * dse.c - DSE (DSA-Specific Entry) persistent storage. * Index: dynalib.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/dynalib.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- dynalib.c 19 Apr 2005 22:07:36 -0000 1.5 +++ dynalib.c 10 Nov 2006 23:45:40 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* dynalib.c - dynamic library routines */ #include Index: entry.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/entry.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- entry.c 6 Nov 2006 20:51:31 -0000 1.11 +++ entry.c 10 Nov 2006 23:45:40 -0000 1.12 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* entry.c - routines for dealing with entries */ #include Index: entrywsi.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/entrywsi.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- entrywsi.c 19 Apr 2005 22:07:36 -0000 1.4 +++ entrywsi.c 10 Nov 2006 23:45:40 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* entrywsi.c - routines for dealing with entries... With State Information */ #include "slap.h" Index: errormap.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/errormap.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- errormap.c 10 Nov 2006 01:05:04 -0000 1.5 +++ errormap.c 10 Nov 2006 23:45:40 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * errormap.c - map NSPR and OS errors to strings * Index: eventq.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/eventq.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- eventq.c 11 Apr 2006 02:14:44 -0000 1.5 +++ eventq.c 10 Nov 2006 23:45:40 -0000 1.6 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* ******************************************************** eventq.c - Event queue/scheduling system. Index: extendop.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/extendop.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- extendop.c 31 Aug 2006 22:52:07 -0000 1.7 +++ extendop.c 10 Nov 2006 23:45:40 -0000 1.8 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* extendedop.c - handle an LDAPv3 extended operation */ #include Index: factory.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/factory.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- factory.c 19 Apr 2005 22:07:36 -0000 1.5 +++ factory.c 10 Nov 2006 23:45:40 -0000 1.6 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include "slap.h" /* Index: fe.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/fe.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fe.h 19 Apr 2005 22:07:36 -0000 1.4 +++ fe.h 10 Nov 2006 23:45:40 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef _SLAPD_FE_H_ #define _SLAPD_FE_H_ Index: fedse.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/fedse.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- fedse.c 27 Sep 2006 23:40:51 -0000 1.8 +++ fedse.c 10 Nov 2006 23:45:40 -0000 1.9 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * fedse.c - Front End DSE (DSA-Specific Entry) persistent storage. * Index: fileio.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/fileio.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fileio.c 19 Apr 2005 22:07:36 -0000 1.4 +++ fileio.c 10 Nov 2006 23:45:40 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* fileio.c - layer to adjust EOL to use DOS format via PR_Read/Write on NT */ #include Index: filter.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/filter.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- filter.c 31 Aug 2006 22:52:07 -0000 1.8 +++ filter.c 10 Nov 2006 23:45:40 -0000 1.9 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* filter.c - routines for parsing and dealing with filters */ #include Index: filter.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/filter.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- filter.h 19 Apr 2005 22:07:36 -0000 1.4 +++ filter.h 10 Nov 2006 23:45:40 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #ifndef _FILTER_H_ #define _FILTER_H_ Index: filtercmp.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/filtercmp.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- filtercmp.c 30 Aug 2005 21:21:19 -0000 1.5 +++ filtercmp.c 10 Nov 2006 23:45:40 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* filtercmp.c - routines for comparing filters */ #include Index: filterentry.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/filterentry.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- filterentry.c 19 Apr 2005 22:07:36 -0000 1.4 +++ filterentry.c 10 Nov 2006 23:45:40 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* filterentry.c - apply a filter to an entry */ #include Index: generation.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/generation.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- generation.c 19 Apr 2005 22:07:36 -0000 1.5 +++ generation.c 10 Nov 2006 23:45:40 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include #include Index: getfilelist.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/getfilelist.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- getfilelist.c 19 Apr 2005 22:07:36 -0000 1.6 +++ getfilelist.c 10 Nov 2006 23:45:40 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /*********************************************************************** ** NAME ** getfilelist.c Index: getopt_ext.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/getopt_ext.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- getopt_ext.c 19 Apr 2005 22:07:36 -0000 1.4 +++ getopt_ext.c 10 Nov 2006 23:45:40 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include "getopt_ext.h" char *optarg_ext; Index: getopt_ext.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/getopt_ext.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- getopt_ext.h 19 Apr 2005 22:07:36 -0000 1.4 +++ getopt_ext.h 10 Nov 2006 23:45:40 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * getopt_ext.h - long option names * Index: globals.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/globals.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- globals.c 10 Nov 2006 01:10:57 -0000 1.5 +++ globals.c 10 Nov 2006 23:45:40 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Copyright (c) 1996 Regents of the University of Michigan. * All rights reserved. Index: house.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/house.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- house.c 19 Apr 2005 22:07:36 -0000 1.4 +++ house.c 10 Nov 2006 23:45:40 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include #include #include Index: http.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/http.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- http.h 19 Apr 2005 22:07:36 -0000 1.4 +++ http.h 10 Nov 2006 23:45:40 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * --- END COPYRIGHT BLOCK --- */ +#ifdef HAVE_CONFIG_H +# include +#endif + + #ifndef _HTTP_H_ #define _HTTP_H_ Index: index_subsys.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/index_subsys.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- index_subsys.h 19 Apr 2005 22:07:36 -0000 1.4 +++ index_subsys.h 10 Nov 2006 23:45:40 -0000 1.5 @@ -35,6 +35,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #ifndef _INDEX_SUBSYS_H_ #define _INDEX_SUBSYS_H_ Index: index_subsystem.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/index_subsystem.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- index_subsystem.c 19 Apr 2005 22:07:36 -0000 1.5 +++ index_subsystem.c 10 Nov 2006 23:45:40 -0000 1.6 @@ -35,6 +35,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* The indexing subsystem * ---------------------- * Index: init.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/init.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- init.c 19 Apr 2005 22:07:36 -0000 1.5 +++ init.c 10 Nov 2006 23:45:40 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* init.c - initialize various things */ #include Index: intrinsics.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/intrinsics.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- intrinsics.h 19 Apr 2005 22:07:36 -0000 1.4 +++ intrinsics.h 10 Nov 2006 23:45:40 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* Header file used to declare functions which we beat on heavily as intrinsic */ /* For NT ...*/ Index: ldbmlinktest.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/ldbmlinktest.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ldbmlinktest.c 19 Apr 2005 22:07:36 -0000 1.4 +++ ldbmlinktest.c 10 Nov 2006 23:45:40 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #if 0 int detached; int error_logfp; Index: lenstr.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/lenstr.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- lenstr.c 19 Apr 2005 22:07:36 -0000 1.4 +++ lenstr.c 10 Nov 2006 23:45:40 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include #include "slapi-private.h" Index: libglobs.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/libglobs.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- libglobs.c 10 Nov 2006 01:10:57 -0000 1.13 +++ libglobs.c 10 Nov 2006 23:45:40 -0000 1.14 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * * libglobs.c -- SLAPD library global variables Index: lite_entries.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/lite_entries.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- lite_entries.c 19 Apr 2005 22:07:36 -0000 1.4 +++ lite_entries.c 10 Nov 2006 23:45:40 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* lite_entries.c - * * These entries are added under cn=options,cn=features,cn=config for Index: localhost.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/localhost.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- localhost.c 10 Nov 2006 01:10:57 -0000 1.8 +++ localhost.c 10 Nov 2006 23:45:40 -0000 1.9 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include #include #include Index: lock.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/lock.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- lock.c 19 Apr 2005 22:07:36 -0000 1.5 +++ lock.c 10 Nov 2006 23:45:40 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* lock.c - routines to open and apply an advisory lock to a file */ #include Index: log.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/log.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- log.c 13 Oct 2006 01:06:28 -0000 1.14 +++ log.c 10 Nov 2006 23:45:40 -0000 1.15 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* ** ** log.c Index: log.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/log.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- log.h 4 Dec 2005 01:54:37 -0000 1.6 +++ log.h 10 Nov 2006 23:45:40 -0000 1.7 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /*********************************************************************** * log.h * Index: main.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/main.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- main.c 10 Nov 2006 01:10:57 -0000 1.15 +++ main.c 10 Nov 2006 23:45:40 -0000 1.16 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include #undef OFF #undef LITTLE_ENDIAN Index: mapping_tree.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/mapping_tree.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mapping_tree.c 19 Apr 2005 22:07:36 -0000 1.6 +++ mapping_tree.c 10 Nov 2006 23:45:40 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* mapping_tree.c - Maps the DIT onto backends and/or referrals. */ Index: match.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/match.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- match.c 19 Apr 2005 22:07:36 -0000 1.4 +++ match.c 10 Nov 2006 23:45:40 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * match.c * Index: modify.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/modify.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- modify.c 12 Oct 2006 22:30:32 -0000 1.13 +++ modify.c 10 Nov 2006 23:45:40 -0000 1.14 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Copyright (c) 1995 Regents of the University of Michigan. * All rights reserved. Index: modrdn.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/modrdn.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- modrdn.c 1 Sep 2006 21:25:08 -0000 1.7 +++ modrdn.c 10 Nov 2006 23:45:40 -0000 1.8 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Copyright (c) 1995 Regents of the University of Michigan. * All rights reserved. Index: modutil.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/modutil.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- modutil.c 13 Oct 2006 17:54:52 -0000 1.6 +++ modutil.c 10 Nov 2006 23:45:40 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* modutil.c - modify utility routine */ #include Index: monitor.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/monitor.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- monitor.c 19 Apr 2005 22:07:36 -0000 1.5 +++ monitor.c 10 Nov 2006 23:45:40 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Copyright (c) 1995 Regents of the University of Michigan. * All rights reserved. Index: ntuserpin.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/ntuserpin.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ntuserpin.c 10 Nov 2006 01:10:57 -0000 1.8 +++ ntuserpin.c 10 Nov 2006 23:45:40 -0000 1.9 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /****************************************************** * * ntuserpin.c - Prompts for the key Index: object.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/object.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- object.c 19 Apr 2005 22:07:36 -0000 1.4 +++ object.c 10 Nov 2006 23:45:40 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* Implementation note: PR_AtomicIncrement and PR_AtomicDecrement both return a value whose sign is the same sign (or zero) as the variable *after* it was updated. Index: objset.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/objset.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- objset.c 19 Apr 2005 22:07:36 -0000 1.4 +++ objset.c 10 Nov 2006 23:45:40 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include "slapi-plugin.h" #include "slapi-private.h" Index: operation.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/operation.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- operation.c 19 Apr 2005 22:07:36 -0000 1.5 +++ operation.c 10 Nov 2006 23:45:40 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* operation.c - routines to deal with pending ldap operations */ #include Index: opshared.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/opshared.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- opshared.c 1 Sep 2006 21:25:08 -0000 1.7 +++ opshared.c 10 Nov 2006 23:45:40 -0000 1.8 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* opshared.c - functions shared between regular and internal operations */ #include "slap.h" Index: passwd_extop.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/passwd_extop.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- passwd_extop.c 31 Aug 2006 22:52:07 -0000 1.12 +++ passwd_extop.c 10 Nov 2006 23:45:40 -0000 1.13 @@ -34,6 +34,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Password Modify - LDAP Extended Operation. * RFC 3062 Index: pblock.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/pblock.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- pblock.c 10 Nov 2006 01:13:47 -0000 1.7 +++ pblock.c 10 Nov 2006 23:45:40 -0000 1.8 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include #include Index: plugin.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/plugin.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- plugin.c 6 Sep 2005 21:15:15 -0000 1.10 +++ plugin.c 10 Nov 2006 23:45:40 -0000 1.11 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* plugin.c - routines for setting up and calling plugins */ #include Index: plugin_acl.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/plugin_acl.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- plugin_acl.c 19 Apr 2005 22:07:36 -0000 1.4 +++ plugin_acl.c 10 Nov 2006 23:45:40 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* * plugin_acl.c - routines for calling access control plugins */ Index: plugin_internal_op.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/plugin_internal_op.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- plugin_internal_op.c 10 Nov 2006 01:10:57 -0000 1.6 +++ plugin_internal_op.c 10 Nov 2006 23:45:40 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* stevross at netscape.com June 13 1997 */ #include Index: plugin_mr.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/plugin_mr.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- plugin_mr.c 19 Apr 2005 22:07:36 -0000 1.4 +++ plugin_mr.c 10 Nov 2006 23:45:40 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* * plugin_mr.c - routines for calling matching rule plugins */ Index: plugin_role.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/plugin_role.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- plugin_role.c 19 Apr 2005 22:07:36 -0000 1.4 +++ plugin_role.c 10 Nov 2006 23:45:40 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* * plugin_role.c - routines for calling roles plugins */ Index: plugin_syntax.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/plugin_syntax.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- plugin_syntax.c 19 Apr 2005 22:07:36 -0000 1.4 +++ plugin_syntax.c 10 Nov 2006 23:45:40 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* * plugin_syntax.c - routines for calling syntax plugins */ Index: poll_using_select.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/poll_using_select.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- poll_using_select.c 19 Apr 2005 22:07:36 -0000 1.4 +++ poll_using_select.c 10 Nov 2006 23:45:40 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * poll_using_select.c * Index: poll_using_select.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/poll_using_select.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- poll_using_select.h 19 Apr 2005 22:07:36 -0000 1.4 +++ poll_using_select.h 10 Nov 2006 23:45:40 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef _POLL_USING_SELECT_H #define _POLL_USING_SELECT_H Index: prerrstrs.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/prerrstrs.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- prerrstrs.h 10 Nov 2006 01:05:04 -0000 1.5 +++ prerrstrs.h 10 Nov 2006 23:45:40 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * pserrstrs.h - map NSPR errors to strings (used by errormap.c) * Index: protect_db.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/protect_db.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- protect_db.c 10 Nov 2006 01:13:47 -0000 1.8 +++ protect_db.c 10 Nov 2006 23:45:40 -0000 1.9 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* protect_db.c * Used to police access to the db. Prevents different instances of * slapd from clobbering each other Index: protect_db.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/protect_db.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- protect_db.h 10 Nov 2006 01:13:47 -0000 1.5 +++ protect_db.h 10 Nov 2006 23:45:40 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* Header file for protect_db.c */ int add_new_slapd_process(int exec_mode, int r_flag, int skip_flag); Index: psearch.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/psearch.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- psearch.c 1 Sep 2006 21:25:08 -0000 1.7 +++ psearch.c 10 Nov 2006 23:45:40 -0000 1.8 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * * psearch.c - persistent search Index: pw.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/pw.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- pw.c 10 Nov 2006 01:10:57 -0000 1.12 +++ pw.c 10 Nov 2006 23:45:40 -0000 1.13 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * slapd hashed password routines * Index: pw.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/pw.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- pw.h 19 Apr 2005 22:07:36 -0000 1.5 +++ pw.h 10 Nov 2006 23:45:40 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef _SLAPD_PW_H_ #define _SLAPD_PW_H_ Index: pw_mgmt.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/pw_mgmt.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- pw_mgmt.c 19 Apr 2005 22:07:36 -0000 1.6 +++ pw_mgmt.c 10 Nov 2006 23:45:40 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* pw_mgmt.c */ Index: pw_retry.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/pw_retry.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- pw_retry.c 19 Apr 2005 22:07:36 -0000 1.5 +++ pw_retry.c 10 Nov 2006 23:45:40 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* pw_retry.c */ Index: rdn.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/rdn.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rdn.c 19 Apr 2005 22:07:36 -0000 1.4 +++ rdn.c 10 Nov 2006 23:45:40 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include "slap.h" #define FLAG_RDNS 0 Index: referral.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/referral.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- referral.c 19 Apr 2005 22:07:36 -0000 1.6 +++ referral.c 10 Nov 2006 23:45:40 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * referrals.c - LDAP referral-related routines. * a) manage in-memory copiedfrom and copyingfrom referrals. Index: regex.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/regex.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- regex.c 19 Apr 2005 22:07:37 -0000 1.4 +++ regex.c 10 Nov 2006 23:45:40 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "slap.h" /* must come before regex.h */ #include "portable.h" @@ -86,6 +91,16 @@ * Modification history: * * $Log$ + * Revision 1.5 2006/11/10 23:45:40 nhosoi + * Resolves: #214533 + * Summary: configure needs to support --with-fhs (Comment #6) + * Changes: Added the following include next to the end of the copyright block. + * + + * +#ifdef HAVE_CONFIG_H + * +# include + * +#endif + * + + * * Revision 1.4 2005/04/19 22:07:37 nkinder * Fixed licensing typo * Index: resourcelimit.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/resourcelimit.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- resourcelimit.c 11 Apr 2006 02:14:44 -0000 1.5 +++ resourcelimit.c 10 Nov 2006 23:45:40 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* resourcelimit.c - binder-based resource limits implementation */ Index: result.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/result.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- result.c 10 Nov 2006 01:10:57 -0000 1.9 +++ result.c 10 Nov 2006 23:45:40 -0000 1.10 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* result.c - routines to send ldap results, errors, and referrals */ #include Index: rootdse.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/rootdse.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rootdse.c 19 Apr 2005 22:07:37 -0000 1.4 +++ rootdse.c 10 Nov 2006 23:45:40 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* rootdse.c - routines to manage the root DSE */ #include Index: rwlock.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/rwlock.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rwlock.c 19 Apr 2005 22:07:37 -0000 1.4 +++ rwlock.c 10 Nov 2006 23:45:40 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * rwlock.c - generic multiple reader, single-writer locking routines. * Index: rwlock.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/rwlock.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rwlock.h 19 Apr 2005 22:07:37 -0000 1.4 +++ rwlock.h 10 Nov 2006 23:45:40 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef _RWLOCK_H_ #define _RWLOCK_H_ Index: sasl_io.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/sasl_io.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sasl_io.c 10 Nov 2006 01:46:59 -0000 1.9 +++ sasl_io.c 10 Nov 2006 23:45:40 -0000 1.10 @@ -35,6 +35,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include "slap.h" #include "slapi-plugin.h" #include "fe.h" Index: sasl_map.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/sasl_map.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sasl_map.c 25 Apr 2005 20:38:29 -0000 1.7 +++ sasl_map.c 10 Nov 2006 23:45:40 -0000 1.8 @@ -35,6 +35,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include "slap.h" #include "slapi-plugin.h" #include "fe.h" Index: saslbind.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/saslbind.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- saslbind.c 10 Nov 2006 01:46:59 -0000 1.20 +++ saslbind.c 10 Nov 2006 23:45:40 -0000 1.21 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include #include #include Index: schema.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/schema.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- schema.c 27 Sep 2006 23:40:51 -0000 1.9 +++ schema.c 10 Nov 2006 23:45:40 -0000 1.10 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* schema.c - routines to enforce schema definitions */ #include Index: schemaparse.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/schemaparse.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- schemaparse.c 19 Apr 2005 22:07:37 -0000 1.4 +++ schemaparse.c 10 Nov 2006 23:45:40 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* schemaparse.c - routines to support objectclass definitions */ #include Index: search.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/search.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- search.c 31 Aug 2006 22:52:07 -0000 1.6 +++ search.c 10 Nov 2006 23:45:40 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Copyright (c) 1995 Regents of the University of Michigan. * All rights reserved. Index: secerrstrs.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/secerrstrs.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- secerrstrs.h 10 Nov 2006 01:05:04 -0000 1.5 +++ secerrstrs.h 10 Nov 2006 23:45:40 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * secerrstrs.h - map security errors to strings (used by errormap.c) * Index: security_wrappers.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/security_wrappers.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- security_wrappers.c 19 Apr 2005 22:07:37 -0000 1.4 +++ security_wrappers.c 10 Nov 2006 23:45:40 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include #include #include Index: slap.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/slap.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- slap.h 10 Nov 2006 01:10:57 -0000 1.19 +++ slap.h 10 Nov 2006 23:45:40 -0000 1.20 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* slap.h - stand alone ldap server include file */ #ifndef _SLDAPD_H_ Index: slapd_plhash.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/slapd_plhash.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- slapd_plhash.c 19 Apr 2005 22:07:37 -0000 1.4 +++ slapd_plhash.c 10 Nov 2006 23:45:40 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* This file contains a function which augments the standard nspr PL_HashTable api. The problem is that the hash table lookup function in the standard NSPR Index: slapi-plugin-compat4.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/slapi-plugin-compat4.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- slapi-plugin-compat4.h 19 Apr 2005 22:07:37 -0000 1.4 +++ slapi-plugin-compat4.h 10 Nov 2006 23:45:40 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* * Netscape Directory Server 4.x plugin API backwards compatible header file. */ Index: slapi-plugin.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/slapi-plugin.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- slapi-plugin.h 6 Nov 2006 20:51:31 -0000 1.12 +++ slapi-plugin.h 10 Nov 2006 23:45:40 -0000 1.13 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* slapi-plugin.h - public Directory Server plugin interface */ #ifndef _SLAPIPLUGIN Index: slapi2nspr.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/slapi2nspr.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- slapi2nspr.c 19 Apr 2005 22:07:37 -0000 1.4 +++ slapi2nspr.c 10 Nov 2006 23:45:40 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * slapi2nspr.c - expose a subset of the NSPR20/21 API to SLAPI plugin writers * Index: snmp_collator.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/snmp_collator.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- snmp_collator.c 13 Oct 2006 01:06:28 -0000 1.9 +++ snmp_collator.c 10 Nov 2006 23:45:40 -0000 1.10 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include #include #include Index: snmp_collator.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/snmp_collator.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- snmp_collator.h 19 Apr 2005 22:07:37 -0000 1.5 +++ snmp_collator.h 10 Nov 2006 23:45:40 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /****************************************************************************** * * defines Index: snoop.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/snoop.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- snoop.c 19 Apr 2005 22:07:37 -0000 1.4 +++ snoop.c 10 Nov 2006 23:45:40 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* Operation Snooping Function. Used by server internal code (and plugins if they fancy) to detect state changes in the server. Index: sslerrstrs.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/sslerrstrs.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sslerrstrs.h 10 Nov 2006 01:05:04 -0000 1.5 +++ sslerrstrs.h 10 Nov 2006 23:45:40 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * sslerrstrs.h - map SSL errors to strings (used by errormap.c) * Index: start_tls_extop.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/start_tls_extop.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- start_tls_extop.c 19 Apr 2005 22:07:37 -0000 1.7 +++ start_tls_extop.c 10 Nov 2006 23:45:40 -0000 1.8 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Start TLS - LDAP Extended Operation. * Index: statechange.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/statechange.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- statechange.h 19 Apr 2005 22:07:37 -0000 1.4 +++ statechange.h 10 Nov 2006 23:45:40 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #ifndef _STATE_NOTIFY_H_ #define _STATE_NOTIFY_H_ Index: str2filter.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/str2filter.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- str2filter.c 19 Apr 2005 22:07:37 -0000 1.5 +++ str2filter.c 10 Nov 2006 23:45:40 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* slapi_str2filter.c - parse an rfc 1588 string filter */ #include Index: strdup.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/strdup.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- strdup.c 19 Apr 2005 22:07:37 -0000 1.4 +++ strdup.c 10 Nov 2006 23:45:40 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #if defined( ultrix ) || defined( nextstep ) #include Index: stubrepl.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/stubrepl.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- stubrepl.c 1 Sep 2006 21:25:08 -0000 1.5 +++ stubrepl.c 10 Nov 2006 23:45:40 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* stubrepl.c - stubs of functions required for the evil stuff in the tools directory */ #include "slap.h" Index: stubs.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/stubs.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- stubs.c 19 Apr 2005 22:07:37 -0000 1.4 +++ stubs.c 10 Nov 2006 23:45:40 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* Needed because not all functions are currently defined for server3_branch */ #include Index: subentry.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/subentry.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- subentry.c 19 Apr 2005 22:07:37 -0000 1.4 +++ subentry.c 10 Nov 2006 23:45:40 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* Code to implement subentries */ Index: task.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/task.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- task.c 10 Nov 2006 01:13:47 -0000 1.8 +++ task.c 10 Nov 2006 23:45:40 -0000 1.9 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * directory online tasks (import, export, backup, restore) */ Index: tempnam.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tempnam.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- tempnam.c 19 Apr 2005 22:07:37 -0000 1.4 +++ tempnam.c 10 Nov 2006 23:45:40 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #if defined( nextstep ) #include Index: time.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/time.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- time.c 19 Apr 2005 22:07:37 -0000 1.5 +++ time.c 10 Nov 2006 23:45:40 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* time.c - various time routines */ #include Index: unbind.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/unbind.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- unbind.c 19 Apr 2005 22:07:37 -0000 1.4 +++ unbind.c 10 Nov 2006 23:45:40 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* unbind.c - decode an ldap unbind operation and pass it to a backend db */ /* Index: uniqueid.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/uniqueid.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- uniqueid.c 19 Apr 2005 22:07:37 -0000 1.4 +++ uniqueid.c 10 Nov 2006 23:45:40 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* uniqueid.c implementation of entryid functionality */ #include Index: uniqueidgen.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/uniqueidgen.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- uniqueidgen.c 19 Apr 2005 22:07:37 -0000 1.4 +++ uniqueidgen.c 10 Nov 2006 23:45:40 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* uniqueidgen.c - implementation for uniqueID generator */ #include Index: utf8compare.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/utf8compare.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- utf8compare.c 19 Apr 2005 22:07:37 -0000 1.4 +++ utf8compare.c 10 Nov 2006 23:45:40 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include #include #include Index: util.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/util.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- util.c 24 Aug 2006 00:03:19 -0000 1.12 +++ util.c 10 Nov 2006 23:45:40 -0000 1.13 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* util.c -- utility functions -- functions available form libslapd */ #ifdef _WIN32 #include /* for getcwd */ Index: uuid.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/uuid.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- uuid.c 19 Apr 2005 22:07:37 -0000 1.5 +++ uuid.c 10 Nov 2006 23:45:40 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* uuid.c */ /* Index: uuid.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/uuid.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- uuid.h 19 Apr 2005 22:07:37 -0000 1.4 +++ uuid.h 10 Nov 2006 23:45:40 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* uuid.h - interface to uuid layer. UUID is generated in accordance with UUIDs and GUIDs IETF draft */ Index: value.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/value.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- value.c 6 Nov 2006 20:51:31 -0000 1.5 +++ value.c 10 Nov 2006 23:45:40 -0000 1.6 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* value.c - routines for dealing with values */ #undef DEBUG /* disable counters */ Index: vattr.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/vattr.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- vattr.c 19 Apr 2005 22:07:37 -0000 1.5 +++ vattr.c 10 Nov 2006 23:45:40 -0000 1.6 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* Virtual Attributes Index: vattr_spi.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/vattr_spi.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- vattr_spi.h 19 Apr 2005 22:07:37 -0000 1.4 +++ vattr_spi.h 10 Nov 2006 23:45:40 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* Defines the vattr SPI interface, used by COS and Roles at present */ /* Also needs to be included by any code which participates in the vattr loop detection scheme (e.g. filter test code) Index: views.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/views.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- views.h 19 Apr 2005 22:07:37 -0000 1.4 +++ views.h 10 Nov 2006 23:45:40 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #ifndef _VIEWS_H_ #define _VIEWS_H_ Index: slapi-private.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/slapi-private.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- slapi-private.h 10 Nov 2006 01:13:47 -0000 1.13 +++ slapi-private.h 10 Nov 2006 23:45:40 -0000 1.14 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* slapi-private.h - external header file for some special plugins */ #ifndef _SLAPISTATE Index: ssl.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/ssl.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ssl.c 10 Nov 2006 01:10:57 -0000 1.10 +++ ssl.c 10 Nov 2006 23:45:40 -0000 1.11 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* SSL-related stuff for slapd */ #if defined( _WINDOWS ) Index: proto-slap.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/proto-slap.h,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- proto-slap.h 6 Nov 2006 20:51:31 -0000 1.24 +++ proto-slap.h 10 Nov 2006 23:45:40 -0000 1.25 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef _PROTO_SLAP #define _PROTO_SLAP Index: valueset.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/valueset.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- valueset.c 6 Nov 2006 20:51:31 -0000 1.6 +++ valueset.c 10 Nov 2006 23:45:40 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* valueset.c - routines for dealing with value sets */ #include "slap.h" From fedora-directory-commits at redhat.com Fri Nov 10 23:45:45 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:45:45 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/ntmsgdll ntslapdmessages.c, 1.4, 1.5 Message-ID: <200611102346.kAANkFSv032557@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/ntmsgdll In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/servers/slapd/ntmsgdll Modified Files: ntslapdmessages.c Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: ntslapdmessages.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/ntmsgdll/ntslapdmessages.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ntslapdmessages.c 19 Apr 2005 22:07:40 -0000 1.4 +++ ntslapdmessages.c 10 Nov 2006 23:45:43 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* This is the required stub entry point for the message-table DLL */ #if defined( _WIN32 ) #include From fedora-directory-commits at redhat.com Fri Nov 10 23:44:46 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:44:46 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/libraries/liblitekey keycheck.c, 1.5, 1.6 Message-ID: <200611102346.kAANkGlJ032569@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/libraries/liblitekey In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/libraries/liblitekey Modified Files: keycheck.c Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: keycheck.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/libraries/liblitekey/keycheck.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- keycheck.c 19 Apr 2005 22:07:27 -0000 1.5 +++ keycheck.c 10 Nov 2006 23:44:43 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * keycheck.c */ From fedora-directory-commits at redhat.com Fri Nov 10 23:45:11 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:45:11 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/passthru passthru.h, 1.4, 1.5 ptbind.c, 1.4, 1.5 ptconfig.c, 1.5, 1.6 ptconn.c, 1.4, 1.5 ptdebug.c, 1.4, 1.5 ptdllmain.c, 1.5, 1.6 ptpreop.c, 1.5, 1.6 ptutil.c, 1.4, 1.5 Message-ID: <200611102346.kAANkCNM032241@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/passthru In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/servers/plugins/passthru Modified Files: passthru.h ptbind.c ptconfig.c ptconn.c ptdebug.c ptdllmain.c ptpreop.c ptutil.c Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: passthru.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/passthru/passthru.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- passthru.h 19 Apr 2005 22:07:31 -0000 1.4 +++ passthru.h 10 Nov 2006 23:45:04 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * passthru.h - Pass Through Authentication shared definitions * Index: ptbind.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/passthru/ptbind.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ptbind.c 19 Apr 2005 22:07:31 -0000 1.4 +++ ptbind.c 10 Nov 2006 23:45:04 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * ptbind.c - LDAP bind-related code for Pass Through Authentication * Index: ptconfig.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/passthru/ptconfig.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ptconfig.c 19 Apr 2005 22:07:31 -0000 1.5 +++ ptconfig.c 10 Nov 2006 23:45:04 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * ptconfig.c - configuration-related code for Pass Through Authentication * Index: ptconn.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/passthru/ptconn.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ptconn.c 19 Apr 2005 22:07:31 -0000 1.4 +++ ptconn.c 10 Nov 2006 23:45:04 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * ptconn.c - LDAP connection-related code for Pass Through Authentication * Index: ptdebug.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/passthru/ptdebug.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ptdebug.c 19 Apr 2005 22:07:31 -0000 1.4 +++ ptdebug.c 10 Nov 2006 23:45:04 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * ptdebug.c - debugging-related code for Pass Through Authentication * Index: ptdllmain.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/passthru/ptdllmain.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ptdllmain.c 11 Apr 2006 02:14:41 -0000 1.5 +++ ptdllmain.c 10 Nov 2006 23:45:04 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "ldap.h" #include "lber.h" #include "passthru.h" Index: ptpreop.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/passthru/ptpreop.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ptpreop.c 8 Feb 2006 18:59:22 -0000 1.5 +++ ptpreop.c 10 Nov 2006 23:45:04 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * ptpreop.c - bind pre-operation plugin for Pass Through Authentication * Index: ptutil.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/passthru/ptutil.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ptutil.c 19 Apr 2005 22:07:31 -0000 1.4 +++ ptutil.c 10 Nov 2006 23:45:04 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * ptutil.c - utility functions for Pass Through Authentication * From fedora-directory-commits at redhat.com Fri Nov 10 23:46:12 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:46:12 -0700 Subject: [Fedora-directory-commits] ldapserver/lib/libsi18n acclanglist.c, 1.6, 1.7 coreres.c, 1.5, 1.6 coreres.h, 1.5, 1.6 getlang.c, 1.5, 1.6 getstrmem.c, 1.4, 1.5 getstrmem.h, 1.6, 1.7 getstrprop.c, 1.5, 1.6 gsslapd.h, 1.5, 1.6 makstrdb.c, 1.8, 1.9 propset.c, 1.5, 1.6 propset.h, 1.4, 1.5 reshash.c, 1.4, 1.5 reshash.h, 1.4, 1.5 txtfile.c, 1.4, 1.5 txtfile.h, 1.4, 1.5 Message-ID: <200611102346.kAANkCd3032266@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/lib/libsi18n In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/lib/libsi18n Modified Files: acclanglist.c coreres.c coreres.h getlang.c getstrmem.c getstrmem.h getstrprop.c gsslapd.h makstrdb.c propset.c propset.h reshash.c reshash.h txtfile.c txtfile.h Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: acclanglist.c =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libsi18n/acclanglist.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- acclanglist.c 11 Apr 2006 02:14:54 -0000 1.6 +++ acclanglist.c 10 Nov 2006 23:46:05 -0000 1.7 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include #include #include Index: coreres.c =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libsi18n/coreres.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- coreres.c 19 Apr 2005 22:07:54 -0000 1.5 +++ coreres.c 10 Nov 2006 23:46:05 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include #include #include Index: coreres.h =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libsi18n/coreres.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- coreres.h 19 Apr 2005 22:07:54 -0000 1.5 +++ coreres.h 10 Nov 2006 23:46:05 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef CORERES_H #define CORERES_H Index: getlang.c =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libsi18n/getlang.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- getlang.c 19 Apr 2005 22:07:54 -0000 1.5 +++ getlang.c 10 Nov 2006 23:46:05 -0000 1.6 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include #include #include Index: getstrmem.c =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libsi18n/getstrmem.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- getstrmem.c 19 Apr 2005 22:07:54 -0000 1.4 +++ getstrmem.c 10 Nov 2006 23:46:05 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include #include Index: getstrmem.h =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libsi18n/getstrmem.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- getstrmem.h 19 Apr 2005 22:07:54 -0000 1.6 +++ getstrmem.h 10 Nov 2006 23:46:05 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #define BUCKET_MASK NUM_BUCKETS-1 typedef struct DATABIN { char* pLibraryName; Index: getstrprop.c =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libsi18n/getstrprop.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- getstrprop.c 19 Apr 2005 22:07:54 -0000 1.5 +++ getstrprop.c 10 Nov 2006 23:46:05 -0000 1.6 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include #include #include Index: gsslapd.h =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libsi18n/gsslapd.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gsslapd.h 19 Apr 2005 22:07:54 -0000 1.5 +++ gsslapd.h 10 Nov 2006 23:46:05 -0000 1.6 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #define DATABASE_NAME "ns-slapd" #ifdef RESOURCE_STR Index: makstrdb.c =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libsi18n/makstrdb.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- makstrdb.c 10 Nov 2006 01:05:06 -0000 1.8 +++ makstrdb.c 10 Nov 2006 23:46:05 -0000 1.9 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include #include #include Index: propset.c =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libsi18n/propset.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- propset.c 19 Apr 2005 22:07:54 -0000 1.5 +++ propset.c 10 Nov 2006 23:46:05 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include #include #include Index: propset.h =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libsi18n/propset.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- propset.h 19 Apr 2005 22:07:54 -0000 1.4 +++ propset.h 10 Nov 2006 23:46:05 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef PROPSET_H #define PROPSET_H Index: reshash.c =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libsi18n/reshash.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- reshash.c 19 Apr 2005 22:07:54 -0000 1.4 +++ reshash.c 10 Nov 2006 23:46:05 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include #include #include Index: reshash.h =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libsi18n/reshash.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- reshash.h 19 Apr 2005 22:07:54 -0000 1.4 +++ reshash.h 10 Nov 2006 23:46:05 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef RESHASH_H #define RESHASH_H /********************************************************************** Index: txtfile.c =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libsi18n/txtfile.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- txtfile.c 19 Apr 2005 22:07:54 -0000 1.4 +++ txtfile.c 10 Nov 2006 23:46:05 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include #include #include Index: txtfile.h =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libsi18n/txtfile.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- txtfile.h 19 Apr 2005 22:07:54 -0000 1.4 +++ txtfile.h 10 Nov 2006 23:46:05 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef TXTFILE_H #define TXTFILE_H From fedora-directory-commits at redhat.com Fri Nov 10 23:45:12 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:45:12 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/presence dllmain.c, 1.4, 1.5 presence.c, 1.5, 1.6 Message-ID: <200611102346.kAANkCFM032272@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/presence In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/servers/plugins/presence Modified Files: dllmain.c presence.c Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: dllmain.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/presence/dllmain.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dllmain.c 19 Apr 2005 22:07:31 -0000 1.4 +++ dllmain.c 10 Nov 2006 23:45:09 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Microsoft Windows specifics for BACK-LDBM DLL */ Index: presence.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/presence/presence.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- presence.c 11 Apr 2006 02:14:42 -0000 1.5 +++ presence.c 10 Nov 2006 23:45:09 -0000 1.6 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /** * IM Presence plug-in */ From fedora-directory-commits at redhat.com Fri Nov 10 23:45:19 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:45:19 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/replication/tests dnp_sim.c, 1.4, 1.5 dnp_sim2.c, 1.4, 1.5 dnp_sim3.c, 1.4, 1.5 Message-ID: <200611102346.kAANkJge032604@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/tests In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/servers/plugins/replication/tests Modified Files: dnp_sim.c dnp_sim2.c dnp_sim3.c Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: dnp_sim.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/tests/dnp_sim.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dnp_sim.c 19 Apr 2005 22:07:33 -0000 1.4 +++ dnp_sim.c 10 Nov 2006 23:45:16 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* dnp_simulation.c - this file varifies the correctness of dnp algorithm by generating random sequences of operations, applying the algorithm and outputing the result Index: dnp_sim2.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/tests/dnp_sim2.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dnp_sim2.c 19 Apr 2005 22:07:33 -0000 1.4 +++ dnp_sim2.c 10 Nov 2006 23:45:16 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* dnp_simulation.c - this file varifies the correctness of dnp algorithm by generating random sequences of operations, applying the algorithm and outputing the result Index: dnp_sim3.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/tests/dnp_sim3.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dnp_sim3.c 19 Apr 2005 22:07:33 -0000 1.4 +++ dnp_sim3.c 10 Nov 2006 23:45:16 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* dnp_simulation.c - this file varifies the correctness of dnp algorithm by generating random sequences of operations, applying the algorithm and outputing the result From fedora-directory-commits at redhat.com Fri Nov 10 23:45:45 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:45:45 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/libsh_stub libsh_stub.c, 1.4, 1.5 Message-ID: <200611102346.kAANkFDj032526@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/libsh_stub In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/servers/slapd/libsh_stub Modified Files: libsh_stub.c Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: libsh_stub.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/libsh_stub/libsh_stub.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libsh_stub.c 19 Apr 2005 22:07:39 -0000 1.4 +++ libsh_stub.c 10 Nov 2006 23:45:42 -0000 1.5 @@ -36,4 +36,9 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + int MemRegisterTask(void) { return 0; } From fedora-directory-commits at redhat.com Fri Nov 10 23:45:51 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:45:51 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/ntperfdll nsldapctrdef.h, 1.4, 1.5 nsldapctrmc.h, 1.4, 1.5 nsldapctrmsg.h, 1.4, 1.5 nsldapctrs.h, 1.4, 1.5 nsldapctrutil.h, 1.4, 1.5 nsldapctr.cpp, 1.4, 1.5 nsldapctrutil.cpp, 1.4, 1.5 Message-ID: <200611102346.kAANkLnt032696@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/ntperfdll In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/servers/slapd/ntperfdll Modified Files: nsldapctrdef.h nsldapctrmc.h nsldapctrmsg.h nsldapctrs.h nsldapctrutil.h nsldapctr.cpp nsldapctrutil.cpp Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: nsldapctrdef.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/ntperfdll/nsldapctrdef.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nsldapctrdef.h 19 Apr 2005 22:07:40 -0000 1.4 +++ nsldapctrdef.h 10 Nov 2006 23:45:43 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * nsctrdef.h * Index: nsldapctrmc.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/ntperfdll/nsldapctrmc.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nsldapctrmc.h 19 Apr 2005 22:07:40 -0000 1.4 +++ nsldapctrmc.h 10 Nov 2006 23:45:43 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * nsctrs.h */ Index: nsldapctrmsg.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/ntperfdll/nsldapctrmsg.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nsldapctrmsg.h 19 Apr 2005 22:07:40 -0000 1.4 +++ nsldapctrmsg.h 10 Nov 2006 23:45:43 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * nsctrmsg.h * Index: nsldapctrs.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/ntperfdll/nsldapctrs.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nsldapctrs.h 19 Apr 2005 22:07:40 -0000 1.4 +++ nsldapctrs.h 10 Nov 2006 23:45:43 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* nsctrs.h Index: nsldapctrutil.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/ntperfdll/nsldapctrutil.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nsldapctrutil.h 19 Apr 2005 22:07:40 -0000 1.4 +++ nsldapctrutil.h 10 Nov 2006 23:45:43 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /*++ BUILD Version: 0001 // Increment this if a change has global effects Index: nsldapctr.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/ntperfdll/nsldapctr.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nsldapctr.cpp 19 Apr 2005 22:07:40 -0000 1.4 +++ nsldapctr.cpp 10 Nov 2006 23:45:43 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* nsctr.c Index: nsldapctrutil.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/ntperfdll/nsldapctrutil.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nsldapctrutil.cpp 19 Apr 2005 22:07:40 -0000 1.4 +++ nsldapctrutil.cpp 10 Nov 2006 23:45:43 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* nsctrutil.c From fedora-directory-commits at redhat.com Fri Nov 10 23:44:45 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:44:45 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/libraries/libldif fileurl.c, 1.4, 1.5 fileurl.h, 1.4, 1.5 line64.c, 1.5, 1.6 Message-ID: <200611102346.kAANkFKw032560@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/libraries/libldif In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/libraries/libldif Modified Files: fileurl.c fileurl.h line64.c Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: fileurl.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/libraries/libldif/fileurl.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fileurl.c 19 Apr 2005 22:07:26 -0000 1.4 +++ fileurl.c 10 Nov 2006 23:44:43 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * LDIF tools fileurl.c -- functions for handling file URLs. * Used by ldif_parse_line. Index: fileurl.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/libraries/libldif/fileurl.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fileurl.h 19 Apr 2005 22:07:26 -0000 1.4 +++ fileurl.h 10 Nov 2006 23:44:43 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * LDIF tools fileurl.h -- defines for file URL functions. * Used by ldif_parse_line. Index: line64.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/libraries/libldif/line64.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- line64.c 19 Apr 2005 22:07:26 -0000 1.5 +++ line64.c 10 Nov 2006 23:44:43 -0000 1.6 @@ -35,6 +35,11 @@ * All rights reserved. * --- END COPYRIGHT BLOCK --- */ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * The contents of this file are subject to the Netscape Public License From fedora-directory-commits at redhat.com Fri Nov 10 23:44:51 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:44:51 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/libraries/libutil getopt.c, 1.1.1.1, 1.2 ntdebug.c, 1.5, 1.6 ntevent.c, 1.6, 1.7 ntreg.c, 1.4, 1.5 ntresource.h, 1.4, 1.5 ntstubs.c, 1.5, 1.6 Message-ID: <200611102346.kAANkL3J032708@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/libraries/libutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/libraries/libutil Modified Files: getopt.c ntdebug.c ntevent.c ntreg.c ntresource.h ntstubs.c Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: getopt.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/libraries/libutil/getopt.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- getopt.c 21 Jan 2005 00:40:50 -0000 1.1.1.1 +++ getopt.c 10 Nov 2006 23:44:44 -0000 1.2 @@ -17,6 +17,11 @@ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#ifdef HAVE_CONFIG_H +# include +#endif + + #ifdef _WINDOWS #if defined(LIBC_SCCS) && !defined(lint) Index: ntdebug.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/libraries/libutil/ntdebug.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ntdebug.c 19 Apr 2005 22:07:27 -0000 1.5 +++ ntdebug.c 10 Nov 2006 23:44:44 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /****************************************************** * * ntdebug.c - Sends debug output to window and stdout Index: ntevent.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/libraries/libutil/ntevent.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ntevent.c 19 Apr 2005 22:07:27 -0000 1.6 +++ ntevent.c 10 Nov 2006 23:44:44 -0000 1.7 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #ifdef _WIN32 #include Index: ntreg.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/libraries/libutil/ntreg.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ntreg.c 19 Apr 2005 22:07:27 -0000 1.4 +++ ntreg.c 10 Nov 2006 23:44:44 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #ifdef _WIN32 #include Index: ntresource.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/libraries/libutil/ntresource.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ntresource.h 19 Apr 2005 22:07:27 -0000 1.4 +++ ntresource.h 10 Nov 2006 23:44:44 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + //{{NO_DEPENDENCIES}} // Microsoft Developer Studio generated include file. // Used by ntslapd.rc Index: ntstubs.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/libraries/libutil/ntstubs.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ntstubs.c 10 Nov 2006 01:10:51 -0000 1.5 +++ ntstubs.c 10 Nov 2006 23:44:44 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /****************************************************** * * ntstubs.c - Stubs needed on NT when linking in From fedora-directory-commits at redhat.com Fri Nov 10 23:45:13 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:45:13 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/pwdstorage clear_pwd.c, 1.4, 1.5 crypt_pwd.c, 1.5, 1.6 dllmain.c, 1.4, 1.5 md5.h, 1.4, 1.5 md5_pwd.c, 1.1, 1.2 md5c.c, 1.4, 1.5 ns-mta-md5_pwd.c, 1.4, 1.5 pwd_init.c, 1.7, 1.8 pwdstorage.h, 1.8, 1.9 sha_pwd.c, 1.7, 1.8 ssha_pwd.c, 1.8, 1.9 Message-ID: <200611102346.kAANkD3K032347@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/pwdstorage In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/servers/plugins/pwdstorage Modified Files: clear_pwd.c crypt_pwd.c dllmain.c md5.h md5_pwd.c md5c.c ns-mta-md5_pwd.c pwd_init.c pwdstorage.h sha_pwd.c ssha_pwd.c Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: clear_pwd.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/pwdstorage/clear_pwd.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- clear_pwd.c 19 Apr 2005 22:07:31 -0000 1.4 +++ clear_pwd.c 10 Nov 2006 23:45:10 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * slapd hashed password routines * Index: crypt_pwd.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/pwdstorage/crypt_pwd.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- crypt_pwd.c 19 Apr 2005 22:07:31 -0000 1.5 +++ crypt_pwd.c 10 Nov 2006 23:45:10 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * slapd hashed password routines * Index: dllmain.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/pwdstorage/dllmain.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dllmain.c 19 Apr 2005 22:07:31 -0000 1.4 +++ dllmain.c 10 Nov 2006 23:45:10 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Microsoft Windows specifics for LIBPWDSTORAGE DLL Index: md5.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/pwdstorage/md5.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- md5.h 19 Apr 2005 22:07:31 -0000 1.4 +++ md5.h 10 Nov 2006 23:45:10 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * MD5 algorithm used by Netscape Mail Server */ Index: md5_pwd.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/pwdstorage/md5_pwd.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- md5_pwd.c 14 Jun 2005 15:44:19 -0000 1.1 +++ md5_pwd.c 10 Nov 2006 23:45:10 -0000 1.2 @@ -34,6 +34,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * MD5 Password Encryption/Comparison routines by David Irving, Fred Brittain, * and Aaron Gagnon -- University of Maine Farmington Index: md5c.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/pwdstorage/md5c.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- md5c.c 19 Apr 2005 22:07:31 -0000 1.4 +++ md5c.c 10 Nov 2006 23:45:10 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* MD5 code taken from reference implementation published in RFC 1321 */ /* MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm */ Index: ns-mta-md5_pwd.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/pwdstorage/ns-mta-md5_pwd.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ns-mta-md5_pwd.c 19 Apr 2005 22:07:31 -0000 1.4 +++ ns-mta-md5_pwd.c 10 Nov 2006 23:45:10 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * slapd hashed password routines * Index: pwd_init.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/pwdstorage/pwd_init.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- pwd_init.c 6 Sep 2005 21:15:15 -0000 1.7 +++ pwd_init.c 10 Nov 2006 23:45:10 -0000 1.8 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include #include #include Index: pwdstorage.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/pwdstorage/pwdstorage.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- pwdstorage.h 10 Nov 2006 01:10:51 -0000 1.8 +++ pwdstorage.h 10 Nov 2006 23:45:10 -0000 1.9 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef _PWDSTORAGE_H #define _PWDSTORAGE_H Index: sha_pwd.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/pwdstorage/sha_pwd.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sha_pwd.c 10 Nov 2006 01:10:51 -0000 1.7 +++ sha_pwd.c 10 Nov 2006 23:45:10 -0000 1.8 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * slapd hashed password routines * Index: ssha_pwd.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/pwdstorage/ssha_pwd.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ssha_pwd.c 10 Nov 2006 01:10:51 -0000 1.8 +++ ssha_pwd.c 10 Nov 2006 23:45:10 -0000 1.9 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * slapd hashed password routines * From fedora-directory-commits at redhat.com Fri Nov 10 23:44:43 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:44:43 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/cm/newinstnt consolinst.c, 1.6, 1.7 consolinst.h, 1.4, 1.5 dsinst.c, 1.12, 1.13 dsinst.h, 1.5, 1.6 dsinst_dsalib_dn.c, 1.4, 1.5 libinst.c, 1.4, 1.5 libinst.h, 1.4, 1.5 resource.h, 1.5, 1.6 Message-ID: <200611102346.kAANkDQB032387@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/cm/newinstnt In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/cm/newinstnt Modified Files: consolinst.c consolinst.h dsinst.c dsinst.h dsinst_dsalib_dn.c libinst.c libinst.h resource.h Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: consolinst.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinstnt/consolinst.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- consolinst.c 19 Apr 2005 22:07:21 -0000 1.6 +++ consolinst.c 10 Nov 2006 23:44:41 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + ////////////////////////////////////////////////////////////////////////////// // CONSOLINST.c - Fedora Directory Server Installation Plug-In // Index: consolinst.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinstnt/consolinst.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- consolinst.h 19 Apr 2005 22:07:21 -0000 1.4 +++ consolinst.h 10 Nov 2006 23:44:41 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + ////////////////////////////////////////////////////////////////////////////// // CONSOLINST.h - Netscape SuiteSpot Installation Plug-In Directory Server // Index: dsinst.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinstnt/dsinst.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- dsinst.c 2 Sep 2005 20:40:54 -0000 1.12 +++ dsinst.c 10 Nov 2006 23:44:41 -0000 1.13 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /////////////////////////////////////////////////////////////////////////////// // dsinst.c - Fedora Directory Server Installation Plug-In // Index: dsinst.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinstnt/dsinst.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- dsinst.h 19 Apr 2005 22:07:21 -0000 1.5 +++ dsinst.h 10 Nov 2006 23:44:41 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + ////////////////////////////////////////////////////////////////////////////// // dsinst.h - Netscape SuiteSpot Installation Plug-In Directory Server // Index: dsinst_dsalib_dn.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinstnt/dsinst_dsalib_dn.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dsinst_dsalib_dn.c 19 Apr 2005 22:07:21 -0000 1.4 +++ dsinst_dsalib_dn.c 10 Nov 2006 23:44:41 -0000 1.5 @@ -36,4 +36,9 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include Index: libinst.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinstnt/libinst.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libinst.c 19 Apr 2005 22:07:21 -0000 1.4 +++ libinst.c 10 Nov 2006 23:44:41 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "libinst.h" #include Index: libinst.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinstnt/libinst.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libinst.h 19 Apr 2005 22:07:21 -0000 1.4 +++ libinst.h 10 Nov 2006 23:44:41 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + ////////////////////////////////////////////////////////////////////////////// // libinst.h - Netscape SuiteSpot Installation Plug-In Directory Server // Index: resource.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinstnt/resource.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- resource.h 19 Apr 2005 22:07:21 -0000 1.5 +++ resource.h 10 Nov 2006 23:44:41 -0000 1.6 @@ -36,6 +36,11 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- +#ifdef HAVE_CONFIG_H +# include +#endif + + //{{NO_DEPENDENCIES}} // Microsoft Developer Studio generated include file. // Used by dsinst.rc From fedora-directory-commits at redhat.com Fri Nov 10 23:45:54 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:45:54 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/tools/rsearch addthread.c, 1.2, 1.3 addthread.h, 1.2, 1.3 infadd.c, 1.2, 1.3 infadd.h, 1.2, 1.3 main.c, 1.2, 1.3 nametable.c, 1.2, 1.3 nametable.h, 1.2, 1.3 rsearch.c, 1.2, 1.3 rsearch.h, 1.2, 1.3 sdattable.c, 1.2, 1.3 sdattable.h, 1.2, 1.3 searchthread.c, 1.3, 1.4 searchthread.h, 1.2, 1.3 Message-ID: <200611102346.kAANkOvb000311@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/rsearch In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/servers/slapd/tools/rsearch Modified Files: addthread.c addthread.h infadd.c infadd.h main.c nametable.c nametable.h rsearch.c rsearch.h sdattable.c sdattable.h searchthread.c searchthread.h Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: addthread.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/rsearch/addthread.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- addthread.c 11 Jan 2006 02:00:32 -0000 1.2 +++ addthread.c 10 Nov 2006 23:45:51 -0000 1.3 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include #include #include Index: addthread.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/rsearch/addthread.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- addthread.h 11 Jan 2006 02:00:32 -0000 1.2 +++ addthread.h 10 Nov 2006 23:45:51 -0000 1.3 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #ifndef _ADDTHREAD_H #define _ADDTHREAD_H Index: infadd.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/rsearch/infadd.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- infadd.c 11 Jan 2006 02:00:32 -0000 1.2 +++ infadd.c 10 Nov 2006 23:45:51 -0000 1.3 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* * XP port of dboreham's NT tool "infinite_add" * robey, june 1998 @@ -338,8 +343,11 @@ ntot); } if (!quiet && (numThreads > 1 || !verbose)) { - fprintf(stdout, "Average rate:%7.2f, total: %u\n", - (double)total/(double)numThreads, ntotal); + double val = 1000.0 * (double)total / (double)sampleInterval; + fprintf(stdout, "Rate: %7.2f/thr (%6.2f/sec =%7.4fms/op), " + "total: %u (%d thr)\n", + (double)total/(double)numThreads, val, + (double)1000.0/val, ntotal, numThreads); } if (lmtCount && ntotal >= lmtCount) { if (!quiet) { Index: infadd.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/rsearch/infadd.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- infadd.h 11 Jan 2006 02:00:32 -0000 1.2 +++ infadd.h 10 Nov 2006 23:45:51 -0000 1.3 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #ifndef _INFADD_H #define _INFADD_H Index: main.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/rsearch/main.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- main.c 11 Jan 2006 02:00:32 -0000 1.2 +++ main.c 10 Nov 2006 23:45:51 -0000 1.3 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* * this was just easier to start from scratch. windows is too different * from nspr. Index: nametable.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/rsearch/nametable.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nametable.c 11 Jan 2006 02:00:32 -0000 1.2 +++ nametable.c 10 Nov 2006 23:45:51 -0000 1.3 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include #include #include Index: nametable.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/rsearch/nametable.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nametable.h 11 Jan 2006 02:00:32 -0000 1.2 +++ nametable.h 10 Nov 2006 23:45:51 -0000 1.3 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #ifndef _NAMETABLE_H #define _NAMETABLE_H Index: rsearch.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/rsearch/rsearch.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rsearch.c 11 Jan 2006 02:00:32 -0000 1.2 +++ rsearch.c 10 Nov 2006 23:45:51 -0000 1.3 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* * XP port of dboreham's NT tool "repeated_search" * robey, march 1998 Index: rsearch.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/rsearch/rsearch.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rsearch.h 11 Jan 2006 02:00:32 -0000 1.2 +++ rsearch.h 10 Nov 2006 23:45:51 -0000 1.3 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #ifndef _RSEARCH_H #define _RSEARCH_H Index: sdattable.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/rsearch/sdattable.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sdattable.c 11 Jan 2006 02:00:32 -0000 1.2 +++ sdattable.c 10 Nov 2006 23:45:51 -0000 1.3 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include #include #include Index: sdattable.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/rsearch/sdattable.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sdattable.h 11 Jan 2006 02:00:32 -0000 1.2 +++ sdattable.h 10 Nov 2006 23:45:51 -0000 1.3 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #ifndef _SDATTABLE_H #define _SDATTABLE_H Index: searchthread.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/rsearch/searchthread.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- searchthread.c 31 Aug 2006 22:52:13 -0000 1.3 +++ searchthread.c 10 Nov 2006 23:45:51 -0000 1.4 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include #include #include Index: searchthread.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/rsearch/searchthread.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- searchthread.h 11 Jan 2006 02:00:32 -0000 1.2 +++ searchthread.h 10 Nov 2006 23:45:51 -0000 1.3 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #ifndef _SEARCHTHREAD_H #define _SEARCHTHREAD_H From fedora-directory-commits at redhat.com Fri Nov 10 23:45:55 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:45:55 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/snmp/ntagt nslagtcom_nt.h, 1.4, 1.5 nsldapagt_nt.c, 1.8, 1.9 nsldapagt_nt.h, 1.5, 1.6 nsldapmib_nt.c, 1.4, 1.5 nsldapmib_nt.h, 1.4, 1.5 Message-ID: <200611102346.kAANkPPU000325@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/snmp/ntagt In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/servers/snmp/ntagt Modified Files: nslagtcom_nt.h nsldapagt_nt.c nsldapagt_nt.h nsldapmib_nt.c nsldapmib_nt.h Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: nslagtcom_nt.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/snmp/ntagt/nslagtcom_nt.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nslagtcom_nt.h 19 Apr 2005 22:07:43 -0000 1.4 +++ nslagtcom_nt.h 10 Nov 2006 23:45:52 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /*------------------------------------------------------------------------- * * nslagtcom_nt.h - Common definitions for NS Directory Server's SNMP Index: nsldapagt_nt.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/snmp/ntagt/nsldapagt_nt.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- nsldapagt_nt.c 29 Oct 2005 02:28:24 -0000 1.8 +++ nsldapagt_nt.c 10 Nov 2006 23:45:52 -0000 1.9 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /*------------------------------------------------------------------------- * * nsldapagt_nt.c - SNMP Extension Agent for Directory Server on NT. Index: nsldapagt_nt.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/snmp/ntagt/nsldapagt_nt.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- nsldapagt_nt.h 19 Apr 2005 22:07:43 -0000 1.5 +++ nsldapagt_nt.h 10 Nov 2006 23:45:52 -0000 1.6 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /*------------------------------------------------------------------------- * * nsldapagt_nt.h - Definitions for NS Directory Server's SNMP subagent on Index: nsldapmib_nt.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/snmp/ntagt/nsldapmib_nt.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nsldapmib_nt.c 19 Apr 2005 22:07:43 -0000 1.4 +++ nsldapmib_nt.c 10 Nov 2006 23:45:52 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /*------------------------------------------------------------------------- * * nsldapmib_nt.c - NS Directory Server's MIB for extended SNMP agent Index: nsldapmib_nt.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/snmp/ntagt/nsldapmib_nt.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nsldapmib_nt.h 19 Apr 2005 22:07:43 -0000 1.4 +++ nsldapmib_nt.h 10 Nov 2006 23:45:52 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /*------------------------------------------------------------------------- * * nsldapmib_nt.h - Definitions for NS Directory Server's MIB on NT. From fedora-directory-commits at redhat.com Fri Nov 10 23:44:44 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:44:44 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/include avl.h, 1.4, 1.5 dblayer.h, 1.4, 1.5 dirlite_strings.h, 1.6, 1.7 disptmpl.h, 1.4, 1.5 ldaplog.h, 1.5, 1.6 ldaprot.h, 1.4, 1.5 ldbm.h, 1.4, 1.5 ldif.h, 1.4, 1.5 litekey.h, 1.4, 1.5 lthread.h, 1.4, 1.5 ntslapdregparms.h, 1.6, 1.7 ntwatchdog.h, 1.4, 1.5 portable.h, 1.4, 1.5 proto-ntutil.h, 1.6, 1.7 regex.h, 1.5, 1.6 srchpref.h, 1.4, 1.5 sysexits-compat.h, 1.4, 1.5 Message-ID: <200611102346.kAANkEWF032485@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/include In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/include Modified Files: avl.h dblayer.h dirlite_strings.h disptmpl.h ldaplog.h ldaprot.h ldbm.h ldif.h litekey.h lthread.h ntslapdregparms.h ntwatchdog.h portable.h proto-ntutil.h regex.h srchpref.h sysexits-compat.h Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: avl.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/include/avl.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- avl.h 19 Apr 2005 22:07:25 -0000 1.4 +++ avl.h 10 Nov 2006 23:44:41 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* avl.h - avl tree definitions */ /* * Copyright (c) 1993 Regents of the University of Michigan. Index: dblayer.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/include/dblayer.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dblayer.h 19 Apr 2005 22:07:25 -0000 1.4 +++ dblayer.h 10 Nov 2006 23:44:41 -0000 1.5 @@ -36,4 +36,9 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* This file is no longer used */ Index: dirlite_strings.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/include/dirlite_strings.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- dirlite_strings.h 19 Apr 2005 22:07:25 -0000 1.6 +++ dirlite_strings.h 10 Nov 2006 23:44:41 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* dirlite_strings.h - strings used for Directory Lite */ #ifndef _DIRLITE_STRINGS_H_ #define _DIRLITE_STRINGS_H_ Index: disptmpl.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/include/disptmpl.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- disptmpl.h 19 Apr 2005 22:07:25 -0000 1.4 +++ disptmpl.h 10 Nov 2006 23:44:41 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Copyright (c) 1993, 1994 Regents of the University of Michigan. * All rights reserved. Index: ldaplog.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/include/ldaplog.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ldaplog.h 19 Apr 2005 22:07:25 -0000 1.5 +++ ldaplog.h 10 Nov 2006 23:44:41 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef _LDAPLOG_H #define _LDAPLOG_H Index: ldaprot.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/include/ldaprot.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ldaprot.h 19 Apr 2005 22:07:25 -0000 1.4 +++ ldaprot.h 10 Nov 2006 23:44:41 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef _LDAPROT_H #define _LDAPROT_H Index: ldbm.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/include/ldbm.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ldbm.h 19 Apr 2005 22:07:25 -0000 1.4 +++ ldbm.h 10 Nov 2006 23:44:41 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* ldbm.h - ldap dbm compatibility routine header file */ #error "Hmm, shoudn't be here" Index: ldif.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/include/ldif.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ldif.h 19 Apr 2005 22:07:25 -0000 1.4 +++ ldif.h 10 Nov 2006 23:44:41 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Copyright (c) 1996 Regents of the University of Michigan. * All rights reserved. Index: litekey.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/include/litekey.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- litekey.h 19 Apr 2005 22:07:25 -0000 1.4 +++ litekey.h 10 Nov 2006 23:44:41 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Defines function used to determine the type of DS based on the * key. Index: lthread.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/include/lthread.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- lthread.h 19 Apr 2005 22:07:25 -0000 1.4 +++ lthread.h 10 Nov 2006 23:44:41 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* lthread.h - ldap threads header file */ #ifndef _LTHREAD_H Index: ntslapdregparms.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/include/ntslapdregparms.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ntslapdregparms.h 19 Apr 2005 22:07:25 -0000 1.6 +++ ntslapdregparms.h 10 Nov 2006 23:44:41 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /****************************************************** * * Index: ntwatchdog.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/include/ntwatchdog.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ntwatchdog.h 19 Apr 2005 22:07:25 -0000 1.4 +++ ntwatchdog.h 10 Nov 2006 23:44:41 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /****************************************************** * * Index: portable.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/include/portable.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- portable.h 19 Apr 2005 22:07:25 -0000 1.4 +++ portable.h 10 Nov 2006 23:44:41 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Copyright (c) 1994 Regents of the University of Michigan. * All rights reserved. Index: proto-ntutil.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/include/proto-ntutil.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- proto-ntutil.h 10 Nov 2006 01:10:45 -0000 1.6 +++ proto-ntutil.h 10 Nov 2006 23:44:41 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /****************************************************** * * Index: regex.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/include/regex.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- regex.h 19 Apr 2005 22:07:25 -0000 1.5 +++ regex.h 10 Nov 2006 23:44:41 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #if defined( macintosh ) || defined( DOS ) || defined( _WINDOWS ) || defined( NEED_BSDREGEX ) /* * Copyright (c) 1993 Regents of the University of Michigan. Index: srchpref.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/include/srchpref.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- srchpref.h 19 Apr 2005 22:07:25 -0000 1.4 +++ srchpref.h 10 Nov 2006 23:44:41 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Copyright (c) 1993, 1994 Regents of the University of Michigan. * All rights reserved. Index: sysexits-compat.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/include/sysexits-compat.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sysexits-compat.h 19 Apr 2005 22:07:25 -0000 1.4 +++ sysexits-compat.h 10 Nov 2006 23:44:41 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Copyright (c) 1987 Regents of the University of California. * All rights reserved. From fedora-directory-commits at redhat.com Fri Nov 10 23:45:25 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:45:25 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/retrocl dllmain.c, 1.4, 1.5 linktest.c, 1.4, 1.5 retrocl.c, 1.5, 1.6 retrocl.h, 1.5, 1.6 retrocl_cn.c, 1.4, 1.5 retrocl_create.c, 1.4, 1.5 retrocl_po.c, 1.5, 1.6 retrocl_rootdse.c, 1.4, 1.5 retrocl_trim.c, 1.6, 1.7 Message-ID: <200611102346.kAANkP01000334@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/retrocl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/servers/plugins/retrocl Modified Files: dllmain.c linktest.c retrocl.c retrocl.h retrocl_cn.c retrocl_create.c retrocl_po.c retrocl_rootdse.c retrocl_trim.c Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: dllmain.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/retrocl/dllmain.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dllmain.c 19 Apr 2005 22:07:34 -0000 1.4 +++ dllmain.c 10 Nov 2006 23:45:18 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Microsoft Windows specifics for LIBRETROCL DLL */ Index: linktest.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/retrocl/linktest.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- linktest.c 19 Apr 2005 22:07:34 -0000 1.4 +++ linktest.c 10 Nov 2006 23:45:18 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* This is a test program. Not linked into the shared library */ #include "retrocl.h" Index: retrocl.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/retrocl/retrocl.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- retrocl.c 19 Apr 2005 22:07:34 -0000 1.5 +++ retrocl.c 10 Nov 2006 23:45:18 -0000 1.6 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* * Requires that create_instance.c have added a plugin entry similar to: Index: retrocl.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/retrocl/retrocl.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- retrocl.h 19 Apr 2005 22:07:34 -0000 1.5 +++ retrocl.h 10 Nov 2006 23:45:18 -0000 1.6 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #ifndef _H_RETROCL #define _H_RETROCL 1 Index: retrocl_cn.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/retrocl/retrocl_cn.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- retrocl_cn.c 19 Apr 2005 22:07:34 -0000 1.4 +++ retrocl_cn.c 10 Nov 2006 23:45:18 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include "retrocl.h" static changeNumber retrocl_internal_cn = 0; Index: retrocl_create.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/retrocl/retrocl_create.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- retrocl_create.c 19 Apr 2005 22:07:34 -0000 1.4 +++ retrocl_create.c 10 Nov 2006 23:45:18 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include "retrocl.h" /* Index: retrocl_po.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/retrocl/retrocl_po.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- retrocl_po.c 19 Apr 2005 22:07:34 -0000 1.5 +++ retrocl_po.c 10 Nov 2006 23:45:18 -0000 1.6 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include "retrocl.h" static int Index: retrocl_rootdse.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/retrocl/retrocl_rootdse.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- retrocl_rootdse.c 19 Apr 2005 22:07:34 -0000 1.4 +++ retrocl_rootdse.c 10 Nov 2006 23:45:18 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include "retrocl.h" Index: retrocl_trim.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/retrocl/retrocl_trim.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- retrocl_trim.c 19 Apr 2005 22:07:34 -0000 1.6 +++ retrocl_trim.c 10 Nov 2006 23:45:18 -0000 1.7 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include "retrocl.h" From fedora-directory-commits at redhat.com Fri Nov 10 23:45:20 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:45:20 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/replication cl4.h, 1.4, 1.5 cl4_api.c, 1.5, 1.6 cl4_api.h, 1.4, 1.5 cl4_init.c, 1.4, 1.5 cl5.h, 1.4, 1.5 cl5_api.c, 1.10, 1.11 cl5_api.h, 1.5, 1.6 cl5_clcache.c, 1.6, 1.7 cl5_clcache.h, 1.4, 1.5 cl5_config.c, 1.5, 1.6 cl5_init.c, 1.4, 1.5 cl5_test.c, 1.5, 1.6 cl5_test.h, 1.4, 1.5 csnpl.c, 1.4, 1.5 csnpl.h, 1.4, 1.5 dllmain.c, 1.4, 1.5 legacy_consumer.c, 1.5, 1.6 llist.c, 1.4, 1.5 llist.h, 1.4, 1.5 profile.c, 1.5, 1.6 repl.h, 1.6, 1.7 repl5.h, 1.8, 1.9 repl5_agmt.c, 1.10, 1.11 repl5_agmtlist.c, 1.10, 1.11 repl5_backoff.c, 1.4, 1.5 repl5_connection.c, 1.6, 1.7 repl5_inc_protocol.c, 1.9, 1.10 repl5_init.c, 1.6, 1.7 repl5_mtnode_ext.c, 1.5, 1.6 repl5_plugins.c, 1.6, 1.7 repl5_prot_private.h, 1.6, 1.7 repl5_protocol.c, 1.7, 1.8 repl5_protocol_util.c, 1.8, 1.9 repl5_replica.c, 1.13, 1.14 repl5_replica_config.c, 1.6, 1.7 repl5_replica_dnhash.c, 1.4, 1.5 repl5_replica_hash.c, 1.4, 1.5 repl5_replsupplier.c, 1.4, 1.5 repl5_ruv.c, 1.9, 1.10 repl5_ruv.h, 1.7, 1.8 repl5_schedule.c, 1.5, 1.6 repl5_tot_protocol.c, 1.8, 1.9 repl5_to! tal.c, 1.8, 1.9 repl5_updatedn_list.c, 1.4, 1.5 repl_add.c, 1.4, 1.5 repl_bind.c, 1.5, 1.6 repl_compare.c, 1.4, 1.5 repl_connext.c, 1.5, 1.6 repl_controls.c, 1.7, 1.8 repl_delete.c, 1.4, 1.5 repl_entry.c, 1.4, 1.5 repl_ext.c, 1.4, 1.5 repl_extop.c, 1.10, 1.11 repl_globals.c, 1.6, 1.7 repl_helper.c, 1.4, 1.5 repl_helper.h, 1.4, 1.5 repl_init.c, 1.5, 1.6 repl_modify.c, 1.4, 1.5 repl_modrdn.c, 1.4, 1.5 repl_monitor.c, 1.5, 1.6 repl_objset.c, 1.4, 1.5 repl_objset.h, 1.4, 1.5 repl_opext.c, 1.5, 1.6 repl_ops.c, 1.5, 1.6 repl_rootdse.c, 1.4, 1.5 repl_search.c, 1.4, 1.5 repl_shared.h, 1.5, 1.6 replutil.c, 1.8, 1.9 urp.c, 1.5, 1.6 urp.h, 1.4, 1.5 urp_glue.c, 1.5, 1.6 urp_tombstone.c, 1.4, 1.5 windows_connection.c, 1.14, 1.15 windows_inc_protocol.c, 1.12, 1.13 windows_private.c, 1.13, 1.14 windows_prot_private.h, 1.6, 1.7 windows_protocol_util.c, 1.26, 1.27 windows_tot_protocol.c, 1.8, 1.9 windowsrepl.h, 1.8, 1.9 Message-ID: <200611102346.kAANkKSh032606@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/replication In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/servers/plugins/replication Modified Files: cl4.h cl4_api.c cl4_api.h cl4_init.c cl5.h cl5_api.c cl5_api.h cl5_clcache.c cl5_clcache.h cl5_config.c cl5_init.c cl5_test.c cl5_test.h csnpl.c csnpl.h dllmain.c legacy_consumer.c llist.c llist.h profile.c repl.h repl5.h repl5_agmt.c repl5_agmtlist.c repl5_backoff.c repl5_connection.c repl5_inc_protocol.c repl5_init.c repl5_mtnode_ext.c repl5_plugins.c repl5_prot_private.h repl5_protocol.c repl5_protocol_util.c repl5_replica.c repl5_replica_config.c repl5_replica_dnhash.c repl5_replica_hash.c repl5_replsupplier.c repl5_ruv.c repl5_ruv.h repl5_schedule.c repl5_tot_protocol.c repl5_total.c repl5_updatedn_list.c repl_add.c repl_bind.c repl_compare.c repl_connext.c repl_controls.c repl_delete.c repl_entry.c repl_ext.c repl_extop.c repl_globals.c repl_helper.c repl_helper.h repl_init.c repl_modify.c repl_modrdn.c repl_monitor.c repl_objset.c repl_objset.h repl_opext.c repl_ops.c repl_rootdse.c repl_search.c repl_shared.h replutil.c urp.c urp.h urp_glue.c urp_tombstone.c windows_connection.c windows_inc_protocol.c windows_private.c windows_prot_private.h windows_protocol_util.c windows_tot_protocol.c windowsrepl.h Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: cl4.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/cl4.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cl4.h 19 Apr 2005 22:07:32 -0000 1.4 +++ cl4.h 10 Nov 2006 23:45:17 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* cl4.h - global declarations used by the 4.0 style changelog module */ Index: cl4_api.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/cl4_api.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- cl4_api.c 19 Apr 2005 22:07:32 -0000 1.5 +++ cl4_api.c 10 Nov 2006 23:45:17 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* cl4_api.h - implementation of the minimal interface to 4.0 changelog necessary to link 4.0 changelog to 5.0 replication */ Index: cl4_api.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/cl4_api.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cl4_api.h 19 Apr 2005 22:07:32 -0000 1.4 +++ cl4_api.h 10 Nov 2006 23:45:17 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* cl4_api.h - minimal interface to 4.0 changelog necessary to link 4.0 changelog to 5.0 replication */ Index: cl4_init.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/cl4_init.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cl4_init.c 19 Apr 2005 22:07:32 -0000 1.4 +++ cl4_init.c 10 Nov 2006 23:45:17 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* cl4_init.c - implments initialization/cleanup functions for 4.0 style changelog */ Index: cl5.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/cl5.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cl5.h 19 Apr 2005 22:07:32 -0000 1.4 +++ cl5.h 10 Nov 2006 23:45:17 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* cl5.h - changelog related function */ #ifndef CL5_H Index: cl5_api.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/cl5_api.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- cl5_api.c 11 Apr 2006 02:14:42 -0000 1.10 +++ cl5_api.c 10 Nov 2006 23:45:17 -0000 1.11 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* cl5_api.c - implementation of 5.0 style changelog API */ #include Index: cl5_api.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/cl5_api.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- cl5_api.h 19 Apr 2005 22:07:32 -0000 1.5 +++ cl5_api.h 10 Nov 2006 23:45:17 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* cl5_api.h - interface to 5.0 changelog */ #ifndef CL5_API_H Index: cl5_clcache.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/cl5_clcache.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- cl5_clcache.c 29 Nov 2005 22:19:25 -0000 1.6 +++ cl5_clcache.c 10 Nov 2006 23:45:17 -0000 1.7 @@ -35,6 +35,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include "errno.h" /* ENOMEM, EVAL used by Berkeley DB */ #include "db.h" /* Berkeley DB */ #include "cl5.h" /* changelog5Config */ Index: cl5_clcache.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/cl5_clcache.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cl5_clcache.h 19 Apr 2005 22:07:32 -0000 1.4 +++ cl5_clcache.h 10 Nov 2006 23:45:17 -0000 1.5 @@ -39,6 +39,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include "db.h" #include "slapi-private.h" Index: cl5_config.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/cl5_config.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- cl5_config.c 19 Apr 2005 22:07:32 -0000 1.5 +++ cl5_config.c 10 Nov 2006 23:45:17 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* cl5_config.c - functions to process changelog configuration */ Index: cl5_init.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/cl5_init.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cl5_init.c 19 Apr 2005 22:07:32 -0000 1.4 +++ cl5_init.c 10 Nov 2006 23:45:17 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* cl5_init.c - implments initialization/cleanup functions for 4.0 style changelog */ Index: cl5_test.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/cl5_test.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- cl5_test.c 19 Apr 2005 22:07:32 -0000 1.5 +++ cl5_test.c 10 Nov 2006 23:45:17 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* cl5_test.c - changelog test cases */ #include "cl5_test.h" #include "slapi-plugin.h" Index: cl5_test.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/cl5_test.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cl5_test.h 19 Apr 2005 22:07:32 -0000 1.4 +++ cl5_test.h 10 Nov 2006 23:45:17 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* cl5_test.h - changelog test cases */ typedef enum Index: csnpl.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/csnpl.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- csnpl.c 19 Apr 2005 22:07:32 -0000 1.4 +++ csnpl.c 10 Nov 2006 23:45:17 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include "csnpl.h" #include "llist.h" #include "repl_shared.h" Index: csnpl.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/csnpl.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- csnpl.h 19 Apr 2005 22:07:32 -0000 1.4 +++ csnpl.h 10 Nov 2006 23:45:17 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* csnpl.h - interface for csn pending list */ #ifndef CSNPL_H Index: dllmain.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/dllmain.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dllmain.c 19 Apr 2005 22:07:32 -0000 1.4 +++ dllmain.c 10 Nov 2006 23:45:17 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Microsoft Windows specifics for LIBREPLICATION DLL Index: legacy_consumer.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/legacy_consumer.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- legacy_consumer.c 19 Apr 2005 22:07:32 -0000 1.5 +++ legacy_consumer.c 10 Nov 2006 23:45:17 -0000 1.6 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* * repl_legacy_consumer.c - support for legacy replication (consumer-side) * Index: llist.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/llist.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- llist.c 19 Apr 2005 22:07:32 -0000 1.4 +++ llist.c 10 Nov 2006 23:45:17 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* llist.c - single link list implementation */ #include Index: llist.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/llist.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- llist.h 19 Apr 2005 22:07:32 -0000 1.4 +++ llist.h 10 Nov 2006 23:45:17 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* llist.h - single link list interface */ #ifndef LLIST_H Index: profile.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/profile.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- profile.c 19 Apr 2005 22:07:32 -0000 1.5 +++ profile.c 10 Nov 2006 23:45:17 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "slapi-plugin.h" #include "repl.h" Index: repl.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- repl.h 11 Apr 2006 02:14:42 -0000 1.6 +++ repl.h 10 Nov 2006 23:45:17 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef _REPL_H_ #define _REPL_H_ Index: repl5.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl5.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- repl5.h 6 May 2005 03:35:52 -0000 1.8 +++ repl5.h 10 Nov 2006 23:45:17 -0000 1.9 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* repl5.h - 5.0 replication header */ #ifndef _REPL5_H_ Index: repl5_agmt.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl5_agmt.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- repl5_agmt.c 20 May 2005 03:57:34 -0000 1.10 +++ repl5_agmt.c 10 Nov 2006 23:45:17 -0000 1.11 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* repl5_agmt.c */ /* Index: repl5_agmtlist.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl5_agmtlist.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- repl5_agmtlist.c 20 May 2005 03:57:34 -0000 1.10 +++ repl5_agmtlist.c 10 Nov 2006 23:45:17 -0000 1.11 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* repl5_agmtlist.c */ /* Index: repl5_backoff.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl5_backoff.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- repl5_backoff.c 19 Apr 2005 22:07:32 -0000 1.4 +++ repl5_backoff.c 10 Nov 2006 23:45:17 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* repl5_backoff.c */ /* Index: repl5_connection.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl5_connection.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- repl5_connection.c 19 Apr 2005 22:07:32 -0000 1.6 +++ repl5_connection.c 10 Nov 2006 23:45:17 -0000 1.7 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* repl5_connection.c */ /* Index: repl5_inc_protocol.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl5_inc_protocol.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- repl5_inc_protocol.c 11 Apr 2006 02:14:42 -0000 1.9 +++ repl5_inc_protocol.c 10 Nov 2006 23:45:17 -0000 1.10 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* repl5_inc_protocol.c */ /* Index: repl5_init.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl5_init.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- repl5_init.c 19 Apr 2005 22:07:32 -0000 1.6 +++ repl5_init.c 10 Nov 2006 23:45:17 -0000 1.7 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* repl5_init.c - plugin initialization functions */ Index: repl5_mtnode_ext.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl5_mtnode_ext.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- repl5_mtnode_ext.c 19 Apr 2005 22:07:32 -0000 1.5 +++ repl5_mtnode_ext.c 10 Nov 2006 23:45:17 -0000 1.6 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* repl5_replica.c */ #include "repl.h" /* ONREPL - this is bad */ Index: repl5_plugins.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl5_plugins.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- repl5_plugins.c 19 Apr 2005 22:07:32 -0000 1.6 +++ repl5_plugins.c 10 Nov 2006 23:45:17 -0000 1.7 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* * repl5_consumer.c - consumer plugin functions */ Index: repl5_prot_private.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl5_prot_private.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- repl5_prot_private.h 19 Apr 2005 22:07:32 -0000 1.6 +++ repl5_prot_private.h 10 Nov 2006 23:45:17 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef _REPL5_PROT_PRIVATE_H_ #define _REPL5_PROT_PRIVATE_H_ Index: repl5_protocol.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl5_protocol.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- repl5_protocol.c 19 Apr 2005 22:07:32 -0000 1.7 +++ repl5_protocol.c 10 Nov 2006 23:45:17 -0000 1.8 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* repl5_protocol.c */ /* Index: repl5_protocol_util.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl5_protocol_util.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- repl5_protocol_util.c 18 May 2005 03:17:33 -0000 1.8 +++ repl5_protocol_util.c 10 Nov 2006 23:45:17 -0000 1.9 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* repl5_protocol_util.c */ /* Index: repl5_replica.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl5_replica.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- repl5_replica.c 11 Apr 2006 02:14:43 -0000 1.13 +++ repl5_replica.c 10 Nov 2006 23:45:17 -0000 1.14 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* repl5_replica.c */ #include "slapi-plugin.h" Index: repl5_replica_config.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl5_replica_config.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- repl5_replica_config.c 19 Apr 2005 22:07:32 -0000 1.6 +++ repl5_replica_config.c 10 Nov 2006 23:45:17 -0000 1.7 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* repl5_replica_config.c - replica configuration over ldap */ #include /* for isdigit() */ #include "repl.h" /* ONREPL - this is bad */ Index: repl5_replica_dnhash.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl5_replica_dnhash.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- repl5_replica_dnhash.c 19 Apr 2005 22:07:32 -0000 1.4 +++ repl5_replica_dnhash.c 10 Nov 2006 23:45:17 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* repl5_replica_dnhash.c */ #include "repl5.h" Index: repl5_replica_hash.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl5_replica_hash.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- repl5_replica_hash.c 19 Apr 2005 22:07:32 -0000 1.4 +++ repl5_replica_hash.c 10 Nov 2006 23:45:17 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* repl5_replica_hash.c */ #include "repl5.h" Index: repl5_replsupplier.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl5_replsupplier.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- repl5_replsupplier.c 19 Apr 2005 22:07:32 -0000 1.4 +++ repl5_replsupplier.c 10 Nov 2006 23:45:17 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* repl5_replsupplier.c */ /* Index: repl5_ruv.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl5_ruv.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- repl5_ruv.c 6 May 2005 03:33:36 -0000 1.9 +++ repl5_ruv.c 10 Nov 2006 23:45:17 -0000 1.10 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* repl5_ruv.c - implementation of replica update vector */ /* * The replica update vector is stored in the nsds50ruv attribute. The LDIF Index: repl5_ruv.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl5_ruv.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- repl5_ruv.h 6 May 2005 03:33:36 -0000 1.7 +++ repl5_ruv.h 10 Nov 2006 23:45:17 -0000 1.8 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* repl5_ruv.h - interface for replica update vector */ #ifndef REPL5_RUV Index: repl5_schedule.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl5_schedule.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- repl5_schedule.c 19 Apr 2005 22:07:32 -0000 1.5 +++ repl5_schedule.c 10 Nov 2006 23:45:17 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* repl5_schedule.c */ /* Index: repl5_tot_protocol.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl5_tot_protocol.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- repl5_tot_protocol.c 11 Apr 2006 02:14:43 -0000 1.8 +++ repl5_tot_protocol.c 10 Nov 2006 23:45:17 -0000 1.9 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* repl5_tot_protocol.c */ /* Index: repl5_total.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl5_total.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- repl5_total.c 1 Sep 2006 21:25:07 -0000 1.8 +++ repl5_total.c 10 Nov 2006 23:45:17 -0000 1.9 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* repl5_total.c - code that implements a total replica update. Index: repl5_updatedn_list.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl5_updatedn_list.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- repl5_updatedn_list.c 19 Apr 2005 22:07:32 -0000 1.4 +++ repl5_updatedn_list.c 10 Nov 2006 23:45:17 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* repl5_updatedn_list.c */ /* Index: repl_add.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl_add.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- repl_add.c 19 Apr 2005 22:07:32 -0000 1.4 +++ repl_add.c 10 Nov 2006 23:45:17 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "slapi-plugin.h" #include "repl.h" Index: repl_bind.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl_bind.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- repl_bind.c 19 Apr 2005 22:07:32 -0000 1.5 +++ repl_bind.c 10 Nov 2006 23:45:17 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "slapi-plugin.h" Index: repl_compare.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl_compare.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- repl_compare.c 19 Apr 2005 22:07:32 -0000 1.4 +++ repl_compare.c 10 Nov 2006 23:45:17 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "slapi-plugin.h" #include "repl.h" Index: repl_connext.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl_connext.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- repl_connext.c 19 Apr 2005 22:07:32 -0000 1.5 +++ repl_connext.c 10 Nov 2006 23:45:17 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* repl_connext.c - replication extension to the Connection object */ Index: repl_controls.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl_controls.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- repl_controls.c 31 Aug 2006 22:52:07 -0000 1.7 +++ repl_controls.c 10 Nov 2006 23:45:17 -0000 1.8 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include "slapi-plugin.h" #include "repl5.h" #include "repl.h" /* For LDAP_CONTROL_REPL_MODRDN_EXTRAMODS */ Index: repl_delete.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl_delete.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- repl_delete.c 19 Apr 2005 22:07:32 -0000 1.4 +++ repl_delete.c 10 Nov 2006 23:45:17 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "slapi-plugin.h" #include "repl.h" Index: repl_entry.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl_entry.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- repl_entry.c 19 Apr 2005 22:07:32 -0000 1.4 +++ repl_entry.c 10 Nov 2006 23:45:17 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "slapi-plugin.h" #include "repl.h" Index: repl_ext.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl_ext.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- repl_ext.c 19 Apr 2005 22:07:32 -0000 1.4 +++ repl_ext.c 10 Nov 2006 23:45:17 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* repl_ext.c - manages operation extensions created by the * replication system */ Index: repl_extop.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl_extop.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- repl_extop.c 1 Sep 2006 21:25:07 -0000 1.10 +++ repl_extop.c 10 Nov 2006 23:45:17 -0000 1.11 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "slapi-plugin.h" #include "repl.h" Index: repl_globals.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl_globals.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- repl_globals.c 19 Apr 2005 22:07:32 -0000 1.6 +++ repl_globals.c 10 Nov 2006 23:45:17 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "nspr.h" #include "repl.h" Index: repl_helper.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl_helper.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- repl_helper.c 19 Apr 2005 22:07:32 -0000 1.4 +++ repl_helper.c 10 Nov 2006 23:45:17 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "repl_helper.h" ReplGenericList * Index: repl_helper.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl_helper.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- repl_helper.h 19 Apr 2005 22:07:32 -0000 1.4 +++ repl_helper.h 10 Nov 2006 23:45:17 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * repl_helper.h - Helper functions (should actually be repl_utils.h) * Index: repl_init.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl_init.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- repl_init.c 19 Apr 2005 22:07:32 -0000 1.5 +++ repl_init.c 10 Nov 2006 23:45:17 -0000 1.6 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* * Add an entry like the following to dse.ldif to enable this plugin: Index: repl_modify.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl_modify.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- repl_modify.c 19 Apr 2005 22:07:32 -0000 1.4 +++ repl_modify.c 10 Nov 2006 23:45:17 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "slapi-plugin.h" #include "repl.h" Index: repl_modrdn.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl_modrdn.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- repl_modrdn.c 19 Apr 2005 22:07:33 -0000 1.4 +++ repl_modrdn.c 10 Nov 2006 23:45:17 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "slapi-plugin.h" #include "repl.h" Index: repl_monitor.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl_monitor.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- repl_monitor.c 19 Apr 2005 22:07:33 -0000 1.5 +++ repl_monitor.c 10 Nov 2006 23:45:17 -0000 1.6 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include #include "repl.h" Index: repl_objset.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl_objset.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- repl_objset.c 19 Apr 2005 22:07:33 -0000 1.4 +++ repl_objset.c 10 Nov 2006 23:45:17 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* repl_objset.c */ /* * Support for lifetime management of sets of objects. Index: repl_objset.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl_objset.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- repl_objset.h 19 Apr 2005 22:07:33 -0000 1.4 +++ repl_objset.h 10 Nov 2006 23:45:17 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* */ Index: repl_opext.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl_opext.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- repl_opext.c 19 Apr 2005 22:07:33 -0000 1.5 +++ repl_opext.c 10 Nov 2006 23:45:17 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* supplier_operation_extension.c - replication extension to the Operation object */ Index: repl_ops.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl_ops.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- repl_ops.c 19 Apr 2005 22:07:33 -0000 1.5 +++ repl_ops.c 10 Nov 2006 23:45:17 -0000 1.6 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include "slapi-plugin.h" #include "repl.h" #include "repl5.h" Index: repl_rootdse.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl_rootdse.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- repl_rootdse.c 19 Apr 2005 22:07:33 -0000 1.4 +++ repl_rootdse.c 10 Nov 2006 23:45:17 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include Index: repl_search.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl_search.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- repl_search.c 19 Apr 2005 22:07:33 -0000 1.4 +++ repl_search.c 10 Nov 2006 23:45:17 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "slapi-plugin.h" #include "repl.h" Index: repl_shared.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl_shared.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- repl_shared.h 19 Apr 2005 22:07:33 -0000 1.5 +++ repl_shared.h 10 Nov 2006 23:45:17 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* repl_shared.h - definitions shared between 4.0 and 5.0 replication modules */ Index: replutil.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/replutil.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- replutil.c 8 Feb 2006 21:52:22 -0000 1.8 +++ replutil.c 10 Nov 2006 23:45:17 -0000 1.9 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * replutil.c - various utility functions common to all replication methods. Index: urp.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/urp.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- urp.c 19 Apr 2005 22:07:33 -0000 1.5 +++ urp.c 10 Nov 2006 23:45:17 -0000 1.6 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* * urp.c - Update Resolution Procedures */ Index: urp.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/urp.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- urp.h 19 Apr 2005 22:07:33 -0000 1.4 +++ urp.h 10 Nov 2006 23:45:17 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* */ Index: urp_glue.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/urp_glue.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- urp_glue.c 19 Apr 2005 22:07:33 -0000 1.5 +++ urp_glue.c 10 Nov 2006 23:45:17 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * urp_glue.c - Update Resolution Procedures - Glue Index: urp_tombstone.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/urp_tombstone.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- urp_tombstone.c 19 Apr 2005 22:07:33 -0000 1.4 +++ urp_tombstone.c 10 Nov 2006 23:45:17 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * urp_tombstone.c - Update Resolution Procedures - Tombstones Index: windows_connection.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/windows_connection.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- windows_connection.c 11 Apr 2006 02:14:43 -0000 1.14 +++ windows_connection.c 10 Nov 2006 23:45:17 -0000 1.15 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* repl5_connection.c */ /* Index: windows_inc_protocol.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/windows_inc_protocol.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- windows_inc_protocol.c 11 Apr 2006 02:14:43 -0000 1.12 +++ windows_inc_protocol.c 10 Nov 2006 23:45:17 -0000 1.13 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* repl5_inc_protocol.c */ /* Index: windows_private.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/windows_private.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- windows_private.c 1 Sep 2006 21:25:07 -0000 1.13 +++ windows_private.c 10 Nov 2006 23:45:17 -0000 1.14 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* windows_private.c */ #include "repl.h" Index: windows_prot_private.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/windows_prot_private.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- windows_prot_private.h 28 Apr 2005 22:50:15 -0000 1.6 +++ windows_prot_private.h 10 Nov 2006 23:45:17 -0000 1.7 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include "repl5_prot_private.h" #ifndef _WINDOWS_PROT_PRIVATE_H_ Index: windows_protocol_util.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/windows_protocol_util.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- windows_protocol_util.c 11 Apr 2006 02:14:43 -0000 1.26 +++ windows_protocol_util.c 10 Nov 2006 23:45:17 -0000 1.27 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* repl5_protocol_util.c */ /* Index: windows_tot_protocol.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/windows_tot_protocol.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- windows_tot_protocol.c 22 Apr 2005 15:58:27 -0000 1.8 +++ windows_tot_protocol.c 10 Nov 2006 23:45:17 -0000 1.9 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* windows_tot_protocol.c */ /* Index: windowsrepl.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/windowsrepl.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- windowsrepl.h 9 May 2005 20:34:31 -0000 1.8 +++ windowsrepl.h 10 Nov 2006 23:45:17 -0000 1.9 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* windows_private.c */ typedef struct windowsprivate Dirsync_Private; Dirsync_Private* windows_private_new(); From fedora-directory-commits at redhat.com Fri Nov 10 23:45:55 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:45:55 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/snmp ldap-agent.c, 1.10, 1.11 ldap-agent.h, 1.8, 1.9 main.c, 1.9, 1.10 Message-ID: <200611102346.kAANkPmr000340@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/snmp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/servers/snmp Modified Files: ldap-agent.c ldap-agent.h main.c Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: ldap-agent.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/snmp/ldap-agent.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ldap-agent.c 13 Apr 2006 23:12:16 -0000 1.10 +++ ldap-agent.c 10 Nov 2006 23:45:53 -0000 1.11 @@ -35,6 +35,11 @@ * All rights reserved. * --- END COPYRIGHT BLOCK --- */ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include #include #include "ldap-agent.h" Index: ldap-agent.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/snmp/ldap-agent.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ldap-agent.h 13 Apr 2006 23:12:16 -0000 1.8 +++ ldap-agent.h 10 Nov 2006 23:45:53 -0000 1.9 @@ -35,6 +35,11 @@ * All rights reserved. * --- END COPYRIGHT BLOCK --- */ +#ifdef HAVE_CONFIG_H +# include +#endif + + #ifndef DSOPSTABLE_H #define DSOPSTABLE_H Index: main.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/snmp/main.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- main.c 17 Oct 2006 17:07:14 -0000 1.9 +++ main.c 10 Nov 2006 23:45:53 -0000 1.10 @@ -35,6 +35,11 @@ * All rights reserved. * --- END COPYRIGHT BLOCK --- */ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include #include #include From fedora-directory-commits at redhat.com Fri Nov 10 23:44:52 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:44:52 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/acl acl.c, 1.7, 1.8 acl.h, 1.4, 1.5 acl_ext.c, 1.5, 1.6 aclanom.c, 1.5, 1.6 acldllmain.c, 1.5, 1.6 acleffectiverights.c, 1.5, 1.6 aclgroup.c, 1.4, 1.5 aclinit.c, 1.5, 1.6 acllas.c, 1.6, 1.7 acllist.c, 1.4, 1.5 aclparse.c, 1.5, 1.6 aclplugin.c, 1.4, 1.5 aclproxy.c, 1.5, 1.6 aclutil.c, 1.6, 1.7 Message-ID: <200611102346.kAANkMBw032717@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/acl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/servers/plugins/acl Modified Files: acl.c acl.h acl_ext.c aclanom.c acldllmain.c acleffectiverights.c aclgroup.c aclinit.c acllas.c acllist.c aclparse.c aclplugin.c aclproxy.c aclutil.c Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: acl.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/acl/acl.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- acl.c 19 May 2006 02:37:18 -0000 1.7 +++ acl.c 10 Nov 2006 23:44:49 -0000 1.8 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "acl.h" /**************************************************************************** Index: acl.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/acl/acl.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- acl.h 19 Apr 2005 22:07:28 -0000 1.4 +++ acl.h 10 Nov 2006 23:44:49 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /***************************************************************************** * acl.h * Index: acl_ext.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/acl/acl_ext.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- acl_ext.c 19 Apr 2005 22:07:28 -0000 1.5 +++ acl_ext.c 10 Nov 2006 23:44:49 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "acl.h" static void acl__done_aclpb ( struct acl_pblock *aclpb ); Index: aclanom.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/acl/aclanom.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- aclanom.c 19 Apr 2005 22:07:28 -0000 1.5 +++ aclanom.c 10 Nov 2006 23:44:49 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "acl.h" /************************************************************************ Index: acldllmain.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/acl/acldllmain.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- acldllmain.c 11 Apr 2006 02:14:38 -0000 1.5 +++ acldllmain.c 10 Nov 2006 23:44:49 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "acl.h" #ifdef _WIN32 Index: acleffectiverights.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/acl/acleffectiverights.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- acleffectiverights.c 19 Apr 2005 22:07:28 -0000 1.5 +++ acleffectiverights.c 10 Nov 2006 23:44:49 -0000 1.6 @@ -35,6 +35,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include "acl.h" /* safer than doing strcat unprotected */ Index: aclgroup.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/acl/aclgroup.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- aclgroup.c 19 Apr 2005 22:07:28 -0000 1.4 +++ aclgroup.c 10 Nov 2006 23:44:49 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "acl.h" /*************************************************************************** Index: aclinit.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/acl/aclinit.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- aclinit.c 19 Apr 2005 22:07:28 -0000 1.5 +++ aclinit.c 10 Nov 2006 23:44:49 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "acl.h" static int __aclinit__RegisterLases(void); Index: acllas.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/acl/acllas.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- acllas.c 11 Apr 2006 02:14:38 -0000 1.6 +++ acllas.c 10 Nov 2006 23:44:49 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include #include "acl.h" Index: acllist.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/acl/acllist.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- acllist.c 19 Apr 2005 22:07:28 -0000 1.4 +++ acllist.c 10 Nov 2006 23:44:49 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /************************************************************************ * * ACLLIST Index: aclparse.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/acl/aclparse.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- aclparse.c 19 Apr 2005 22:07:28 -0000 1.5 +++ aclparse.c 10 Nov 2006 23:44:49 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "acl.h" /****************************************************************************/ Index: aclplugin.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/acl/aclplugin.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- aclplugin.c 19 Apr 2005 22:07:28 -0000 1.4 +++ aclplugin.c 10 Nov 2006 23:44:49 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * There are 3 ACL PLUGIN points * PREOP, POSTOP and ACL plugin Index: aclproxy.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/acl/aclproxy.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- aclproxy.c 31 Aug 2006 22:52:06 -0000 1.5 +++ aclproxy.c 10 Nov 2006 23:44:49 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "acl.h" #define BEGIN do { Index: aclutil.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/acl/aclutil.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- aclutil.c 19 Apr 2005 22:07:28 -0000 1.6 +++ aclutil.c 10 Nov 2006 23:44:49 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "acl.h" /************************************************************************** From fedora-directory-commits at redhat.com Fri Nov 10 23:44:27 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:44:27 -0700 Subject: [Fedora-directory-commits] ldapserver/include i18n.h, 1.5, 1.6 netsite.h, 1.5, 1.6 version.h, 1.11, 1.12 Message-ID: <200611102346.kAANkRDm000372@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/include In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/include Modified Files: i18n.h netsite.h version.h Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: i18n.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/i18n.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- i18n.h 19 Apr 2005 22:06:43 -0000 1.5 +++ i18n.h 10 Nov 2006 23:44:24 -0000 1.6 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #ifndef I18N_H #define I18N_H Index: netsite.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/netsite.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- netsite.h 19 Apr 2005 22:06:43 -0000 1.5 +++ netsite.h 10 Nov 2006 23:44:24 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef NETSITE_H #define NETSITE_H Index: version.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/version.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- version.h 3 Nov 2006 21:15:31 -0000 1.11 +++ version.h 10 Nov 2006 23:44:24 -0000 1.12 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* This file is included from both C source and the NT installation compiler. Because of that, no ifdefs are allowed, and strings must be simple strings From fedora-directory-commits at redhat.com Fri Nov 10 23:44:58 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:44:58 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/chainingdb cb.h, 1.4, 1.5 cb_abandon.c, 1.4, 1.5 cb_acl.c, 1.4, 1.5 cb_add.c, 1.5, 1.6 cb_bind.c, 1.5, 1.6 cb_cleanup.c, 1.4, 1.5 cb_close.c, 1.4, 1.5 cb_compare.c, 1.5, 1.6 cb_config.c, 1.5, 1.6 cb_conn_stateless.c, 1.5, 1.6 cb_controls.c, 1.7, 1.8 cb_debug.c, 1.4, 1.5 cb_delete.c, 1.5, 1.6 cb_init.c, 1.5, 1.6 cb_instance.c, 1.6, 1.7 cb_modify.c, 1.5, 1.6 cb_modrdn.c, 1.5, 1.6 cb_monitor.c, 1.5, 1.6 cb_schema.c, 1.4, 1.5 cb_search.c, 1.6, 1.7 cb_size.c, 1.4, 1.5 cb_start.c, 1.4, 1.5 cb_temp.c, 1.4, 1.5 cb_test.c, 1.5, 1.6 cb_unbind.c, 1.4, 1.5 cb_utils.c, 1.6, 1.7 cbdllmain.c, 1.4, 1.5 Message-ID: <200611102346.kAANkSKF000381@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/chainingdb In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/servers/plugins/chainingdb Modified Files: cb.h cb_abandon.c cb_acl.c cb_add.c cb_bind.c cb_cleanup.c cb_close.c cb_compare.c cb_config.c cb_conn_stateless.c cb_controls.c cb_debug.c cb_delete.c cb_init.c cb_instance.c cb_modify.c cb_modrdn.c cb_monitor.c cb_schema.c cb_search.c cb_size.c cb_start.c cb_temp.c cb_test.c cb_unbind.c cb_utils.c cbdllmain.c Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: cb.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/chainingdb/cb.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cb.h 19 Apr 2005 22:07:29 -0000 1.4 +++ cb.h 10 Nov 2006 23:44:50 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef CBHFILE #define CBHFILE Index: cb_abandon.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/chainingdb/cb_abandon.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cb_abandon.c 19 Apr 2005 22:07:29 -0000 1.4 +++ cb_abandon.c 10 Nov 2006 23:44:50 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "cb.h" /* Index: cb_acl.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/chainingdb/cb_acl.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cb_acl.c 19 Apr 2005 22:07:29 -0000 1.4 +++ cb_acl.c 10 Nov 2006 23:44:50 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "cb.h" /* Index: cb_add.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/chainingdb/cb_add.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- cb_add.c 19 Apr 2005 22:07:29 -0000 1.5 +++ cb_add.c 10 Nov 2006 23:44:50 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "cb.h" /* Index: cb_bind.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/chainingdb/cb_bind.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- cb_bind.c 19 Apr 2005 22:07:29 -0000 1.5 +++ cb_bind.c 10 Nov 2006 23:44:50 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "cb.h" static void Index: cb_cleanup.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/chainingdb/cb_cleanup.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cb_cleanup.c 19 Apr 2005 22:07:29 -0000 1.4 +++ cb_cleanup.c 10 Nov 2006 23:44:50 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "cb.h" /* Index: cb_close.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/chainingdb/cb_close.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cb_close.c 19 Apr 2005 22:07:29 -0000 1.4 +++ cb_close.c 10 Nov 2006 23:44:50 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "cb.h" /* Index: cb_compare.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/chainingdb/cb_compare.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- cb_compare.c 19 Apr 2005 22:07:29 -0000 1.5 +++ cb_compare.c 10 Nov 2006 23:44:50 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "cb.h" /* Index: cb_config.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/chainingdb/cb_config.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- cb_config.c 19 Apr 2005 22:07:29 -0000 1.5 +++ cb_config.c 10 Nov 2006 23:44:50 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "cb.h" #include Index: cb_conn_stateless.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/chainingdb/cb_conn_stateless.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- cb_conn_stateless.c 19 Apr 2005 22:07:29 -0000 1.5 +++ cb_conn_stateless.c 10 Nov 2006 23:44:50 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "cb.h" /* Index: cb_controls.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/chainingdb/cb_controls.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- cb_controls.c 1 Sep 2006 21:25:07 -0000 1.7 +++ cb_controls.c 10 Nov 2006 23:44:50 -0000 1.8 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "cb.h" /* Index: cb_debug.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/chainingdb/cb_debug.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cb_debug.c 19 Apr 2005 22:07:29 -0000 1.4 +++ cb_debug.c 10 Nov 2006 23:44:50 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * cb_debug.c - debugging-related code for Chaining backend */ Index: cb_delete.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/chainingdb/cb_delete.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- cb_delete.c 19 Apr 2005 22:07:29 -0000 1.5 +++ cb_delete.c 10 Nov 2006 23:44:50 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "cb.h" /* Index: cb_init.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/chainingdb/cb_init.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- cb_init.c 19 Apr 2005 22:07:29 -0000 1.5 +++ cb_init.c 10 Nov 2006 23:44:50 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "cb.h" Slapi_PluginDesc chainingdbdesc = { CB_PLUGIN_NAME, Index: cb_instance.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/chainingdb/cb_instance.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- cb_instance.c 11 Apr 2006 02:14:39 -0000 1.6 +++ cb_instance.c 10 Nov 2006 23:44:50 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "cb.h" #include "plstr.h" Index: cb_modify.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/chainingdb/cb_modify.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- cb_modify.c 19 Apr 2005 22:07:29 -0000 1.5 +++ cb_modify.c 10 Nov 2006 23:44:50 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "cb.h" static void cb_remove_illegal_mods(cb_backend_instance * inst, LDAPMod **mods); Index: cb_modrdn.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/chainingdb/cb_modrdn.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- cb_modrdn.c 19 Apr 2005 22:07:29 -0000 1.5 +++ cb_modrdn.c 10 Nov 2006 23:44:50 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "cb.h" /* Index: cb_monitor.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/chainingdb/cb_monitor.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- cb_monitor.c 11 Apr 2006 02:14:39 -0000 1.5 +++ cb_monitor.c 10 Nov 2006 23:44:50 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "cb.h" extern cb_instance_config_info cb_the_instance_config[]; Index: cb_schema.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/chainingdb/cb_schema.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cb_schema.c 19 Apr 2005 22:07:29 -0000 1.4 +++ cb_schema.c 10 Nov 2006 23:44:50 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "cb.h" void cb_eliminate_illegal_attributes(cb_backend_instance * inst, Slapi_Entry * e) { Index: cb_search.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/chainingdb/cb_search.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- cb_search.c 5 Oct 2006 21:14:01 -0000 1.6 +++ cb_search.c 10 Nov 2006 23:44:50 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "cb.h" /* Index: cb_size.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/chainingdb/cb_size.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cb_size.c 19 Apr 2005 22:07:29 -0000 1.4 +++ cb_size.c 10 Nov 2006 23:44:50 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "cb.h" int Index: cb_start.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/chainingdb/cb_start.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cb_start.c 19 Apr 2005 22:07:29 -0000 1.4 +++ cb_start.c 10 Nov 2006 23:44:50 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "cb.h" int Index: cb_temp.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/chainingdb/cb_temp.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cb_temp.c 19 Apr 2005 22:07:29 -0000 1.4 +++ cb_temp.c 10 Nov 2006 23:44:50 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "cb.h" /* Index: cb_test.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/chainingdb/cb_test.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- cb_test.c 19 Apr 2005 22:07:29 -0000 1.5 +++ cb_test.c 10 Nov 2006 23:44:50 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "cb.h" int cb_back_test( Slapi_PBlock *pb ) Index: cb_unbind.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/chainingdb/cb_unbind.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cb_unbind.c 19 Apr 2005 22:07:29 -0000 1.4 +++ cb_unbind.c 10 Nov 2006 23:44:50 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "cb.h" int Index: cb_utils.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/chainingdb/cb_utils.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- cb_utils.c 31 Aug 2006 22:52:06 -0000 1.6 +++ cb_utils.c 10 Nov 2006 23:44:50 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "cb.h" /* return the rootdn configured in the server */ Index: cbdllmain.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/chainingdb/cbdllmain.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cbdllmain.c 19 Apr 2005 22:07:29 -0000 1.4 +++ cbdllmain.c 10 Nov 2006 23:44:50 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "cb.h" #ifdef _WIN32 From fedora-directory-commits at redhat.com Fri Nov 10 23:45:52 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:45:52 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/test-plugins dllmain.c, 1.4, 1.5 testbind.c, 1.11, 1.12 testdatainterop.c, 1.10, 1.11 testdbinterop.c, 1.4, 1.5 testdbinterop.h, 1.4, 1.5 testentry.c, 1.10, 1.11 testextendedop.c, 1.10, 1.11 testgetip.c, 1.10, 1.11 testpostop.c, 1.10, 1.11 testpreop.c, 1.11, 1.12 testsaslbind.c, 1.12, 1.13 Message-ID: <200611102346.kAANkMm7032732@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/servers/slapd/test-plugins Modified Files: dllmain.c testbind.c testdatainterop.c testdbinterop.c testdbinterop.h testentry.c testextendedop.c testgetip.c testpostop.c testpreop.c testsaslbind.c Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: dllmain.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/dllmain.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dllmain.c 19 Apr 2005 22:07:41 -0000 1.4 +++ dllmain.c 10 Nov 2006 23:45:50 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Microsoft Windows specifics for sample plug-ins DLL */ Index: testbind.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testbind.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- testbind.c 3 Nov 2006 21:15:32 -0000 1.11 +++ testbind.c 10 Nov 2006 23:45:50 -0000 1.12 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /************************************************************ testbind.c Index: testdatainterop.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testdatainterop.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- testdatainterop.c 3 Nov 2006 21:15:33 -0000 1.10 +++ testdatainterop.c 10 Nov 2006 23:45:50 -0000 1.11 @@ -35,6 +35,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /******** testdatainterop.c ******************* This source file provides an example of a plug-in function Index: testdbinterop.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testdbinterop.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- testdbinterop.c 19 Apr 2005 22:07:41 -0000 1.4 +++ testdbinterop.c 10 Nov 2006 23:45:50 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * --- END COPYRIGHT BLOCK --- */ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include #include #include "db.h" Index: testdbinterop.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testdbinterop.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- testdbinterop.h 19 Apr 2005 22:07:41 -0000 1.4 +++ testdbinterop.h 10 Nov 2006 23:45:50 -0000 1.5 @@ -35,6 +35,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /******** testdbinterop.h ******************* The header file is for access to a Berkeley DB Index: testentry.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testentry.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- testentry.c 3 Nov 2006 21:15:33 -0000 1.10 +++ testentry.c 10 Nov 2006 23:45:50 -0000 1.11 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /************************************************************ testentry.c Index: testextendedop.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testextendedop.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- testextendedop.c 3 Nov 2006 21:15:33 -0000 1.10 +++ testextendedop.c 10 Nov 2006 23:45:50 -0000 1.11 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /************************************************************ testextendedop.c Index: testgetip.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testgetip.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- testgetip.c 3 Nov 2006 21:15:33 -0000 1.10 +++ testgetip.c 10 Nov 2006 23:45:50 -0000 1.11 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /************************************************************ testgetip.c Index: testpostop.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testpostop.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- testpostop.c 3 Nov 2006 21:15:33 -0000 1.10 +++ testpostop.c 10 Nov 2006 23:45:50 -0000 1.11 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /************************************************************ testpostop.c Index: testpreop.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testpreop.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- testpreop.c 3 Nov 2006 21:15:33 -0000 1.11 +++ testpreop.c 10 Nov 2006 23:45:50 -0000 1.12 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /************************************************************ testpreop.c Index: testsaslbind.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testsaslbind.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- testsaslbind.c 3 Nov 2006 21:15:33 -0000 1.12 +++ testsaslbind.c 10 Nov 2006 23:45:50 -0000 1.13 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /************************************************************ testsaslbind.c From fedora-directory-commits at redhat.com Fri Nov 10 23:45:18 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:45:18 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/referint dllmain.c, 1.4, 1.5 referint.c, 1.5, 1.6 Message-ID: <200611102346.kAANkIwB032597@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/referint In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/servers/plugins/referint Modified Files: dllmain.c referint.c Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: dllmain.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/referint/dllmain.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dllmain.c 19 Apr 2005 22:07:32 -0000 1.4 +++ dllmain.c 10 Nov 2006 23:45:11 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Microsoft Windows specifics for BACK-LDBM DLL */ Index: referint.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/referint/referint.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- referint.c 19 Apr 2005 22:07:32 -0000 1.5 +++ referint.c 10 Nov 2006 23:45:11 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include #include #include "portable.h" From fedora-directory-commits at redhat.com Fri Nov 10 23:45:53 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:45:53 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/tools/ldclt data.c, 1.1, 1.2 ldap-private.h, 1.1, 1.2 ldapfct.c, 1.1, 1.2 ldclt.c, 1.2, 1.3 ldclt.h, 1.1, 1.2 ldcltU.c, 1.1, 1.2 opCheck.c, 1.1, 1.2 parser.c, 1.1, 1.2 port.c, 1.1, 1.2 port.h, 1.2, 1.3 remote.h, 1.1, 1.2 repcheck.c, 1.2, 1.3 repslave.c, 1.2, 1.3 scalab01.c, 1.1, 1.2 scalab01.h, 1.1, 1.2 srv.c, 1.1, 1.2 threadMain.c, 1.1, 1.2 utils.c, 1.1, 1.2 utils.h, 1.1, 1.2 workarounds.c, 1.1, 1.2 Message-ID: <200611102346.kAANkNia032745@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/ldclt In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/servers/slapd/tools/ldclt Modified Files: data.c ldap-private.h ldapfct.c ldclt.c ldclt.h ldcltU.c opCheck.c parser.c port.c port.h remote.h repcheck.c repslave.c scalab01.c scalab01.h srv.c threadMain.c utils.c utils.h workarounds.c Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: data.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/ldclt/data.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- data.c 11 Jan 2006 01:54:30 -0000 1.1 +++ data.c 10 Nov 2006 23:45:50 -0000 1.2 @@ -38,6 +38,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* FILE : data.c AUTHOR : Jean-Luc SCHWING Index: ldap-private.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/ldclt/ldap-private.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ldap-private.h 11 Jan 2006 01:54:30 -0000 1.1 +++ ldap-private.h 10 Nov 2006 23:45:50 -0000 1.2 @@ -38,6 +38,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #ifndef _LDAP_PRIVATE_H #define _LDAP_PRIVATE_H Index: ldapfct.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/ldclt/ldapfct.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ldapfct.c 11 Jan 2006 01:54:30 -0000 1.1 +++ ldapfct.c 10 Nov 2006 23:45:50 -0000 1.2 @@ -38,6 +38,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* FILE : ldapfct.c AUTHOR : Jean-Luc SCHWING Index: ldclt.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/ldclt/ldclt.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ldclt.c 11 Apr 2006 02:14:51 -0000 1.2 +++ ldclt.c 10 Nov 2006 23:45:50 -0000 1.3 @@ -38,6 +38,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* FILE : ldclt.c AUTHOR : Jean-Luc SCHWING Index: ldclt.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/ldclt/ldclt.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ldclt.h 11 Jan 2006 01:54:30 -0000 1.1 +++ ldclt.h 10 Nov 2006 23:45:50 -0000 1.2 @@ -38,6 +38,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* FILE : ldclt.h AUTHOR : Jean-Luc SCHWING Index: ldcltU.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/ldclt/ldcltU.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ldcltU.c 11 Jan 2006 01:54:30 -0000 1.1 +++ ldcltU.c 10 Nov 2006 23:45:50 -0000 1.2 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include Index: opCheck.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/ldclt/opCheck.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- opCheck.c 11 Jan 2006 01:54:30 -0000 1.1 +++ opCheck.c 10 Nov 2006 23:45:50 -0000 1.2 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* FILE : opCheck.c AUTHOR : Jean-Luc SCHWING Index: parser.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/ldclt/parser.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- parser.c 11 Jan 2006 01:54:30 -0000 1.1 +++ parser.c 10 Nov 2006 23:45:50 -0000 1.2 @@ -38,6 +38,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* FILE : parser.c AUTHOR : Jean-Luc SCHWING Index: port.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/ldclt/port.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- port.c 11 Jan 2006 01:54:30 -0000 1.1 +++ port.c 10 Nov 2006 23:45:50 -0000 1.2 @@ -38,6 +38,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* FILE : port.c AUTHOR : Jean-Luc SCHWING Index: port.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/ldclt/port.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- port.h 27 Jan 2006 03:05:12 -0000 1.2 +++ port.h 10 Nov 2006 23:45:50 -0000 1.3 @@ -38,6 +38,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* FILE : port.h AUTHOR : Jean-Luc SCHWING Index: remote.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/ldclt/remote.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- remote.h 11 Jan 2006 01:54:30 -0000 1.1 +++ remote.h 10 Nov 2006 23:45:50 -0000 1.2 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* FILE : remote.h AUTHOR : Jean-Luc SCHWING Index: repcheck.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/ldclt/repcheck.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- repcheck.c 11 Apr 2006 02:14:51 -0000 1.2 +++ repcheck.c 10 Nov 2006 23:45:50 -0000 1.3 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include #include #include Index: repslave.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/ldclt/repslave.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- repslave.c 11 Apr 2006 02:14:51 -0000 1.2 +++ repslave.c 10 Nov 2006 23:45:50 -0000 1.3 @@ -38,6 +38,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* FILE : repslave.c AUTHOR : Fabio Pistolesi Index: scalab01.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/ldclt/scalab01.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- scalab01.c 11 Jan 2006 01:54:30 -0000 1.1 +++ scalab01.c 10 Nov 2006 23:45:50 -0000 1.2 @@ -38,6 +38,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* FILE : scalab01.c AUTHOR : Jean-Luc SCHWING Index: scalab01.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/ldclt/scalab01.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- scalab01.h 11 Jan 2006 01:54:30 -0000 1.1 +++ scalab01.h 10 Nov 2006 23:45:50 -0000 1.2 @@ -38,6 +38,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* FILE : scalab01.h AUTHOR : Jean-Luc SCHWING Index: srv.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/ldclt/srv.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- srv.c 11 Jan 2006 01:54:30 -0000 1.1 +++ srv.c 10 Nov 2006 23:45:50 -0000 1.2 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include #include #include Index: threadMain.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/ldclt/threadMain.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- threadMain.c 11 Jan 2006 01:54:30 -0000 1.1 +++ threadMain.c 10 Nov 2006 23:45:50 -0000 1.2 @@ -38,6 +38,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* FILE : threadMain.c AUTHOR : Jean-Luc SCHWING Index: utils.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/ldclt/utils.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- utils.c 11 Jan 2006 01:54:30 -0000 1.1 +++ utils.c 10 Nov 2006 23:45:50 -0000 1.2 @@ -38,6 +38,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* FILE : utils.c AUTHOR : Jean-Luc SCHWING Index: utils.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/ldclt/utils.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- utils.h 11 Jan 2006 01:54:30 -0000 1.1 +++ utils.h 10 Nov 2006 23:45:50 -0000 1.2 @@ -38,6 +38,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* FILE : utils.h AUTHOR : Jean-Luc SCHWING Index: workarounds.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/ldclt/workarounds.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- workarounds.c 11 Jan 2006 01:54:30 -0000 1.1 +++ workarounds.c 10 Nov 2006 23:45:50 -0000 1.2 @@ -38,6 +38,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* FILE : workarounds.c AUTHOR : Jean-Luc SCHWING From fedora-directory-commits at redhat.com Fri Nov 10 23:44:30 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:44:30 -0700 Subject: [Fedora-directory-commits] ldapserver/include/libadmin dbtlibadmin.h, 1.4, 1.5 libadmin.h, 1.6, 1.7 Message-ID: <200611102346.kAANkUFX000453@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/include/libadmin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/include/libadmin Modified Files: dbtlibadmin.h libadmin.h Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: dbtlibadmin.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/libadmin/dbtlibadmin.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dbtlibadmin.h 19 Apr 2005 22:06:46 -0000 1.4 +++ dbtlibadmin.h 10 Nov 2006 23:44:26 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #define LIBRARY_NAME "libadmin" static char dbtlibadminid[] = "$DBT: libadmin referenced v1 $"; Index: libadmin.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/libadmin/libadmin.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libadmin.h 19 Apr 2005 22:06:46 -0000 1.6 +++ libadmin.h 10 Nov 2006 23:44:26 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * libadmin.h - All functions contained in libadmin.a * From fedora-directory-commits at redhat.com Fri Nov 10 23:44:25 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:44:25 -0700 Subject: [Fedora-directory-commits] ldapserver/httpd/src ntnsapi.c,1.9,1.10 Message-ID: <200611102346.kAANkPN3000337@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/httpd/src In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/httpd/src Modified Files: ntnsapi.c Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: ntnsapi.c =================================================================== RCS file: /cvs/dirsec/ldapserver/httpd/src/ntnsapi.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ntnsapi.c 10 Nov 2006 01:10:43 -0000 1.9 +++ ntnsapi.c 10 Nov 2006 23:44:21 -0000 1.10 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Aruna Victor * NT NSAPI works differently from UNIX. The DLL doesn't know the addresses From fedora-directory-commits at redhat.com Fri Nov 10 23:46:01 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:46:01 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/systools hp_patches.c, 1.5, 1.6 idsktune.c, 1.13, 1.14 pio.c, 1.5, 1.6 pio.h, 1.4, 1.5 sol_patches.c, 1.4, 1.5 viewcore.c, 1.5, 1.6 Message-ID: <200611102346.kAANkVk3000469@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/systools In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/systools Modified Files: hp_patches.c idsktune.c pio.c pio.h sol_patches.c viewcore.c Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: hp_patches.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/systools/hp_patches.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- hp_patches.c 19 Apr 2005 22:07:44 -0000 1.5 +++ hp_patches.c 10 Nov 2006 23:45:53 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * --- END COPYRIGHT BLOCK --- */ + +#ifdef HAVE_CONFIG_H +# include +#endif + {"PHSS_30966","1.0","ld(1) and linker tools cumulative patch",0,0,0}, {"PHSS_29486","1.0","KRB5-Client Version 1.0 cumulative patch",0,0,0}, {"PHSS_29487","1.0","GSS-API Version 1.0 Cumulative patch",0,0,0}, Index: idsktune.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/systools/idsktune.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- idsktune.c 7 Nov 2006 04:20:19 -0000 1.13 +++ idsktune.c 10 Nov 2006 23:45:53 -0000 1.14 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! * Don't forget to update build_date when the patch sets are updated. * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */ Index: pio.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/systools/pio.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- pio.c 19 Apr 2005 22:07:45 -0000 1.5 +++ pio.c 10 Nov 2006 23:45:53 -0000 1.6 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include "pio.h" #include #include Index: pio.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/systools/pio.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- pio.h 19 Apr 2005 22:07:45 -0000 1.4 +++ pio.h 10 Nov 2006 23:45:53 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #ifndef _H_III_PIO_H #define _H_III_PIO_H Index: sol_patches.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/systools/sol_patches.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sol_patches.c 19 Apr 2005 22:07:45 -0000 1.4 +++ sol_patches.c 10 Nov 2006 23:45:53 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * --- END COPYRIGHT BLOCK --- */ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* This list was generated by /u/norikoyasuo/bin/getSolPatches.pl */ /* on droid.mcom.com */ /* at Thu Mar 18 18:34:27 2004 GMT */ Index: viewcore.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/systools/viewcore.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- viewcore.c 19 Apr 2005 22:07:45 -0000 1.5 +++ viewcore.c 10 Nov 2006 23:45:53 -0000 1.6 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include #include #ifdef linux From fedora-directory-commits at redhat.com Fri Nov 10 23:45:26 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:45:26 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/rever des.c, 1.6, 1.7 dllmain.c, 1.4, 1.5 rever.c, 1.4, 1.5 rever.h, 1.4, 1.5 Message-ID: <200611102346.kAANkQJ1000348@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/rever In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/servers/plugins/rever Modified Files: des.c dllmain.c rever.c rever.h Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: des.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/rever/des.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- des.c 13 Oct 2006 01:06:27 -0000 1.6 +++ des.c 10 Nov 2006 23:45:23 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* from /usr/project/iplanet/ws/ds5.ke/ns/svrcore/pkcs7/tstarchive.c */ #include Index: dllmain.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/rever/dllmain.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dllmain.c 19 Apr 2005 22:07:34 -0000 1.4 +++ dllmain.c 10 Nov 2006 23:45:23 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Microsoft Windows specifics for LIBPWDSTORAGE DLL Index: rever.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/rever/rever.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rever.c 19 Apr 2005 22:07:34 -0000 1.4 +++ rever.c 10 Nov 2006 23:45:23 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include #include #include Index: rever.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/rever/rever.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rever.h 19 Apr 2005 22:07:34 -0000 1.4 +++ rever.h 10 Nov 2006 23:45:23 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef _REVER_H #define _REVER_H From fedora-directory-commits at redhat.com Fri Nov 10 23:44:41 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:44:41 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/clients/dsgw Versiongw.c, 1.6, 1.7 auth.c, 1.4, 1.5 cgiutil.c, 1.7, 1.8 ckdel.c, 1.5, 1.6 ckdump.c, 1.5, 1.6 ckget.c, 1.5, 1.6 ckpurge.c, 1.5, 1.6 ckput.c, 1.5, 1.6 collate.c, 1.5, 1.6 config.c, 1.7, 1.8 cookie.c, 1.6, 1.7 csearch.c, 1.4, 1.5 dbtdsgw.h, 1.6, 1.7 dnedit.c, 1.4, 1.5 doauth.c, 1.5, 1.6 domodify.c, 1.7, 1.8 dosearch.c, 1.5, 1.6 dsgw.h, 1.8, 1.9 dsgwutil.c, 1.8, 1.9 edit.c, 1.6, 1.7 emitauth.c, 1.4, 1.5 emitf.c, 1.5, 1.6 entrydisplay.c, 1.7, 1.8 error.c, 1.4, 1.5 getopt.c, 1.4, 1.5 htmlout.c, 1.4, 1.5 htmlparse.c, 1.6, 1.7 lang.c, 1.5, 1.6 ldaputil.c, 1.5, 1.6 newentry.c, 1.4, 1.5 search.c, 1.4, 1.5 secglue.c, 1.5, 1.6 sort.c, 1.4, 1.5 tutor.c, 1.5, 1.6 unauth.c, 1.4, 1.5 utf8compare.c, 1.4, 1.5 vcard.c, 1.4, 1.5 Message-ID: <200611102346.kAANkBdY032217@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/clients/dsgw In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/clients/dsgw Modified Files: Versiongw.c auth.c cgiutil.c ckdel.c ckdump.c ckget.c ckpurge.c ckput.c collate.c config.c cookie.c csearch.c dbtdsgw.h dnedit.c doauth.c domodify.c dosearch.c dsgw.h dsgwutil.c edit.c emitauth.c emitf.c entrydisplay.c error.c getopt.c htmlout.c htmlparse.c lang.c ldaputil.c newentry.c search.c secglue.c sort.c tutor.c unauth.c utf8compare.c vcard.c Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: Versiongw.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/Versiongw.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Versiongw.c 10 Nov 2006 01:42:38 -0000 1.6 +++ Versiongw.c 10 Nov 2006 23:44:38 -0000 1.7 @@ -36,6 +36,11 @@ * All rights reserved. --- END COPYRIGHT BLOCK --- */ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include "netsite.h" /* to get MAGNUS_VERSION_STRING */ #ifdef MAGNUS_VERSION_STRING Index: auth.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/auth.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- auth.c 19 Apr 2005 22:07:01 -0000 1.4 +++ auth.c 10 Nov 2006 23:44:38 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. --- END COPYRIGHT BLOCK --- */ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * auth.c -- CGI authentication form generator -- HTTP gateway */ Index: cgiutil.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/cgiutil.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- cgiutil.c 11 Apr 2006 02:14:32 -0000 1.7 +++ cgiutil.c 10 Nov 2006 23:44:38 -0000 1.8 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. --- END COPYRIGHT BLOCK --- */ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * cgiutil.c -- CGI-related utility functions -- HTTP gateway * Index: ckdel.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/ckdel.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ckdel.c 11 Apr 2006 02:14:32 -0000 1.5 +++ ckdel.c 10 Nov 2006 23:44:38 -0000 1.6 @@ -36,6 +36,11 @@ * All rights reserved. --- END COPYRIGHT BLOCK --- */ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include #include "dsgw.h" Index: ckdump.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/ckdump.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ckdump.c 11 Apr 2006 02:14:32 -0000 1.5 +++ ckdump.c 10 Nov 2006 23:44:38 -0000 1.6 @@ -36,6 +36,11 @@ * All rights reserved. --- END COPYRIGHT BLOCK --- */ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include #include "dsgw.h" Index: ckget.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/ckget.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ckget.c 11 Apr 2006 02:14:32 -0000 1.5 +++ ckget.c 10 Nov 2006 23:44:38 -0000 1.6 @@ -36,6 +36,11 @@ * All rights reserved. --- END COPYRIGHT BLOCK --- */ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include #include "dsgw.h" Index: ckpurge.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/ckpurge.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ckpurge.c 11 Apr 2006 02:14:32 -0000 1.5 +++ ckpurge.c 10 Nov 2006 23:44:38 -0000 1.6 @@ -36,6 +36,11 @@ * All rights reserved. --- END COPYRIGHT BLOCK --- */ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include #include "dsgw.h" Index: ckput.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/ckput.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ckput.c 11 Apr 2006 02:14:32 -0000 1.5 +++ ckput.c 10 Nov 2006 23:44:38 -0000 1.6 @@ -36,6 +36,11 @@ * All rights reserved. --- END COPYRIGHT BLOCK --- */ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include #include "dsgw.h" Index: collate.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/collate.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- collate.c 19 Apr 2005 22:07:02 -0000 1.5 +++ collate.c 10 Nov 2006 23:44:38 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. --- END COPYRIGHT BLOCK --- */ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * collate.c -- routines to collate character strings */ Index: config.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/config.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- config.c 22 May 2006 17:28:36 -0000 1.7 +++ config.c 10 Nov 2006 23:44:38 -0000 1.8 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. --- END COPYRIGHT BLOCK --- */ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * config.c -- parse config file for directory server gateway */ Index: cookie.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/cookie.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- cookie.c 11 Apr 2006 02:14:32 -0000 1.6 +++ cookie.c 10 Nov 2006 23:44:38 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. --- END COPYRIGHT BLOCK --- */ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * cookie.c -- routines to generate and manipulate cookies for dsgw */ Index: csearch.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/csearch.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- csearch.c 19 Apr 2005 22:07:02 -0000 1.4 +++ csearch.c 10 Nov 2006 23:44:38 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. --- END COPYRIGHT BLOCK --- */ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * csearch.c -- CGI program to generate complex search form -- HTTP gateway */ Index: dbtdsgw.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/dbtdsgw.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- dbtdsgw.h 9 Oct 2006 20:38:37 -0000 1.6 +++ dbtdsgw.h 10 Nov 2006 23:44:38 -0000 1.7 @@ -36,6 +36,11 @@ * All rights reserved. --- END COPYRIGHT BLOCK --- */ +#ifdef HAVE_CONFIG_H +# include +#endif + + #define LIBRARY_NAME "dsgw" /* avoid warnings for this extremely annoying variable */ Index: dnedit.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/dnedit.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dnedit.c 19 Apr 2005 22:07:02 -0000 1.4 +++ dnedit.c 10 Nov 2006 23:44:38 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. --- END COPYRIGHT BLOCK --- */ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Generate a DN edit screen. */ Index: doauth.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/doauth.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- doauth.c 19 Apr 2005 22:07:02 -0000 1.5 +++ doauth.c 10 Nov 2006 23:44:38 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. --- END COPYRIGHT BLOCK --- */ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * doauth.c -- CGI authentication handler -- HTTP gateway */ Index: domodify.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/domodify.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- domodify.c 22 May 2006 17:28:36 -0000 1.7 +++ domodify.c 10 Nov 2006 23:44:38 -0000 1.8 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. --- END COPYRIGHT BLOCK --- */ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * domodify.c -- LDAP modify CGI handler -- HTTP gateway */ Index: dosearch.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/dosearch.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- dosearch.c 19 Apr 2005 22:07:02 -0000 1.5 +++ dosearch.c 10 Nov 2006 23:44:38 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. --- END COPYRIGHT BLOCK --- */ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * dosearch.c -- CGI search handler -- HTTP gateway */ Index: dsgw.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/dsgw.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- dsgw.h 10 Nov 2006 01:10:45 -0000 1.8 +++ dsgw.h 10 Nov 2006 23:44:38 -0000 1.9 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. --- END COPYRIGHT BLOCK --- */ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * dsgw.h -- defines for HTTP gateway */ Index: dsgwutil.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/dsgwutil.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- dsgwutil.c 10 Nov 2006 01:05:03 -0000 1.8 +++ dsgwutil.c 10 Nov 2006 23:44:38 -0000 1.9 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. --- END COPYRIGHT BLOCK --- */ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * dsgwutil.c -- misc. utility functions -- HTTP gateway */ Index: edit.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/edit.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- edit.c 22 May 2006 17:28:36 -0000 1.6 +++ edit.c 10 Nov 2006 23:44:38 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. --- END COPYRIGHT BLOCK --- */ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * edit.c -- CGI editable entry display -- HTTP gateway */ Index: emitauth.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/emitauth.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- emitauth.c 19 Apr 2005 22:07:02 -0000 1.4 +++ emitauth.c 10 Nov 2006 23:44:38 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. --- END COPYRIGHT BLOCK --- */ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * emitauth.c -- generate authentication form -- HTTP gateway */ Index: emitf.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/emitf.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- emitf.c 11 Apr 2006 02:14:32 -0000 1.5 +++ emitf.c 10 Nov 2006 23:44:38 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. --- END COPYRIGHT BLOCK --- */ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include /* va_list etc. */ #include /* sprintf */ #include /* malloc, realloc, free */ Index: entrydisplay.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/entrydisplay.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- entrydisplay.c 22 May 2006 17:28:36 -0000 1.7 +++ entrydisplay.c 10 Nov 2006 23:44:38 -0000 1.8 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. --- END COPYRIGHT BLOCK --- */ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * entrydisplay.c -- output entries one at a time or in a list -- HTTP gateway */ Index: error.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/error.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- error.c 19 Apr 2005 22:07:02 -0000 1.4 +++ error.c 10 Nov 2006 23:44:38 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. --- END COPYRIGHT BLOCK --- */ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * error.c -- error handling functions -- HTTP gateway */ Index: getopt.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/getopt.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- getopt.c 19 Apr 2005 22:07:02 -0000 1.4 +++ getopt.c 10 Nov 2006 23:44:38 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. --- END COPYRIGHT BLOCK --- */ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Copyright (c) 1987 Regents of the University of California. * All rights reserved. Index: htmlout.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/htmlout.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- htmlout.c 19 Apr 2005 22:07:02 -0000 1.4 +++ htmlout.c 10 Nov 2006 23:44:38 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. --- END COPYRIGHT BLOCK --- */ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * htmlout.c -- routines to output HTML elements -- HTTP gateway */ Index: htmlparse.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/htmlparse.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- htmlparse.c 22 May 2006 17:28:36 -0000 1.6 +++ htmlparse.c 10 Nov 2006 23:44:38 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. --- END COPYRIGHT BLOCK --- */ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * htmlparse.c -- routines to parse HTML templates -- HTTP gateway. * Stolen from libadmin/template.c and libadmin/form_get.c, originally Index: lang.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/lang.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- lang.c 22 May 2006 17:28:36 -0000 1.5 +++ lang.c 10 Nov 2006 23:44:38 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. --- END COPYRIGHT BLOCK --- */ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Convert a document from ../html, or redirect the server to it. */ Index: ldaputil.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/ldaputil.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ldaputil.c 11 Apr 2006 02:14:32 -0000 1.5 +++ ldaputil.c 10 Nov 2006 23:44:38 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. --- END COPYRIGHT BLOCK --- */ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * ldaputil.c -- LDAP utility functions -- HTTP gateway */ Index: newentry.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/newentry.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- newentry.c 19 Apr 2005 22:07:02 -0000 1.4 +++ newentry.c 10 Nov 2006 23:44:38 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. --- END COPYRIGHT BLOCK --- */ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * newentry.c -- CGI program to generate newentry form -- HTTP gateway */ Index: search.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/search.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- search.c 19 Apr 2005 22:07:02 -0000 1.4 +++ search.c 10 Nov 2006 23:44:38 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. --- END COPYRIGHT BLOCK --- */ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * search.c -- CGI program to generate smart search form -- HTTP gateway */ Index: secglue.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/secglue.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- secglue.c 3 Oct 2005 19:53:53 -0000 1.5 +++ secglue.c 10 Nov 2006 23:44:38 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. --- END COPYRIGHT BLOCK --- */ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * secglue.c: Glue routines for the httpd.so shared object. These are * necessary because on many system no garbage collection is performed for Index: sort.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/sort.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sort.c 19 Apr 2005 22:07:02 -0000 1.4 +++ sort.c 10 Nov 2006 23:44:38 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. --- END COPYRIGHT BLOCK --- */ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* DON'T SHIP THIS PROGRAM. It's terribly un-secure, as it enables an HTTP client to read the contents of any file. */ Index: tutor.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/tutor.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- tutor.c 11 Apr 2006 02:14:32 -0000 1.5 +++ tutor.c 10 Nov 2006 23:44:38 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. --- END COPYRIGHT BLOCK --- */ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * tutor.c - Take a qs, and spit out the appropriate tutorial * Index: unauth.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/unauth.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- unauth.c 19 Apr 2005 22:07:03 -0000 1.4 +++ unauth.c 10 Nov 2006 23:44:38 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. --- END COPYRIGHT BLOCK --- */ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * unauth.c -- CGI to discard cookies -- HTTP gateway */ Index: utf8compare.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/utf8compare.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- utf8compare.c 19 Apr 2005 22:07:03 -0000 1.4 +++ utf8compare.c 10 Nov 2006 23:44:38 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. --- END COPYRIGHT BLOCK --- */ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include #include #include Index: vcard.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/vcard.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- vcard.c 19 Apr 2005 22:07:03 -0000 1.4 +++ vcard.c 10 Nov 2006 23:44:38 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. --- END COPYRIGHT BLOCK --- */ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * vcard.c -- vCard utility functions -- HTTP gateway */ From fedora-directory-commits at redhat.com Fri Nov 10 23:44:26 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:44:26 -0700 Subject: [Fedora-directory-commits] ldapserver/include/base crit.h, 1.6, 1.7 dbtbase.h, 1.5, 1.6 ereport.h, 1.7, 1.8 eventhandler.h, 1.4, 1.5 eventlog.h, 1.4, 1.5 file.h, 1.5, 1.6 fsmutex.h, 1.4, 1.5 lexer.h, 1.4, 1.5 nterr.h, 1.4, 1.5 nterrors.h, 1.4, 1.5 plist.h, 1.4, 1.5 pool.h, 1.6, 1.7 rwlock.h, 1.4, 1.5 shexp.h, 1.5, 1.6 systems.h, 1.7, 1.8 systhr.h, 1.5, 1.6 util.h, 1.7, 1.8 Message-ID: <200611102346.kAANkQ33000355@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/include/base In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/include/base Modified Files: crit.h dbtbase.h ereport.h eventhandler.h eventlog.h file.h fsmutex.h lexer.h nterr.h nterrors.h plist.h pool.h rwlock.h shexp.h systems.h systhr.h util.h Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: crit.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/base/crit.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- crit.h 19 Apr 2005 22:06:44 -0000 1.6 +++ crit.h 10 Nov 2006 23:44:23 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef BASE_CRIT_H #define BASE_CRIT_H Index: dbtbase.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/base/dbtbase.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- dbtbase.h 19 Apr 2005 22:06:44 -0000 1.5 +++ dbtbase.h 10 Nov 2006 23:44:24 -0000 1.6 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #define LIBRARY_NAME "base" static char dbtbaseid[] = "$DBT: base referenced v1 $"; Index: ereport.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/base/ereport.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ereport.h 11 Apr 2006 02:14:26 -0000 1.7 +++ ereport.h 10 Nov 2006 23:44:24 -0000 1.8 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef BASE_EREPORT_H #define BASE_EREPORT_H Index: eventhandler.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/base/eventhandler.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- eventhandler.h 19 Apr 2005 22:06:44 -0000 1.4 +++ eventhandler.h 10 Nov 2006 23:44:24 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * eventhandler.h: Handle registration of event handlers * Index: eventlog.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/base/eventlog.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- eventlog.h 19 Apr 2005 22:06:44 -0000 1.4 +++ eventlog.h 10 Nov 2006 23:44:24 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + // EVENTLOG.H // // This file contains the defines that make NT an installable service. Index: file.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/base/file.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- file.h 19 Apr 2005 22:06:44 -0000 1.5 +++ file.h 10 Nov 2006 23:44:24 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef BASE_FILE_H #define BASE_FILE_H Index: fsmutex.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/base/fsmutex.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fsmutex.h 19 Apr 2005 22:06:44 -0000 1.4 +++ fsmutex.h 10 Nov 2006 23:44:24 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * fsmutex: Mutexes that are filesystem-based so they're available from more * than one process and address space Index: lexer.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/base/lexer.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- lexer.h 19 Apr 2005 22:06:44 -0000 1.4 +++ lexer.h 10 Nov 2006 23:44:24 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef __lexer_h #define __lexer_h Index: nterr.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/base/nterr.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nterr.h 19 Apr 2005 22:06:44 -0000 1.4 +++ nterr.h 10 Nov 2006 23:44:24 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Added function prototypes for nterror stuff. * Index: nterrors.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/base/nterrors.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nterrors.h 19 Apr 2005 22:06:44 -0000 1.4 +++ nterrors.h 10 Nov 2006 23:44:24 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* DO NOT EDIT THIS FILE - it is automatically generated */ typedef struct _NtError { Index: plist.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/base/plist.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- plist.h 19 Apr 2005 22:06:44 -0000 1.4 +++ plist.h 10 Nov 2006 23:44:24 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef _PLIST_H #define _PLIST_H Index: pool.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/base/pool.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- pool.h 19 Apr 2005 22:06:44 -0000 1.6 +++ pool.h 10 Nov 2006 23:44:24 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef BASE_POOL_H #define BASE_POOL_H Index: rwlock.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/base/rwlock.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rwlock.h 19 Apr 2005 22:06:44 -0000 1.4 +++ rwlock.h 10 Nov 2006 23:44:24 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * rwlock.h: Shared/Exclusive lock abstraction. * Index: shexp.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/base/shexp.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- shexp.h 19 Apr 2005 22:06:44 -0000 1.5 +++ shexp.h 10 Nov 2006 23:44:24 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef BASE_SHEXP_H #define BASE_SHEXP_H Index: systems.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/base/systems.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- systems.h 10 Nov 2006 01:42:37 -0000 1.7 +++ systems.h 10 Nov 2006 23:44:24 -0000 1.8 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef BASE_SYSTEMS_H #define BASE_SYSTEMS_H Index: systhr.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/base/systhr.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- systhr.h 19 Apr 2005 22:06:44 -0000 1.5 +++ systhr.h 10 Nov 2006 23:44:24 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef BASE_SYSTHR_H #define BASE_SYSTHR_H Index: util.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/base/util.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- util.h 11 Apr 2006 02:14:26 -0000 1.7 +++ util.h 10 Nov 2006 23:44:24 -0000 1.8 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef BASE_UTIL_H #define BASE_UTIL_H From fedora-directory-commits at redhat.com Fri Nov 10 23:45:52 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:45:52 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/test-plugins/clients reqextop.c, 1.4, 1.5 Message-ID: <200611102346.kAANkMLY032709@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/clients In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/servers/slapd/test-plugins/clients Modified Files: reqextop.c Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: reqextop.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/clients/reqextop.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- reqextop.c 19 Apr 2005 22:07:42 -0000 1.4 +++ reqextop.c 10 Nov 2006 23:45:49 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Requests an extended operation with the OID 1.2.3.4. * Use this client in conjunction with a server that can process From fedora-directory-commits at redhat.com Fri Nov 10 23:45:51 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:45:51 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/ntwdog cron_conf.c, 1.5, 1.6 cron_conf.h, 1.5, 1.6 ntcron.c, 1.5, 1.6 ntwatchdog.c, 1.6, 1.7 Message-ID: <200611102346.kAANkL4A032702@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/ntwdog In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/servers/slapd/ntwdog Modified Files: cron_conf.c cron_conf.h ntcron.c ntwatchdog.c Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: cron_conf.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/ntwdog/cron_conf.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- cron_conf.c 19 Apr 2005 22:07:40 -0000 1.5 +++ cron_conf.c 10 Nov 2006 23:45:49 -0000 1.6 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include #include #include Index: cron_conf.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/ntwdog/cron_conf.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- cron_conf.h 15 Sep 2006 16:26:44 -0000 1.5 +++ cron_conf.h 10 Nov 2006 23:45:49 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /*********************************************************************** ** $Id$ ** Index: ntcron.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/ntwdog/ntcron.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ntcron.c 19 Apr 2005 22:07:40 -0000 1.5 +++ ntcron.c 10 Nov 2006 23:45:49 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + // // // Name: NTCRON // // Platforms: WIN32 // Index: ntwatchdog.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/ntwdog/ntwatchdog.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ntwatchdog.c 19 Apr 2005 22:07:40 -0000 1.6 +++ ntwatchdog.c 10 Nov 2006 23:45:49 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #pragma warning(disable : 4001) // disable warning C4001: nonstandard extension 'single line comment' was used From fedora-directory-commits at redhat.com Fri Nov 10 23:44:33 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:44:33 -0700 Subject: [Fedora-directory-commits] ldapserver/include/public netsite.h, 1.4, 1.5 nsapi.h, 1.7, 1.8 Message-ID: <200611102346.kAANkXLQ000510@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/include/public In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/include/public Modified Files: netsite.h nsapi.h Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: netsite.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/public/netsite.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- netsite.h 19 Apr 2005 22:06:47 -0000 1.4 +++ netsite.h 10 Nov 2006 23:44:30 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef PUBLIC_NETSITE_H #define PUBLIC_NETSITE_H Index: nsapi.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/public/nsapi.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- nsapi.h 28 Apr 2005 17:31:53 -0000 1.7 +++ nsapi.h 10 Nov 2006 23:44:30 -0000 1.8 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef PUBLIC_NSAPI_H #define PUBLIC_NSAPI_H From fedora-directory-commits at redhat.com Fri Nov 10 23:44:23 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:44:23 -0700 Subject: [Fedora-directory-commits] ldapserver/config nsinstall.c, 1.5, 1.6 pathsub.c, 1.4, 1.5 pathsub.h, 1.5, 1.6 Message-ID: <200611102346.kAANkNox032761@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/config In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/config Modified Files: nsinstall.c pathsub.c pathsub.h Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: nsinstall.c =================================================================== RCS file: /cvs/dirsec/ldapserver/config/nsinstall.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- nsinstall.c 19 Apr 2005 22:06:42 -0000 1.5 +++ nsinstall.c 10 Nov 2006 23:44:20 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* ** install command. ** Index: pathsub.c =================================================================== RCS file: /cvs/dirsec/ldapserver/config/pathsub.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- pathsub.c 19 Apr 2005 22:06:42 -0000 1.4 +++ pathsub.c 10 Nov 2006 23:44:20 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* ** Pathname subroutines. ** Index: pathsub.h =================================================================== RCS file: /cvs/dirsec/ldapserver/config/pathsub.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- pathsub.h 11 Apr 2006 02:14:25 -0000 1.5 +++ pathsub.h 10 Nov 2006 23:44:20 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef pathsub_h___ #define pathsub_h___ /* From fedora-directory-commits at redhat.com Fri Nov 10 23:46:03 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:46:03 -0700 Subject: [Fedora-directory-commits] ldapserver/lib/ldaputil cert.c, 1.4, 1.5 dbconf.c, 1.5, 1.6 encode.c, 1.4, 1.5 errors.c, 1.4, 1.5 init.c, 1.7, 1.8 ldapauth.c, 1.6, 1.7 certmap.c, 1.6, 1.7 ldaputili.h, 1.4, 1.5 vtable.c, 1.4, 1.5 ldapdb.c, 1.5, 1.6 Message-ID: <200611102346.kAANkXkX000520@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/lib/ldaputil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/lib/ldaputil Modified Files: cert.c dbconf.c encode.c errors.c init.c ldapauth.c certmap.c ldaputili.h vtable.c ldapdb.c Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: cert.c =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/ldaputil/cert.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cert.c 19 Apr 2005 22:07:45 -0000 1.4 +++ cert.c 10 Nov 2006 23:46:00 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include #include Index: dbconf.c =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/ldaputil/dbconf.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- dbconf.c 19 Apr 2005 22:07:45 -0000 1.5 +++ dbconf.c 10 Nov 2006 23:46:00 -0000 1.6 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include #include #include Index: encode.c =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/ldaputil/encode.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- encode.c 19 Apr 2005 22:07:45 -0000 1.4 +++ encode.c 10 Nov 2006 23:46:00 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include #include #include Index: errors.c =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/ldaputil/errors.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- errors.c 19 Apr 2005 22:07:45 -0000 1.4 +++ errors.c 10 Nov 2006 23:46:00 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include #include Index: init.c =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/ldaputil/init.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- init.c 11 Apr 2006 02:14:53 -0000 1.7 +++ init.c 10 Nov 2006 23:46:00 -0000 1.8 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include #include #include Index: ldapauth.c =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/ldaputil/ldapauth.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ldapauth.c 11 Apr 2006 02:14:53 -0000 1.6 +++ ldapauth.c 10 Nov 2006 23:46:00 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * ldapauth.cpp: Implements LDAP integration in the web server. * Index: certmap.c =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/ldaputil/certmap.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- certmap.c 11 Apr 2006 02:14:53 -0000 1.6 +++ certmap.c 10 Nov 2006 23:46:00 -0000 1.7 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include #include #include Index: ldaputili.h =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/ldaputil/ldaputili.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ldaputili.h 19 Apr 2005 22:07:45 -0000 1.4 +++ ldaputili.h 10 Nov 2006 23:46:00 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef _LDAPU_LDAPUTILI_H #define _LDAPU_LDAPUTILI_H Index: vtable.c =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/ldaputil/vtable.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- vtable.c 19 Apr 2005 22:07:45 -0000 1.4 +++ vtable.c 10 Nov 2006 23:46:00 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "ldaputili.h" #include #ifdef USE_LDAP_SSL Index: ldapdb.c =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/ldaputil/ldapdb.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ldapdb.c 10 Nov 2006 01:34:10 -0000 1.5 +++ ldapdb.c 10 Nov 2006 23:46:00 -0000 1.6 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #ifndef DONT_USE_LDAP_SSL #define USE_LDAP_SSL #endif From fedora-directory-commits at redhat.com Fri Nov 10 23:44:28 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:44:28 -0700 Subject: [Fedora-directory-commits] ldapserver/include/libaccess acl.h, 1.5, 1.6 aclerror.h, 1.4, 1.5 acleval.h, 1.4, 1.5 aclglobal.h, 1.4, 1.5 aclproto.h, 1.4, 1.5 aclstruct.h, 1.4, 1.5 attrec.h, 1.4, 1.5 authdb.h, 1.4, 1.5 dbtlibaccess.h, 1.4, 1.5 dnfstruct.h, 1.4, 1.5 ipfstruct.h, 1.4, 1.5 las.h, 1.5, 1.6 ldapacl.h, 1.4, 1.5 nsauth.h, 1.5, 1.6 nsautherr.h, 1.5, 1.6 nserror.h, 1.4, 1.5 symbols.h, 1.4, 1.5 userauth.h, 1.4, 1.5 usi.h, 1.4, 1.5 usrcache.h, 1.5, 1.6 Message-ID: <200611102346.kAANkSWI000434@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/include/libaccess In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/include/libaccess Modified Files: acl.h aclerror.h acleval.h aclglobal.h aclproto.h aclstruct.h attrec.h authdb.h dbtlibaccess.h dnfstruct.h ipfstruct.h las.h ldapacl.h nsauth.h nsautherr.h nserror.h symbols.h userauth.h usi.h usrcache.h Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: acl.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/libaccess/acl.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- acl.h 19 Apr 2005 22:06:45 -0000 1.5 +++ acl.h 10 Nov 2006 23:44:26 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef ACL_HEADER #define ACL_HEADER Index: aclerror.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/libaccess/aclerror.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- aclerror.h 19 Apr 2005 22:06:45 -0000 1.4 +++ aclerror.h 10 Nov 2006 23:44:26 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef __aclerror_h #define __aclerror_h Index: acleval.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/libaccess/acleval.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- acleval.h 19 Apr 2005 22:06:45 -0000 1.4 +++ acleval.h 10 Nov 2006 23:44:26 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef __acleval_h #define __acleval_h Index: aclglobal.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/libaccess/aclglobal.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- aclglobal.h 19 Apr 2005 22:06:45 -0000 1.4 +++ aclglobal.h 10 Nov 2006 23:44:26 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* ** Header file containing global data elements. These are duplicated ** when a cache flush is done. Index: aclproto.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/libaccess/aclproto.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- aclproto.h 19 Apr 2005 22:06:45 -0000 1.4 +++ aclproto.h 10 Nov 2006 23:44:26 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef ACL_PROTO_HEADER #define ACL_PROTO_HEADER Index: aclstruct.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/libaccess/aclstruct.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- aclstruct.h 19 Apr 2005 22:06:45 -0000 1.4 +++ aclstruct.h 10 Nov 2006 23:44:26 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef __aclstruct_h #define __aclstruct_h Index: attrec.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/libaccess/attrec.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- attrec.h 19 Apr 2005 22:06:45 -0000 1.4 +++ attrec.h 10 Nov 2006 23:44:26 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef __attrec_h #define __attrec_h Index: authdb.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/libaccess/authdb.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- authdb.h 19 Apr 2005 22:06:45 -0000 1.4 +++ authdb.h 10 Nov 2006 23:44:26 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef AUTHDB_H #define AUTHDB_H Index: dbtlibaccess.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/libaccess/dbtlibaccess.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dbtlibaccess.h 19 Apr 2005 22:06:45 -0000 1.4 +++ dbtlibaccess.h 10 Nov 2006 23:44:26 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #define LIBRARY_NAME "libaccess" static char dbtlibaccessid[] = "$DBT: libaccess referenced v1 $"; Index: dnfstruct.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/libaccess/dnfstruct.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dnfstruct.h 19 Apr 2005 22:06:45 -0000 1.4 +++ dnfstruct.h 10 Nov 2006 23:44:26 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef __dnfstruct_h #define __dnfstruct_h Index: ipfstruct.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/libaccess/ipfstruct.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ipfstruct.h 19 Apr 2005 22:06:45 -0000 1.4 +++ ipfstruct.h 10 Nov 2006 23:44:26 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef __ipfstruct_h #define __ipfstruct_h Index: las.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/libaccess/las.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- las.h 19 Apr 2005 22:06:45 -0000 1.5 +++ las.h 10 Nov 2006 23:44:26 -0000 1.6 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #ifndef ACL_LAS_HEADER #define ACL_LAS_HEADER Index: ldapacl.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/libaccess/ldapacl.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ldapacl.h 19 Apr 2005 22:06:45 -0000 1.4 +++ ldapacl.h 10 Nov 2006 23:44:26 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #ifndef ACL_AUTH_H #define ACL_AUTH_H Index: nsauth.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/libaccess/nsauth.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- nsauth.h 10 Nov 2006 01:40:44 -0000 1.5 +++ nsauth.h 10 Nov 2006 23:44:26 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef __nsauth_h #define __nsauth_h Index: nsautherr.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/libaccess/nsautherr.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- nsautherr.h 10 Nov 2006 01:40:44 -0000 1.5 +++ nsautherr.h 10 Nov 2006 23:44:26 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef __nsautherr_h #define __nsautherr_h Index: nserror.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/libaccess/nserror.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nserror.h 19 Apr 2005 22:06:45 -0000 1.4 +++ nserror.h 10 Nov 2006 23:44:26 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef __nserror_h #define __nserror_h Index: symbols.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/libaccess/symbols.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- symbols.h 19 Apr 2005 22:06:45 -0000 1.4 +++ symbols.h 10 Nov 2006 23:44:26 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef __symbols_h #define __symbols_h Index: userauth.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/libaccess/userauth.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- userauth.h 19 Apr 2005 22:06:45 -0000 1.4 +++ userauth.h 10 Nov 2006 23:44:26 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef USERAUTH_H #define USERAUTH_H Index: usi.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/libaccess/usi.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- usi.h 19 Apr 2005 22:06:45 -0000 1.4 +++ usi.h 10 Nov 2006 23:44:26 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef __usi_h #define __usi_h Index: usrcache.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/libaccess/usrcache.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- usrcache.h 10 Nov 2006 01:34:08 -0000 1.5 +++ usrcache.h 10 Nov 2006 23:44:26 -0000 1.6 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #ifndef ACL_USER_CACHE_H #define ACL_USER_CACHE_H From fedora-directory-commits at redhat.com Fri Nov 10 23:45:53 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:45:53 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/tools dbscan.c, 1.14, 1.15 eggencode.c, 1.4, 1.5 keyupg.c, 1.4, 1.5 ldif.c, 1.5, 1.6 migratecred.c, 1.6, 1.7 mkdep.c, 1.4, 1.5 mmldif.c, 1.6, 1.7 pwenc.c, 1.7, 1.8 Message-ID: <200611102346.kAANkN0p000300@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/tools In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/servers/slapd/tools Modified Files: dbscan.c eggencode.c keyupg.c ldif.c migratecred.c mkdep.c mmldif.c pwenc.c Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: dbscan.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/dbscan.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- dbscan.c 25 Oct 2006 00:05:15 -0000 1.14 +++ dbscan.c 10 Nov 2006 23:45:51 -0000 1.15 @@ -35,6 +35,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* * small program to scan a Directory Server db file and dump the contents * Index: eggencode.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/eggencode.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- eggencode.c 19 Apr 2005 22:07:42 -0000 1.4 +++ eggencode.c 10 Nov 2006 23:45:51 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* * Easter egg encoder. See ../fedse.c:egg_decode() for the mirror image. */ Index: keyupg.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/keyupg.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- keyupg.c 19 Apr 2005 22:07:42 -0000 1.4 +++ keyupg.c 10 Nov 2006 23:45:51 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * * keyupg.c Index: ldif.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/ldif.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ldif.c 19 Apr 2005 22:07:42 -0000 1.5 +++ ldif.c 10 Nov 2006 23:45:51 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include #include #include Index: migratecred.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/migratecred.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- migratecred.c 11 Apr 2006 02:14:51 -0000 1.6 +++ migratecred.c 10 Nov 2006 23:45:51 -0000 1.7 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include #include #include Index: mkdep.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/mkdep.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mkdep.c 19 Apr 2005 22:07:42 -0000 1.4 +++ mkdep.c 10 Nov 2006 23:45:51 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Originally by Linus Torvalds. * Smart CONFIG_* processing by Werner Almesberger, Michael Chastain. Index: mmldif.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/mmldif.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mmldif.c 19 Apr 2005 22:07:42 -0000 1.6 +++ mmldif.c 10 Nov 2006 23:45:51 -0000 1.7 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include #include #include Index: pwenc.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/pwenc.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- pwenc.c 27 Sep 2006 23:40:52 -0000 1.7 +++ pwenc.c 10 Nov 2006 23:45:51 -0000 1.8 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #if defined( _WIN32 ) #include /* for S_IREAD and S_IWRITE */ #include From fedora-directory-commits at redhat.com Fri Nov 10 23:44:58 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:44:58 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/collation collate.c, 1.7, 1.8 collate.h, 1.4, 1.5 config.c, 1.4, 1.5 config.h, 1.4, 1.5 debug.c, 1.4, 1.5 dllmain.c, 1.5, 1.6 orfilter.c, 1.4, 1.5 orfilter.h, 1.4, 1.5 Message-ID: <200611102346.kAANkSdc000424@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/collation In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/servers/plugins/collation Modified Files: collate.c collate.h config.c config.h debug.c dllmain.c orfilter.c orfilter.h Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: collate.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/collation/collate.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- collate.c 6 Jan 2006 21:49:53 -0000 1.7 +++ collate.c 10 Nov 2006 23:44:56 -0000 1.8 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* collate.c - implementation of indexing, using a Collation */ #include "collate.h" Index: collate.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/collation/collate.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- collate.h 19 Apr 2005 22:07:29 -0000 1.4 +++ collate.h 10 Nov 2006 23:44:56 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #ifndef _COLLATE_H_ #define _COLLATE_H_ Index: config.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/collation/config.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- config.c 19 Apr 2005 22:07:29 -0000 1.4 +++ config.c 10 Nov 2006 23:44:56 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "collate.h" #include "config.h" #include Index: config.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/collation/config.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- config.h 19 Apr 2005 22:07:29 -0000 1.4 +++ config.h 10 Nov 2006 23:44:56 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef _COLL_CONFIG_H_ #define _COLL_CONFIG_H_ Index: debug.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/collation/debug.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- debug.c 19 Apr 2005 22:07:29 -0000 1.4 +++ debug.c 10 Nov 2006 23:44:56 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifdef _WIN32 int *module_ldap_debug = 0; Index: dllmain.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/collation/dllmain.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- dllmain.c 11 Apr 2006 02:14:39 -0000 1.5 +++ dllmain.c 10 Nov 2006 23:44:56 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Microsoft Windows specifics for collation DLL */ Index: orfilter.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/collation/orfilter.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- orfilter.c 19 Apr 2005 22:07:29 -0000 1.4 +++ orfilter.c 10 Nov 2006 23:44:56 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* orfilter.c - implementation of ordering rule filter */ #include /* LDAP_UTF8INC */ Index: orfilter.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/collation/orfilter.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- orfilter.h 19 Apr 2005 22:07:29 -0000 1.4 +++ orfilter.h 10 Nov 2006 23:44:56 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #ifndef _ORFILTER_H_ #define _ORFILTER_H_ From fedora-directory-commits at redhat.com Fri Nov 10 23:46:04 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:46:04 -0700 Subject: [Fedora-directory-commits] ldapserver/lib/ldaputil/utest example.c, 1.4, 1.5 plugin.c, 1.4, 1.5 plugin.h, 1.4, 1.5 stubs.c, 1.4, 1.5 auth.cpp, 1.5, 1.6 stubs.cpp, 1.5, 1.6 Message-ID: <200611102346.kAANkYNR000557@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/lib/ldaputil/utest In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/lib/ldaputil/utest Modified Files: example.c plugin.c plugin.h stubs.c auth.cpp stubs.cpp Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: example.c =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/ldaputil/utest/example.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- example.c 19 Apr 2005 22:07:47 -0000 1.4 +++ example.c 10 Nov 2006 23:46:01 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include #include Index: plugin.c =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/ldaputil/utest/plugin.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- plugin.c 19 Apr 2005 22:07:47 -0000 1.4 +++ plugin.c 10 Nov 2006 23:46:01 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include #include #include Index: plugin.h =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/ldaputil/utest/plugin.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- plugin.h 19 Apr 2005 22:07:47 -0000 1.4 +++ plugin.h 10 Nov 2006 23:46:01 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef _CERTMAP_PLUGIN_H #define _CERTMAP_PLUGIN_H Index: stubs.c =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/ldaputil/utest/stubs.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- stubs.c 19 Apr 2005 22:07:47 -0000 1.4 +++ stubs.c 10 Nov 2006 23:46:01 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include /* isspace */ #include #include /* sprintf */ Index: auth.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/ldaputil/utest/auth.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- auth.cpp 19 Apr 2005 22:07:47 -0000 1.5 +++ auth.cpp 10 Nov 2006 23:46:01 -0000 1.6 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include #include #include Index: stubs.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/ldaputil/utest/stubs.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- stubs.cpp 19 Apr 2005 22:07:47 -0000 1.5 +++ stubs.cpp 10 Nov 2006 23:46:01 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include /* isspace */ #include #include /* sprintf */ From fedora-directory-commits at redhat.com Fri Nov 10 23:45:04 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:45:04 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/distrib distrib.c, 1.5, 1.6 dllmain.c, 1.4, 1.5 Message-ID: <200611102346.kAANkYcZ000570@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/distrib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/servers/plugins/distrib Modified Files: distrib.c dllmain.c Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: distrib.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/distrib/distrib.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- distrib.c 19 Apr 2005 22:07:30 -0000 1.5 +++ distrib.c 10 Nov 2006 23:45:01 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * --- END COPYRIGHT BLOCK --- */ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include #include #include "slapi-plugin.h" Index: dllmain.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/distrib/dllmain.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dllmain.c 19 Apr 2005 22:07:30 -0000 1.4 +++ dllmain.c 10 Nov 2006 23:45:01 -0000 1.5 @@ -34,7 +34,12 @@ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. - * --- END COPYRIGHT BLOCK --- */ + * --- END COPYRIGHT BLOCK --- */ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Microsoft Windows specifics */ From fedora-directory-commits at redhat.com Fri Nov 10 23:44:35 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:44:35 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/admin/include dsalib.h, 1.7, 1.8 dsalib_pw.h, 1.4, 1.5 dsalib_schema.h, 1.4, 1.5 nterrors.h, 1.4, 1.5 Message-ID: <200611102346.kAANkZs4000581@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/admin/include In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/admin/include Modified Files: dsalib.h dsalib_pw.h dsalib_schema.h nterrors.h Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: dsalib.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/include/dsalib.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- dsalib.h 13 Oct 2006 01:06:19 -0000 1.7 +++ dsalib.h 10 Nov 2006 23:44:31 -0000 1.8 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #ifndef __dsalib_h #define __dsalib_h Index: dsalib_pw.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/include/dsalib_pw.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dsalib_pw.h 19 Apr 2005 22:06:53 -0000 1.4 +++ dsalib_pw.h 10 Nov 2006 23:44:31 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #ifndef __dsalib_pw_h #define __dsalib_pw_h Index: dsalib_schema.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/include/dsalib_schema.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dsalib_schema.h 19 Apr 2005 22:06:53 -0000 1.4 +++ dsalib_schema.h 10 Nov 2006 23:44:31 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Routines to parse schema LDIF * Index: nterrors.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/include/nterrors.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nterrors.h 19 Apr 2005 22:06:53 -0000 1.4 +++ nterrors.h 10 Nov 2006 23:44:31 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* DO NOT EDIT THIS FILE - it is automatically generated */ struct _NtError { From fedora-directory-commits at redhat.com Fri Nov 10 23:45:32 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:45:32 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/roles dllmain.c, 1.4, 1.5 roles_cache.c, 1.5, 1.6 roles_cache.h, 1.4, 1.5 roles_plugin.c, 1.5, 1.6 Message-ID: <200611102346.kAANkWDx000479@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/roles In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/servers/plugins/roles Modified Files: dllmain.c roles_cache.c roles_cache.h roles_plugin.c Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: dllmain.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/roles/dllmain.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dllmain.c 19 Apr 2005 22:07:34 -0000 1.4 +++ dllmain.c 10 Nov 2006 23:45:24 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Microsoft Windows specifics for BACK-LDBM DLL */ Index: roles_cache.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/roles/roles_cache.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- roles_cache.c 19 Apr 2005 22:07:34 -0000 1.5 +++ roles_cache.c 10 Nov 2006 23:45:24 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include #include #include Index: roles_cache.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/roles/roles_cache.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- roles_cache.h 19 Apr 2005 22:07:34 -0000 1.4 +++ roles_cache.h 10 Nov 2006 23:45:24 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #if !defined( _ROLES_CACHE_H ) #define SLAPD_ROLES_INTERFACE "roles-slapd" Index: roles_plugin.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/roles/roles_plugin.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- roles_plugin.c 19 Apr 2005 22:07:34 -0000 1.5 +++ roles_plugin.c 10 Nov 2006 23:45:24 -0000 1.6 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* Code to implement server roles features */ From fedora-directory-commits at redhat.com Fri Nov 10 23:44:32 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:44:32 -0700 Subject: [Fedora-directory-commits] ldapserver/include/public/base systems.h, 1.6, 1.7 Message-ID: <200611102346.kAANkWqr000501@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/include/public/base In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/include/public/base Modified Files: systems.h Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: systems.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/public/base/systems.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- systems.h 19 Apr 2005 22:06:49 -0000 1.6 +++ systems.h 10 Nov 2006 23:44:28 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef PUBLIC_BASE_SYSTEMS_H #define PUBLIC_BASE_SYSTEMS_H From fedora-directory-commits at redhat.com Fri Nov 10 23:45:32 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:45:32 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/shared plugin-utils.h, 1.4, 1.5 utils.c, 1.5, 1.6 Message-ID: <200611102346.kAANkW1J000505@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/shared In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/servers/plugins/shared Modified Files: plugin-utils.h utils.c Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: plugin-utils.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/shared/plugin-utils.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- plugin-utils.h 19 Apr 2005 22:07:34 -0000 1.4 +++ plugin-utils.h 10 Nov 2006 23:45:30 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /*********************************************************************** ** ** NAME Index: utils.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/shared/utils.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- utils.c 19 Apr 2005 22:07:34 -0000 1.5 +++ utils.c 10 Nov 2006 23:45:30 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /*********************************************************************** ** NAME ** utils.c From fedora-directory-commits at redhat.com Fri Nov 10 23:44:28 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:44:28 -0700 Subject: [Fedora-directory-commits] ldapserver/include/ldaputil cert.h, 1.4, 1.5 certmap.h, 1.4, 1.5 dbconf.h, 1.4, 1.5 encode.h, 1.4, 1.5 errors.h, 1.4, 1.5 extcmap.h, 1.4, 1.5 init.h, 1.4, 1.5 ldapauth.h, 1.4, 1.5 ldapdb.h, 1.5, 1.6 ldaputil.h, 1.4, 1.5 Message-ID: <200611102346.kAANkSqG000403@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/include/ldaputil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/include/ldaputil Modified Files: cert.h certmap.h dbconf.h encode.h errors.h extcmap.h init.h ldapauth.h ldapdb.h ldaputil.h Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: cert.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/ldaputil/cert.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cert.h 19 Apr 2005 22:06:45 -0000 1.4 +++ cert.h 10 Nov 2006 23:44:25 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef _LDAPU_CERT_H #define _LDAPU_CERT_H Index: certmap.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/ldaputil/certmap.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- certmap.h 19 Apr 2005 22:06:45 -0000 1.4 +++ certmap.h 10 Nov 2006 23:44:25 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef _LDAPU_CERTMAP_H #define _LDAPU_CERTMAP_H Index: dbconf.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/ldaputil/dbconf.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dbconf.h 19 Apr 2005 22:06:45 -0000 1.4 +++ dbconf.h 10 Nov 2006 23:44:25 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef _LDAPU_DBCONF_H #define _LDAPU_DBCONF_H Index: encode.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/ldaputil/encode.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- encode.h 19 Apr 2005 22:06:45 -0000 1.4 +++ encode.h 10 Nov 2006 23:44:25 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef _LDAPU_ENCODE_H #define _LDAPU_ENCODE_H Index: errors.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/ldaputil/errors.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- errors.h 19 Apr 2005 22:06:45 -0000 1.4 +++ errors.h 10 Nov 2006 23:44:25 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef _LDAPU_ERRORS_H #define _LDAPU_ERRORS_H Index: extcmap.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/ldaputil/extcmap.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- extcmap.h 19 Apr 2005 22:06:45 -0000 1.4 +++ extcmap.h 10 Nov 2006 23:44:25 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef _PUBLIC_CERTMAP_H #define _PUBLIC_CERTMAP_H Index: init.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/ldaputil/init.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- init.h 19 Apr 2005 22:06:45 -0000 1.4 +++ init.h 10 Nov 2006 23:44:25 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef _LDAPU_INIT_H #define _LDAPU_INIT_H Index: ldapauth.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/ldaputil/ldapauth.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ldapauth.h 19 Apr 2005 22:06:45 -0000 1.4 +++ ldapauth.h 10 Nov 2006 23:44:25 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #ifndef LDAPU_AUTH_H #define LDAPU_AUTH_H Index: ldapdb.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/ldaputil/ldapdb.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ldapdb.h 10 Nov 2006 01:37:46 -0000 1.5 +++ ldapdb.h 10 Nov 2006 23:44:25 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef _LDAPU_LDAPDB_H #define _LDAPU_LDAPDB_H Index: ldaputil.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/ldaputil/ldaputil.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ldaputil.h 19 Apr 2005 22:06:45 -0000 1.4 +++ ldaputil.h 10 Nov 2006 23:44:25 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef _LDAPU_LDAPUTIL_H #define _LDAPU_LDAPUTIL_H From fedora-directory-commits at redhat.com Fri Nov 10 23:45:03 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:45:03 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/cos cos.c, 1.4, 1.5 cos_cache.c, 1.6, 1.7 cos_cache.h, 1.4, 1.5 dllmain.c, 1.4, 1.5 Message-ID: <200611102346.kAANkY87000549@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/cos In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/servers/plugins/cos Modified Files: cos.c cos_cache.c cos_cache.h dllmain.c Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: cos.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/cos/cos.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cos.c 19 Apr 2005 22:07:29 -0000 1.4 +++ cos.c 10 Nov 2006 23:44:56 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include #include #include "portable.h" Index: cos_cache.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/cos/cos_cache.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- cos_cache.c 19 Apr 2005 22:07:29 -0000 1.6 +++ cos_cache.c 10 Nov 2006 23:44:56 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* The cos cache keeps in memory all of the data related to cos. This allows Index: cos_cache.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/cos/cos_cache.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cos_cache.h 19 Apr 2005 22:07:29 -0000 1.4 +++ cos_cache.h 10 Nov 2006 23:44:56 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #if !defined( _COS_CACHE_H ) #define _COS_CACHE_H Index: dllmain.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/cos/dllmain.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dllmain.c 19 Apr 2005 22:07:29 -0000 1.4 +++ dllmain.c 10 Nov 2006 23:44:56 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Microsoft Windows specifics for BACK-LDBM DLL */ From fedora-directory-commits at redhat.com Fri Nov 10 23:44:30 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:44:30 -0700 Subject: [Fedora-directory-commits] ldapserver/include/nt messages.h, 1.4, 1.5 nsapi.h, 1.7, 1.8 ntos.h, 1.4, 1.5 regparms.h, 1.8, 1.9 resource.h, 1.4, 1.5 Message-ID: <200611102346.kAANkUvj000458@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/include/nt In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/include/nt Modified Files: messages.h nsapi.h ntos.h regparms.h resource.h Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: messages.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/nt/messages.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- messages.h 19 Apr 2005 22:06:47 -0000 1.4 +++ messages.h 10 Nov 2006 23:44:27 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* Microsoft Developer Support Copyright (c) 1992 Microsoft Corporation Index: nsapi.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/nt/nsapi.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- nsapi.h 19 Apr 2005 22:06:47 -0000 1.7 +++ nsapi.h 10 Nov 2006 23:44:27 -0000 1.8 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Aruna Victor */ Index: ntos.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/nt/ntos.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ntos.h 19 Apr 2005 22:06:47 -0000 1.4 +++ ntos.h 10 Nov 2006 23:44:27 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /********************************************************************** * ntOS.h - functionality used bt NT Operating System * Index: regparms.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/nt/regparms.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- regparms.h 10 Nov 2006 01:05:00 -0000 1.8 +++ regparms.h 10 Nov 2006 23:44:27 -0000 1.9 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + // // // Name: regparms.h // // Platforms: WIN32 // Index: resource.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/nt/resource.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- resource.h 19 Apr 2005 22:06:47 -0000 1.4 +++ resource.h 10 Nov 2006 23:44:27 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + //{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. // Used by netsite.rc From fedora-directory-commits at redhat.com Fri Nov 10 23:45:05 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:45:05 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/http dllmain.c, 1.4, 1.5 http_client.c, 1.5, 1.6 http_client.h, 1.4, 1.5 http_impl.c, 1.9, 1.10 http_impl.h, 1.4, 1.5 Message-ID: <200611102346.kAANkZxG000618@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/http In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/servers/plugins/http Modified Files: dllmain.c http_client.c http_client.h http_impl.c http_impl.h Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: dllmain.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/http/dllmain.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dllmain.c 19 Apr 2005 22:07:30 -0000 1.4 +++ dllmain.c 10 Nov 2006 23:45:02 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * --- END COPYRIGHT BLOCK --- */ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* * Microsoft Windows specifics for BACK-LDBM DLL */ Index: http_client.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/http/http_client.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- http_client.c 19 Apr 2005 22:07:30 -0000 1.5 +++ http_client.c 10 Nov 2006 23:45:02 -0000 1.6 @@ -36,6 +36,11 @@ * All rights reserved. * --- END COPYRIGHT BLOCK --- */ +#ifdef HAVE_CONFIG_H +# include +#endif + + /** * Simple Http Client API broker plugin */ Index: http_client.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/http/http_client.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- http_client.h 19 Apr 2005 22:07:30 -0000 1.4 +++ http_client.h 10 Nov 2006 23:45:02 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * --- END COPYRIGHT BLOCK --- */ +#ifdef HAVE_CONFIG_H +# include +#endif + + #ifndef _HTTP_CLIENT_H_ #define _HTTP_CLIENT_H_ Index: http_impl.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/http/http_impl.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- http_impl.c 13 Oct 2006 01:06:27 -0000 1.9 +++ http_impl.c 10 Nov 2006 23:45:02 -0000 1.10 @@ -36,6 +36,11 @@ * All rights reserved. * --- END COPYRIGHT BLOCK --- */ +#ifdef HAVE_CONFIG_H +# include +#endif + + /** * Implementation of a Simple HTTP Client */ Index: http_impl.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/http/http_impl.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- http_impl.h 19 Apr 2005 22:07:30 -0000 1.4 +++ http_impl.h 10 Nov 2006 23:45:02 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * --- END COPYRIGHT BLOCK --- */ +#ifdef HAVE_CONFIG_H +# include +#endif + + #ifndef HTTP_IMPL_H__ #define HTTP_IMPL_H__ From fedora-directory-commits at redhat.com Fri Nov 10 23:45:35 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:45:35 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/views dllmain.c, 1.4, 1.5 views.c, 1.8, 1.9 Message-ID: <200611102346.kAANkZ0X000649@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/views In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/servers/plugins/views Modified Files: dllmain.c views.c Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: dllmain.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/views/dllmain.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dllmain.c 19 Apr 2005 22:07:36 -0000 1.4 +++ dllmain.c 10 Nov 2006 23:45:33 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Microsoft Windows specifics for BACK-LDBM DLL */ Index: views.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/views/views.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- views.c 5 Jan 2006 17:56:14 -0000 1.8 +++ views.c 10 Nov 2006 23:45:33 -0000 1.9 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* plugin which implements directory server views */ #include From fedora-directory-commits at redhat.com Fri Nov 10 23:46:06 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:46:06 -0700 Subject: [Fedora-directory-commits] ldapserver/lib/libadmin authdb.c, 1.6, 1.7 error.c, 1.6, 1.7 template.c, 1.5, 1.6 util.c, 1.6, 1.7 Message-ID: <200611102346.kAANkaww000653@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/lib/libadmin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/lib/libadmin Modified Files: authdb.c error.c template.c util.c Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: authdb.c =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libadmin/authdb.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- authdb.c 11 Apr 2006 02:14:54 -0000 1.6 +++ authdb.c 10 Nov 2006 23:46:03 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * authdb.c: Functions to aid in user/group database admin * Index: error.c =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libadmin/error.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- error.c 19 Apr 2005 22:07:54 -0000 1.6 +++ error.c 10 Nov 2006 23:46:03 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * error.c - Handle error recovery * Index: template.c =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libadmin/template.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- template.c 19 Apr 2005 22:07:54 -0000 1.5 +++ template.c 10 Nov 2006 23:46:03 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * template.c: The actual HTML templates in a static variable * Index: util.c =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libadmin/util.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- util.c 19 Apr 2005 22:07:54 -0000 1.6 +++ util.c 10 Nov 2006 23:46:03 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * util.c: Miscellaneous stuffs * From fedora-directory-commits at redhat.com Fri Nov 10 23:46:06 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:46:06 -0700 Subject: [Fedora-directory-commits] ldapserver/lib/libnt info.c, 1.4, 1.5 path.c, 1.4, 1.5 pmddeml.c, 1.4, 1.5 registry.c, 1.4, 1.5 service.c, 1.4, 1.5 tcpip.c, 1.4, 1.5 Message-ID: <200611102346.kAANkbEL000669@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/lib/libnt In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/lib/libnt Modified Files: info.c path.c pmddeml.c registry.c service.c tcpip.c Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: info.c =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libnt/info.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- info.c 19 Apr 2005 22:07:54 -0000 1.4 +++ info.c 10 Nov 2006 23:46:04 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include #include "nt/ntos.h" Index: path.c =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libnt/path.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- path.c 19 Apr 2005 22:07:54 -0000 1.4 +++ path.c 10 Nov 2006 23:46:04 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /*********************************************************** * Path functions - removing ../ from path **********************************************************/ Index: pmddeml.c =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libnt/pmddeml.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- pmddeml.c 19 Apr 2005 22:07:54 -0000 1.4 +++ pmddeml.c 10 Nov 2006 23:46:04 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /**************************************************************************** PROGRAM: pmddeml.c Index: registry.c =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libnt/registry.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- registry.c 19 Apr 2005 22:07:54 -0000 1.4 +++ registry.c 10 Nov 2006 23:46:04 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + // ERROR.C // // This file contains the functions needed to install the httpd server. Index: service.c =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libnt/service.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- service.c 19 Apr 2005 22:07:54 -0000 1.4 +++ service.c 10 Nov 2006 23:46:04 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include #include "nt/ntos.h" Index: tcpip.c =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libnt/tcpip.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- tcpip.c 19 Apr 2005 22:07:54 -0000 1.4 +++ tcpip.c 10 Nov 2006 23:46:04 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include #include "nt/ntos.h" From fedora-directory-commits at redhat.com Fri Nov 10 23:46:05 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:46:05 -0700 Subject: [Fedora-directory-commits] ldapserver/lib/libaccess access_plhash.h, 1.4, 1.5 acl.tab.h, 1.4, 1.5 aclcache.h, 1.4, 1.5 aclpriv.h, 1.4, 1.5 aclscan.h, 1.4, 1.5 aclutil.h, 1.4, 1.5 las.h, 1.4, 1.5 lasdns.h, 1.4, 1.5 lasip.h, 1.4, 1.5 ldapauth.h, 1.4, 1.5 oneeval.h, 1.4, 1.5 parse.h, 1.4, 1.5 permhash.h, 1.4, 1.5 access_plhash.cpp, 1.4, 1.5 acl.tab.cpp, 1.5, 1.6 acl.yy.cpp, 1.5, 1.6 aclcache.cpp, 1.6, 1.7 aclerror.cpp, 1.7, 1.8 acleval.cpp, 1.4, 1.5 aclflush.cpp, 1.5, 1.6 aclspace.cpp, 1.4, 1.5 acltools.cpp, 1.6, 1.7 aclutil.cpp, 1.5, 1.6 authdb.cpp, 1.6, 1.7 lasdns.cpp, 1.7, 1.8 lasgroup.cpp, 1.4, 1.5 lasip.cpp, 1.6, 1.7 lastod.cpp, 1.5, 1.6 lasuser.cpp, 1.4, 1.5 ldapacl.cpp, 1.5, 1.6 method.cpp, 1.4, 1.5 nsautherr.cpp, 1.4, 1.5 nseframe.cpp, 1.4, 1.5 oneeval.cpp, 1.6, 1.7 register.cpp, 1.5, 1.6 symbols.cpp, 1.4, 1.5 usi.cpp, 1.4, 1.5 usrcache.cpp, 1.5, 1.6 Message-ID: <200611102346.kAANkZs5000602@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/lib/libaccess In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/lib/libaccess Modified Files: access_plhash.h acl.tab.h aclcache.h aclpriv.h aclscan.h aclutil.h las.h lasdns.h lasip.h ldapauth.h oneeval.h parse.h permhash.h access_plhash.cpp acl.tab.cpp acl.yy.cpp aclcache.cpp aclerror.cpp acleval.cpp aclflush.cpp aclspace.cpp acltools.cpp aclutil.cpp authdb.cpp lasdns.cpp lasgroup.cpp lasip.cpp lastod.cpp lasuser.cpp ldapacl.cpp method.cpp nsautherr.cpp nseframe.cpp oneeval.cpp register.cpp symbols.cpp usi.cpp usrcache.cpp Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: access_plhash.h =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/access_plhash.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- access_plhash.h 19 Apr 2005 22:07:47 -0000 1.4 +++ access_plhash.h 10 Nov 2006 23:46:02 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + NSPR_BEGIN_EXTERN_C /* * access_plhash.cpp - supplement to NSPR plhash Index: acl.tab.h =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/acl.tab.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- acl.tab.h 19 Apr 2005 22:07:47 -0000 1.4 +++ acl.tab.h 10 Nov 2006 23:46:02 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + typedef union #ifdef __cplusplus ACLSTYPE Index: aclcache.h =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/aclcache.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- aclcache.h 19 Apr 2005 22:07:47 -0000 1.4 +++ aclcache.h 10 Nov 2006 23:46:02 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #ifndef CACHE_H #define CACHE_H Index: aclpriv.h =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/aclpriv.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- aclpriv.h 19 Apr 2005 22:07:47 -0000 1.4 +++ aclpriv.h 10 Nov 2006 23:46:02 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* * ACL private data structure definitions */ Index: aclscan.h =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/aclscan.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- aclscan.h 19 Apr 2005 22:07:47 -0000 1.4 +++ aclscan.h 10 Nov 2006 23:46:02 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* * Internal functions for scanner. */ Index: aclutil.h =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/aclutil.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- aclutil.h 19 Apr 2005 22:07:47 -0000 1.4 +++ aclutil.h 10 Nov 2006 23:46:02 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #ifndef ACLUTIL_H #define ACLUTIL_H Index: las.h =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/las.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- las.h 19 Apr 2005 22:07:47 -0000 1.4 +++ las.h 10 Nov 2006 23:46:02 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #ifndef LAS_H #define LAS_H Index: lasdns.h =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/lasdns.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- lasdns.h 19 Apr 2005 22:07:47 -0000 1.4 +++ lasdns.h 10 Nov 2006 23:46:02 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + typedef struct LASDnsContext { PRHashTable *Table; pool_handle_t *pool; Index: lasip.h =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/lasip.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- lasip.h 19 Apr 2005 22:07:47 -0000 1.4 +++ lasip.h 10 Nov 2006 23:46:02 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + typedef struct LASIpTree { struct LASIpTree *action[2]; } LASIpTree_t; Index: ldapauth.h =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/ldapauth.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ldapauth.h 19 Apr 2005 22:07:47 -0000 1.4 +++ ldapauth.h 10 Nov 2006 23:46:02 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #ifndef LDAP_AUTH_H #define LDAP_AUTH_H Index: oneeval.h =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/oneeval.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- oneeval.h 19 Apr 2005 22:07:47 -0000 1.4 +++ oneeval.h 10 Nov 2006 23:46:02 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef LEVAL_H #define LEVAL_H Index: parse.h =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/parse.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- parse.h 19 Apr 2005 22:07:47 -0000 1.4 +++ parse.h 10 Nov 2006 23:46:02 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * module private routines for handling the yacc based * ACL Parser. Index: permhash.h =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/permhash.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- permhash.h 19 Apr 2005 22:07:47 -0000 1.4 +++ permhash.h 10 Nov 2006 23:46:02 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef _PERMHASH_H_ #define _PERMHASH_H_ Index: access_plhash.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/access_plhash.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- access_plhash.cpp 19 Apr 2005 22:07:47 -0000 1.4 +++ access_plhash.cpp 10 Nov 2006 23:46:02 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* This file contains a function which augments the standard nspr PL_HashTable api. The problem is that the hash table lookup function in the standard NSPR Index: acl.tab.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/acl.tab.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- acl.tab.cpp 19 Apr 2005 22:07:47 -0000 1.5 +++ acl.tab.cpp 10 Nov 2006 23:46:02 -0000 1.6 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + # line 8 "acltext.y" #include #include Index: acl.yy.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/acl.yy.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- acl.yy.cpp 11 Apr 2006 02:14:53 -0000 1.5 +++ acl.yy.cpp 10 Nov 2006 23:46:02 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* A lexical scanner generated by flex */ #define FLEX_SCANNER Index: aclcache.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/aclcache.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- aclcache.cpp 19 Apr 2005 22:07:47 -0000 1.6 +++ aclcache.cpp 10 Nov 2006 23:46:02 -0000 1.7 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include #include #include Index: aclerror.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/aclerror.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- aclerror.cpp 10 Nov 2006 01:34:16 -0000 1.7 +++ aclerror.cpp 10 Nov 2006 23:46:02 -0000 1.8 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* * Description (aclerror.c) * Index: acleval.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/acleval.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- acleval.cpp 19 Apr 2005 22:07:47 -0000 1.4 +++ acleval.cpp 10 Nov 2006 23:46:02 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* * Description (acleval.c) * Index: aclflush.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/aclflush.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- aclflush.cpp 19 Apr 2005 22:07:47 -0000 1.5 +++ aclflush.cpp 10 Nov 2006 23:46:02 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Source file for the ACL_CacheFlush-related routines. */ Index: aclspace.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/aclspace.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- aclspace.cpp 19 Apr 2005 22:07:47 -0000 1.4 +++ aclspace.cpp 10 Nov 2006 23:46:02 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include #include #include "aclpriv.h" Index: acltools.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/acltools.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- acltools.cpp 19 Apr 2005 22:07:47 -0000 1.6 +++ acltools.cpp 10 Nov 2006 23:46:02 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Tools to build and maintain access control lists. */ Index: aclutil.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/aclutil.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- aclutil.cpp 19 Apr 2005 22:07:47 -0000 1.5 +++ aclutil.cpp 10 Nov 2006 23:46:02 -0000 1.6 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* * Source file for the TimeOfDay and DayOfWeek LAS drivers */ Index: authdb.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/authdb.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- authdb.cpp 10 Nov 2006 01:34:16 -0000 1.6 +++ authdb.cpp 10 Nov 2006 23:46:02 -0000 1.7 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include #include Index: lasdns.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/lasdns.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- lasdns.cpp 8 Nov 2006 21:23:42 -0000 1.7 +++ lasdns.cpp 10 Nov 2006 23:46:02 -0000 1.8 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* lasdns.c * This file contains the DNS LAS code. */ Index: lasgroup.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/lasgroup.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- lasgroup.cpp 19 Apr 2005 22:07:47 -0000 1.4 +++ lasgroup.cpp 10 Nov 2006 23:46:02 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* #define DBG_PRINT */ /* lasgroup.c Index: lasip.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/lasip.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- lasip.cpp 11 Apr 2006 02:14:53 -0000 1.6 +++ lasip.cpp 10 Nov 2006 23:46:02 -0000 1.7 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* aclip.c * This file contains the IP LAS code. */ Index: lastod.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/lastod.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- lastod.cpp 11 Apr 2006 02:14:53 -0000 1.5 +++ lastod.cpp 10 Nov 2006 23:46:02 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* Source file for the TimeOfDay and DayOfWeek LAS drivers */ #include Index: lasuser.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/lasuser.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- lasuser.cpp 19 Apr 2005 22:07:47 -0000 1.4 +++ lasuser.cpp 10 Nov 2006 23:46:02 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* lasuser.c * This file contains the User LAS code. */ Index: ldapacl.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/ldapacl.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ldapacl.cpp 19 Apr 2005 22:07:47 -0000 1.5 +++ ldapacl.cpp 10 Nov 2006 23:46:02 -0000 1.6 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* #define DBG_PRINT */ #include Index: method.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/method.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- method.cpp 19 Apr 2005 22:07:47 -0000 1.4 +++ method.cpp 10 Nov 2006 23:46:02 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include #include #include Index: nsautherr.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/nsautherr.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nsautherr.cpp 19 Apr 2005 22:07:47 -0000 1.4 +++ nsautherr.cpp 10 Nov 2006 23:46:02 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* * Description (nsautherr.c) * Index: nseframe.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/nseframe.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nseframe.cpp 19 Apr 2005 22:07:47 -0000 1.4 +++ nseframe.cpp 10 Nov 2006 23:46:02 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* * Description (nseframe.c) * Index: oneeval.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/oneeval.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- oneeval.cpp 19 Apr 2005 22:07:47 -0000 1.6 +++ oneeval.cpp 10 Nov 2006 23:46:02 -0000 1.7 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* * Description (acleval.c) * Index: register.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/register.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- register.cpp 19 Apr 2005 22:07:47 -0000 1.5 +++ register.cpp 10 Nov 2006 23:46:02 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * LAS registration interface */ Index: symbols.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/symbols.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- symbols.cpp 19 Apr 2005 22:07:47 -0000 1.4 +++ symbols.cpp 10 Nov 2006 23:46:02 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* * Description (symbols.c) * Index: usi.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/usi.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- usi.cpp 19 Apr 2005 22:07:47 -0000 1.4 +++ usi.cpp 10 Nov 2006 23:46:02 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include "base/systems.h" #include "netsite.h" #include "assert.h" Index: usrcache.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/usrcache.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- usrcache.cpp 19 Apr 2005 22:07:47 -0000 1.5 +++ usrcache.cpp 10 Nov 2006 23:46:02 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* #define DBG_PRINT */ From fedora-directory-commits at redhat.com Fri Nov 10 23:46:02 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:46:02 -0700 Subject: [Fedora-directory-commits] ldapserver/lib/ldaputil/examples init.c, 1.4, 1.5 plugin.c, 1.4, 1.5 plugin.h, 1.4, 1.5 Message-ID: <200611102346.kAANkWub000506@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/lib/ldaputil/examples In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/lib/ldaputil/examples Modified Files: init.c plugin.c plugin.h Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: init.c =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/ldaputil/examples/init.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- init.c 19 Apr 2005 22:07:47 -0000 1.4 +++ init.c 10 Nov 2006 23:46:00 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include #include #include Index: plugin.c =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/ldaputil/examples/plugin.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- plugin.c 19 Apr 2005 22:07:47 -0000 1.4 +++ plugin.c 10 Nov 2006 23:46:00 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include #include #include Index: plugin.h =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/ldaputil/examples/plugin.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- plugin.h 19 Apr 2005 22:07:47 -0000 1.4 +++ plugin.h 10 Nov 2006 23:46:00 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef _CERTMAP_PLUGIN_H #define _CERTMAP_PLUGIN_H From fedora-directory-commits at redhat.com Fri Nov 10 23:46:02 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:46:02 -0700 Subject: [Fedora-directory-commits] ldapserver/lib/base lexer_pvt.h, 1.4, 1.5 nscperror.c, 1.4, 1.5 plist_pvt.h, 1.5, 1.6 crit.cpp, 1.5, 1.6 dns.cpp, 1.6, 1.7 dnsdmain.cpp, 1.7, 1.8 ereport.cpp, 1.5, 1.6 eventlog.cpp, 1.5, 1.6 file.cpp, 1.7, 1.8 fsmutex.cpp, 1.4, 1.5 lexer.cpp, 1.5, 1.6 net.cpp, 1.5, 1.6 nterrors.cpp, 1.4, 1.5 plist.cpp, 1.5, 1.6 pool.cpp, 1.6, 1.7 rwlock.cpp, 1.4, 1.5 shexp.cpp, 1.5, 1.6 system.cpp, 1.8, 1.9 systhr.cpp, 1.8, 1.9 util.cpp, 1.5, 1.6 Message-ID: <200611102346.kAANkWCY000487@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/lib/base In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/lib/base Modified Files: lexer_pvt.h nscperror.c plist_pvt.h crit.cpp dns.cpp dnsdmain.cpp ereport.cpp eventlog.cpp file.cpp fsmutex.cpp lexer.cpp net.cpp nterrors.cpp plist.cpp pool.cpp rwlock.cpp shexp.cpp system.cpp systhr.cpp util.cpp Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: lexer_pvt.h =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/base/lexer_pvt.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- lexer_pvt.h 19 Apr 2005 22:07:45 -0000 1.4 +++ lexer_pvt.h 10 Nov 2006 23:45:59 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef __LEXER_PVT_H #define __LEXER_PVT_H Index: nscperror.c =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/base/nscperror.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nscperror.c 19 Apr 2005 22:07:45 -0000 1.4 +++ nscperror.c 10 Nov 2006 23:45:59 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* nscperrors.c * Very crude error handling for nspr and libsec. */ Index: plist_pvt.h =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/base/plist_pvt.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- plist_pvt.h 19 Apr 2005 22:07:45 -0000 1.5 +++ plist_pvt.h 10 Nov 2006 23:45:59 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef _PLIST_PVT_H #define _PLIST_PVT_H Index: crit.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/base/crit.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- crit.cpp 19 Apr 2005 22:07:45 -0000 1.5 +++ crit.cpp 10 Nov 2006 23:45:59 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * crit.c: Critical section abstraction. Used in threaded servers to protect * areas where two threads can interfere with each other. Index: dns.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/base/dns.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- dns.cpp 11 Apr 2006 02:14:52 -0000 1.6 +++ dns.cpp 10 Nov 2006 23:45:59 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * dns.c: DNS resolution routines * Index: dnsdmain.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/base/dnsdmain.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- dnsdmain.cpp 11 Apr 2006 02:14:52 -0000 1.7 +++ dnsdmain.cpp 10 Nov 2006 23:45:59 -0000 1.8 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * dnsdmain.c: DNS domain guessing stuff moved out of dns.c because of the * string ball problems Index: ereport.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/base/ereport.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ereport.cpp 19 Apr 2005 22:07:45 -0000 1.5 +++ ereport.cpp 10 Nov 2006 23:45:59 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * ereport.c: Records transactions, reports errors to administrators, etc. * Index: eventlog.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/base/eventlog.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- eventlog.cpp 19 Apr 2005 22:07:45 -0000 1.5 +++ eventlog.cpp 10 Nov 2006 23:45:59 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + // // // Name: EVENTLOG // // Platforms: WIN32 // Index: file.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/base/file.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- file.cpp 10 Nov 2006 01:10:57 -0000 1.7 +++ file.cpp 10 Nov 2006 23:45:59 -0000 1.8 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * file.c: system specific functions for reading/writing files * Index: fsmutex.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/base/fsmutex.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fsmutex.cpp 19 Apr 2005 22:07:45 -0000 1.4 +++ fsmutex.cpp 10 Nov 2006 23:45:59 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * fsmutex: Mutexes that are filesystem-based so they're available from more * than one process and address space Index: lexer.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/base/lexer.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- lexer.cpp 19 Apr 2005 22:07:45 -0000 1.5 +++ lexer.cpp 10 Nov 2006 23:45:59 -0000 1.6 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* * Description (lexer.c) * Index: net.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/base/net.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- net.cpp 19 Apr 2005 22:07:45 -0000 1.5 +++ net.cpp 10 Nov 2006 23:45:59 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * net.c: sockets abstraction and DNS related things * Index: nterrors.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/base/nterrors.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nterrors.cpp 19 Apr 2005 22:07:45 -0000 1.4 +++ nterrors.cpp 10 Nov 2006 23:45:59 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * nterrors.c: Conversion of error numbers to explanation strings * Index: plist.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/base/plist.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- plist.cpp 11 Apr 2006 02:14:52 -0000 1.5 +++ plist.cpp 10 Nov 2006 23:45:59 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * MODULE: plist.c * Index: pool.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/base/pool.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- pool.cpp 11 Apr 2006 02:14:52 -0000 1.6 +++ pool.cpp 10 Nov 2006 23:45:59 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Generic pool handling routines. * Index: rwlock.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/base/rwlock.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rwlock.cpp 19 Apr 2005 22:07:45 -0000 1.4 +++ rwlock.cpp 10 Nov 2006 23:45:59 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include #include "crit.h" #include "rwlock.h" Index: shexp.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/base/shexp.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- shexp.cpp 19 Apr 2005 22:07:45 -0000 1.5 +++ shexp.cpp 10 Nov 2006 23:45:59 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * shexp.c: shell-like wildcard match routines * Index: system.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/base/system.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- system.cpp 10 Nov 2006 01:42:39 -0000 1.8 +++ system.cpp 10 Nov 2006 23:45:59 -0000 1.9 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * system.c: A grab bag of system-level abstractions * Index: systhr.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/base/systhr.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- systhr.cpp 10 Nov 2006 01:34:11 -0000 1.8 +++ systhr.cpp 10 Nov 2006 23:45:59 -0000 1.9 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * systhr.c: Abstracted threading mechanisms * Index: util.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/base/util.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- util.cpp 19 Apr 2005 22:07:45 -0000 1.5 +++ util.cpp 10 Nov 2006 23:45:59 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * util.c: A hodge podge of utility functions and standard functions which * are unavailable on certain systems From fedora-directory-commits at redhat.com Fri Nov 10 23:45:33 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:45:33 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/statechange dllmain.c, 1.4, 1.5 statechange.c, 1.5, 1.6 Message-ID: <200611102346.kAANkXU2000512@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/statechange In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/servers/plugins/statechange Modified Files: dllmain.c statechange.c Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: dllmain.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/statechange/dllmain.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dllmain.c 19 Apr 2005 22:07:35 -0000 1.4 +++ dllmain.c 10 Nov 2006 23:45:30 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Microsoft Windows specifics for BACK-LDBM DLL */ Index: statechange.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/statechange/statechange.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- statechange.c 19 Apr 2005 22:07:35 -0000 1.5 +++ statechange.c 10 Nov 2006 23:45:30 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* plugin which provides a callback mechanism for state changes in the DS */ #include From fedora-directory-commits at redhat.com Fri Nov 10 23:45:33 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:45:33 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/syntaxes bin.c, 1.4, 1.5 ces.c, 1.4, 1.5 cis.c, 1.4, 1.5 debug.c, 1.4, 1.5 dllmain.c, 1.5, 1.6 dn.c, 1.4, 1.5 int.c, 1.4, 1.5 phonetic.c, 1.4, 1.5 sicis.c, 1.4, 1.5 string.c, 1.6, 1.7 syntax.h, 1.4, 1.5 tel.c, 1.4, 1.5 value.c, 1.5, 1.6 Message-ID: <200611102346.kAANkYJD000539@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/syntaxes In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/servers/plugins/syntaxes Modified Files: bin.c ces.c cis.c debug.c dllmain.c dn.c int.c phonetic.c sicis.c string.c syntax.h tel.c value.c Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: bin.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/syntaxes/bin.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- bin.c 19 Apr 2005 22:07:35 -0000 1.4 +++ bin.c 10 Nov 2006 23:45:31 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* bin.c - bin syntax routines */ /* Index: ces.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/syntaxes/ces.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ces.c 19 Apr 2005 22:07:35 -0000 1.4 +++ ces.c 10 Nov 2006 23:45:31 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* ces.c - caseexactstring syntax routines */ #include Index: cis.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/syntaxes/cis.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cis.c 19 Apr 2005 22:07:35 -0000 1.4 +++ cis.c 10 Nov 2006 23:45:31 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* cis.c - caseignorestring syntax routines */ /* Index: debug.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/syntaxes/debug.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- debug.c 19 Apr 2005 22:07:35 -0000 1.4 +++ debug.c 10 Nov 2006 23:45:31 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* debug.c - syntax debug stuff */ #include Index: dllmain.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/syntaxes/dllmain.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- dllmain.c 11 Apr 2006 02:14:43 -0000 1.5 +++ dllmain.c 10 Nov 2006 23:45:31 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Microsoft Windows specifics for syntax-plugin DLL */ Index: dn.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/syntaxes/dn.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dn.c 19 Apr 2005 22:07:35 -0000 1.4 +++ dn.c 10 Nov 2006 23:45:31 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* dn.c - dn syntax routines */ #include Index: int.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/syntaxes/int.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- int.c 19 Apr 2005 22:07:35 -0000 1.4 +++ int.c 10 Nov 2006 23:45:31 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* int.c - integer syntax routines */ #include Index: phonetic.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/syntaxes/phonetic.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- phonetic.c 19 Apr 2005 22:07:35 -0000 1.4 +++ phonetic.c 10 Nov 2006 23:45:31 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* phonetic.c - routines to do phonetic matching */ #include Index: sicis.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/syntaxes/sicis.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sicis.c 19 Apr 2005 22:07:35 -0000 1.4 +++ sicis.c 10 Nov 2006 23:45:31 -0000 1.5 @@ -35,6 +35,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* * sicis.c - space insensitive string syntax routines. * these strings are also case insensitive. Index: string.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/syntaxes/string.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- string.c 6 Nov 2006 20:51:30 -0000 1.6 +++ string.c 10 Nov 2006 23:45:31 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* string.c - common string syntax routines */ #include Index: syntax.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/syntaxes/syntax.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- syntax.h 19 Apr 2005 22:07:35 -0000 1.4 +++ syntax.h 10 Nov 2006 23:45:31 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* syntax.h - string syntax definitions */ #ifndef _LIBSYNTAX_H_ Index: tel.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/syntaxes/tel.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- tel.c 19 Apr 2005 22:07:35 -0000 1.4 +++ tel.c 10 Nov 2006 23:45:31 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* tel.c - telephonenumber syntax routines */ #include Index: value.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/syntaxes/value.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- value.c 19 Apr 2005 22:07:35 -0000 1.5 +++ value.c 10 Nov 2006 23:45:31 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* value.c - routines for dealing with values */ #include From fedora-directory-commits at redhat.com Fri Nov 10 23:46:04 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:46:04 -0700 Subject: [Fedora-directory-commits] ldapserver/lib/libaccess/utest shexp.h, 1.4, 1.5 acltest.cpp, 1.5, 1.6 lasemail.cpp, 1.4, 1.5 onetest.cpp, 1.5, 1.6 shexp.cpp, 1.4, 1.5 testmain.cpp, 1.4, 1.5 twotest.cpp, 1.5, 1.6 ustubs.cpp, 1.6, 1.7 Message-ID: <200611102346.kAANkY0I000574@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/lib/libaccess/utest In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/lib/libaccess/utest Modified Files: shexp.h acltest.cpp lasemail.cpp onetest.cpp shexp.cpp testmain.cpp twotest.cpp ustubs.cpp Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: shexp.h =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/utest/shexp.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- shexp.h 19 Apr 2005 22:07:48 -0000 1.4 +++ shexp.h 10 Nov 2006 23:46:02 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * shexp.h: Defines and prototypes for shell exp. match routines * Index: acltest.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/utest/acltest.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- acltest.cpp 19 Apr 2005 22:07:48 -0000 1.5 +++ acltest.cpp 10 Nov 2006 23:46:02 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include #include #include Index: lasemail.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/utest/lasemail.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- lasemail.cpp 19 Apr 2005 22:07:48 -0000 1.4 +++ lasemail.cpp 10 Nov 2006 23:46:02 -0000 1.5 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + /* lasemail.cpp * This file contains the Email LAS code. */ Index: onetest.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/utest/onetest.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- onetest.cpp 19 Apr 2005 22:07:48 -0000 1.5 +++ onetest.cpp 10 Nov 2006 23:46:02 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include #include #include Index: shexp.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/utest/shexp.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- shexp.cpp 19 Apr 2005 22:07:48 -0000 1.4 +++ shexp.cpp 10 Nov 2006 23:46:02 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * shexp.c: shell-like wildcard match routines * Index: testmain.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/utest/testmain.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- testmain.cpp 19 Apr 2005 22:07:48 -0000 1.4 +++ testmain.cpp 10 Nov 2006 23:46:02 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * ACL parser unit test program */ Index: twotest.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/utest/twotest.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- twotest.cpp 19 Apr 2005 22:07:48 -0000 1.5 +++ twotest.cpp 10 Nov 2006 23:46:02 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include #include #include Index: ustubs.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/libaccess/utest/ustubs.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ustubs.cpp 10 Nov 2006 01:34:17 -0000 1.6 +++ ustubs.cpp 10 Nov 2006 23:46:02 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include #include #include From fedora-directory-commits at redhat.com Fri Nov 10 23:45:06 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:45:06 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/pam_passthru pam_passthru.h, 1.5, 1.6 pam_ptconfig.c, 1.7, 1.8 pam_ptdebug.c, 1.4, 1.5 pam_ptdllmain.c, 1.5, 1.6 pam_ptimpl.c, 1.9, 1.10 pam_ptpreop.c, 1.5, 1.6 Message-ID: <200611102346.kAANkamB000661@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/pam_passthru In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/servers/plugins/pam_passthru Modified Files: pam_passthru.h pam_ptconfig.c pam_ptdebug.c pam_ptdllmain.c pam_ptimpl.c pam_ptpreop.c Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: pam_passthru.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/pam_passthru/pam_passthru.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- pam_passthru.h 15 Jul 2005 18:13:28 -0000 1.5 +++ pam_passthru.h 10 Nov 2006 23:45:03 -0000 1.6 @@ -34,6 +34,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * pam_passthru.h - Pass Through Authentication shared definitions * Index: pam_ptconfig.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/pam_passthru/pam_ptconfig.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- pam_ptconfig.c 15 Sep 2006 21:20:36 -0000 1.7 +++ pam_ptconfig.c 10 Nov 2006 23:45:03 -0000 1.8 @@ -34,6 +34,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * ptconfig.c - configuration-related code for Pass Through Authentication * Index: pam_ptdebug.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/pam_passthru/pam_ptdebug.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- pam_ptdebug.c 19 Apr 2005 22:07:30 -0000 1.4 +++ pam_ptdebug.c 10 Nov 2006 23:45:03 -0000 1.5 @@ -34,6 +34,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * pam_ptdebug.c - debugging-related code for PAM Pass Through Authentication * Index: pam_ptdllmain.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/pam_passthru/pam_ptdllmain.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- pam_ptdllmain.c 11 Apr 2006 02:14:41 -0000 1.5 +++ pam_ptdllmain.c 10 Nov 2006 23:45:03 -0000 1.6 @@ -34,6 +34,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include "ldap.h" #include "lber.h" #include "passthru.h" Index: pam_ptimpl.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/pam_passthru/pam_ptimpl.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- pam_ptimpl.c 10 Oct 2006 16:31:01 -0000 1.9 +++ pam_ptimpl.c 10 Nov 2006 23:45:03 -0000 1.10 @@ -35,6 +35,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #include #include "pam_passthru.h" Index: pam_ptpreop.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/pam_passthru/pam_ptpreop.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- pam_ptpreop.c 15 Jul 2005 18:13:28 -0000 1.5 +++ pam_ptpreop.c 10 Nov 2006 23:45:03 -0000 1.6 @@ -34,6 +34,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * pamptpreop.c - bind pre-operation plugin for Pass Through Authentication to PAM * From fedora-directory-commits at redhat.com Fri Nov 10 23:45:34 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:45:34 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/uiduniq 7bit.c, 1.6, 1.7 uid.c, 1.7, 1.8 Message-ID: <200611102346.kAANkYrD000559@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/uiduniq In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/servers/plugins/uiduniq Modified Files: 7bit.c uid.c Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: 7bit.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/uiduniq/7bit.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- 7bit.c 10 Aug 2005 20:56:35 -0000 1.6 +++ 7bit.c 10 Nov 2006 23:45:31 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * 7bit.c * Index: uid.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/uiduniq/uid.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- uid.c 1 Aug 2005 18:05:27 -0000 1.7 +++ uid.c 10 Nov 2006 23:45:31 -0000 1.8 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * uid.c * From fedora-directory-commits at redhat.com Fri Nov 10 23:45:35 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:45:35 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/vattrsp_template dllmain.c, 1.4, 1.5 vattrsp.c, 1.4, 1.5 Message-ID: <200611102346.kAANkZPm000594@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/vattrsp_template In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/servers/plugins/vattrsp_template Modified Files: dllmain.c vattrsp.c Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: dllmain.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/vattrsp_template/dllmain.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dllmain.c 19 Apr 2005 22:07:36 -0000 1.4 +++ dllmain.c 10 Nov 2006 23:45:32 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Microsoft Windows specifics for BACK-LDBM DLL */ Index: vattrsp.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/vattrsp_template/vattrsp.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- vattrsp.c 19 Apr 2005 22:07:36 -0000 1.4 +++ vattrsp.c 10 Nov 2006 23:45:32 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #include #include #include "portable.h" From fedora-directory-commits at redhat.com Fri Nov 10 23:44:35 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:44:35 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/admin/lib dsalib_conf.c, 1.7, 1.8 dsalib_confs.c, 1.6, 1.7 dsalib_db.c, 1.6, 1.7 dsalib_debug.c, 1.6, 1.7 dsalib_dn.c, 1.5, 1.6 dsalib_filename.c, 1.6, 1.7 dsalib_html.c, 1.5, 1.6 dsalib_ldif.c, 1.6, 1.7 dsalib_location.c, 1.8, 1.9 dsalib_pw.c, 1.6, 1.7 dsalib_tailf.c, 1.5, 1.6 dsalib_updown.c, 1.7, 1.8 dsalib_util.c, 1.8, 1.9 Message-ID: <200611102346.kAANkZaC000586@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/admin/lib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/ldap/admin/lib Modified Files: dsalib_conf.c dsalib_confs.c dsalib_db.c dsalib_debug.c dsalib_dn.c dsalib_filename.c dsalib_html.c dsalib_ldif.c dsalib_location.c dsalib_pw.c dsalib_tailf.c dsalib_updown.c dsalib_util.c Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: dsalib_conf.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/lib/dsalib_conf.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- dsalib_conf.c 13 Oct 2006 01:06:20 -0000 1.7 +++ dsalib_conf.c 10 Nov 2006 23:44:32 -0000 1.8 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #if defined( XP_WIN32 ) #include #include Index: dsalib_confs.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/lib/dsalib_confs.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- dsalib_confs.c 19 Apr 2005 22:06:54 -0000 1.6 +++ dsalib_confs.c 10 Nov 2006 23:44:32 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Some of the simple conf stuff here. Must not call any * libadmin functions! This is needed by ds_config.c Index: dsalib_db.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/lib/dsalib_db.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- dsalib_db.c 13 Oct 2006 01:06:20 -0000 1.6 +++ dsalib_db.c 10 Nov 2006 23:44:32 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #if defined( XP_WIN32 ) #include #include Index: dsalib_debug.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/lib/dsalib_debug.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- dsalib_debug.c 19 Apr 2005 22:06:54 -0000 1.6 +++ dsalib_debug.c 10 Nov 2006 23:44:32 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #if defined( XP_WIN32 ) #include #endif Index: dsalib_dn.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/lib/dsalib_dn.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- dsalib_dn.c 19 Apr 2005 22:06:54 -0000 1.5 +++ dsalib_dn.c 10 Nov 2006 23:44:32 -0000 1.6 @@ -36,6 +36,11 @@ * All rights reserved. * END COPYRIGHT BLOCK **/ +#ifdef HAVE_CONFIG_H +# include +#endif + + #if defined( XP_WIN32 ) #include #else Index: dsalib_filename.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/lib/dsalib_filename.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- dsalib_filename.c 19 Apr 2005 22:06:54 -0000 1.6 +++ dsalib_filename.c 10 Nov 2006 23:44:32 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #if defined( XP_WIN32 ) #include #endif Index: dsalib_html.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/lib/dsalib_html.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- dsalib_html.c 19 Apr 2005 22:06:54 -0000 1.5 +++ dsalib_html.c 10 Nov 2006 23:44:32 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #if defined( XP_WIN32 ) #include #endif Index: dsalib_ldif.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/lib/dsalib_ldif.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- dsalib_ldif.c 19 Apr 2005 22:06:54 -0000 1.6 +++ dsalib_ldif.c 10 Nov 2006 23:44:32 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #if defined( XP_WIN32 ) #include #include Index: dsalib_location.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/lib/dsalib_location.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- dsalib_location.c 13 Oct 2006 01:06:20 -0000 1.8 +++ dsalib_location.c 10 Nov 2006 23:44:32 -0000 1.9 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #if defined( XP_WIN32 ) #include #endif Index: dsalib_pw.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/lib/dsalib_pw.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- dsalib_pw.c 10 Nov 2006 01:10:44 -0000 1.6 +++ dsalib_pw.c 10 Nov 2006 23:44:32 -0000 1.7 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + /* * Adjust password policy management related variables. * Index: dsalib_tailf.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/lib/dsalib_tailf.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- dsalib_tailf.c 19 Apr 2005 22:06:54 -0000 1.5 +++ dsalib_tailf.c 10 Nov 2006 23:44:32 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #if defined( XP_WIN32 ) #include #endif Index: dsalib_updown.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/lib/dsalib_updown.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- dsalib_updown.c 27 Sep 2006 23:40:44 -0000 1.7 +++ dsalib_updown.c 10 Nov 2006 23:44:32 -0000 1.8 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #if defined( XP_WIN32 ) #include #include Index: dsalib_util.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/lib/dsalib_util.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- dsalib_util.c 13 Oct 2006 01:06:20 -0000 1.8 +++ dsalib_util.c 10 Nov 2006 23:44:32 -0000 1.9 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #if defined( XP_WIN32 ) #include #include From fedora-directory-commits at redhat.com Fri Nov 10 23:44:33 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:44:33 -0700 Subject: [Fedora-directory-commits] ldapserver/include/public/nsacl aclapi.h, 1.5, 1.6 acldef.h, 1.4, 1.5 nserrdef.h, 1.4, 1.5 plistdef.h, 1.5, 1.6 Message-ID: <200611102346.kAANkXPa000528@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/include/public/nsacl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/include/public/nsacl Modified Files: aclapi.h acldef.h nserrdef.h plistdef.h Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #6) Changes: Added the following include next to the end of the copyright block. + +#ifdef HAVE_CONFIG_H +# include +#endif + Index: aclapi.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/public/nsacl/aclapi.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- aclapi.h 19 Apr 2005 22:06:49 -0000 1.5 +++ aclapi.h 10 Nov 2006 23:44:31 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef PUBLIC_NSACL_ACLAPI_H #define PUBLIC_NSACL_ACLAPI_H Index: acldef.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/public/nsacl/acldef.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- acldef.h 19 Apr 2005 22:06:49 -0000 1.4 +++ acldef.h 10 Nov 2006 23:44:31 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef PUBLIC_NSACL_ACLDEF_H #define PUBLIC_NSACL_ACLDEF_H Index: nserrdef.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/public/nsacl/nserrdef.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nserrdef.h 19 Apr 2005 22:06:50 -0000 1.4 +++ nserrdef.h 10 Nov 2006 23:44:31 -0000 1.5 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef PUBLIC_NSACL_NSERRDEF_H #define PUBLIC_NSACL_NSERRDEF_H Index: plistdef.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/public/nsacl/plistdef.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- plistdef.h 19 Apr 2005 22:06:50 -0000 1.5 +++ plistdef.h 10 Nov 2006 23:44:31 -0000 1.6 @@ -35,6 +35,11 @@ * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ + +#ifdef HAVE_CONFIG_H +# include +#endif + #ifndef PUBLIC_NSACL_PLISTDEF_H #define PUBLIC_NSACL_PLISTDEF_H From fedora-directory-commits at redhat.com Fri Nov 10 23:59:24 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:59:24 -0700 Subject: [Fedora-directory-commits] ldapserver/m4 fhs.m4,NONE,1.1 Message-ID: <200611102359.kAANxORj000761@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/m4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv723/m4 Added Files: fhs.m4 Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #1) Changes: 1. introduced a new option --with-fhs 2. instead of passing the define macro with -D, generate config.h --- NEW FILE fhs.m4 --- # BEGIN COPYRIGHT BLOCK # Copyright (C) 2006 Red Hat, Inc. # All rights reserved. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # END COPYRIGHT BLOCK AC_CHECKING(for FHS) # check for --with-fhs AC_MSG_CHECKING(for --with-fhs) AC_ARG_WITH(fhs, [ --with-fhs Use FHS layout], [ with_fhs=yes ], AC_MSG_RESULT(no)) if test "$with_fhs" = "yes"; then AC_DEFINE([IS_FHS], [1], [Use FHS layout]) fi From fedora-directory-commits at redhat.com Fri Nov 10 23:59:18 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 10 Nov 2006 16:59:18 -0700 Subject: [Fedora-directory-commits] ldapserver configure.ac, 1.7, 1.8 Makefile.am, 1.11, 1.12 Makefile.in, 1.12, 1.13 configure, 1.8, 1.9 Message-ID: <200611102359.kAANxmfi000787@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv723 Modified Files: configure.ac Makefile.am Makefile.in configure Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #1) Changes: 1. introduced a new option --with-fhs 2. instead of passing the define macro with -D, generate config.h Index: configure.ac =================================================================== RCS file: /cvs/dirsec/ldapserver/configure.ac,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- configure.ac 2 Nov 2006 03:11:39 -0000 1.7 +++ configure.ac 10 Nov 2006 23:59:15 -0000 1.8 @@ -2,6 +2,8 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) AC_INIT([fedora-ds], [1.1], [http://bugzilla.redhat.com/]) +# AC_CONFIG_HEADER must be called right after AC_INIT. +AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE([1.9 foreign subdir-objects]) AM_MAINTAINER_MODE AC_CANONICAL_HOST @@ -94,6 +96,7 @@ m4_include(m4/svrcore.m4) m4_include(m4/icu.m4) m4_include(m4/netsnmp.m4) +m4_include(m4/fhs.m4) # write out paths for binary components AC_SUBST(nspr_inc) @@ -152,6 +155,9 @@ # cygnus, mingw, or the like and using cmd.exe as the shell AM_CONDITIONAL([WINNT], false) +AC_DEFINE([LDAP_DEBUG], [1], [LDAP debug flag]) +AC_DEFINE([LDAP_DONT_USE_SMARTHEAP], [1], [Don't use smartheap]) + AC_CONFIG_FILES([Makefile]) AC_OUTPUT Index: Makefile.am =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.am,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- Makefile.am 10 Nov 2006 01:50:11 -0000 1.11 +++ Makefile.am 10 Nov 2006 23:59:15 -0000 1.12 @@ -7,7 +7,7 @@ BUILDNUM := $(shell perl $(srcdir)/buildnum.pl) PLATFORM_DEFINES = @platform_defs@ DEBUG_DEFINES = @debug_defs@ -DS_DEFINES = -DLDAP_DEBUG -DLDAP_DONT_USE_SMARTHEAP -DBUILD_NUM=$(BUILDNUM) +DS_DEFINES = -DBUILD_NUM=$(BUILDNUM) DS_INCLUDES = -I$(srcdir)/ldap/include -I$(srcdir)/ldap/servers/slapd -I$(srcdir)/include -I. AM_CPPFLAGS = $(PLATFORM_DEFINES) $(DEBUG_DEFINES) $(DS_DEFINES) $(DS_INCLUDES) PLUGIN_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@ Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.in,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- Makefile.in 10 Nov 2006 01:50:11 -0000 1.12 +++ Makefile.in 10 Nov 2006 23:59:15 -0000 1.13 @@ -51,20 +51,22 @@ noinst_PROGRAMS = makstrdb$(EXEEXT) @SOLARIS_TRUE at am__append_1 = ldap/servers/slapd/tools/ldclt/opCheck.c DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/configure compile \ - config.guess config.sub depcomp install-sh ltmain.sh missing + $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(top_srcdir)/configure compile config.guess config.sub \ + depcomp install-sh ltmain.sh missing subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/nspr.m4 $(top_srcdir)/m4/nss.m4 \ $(top_srcdir)/m4/mozldap.m4 $(top_srcdir)/m4/db.m4 \ $(top_srcdir)/m4/sasl.m4 $(top_srcdir)/m4/svrcore.m4 \ $(top_srcdir)/m4/icu.m4 $(top_srcdir)/m4/netsnmp.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/fhs.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno configure.status.lineno mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = cru @@ -669,7 +671,7 @@ serverSCRIPT_INSTALL = $(INSTALL_SCRIPT) taskSCRIPT_INSTALL = $(INSTALL_SCRIPT) SCRIPTS = $(bin_SCRIPTS) $(server_SCRIPTS) $(task_SCRIPTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I. depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -911,7 +913,7 @@ BUILDNUM := $(shell perl $(srcdir)/buildnum.pl) PLATFORM_DEFINES = @platform_defs@ DEBUG_DEFINES = @debug_defs@ -DS_DEFINES = -DLDAP_DEBUG -DLDAP_DONT_USE_SMARTHEAP -DBUILD_NUM=$(BUILDNUM) +DS_DEFINES = -DBUILD_NUM=$(BUILDNUM) DS_INCLUDES = -I$(srcdir)/ldap/include -I$(srcdir)/ldap/servers/slapd -I$(srcdir)/include -I. AM_CPPFLAGS = $(PLATFORM_DEFINES) $(DEBUG_DEFINES) $(DS_DEFINES) $(DS_INCLUDES) PLUGIN_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@ @@ -1755,7 +1757,7 @@ -e 's, at taskdir\@,$(taskdir),g' \ -e 's, at configdir\@,$(configdir),g' -all: $(BUILT_SOURCES) +all: $(BUILT_SOURCES) config.h $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: @@ -1794,6 +1796,23 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) +config.h: stamp-h1 + @if test ! -f $@; then \ + rm -f stamp-h1; \ + $(MAKE) stamp-h1; \ + else :; fi + +stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status + @rm -f stamp-h1 + cd $(top_builddir) && $(SHELL) ./config.status config.h +$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_srcdir) && $(AUTOHEADER) + rm -f stamp-h1 + touch $@ + +distclean-hdr: + -rm -f config.h stamp-h1 + clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) ldap/libraries/libavl/$(am__dirstamp): @@ -8583,11 +8602,11 @@ mkid -fID $$unique tags: TAGS -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -8599,11 +8618,11 @@ $$tags $$unique; \ fi ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -8752,7 +8771,7 @@ check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) \ - $(DATA) + $(DATA) config.h installdirs: for dir in "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(taskdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(sampledatadir)" "$(DESTDIR)$(schemadir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ @@ -8866,7 +8885,7 @@ -rm -rf ldap/admin/lib/$(DEPDIR) ldap/admin/src/$(DEPDIR) ldap/libraries/libavl/$(DEPDIR) ldap/servers/plugins/acl/$(DEPDIR) ldap/servers/plugins/chainingdb/$(DEPDIR) ldap/servers/plugins/collation/$(DEPDIR) ldap/servers/plugins/cos/$(DEPDIR) ldap/servers/plugins/distrib/$(DEPDIR) ldap/servers/plugins/http/$(DEPDIR) ldap/servers/plugins/pam_passthru/$(DEPDIR) ldap/servers/plugins/passthru/$(DEPDIR) ldap/servers/plugins/presence/$(DEPDIR) ldap/servers/plugins/pwdstorage/$(DEPDIR) ldap/servers/plugins/referint/$(DEPDIR) ldap/servers/plugins/replication/$(DEPDIR) ldap/servers/plugins/retrocl/$(DEPDIR) ldap/servers/plugins/rever/$(DEPDIR) ldap/servers/plugins/roles/$(DEPDIR) ldap/servers/plugins/shared/$(DEPDIR) ldap/servers/plugins/statechange/$(DEPDIR) ldap/servers/plugins/syntaxes/$(DEPDIR) ldap/servers/plugins/uiduniq/$(DEPDIR) ldap/servers/plugins/views/$(DEPDIR) ldap/servers/slapd/$(DEPDIR) ldap/servers/slapd/back-ldbm/$(DEPDIR) ldap/servers/slapd/tools/$(DEPDIR) ldap/se! rvers/slapd/tools/ldclt/$(DEPDIR) ldap/servers/slapd/tools/rsearch/$(DEPDIR) ldap/servers/snmp/$(DEPDIR) ldap/systools/$(DEPDIR) lib/base/$(DEPDIR) lib/ldaputil/$(DEPDIR) lib/libaccess/$(DEPDIR) lib/libadmin/$(DEPDIR) lib/libsi18n/$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ - distclean-libtool distclean-tags + distclean-hdr distclean-libtool distclean-tags dvi: dvi-am @@ -8925,12 +8944,12 @@ clean-serverLTLIBRARIES clean-serverPROGRAMS \ clean-serverpluginLTLIBRARIES ctags dist dist-all dist-bzip2 \ dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distcleancheck distdir distuninstallcheck dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-binSCRIPTS install-configDATA \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man \ + distclean-compile distclean-generic distclean-hdr \ + distclean-libtool distclean-tags distcleancheck distdir \ + distuninstallcheck dvi dvi-am html html-am info info-am \ + install install-am install-binPROGRAMS install-binSCRIPTS \ + install-configDATA install-data install-data-am install-exec \ + install-exec-am install-info install-info-am install-man \ install-nodist_propertyDATA install-sampledataDATA \ install-schemaDATA install-serverLTLIBRARIES \ install-serverPROGRAMS install-serverSCRIPTS \ Index: configure =================================================================== RCS file: /cvs/dirsec/ldapserver/configure,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- configure 3 Nov 2006 22:33:16 -0000 1.8 +++ configure 10 Nov 2006 23:59:15 -0000 1.9 @@ -1071,6 +1071,7 @@ --with-netsnmp=PATH Net-SNMP directory --with-netsnmp-inc=PATH Net-SNMP include directory --with-netsnmp-lib=PATH Net-SNMP library directory + --with-fhs Use FHS layout Some influential environment variables: CXX C++ compiler command @@ -1535,6 +1536,9 @@ +# AC_CONFIG_HEADER must be called right after AC_INIT. + ac_config_headers="$ac_config_headers config.h" + am__api_version="1.9" ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do @@ -4277,7 +4281,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4280 "configure"' > conftest.$ac_ext + echo '#line 4284 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5385,7 +5389,7 @@ # Provide some information about the compiler. -echo "$as_me:5388:" \ +echo "$as_me:5392:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -6419,11 +6423,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6422: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6426: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6426: \$? = $ac_status" >&5 + echo "$as_me:6430: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6652,11 +6656,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6655: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6659: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6659: \$? = $ac_status" >&5 + echo "$as_me:6663: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6712,11 +6716,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6715: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6719: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6719: \$? = $ac_status" >&5 + echo "$as_me:6723: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8046,7 +8050,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 8049 "configure"' > conftest.$ac_ext + echo '#line 8053 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8917,7 +8921,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:11201: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11201: \$? = $ac_status" >&5 + echo "$as_me:11205: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -11254,11 +11258,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11257: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11261: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11261: \$? = $ac_status" >&5 + echo "$as_me:11265: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11765,7 +11769,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 11768 "configure"' > conftest.$ac_ext + echo '#line 11772 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -12636,7 +12640,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:13568: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13568: \$? = $ac_status" >&5 + echo "$as_me:13572: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -13621,11 +13625,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13624: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13628: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13628: \$? = $ac_status" >&5 + echo "$as_me:13632: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14935,7 +14939,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 14938 "configure"' > conftest.$ac_ext + echo '#line 14942 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -15676,11 +15680,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15679: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15683: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15683: \$? = $ac_status" >&5 + echo "$as_me:15687: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15909,11 +15913,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15912: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15916: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15916: \$? = $ac_status" >&5 + echo "$as_me:15920: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15969,11 +15973,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15972: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15976: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15976: \$? = $ac_status" >&5 + echo "$as_me:15980: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17303,7 +17307,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 17306 "configure"' > conftest.$ac_ext + echo '#line 17310 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -18174,7 +18178,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5 +echo "$as_me: checking for FHS..." >&6;} + +# check for --with-fhs +echo "$as_me:$LINENO: checking for --with-fhs" >&5 +echo $ECHO_N "checking for --with-fhs... $ECHO_C" >&6 + +# Check whether --with-fhs or --without-fhs was given. +if test "${with_fhs+set}" = set; then + withval="$with_fhs" + + with_fhs=yes + +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi; + +if test "$with_fhs" = "yes"; then + +cat >>confdefs.h <<\_ACEOF +#define IS_FHS 1 +_ACEOF + +fi + + # write out paths for binary components @@ -25013,6 +25064,17 @@ fi + +cat >>confdefs.h <<\_ACEOF +#define LDAP_DEBUG 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define LDAP_DONT_USE_SMARTHEAP 1 +_ACEOF + + ac_config_files="$ac_config_files Makefile" @@ -25090,38 +25152,7 @@ }' fi -# Transform confdefs.h into DEFS. -# Protect against shell expansion while executing Makefile rules. -# Protect against Makefile macro expansion. -# -# If the first sed substitution is executed (which looks for macros that -# take arguments), then we branch to the quote section. Otherwise, -# look for a macro that doesn't take arguments. -cat >confdef2opt.sed <<\_ACEOF -t clear -: clear -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g -t quote -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g -t quote -d -: quote -s,[ `~#$^&*(){}\\|;'"<>?],\\&,g -s,\[,\\&,g -s,\],\\&,g -s,\$,$$,g -p -_ACEOF -# We use echo to avoid assuming a particular line-breaking character. -# The extra dot is to prevent the shell from consuming trailing -# line-breaks from the sub-command output. A line-break within -# single-quotes doesn't work because, if this script is created in a -# platform that uses two characters for line-breaks (e.g., DOS), tr -# would break. -ac_LF_and_DOT=`echo; echo .` -DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` -rm -f confdef2opt.sed - +DEFS=-DHAVE_CONFIG_H ac_libobjs= ac_ltlibobjs= @@ -25497,10 +25528,15 @@ --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] instantiate the configuration file FILE + --header=FILE[:TEMPLATE] + instantiate the configuration header FILE Configuration files: $config_files +Configuration headers: +$config_headers + Configuration commands: $config_commands @@ -25621,6 +25657,7 @@ # Handling of arguments. "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; @@ -25633,6 +25670,7 @@ # bizarre bug on SunOS 4.1.3. if $ac_need_defaults; then test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files + test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands fi @@ -26059,6 +26097,251 @@ cat >>$CONFIG_STATUS <<\_ACEOF # +# CONFIG_HEADER section. +# + +# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where +# NAME is the cpp macro being defined and VALUE is the value it is being given. +# +# ac_d sets the value in "#define NAME VALUE" lines. +ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' +ac_dB='[ ].*$,\1#\2' +ac_dC=' ' +ac_dD=',;t' +# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". +ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' +ac_uB='$,\1#\2define\3' +ac_uC=' ' +ac_uD=',;t' + +for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue + # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". + case $ac_file in + - | *:- | *:-:* ) # input from stdin + cat >$tmp/stdin + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + * ) ac_file_in=$ac_file.in ;; + esac + + test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + + # First look for the input files in the build tree, otherwise in the + # src tree. + ac_file_inputs=`IFS=: + for f in $ac_file_in; do + case $f in + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) + test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 +echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + # Do quote $f, to prevent DOS paths from being IFS'd. + echo "$f";; + *) # Relative + if test -f "$f"; then + # Build tree + echo "$f" + elif test -f "$srcdir/$f"; then + # Source tree + echo "$srcdir/$f" + else + # /dev/null tree + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 +echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; + esac + done` || { (exit 1); exit 1; } + # Remove the trailing spaces. + sed 's/[ ]*$//' $ac_file_inputs >$tmp/in + +_ACEOF + +# Transform confdefs.h into two sed scripts, `conftest.defines' and +# `conftest.undefs', that substitutes the proper values into +# config.h.in to produce config.h. The first handles `#define' +# templates, and the second `#undef' templates. +# And first: Protect against being on the right side of a sed subst in +# config.status. Protect against being in an unquoted here document +# in config.status. +rm -f conftest.defines conftest.undefs +# Using a here document instead of a string reduces the quoting nightmare. +# Putting comments in sed scripts is not portable. +# +# `end' is used to avoid that the second main sed command (meant for +# 0-ary CPP macros) applies to n-ary macro definitions. +# See the Autoconf documentation for `clear'. +cat >confdef2sed.sed <<\_ACEOF +s/[\\&,]/\\&/g +s,[\\$`],\\&,g +t clear +: clear +s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp +t end +s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp +: end +_ACEOF +# If some macros were called several times there might be several times +# the same #defines, which is useless. Nevertheless, we may not want to +# sort them, since we want the *last* AC-DEFINE to be honored. +uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines +sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs +rm -f confdef2sed.sed + +# This sed command replaces #undef with comments. This is necessary, for +# example, in the case of _POSIX_SOURCE, which is predefined and required +# on some systems where configure will not decide to define it. +cat >>conftest.undefs <<\_ACEOF +s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, +_ACEOF + +# Break up conftest.defines because some shells have a limit on the size +# of here documents, and old seds have small limits too (100 cmds). +echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS +echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS +echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS +echo ' :' >>$CONFIG_STATUS +rm -f conftest.tail +while grep . conftest.defines >/dev/null +do + # Write a limited-size here document to $tmp/defines.sed. + echo ' cat >$tmp/defines.sed <>$CONFIG_STATUS + # Speed up: don't consider the non `#define' lines. + echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS + # Work around the forget-to-reset-the-flag bug. + echo 't clr' >>$CONFIG_STATUS + echo ': clr' >>$CONFIG_STATUS + sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS + echo 'CEOF + sed -f $tmp/defines.sed $tmp/in >$tmp/out + rm -f $tmp/in + mv $tmp/out $tmp/in +' >>$CONFIG_STATUS + sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail + rm -f conftest.defines + mv conftest.tail conftest.defines +done +rm -f conftest.defines +echo ' fi # grep' >>$CONFIG_STATUS +echo >>$CONFIG_STATUS + +# Break up conftest.undefs because some shells have a limit on the size +# of here documents, and old seds have small limits too (100 cmds). +echo ' # Handle all the #undef templates' >>$CONFIG_STATUS +rm -f conftest.tail +while grep . conftest.undefs >/dev/null +do + # Write a limited-size here document to $tmp/undefs.sed. + echo ' cat >$tmp/undefs.sed <>$CONFIG_STATUS + # Speed up: don't consider the non `#undef' + echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS + # Work around the forget-to-reset-the-flag bug. + echo 't clr' >>$CONFIG_STATUS + echo ': clr' >>$CONFIG_STATUS + sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS + echo 'CEOF + sed -f $tmp/undefs.sed $tmp/in >$tmp/out + rm -f $tmp/in + mv $tmp/out $tmp/in +' >>$CONFIG_STATUS + sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail + rm -f conftest.undefs + mv conftest.tail conftest.undefs +done +rm -f conftest.undefs + +cat >>$CONFIG_STATUS <<\_ACEOF + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + if test x"$ac_file" = x-; then + echo "/* Generated by configure. */" >$tmp/config.h + else + echo "/* $ac_file. Generated by configure. */" >$tmp/config.h + fi + cat $tmp/in >>$tmp/config.h + rm -f $tmp/in + if test x"$ac_file" != x-; then + if diff $ac_file $tmp/config.h >/dev/null 2>&1; then + { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 +echo "$as_me: $ac_file is unchanged" >&6;} + else + ac_dir=`(dirname "$ac_file") 2>/dev/null || +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + { if $as_mkdir_p; then + mkdir -p "$ac_dir" + else + as_dir="$ac_dir" + as_dirs= + while test ! -d "$as_dir"; do + as_dirs="$as_dir $as_dirs" + as_dir=`(dirname "$as_dir") 2>/dev/null || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + done + test ! -n "$as_dirs" || mkdir $as_dirs + fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 +echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} + { (exit 1); exit 1; }; }; } + + rm -f $ac_file + mv $tmp/config.h $ac_file + fi + else + cat $tmp/config.h + rm -f $tmp/config.h + fi +# Compute $ac_file's index in $config_headers. +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $ac_file | $ac_file:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null || +$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X$ac_file : 'X\(//\)[^/]' \| \ + X$ac_file : 'X\(//\)$' \| \ + X$ac_file : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X$ac_file | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'`/stamp-h$_am_stamp_count +done +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF + +# # CONFIG_COMMANDS section. # for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue From fedora-directory-commits at redhat.com Mon Nov 13 18:47:01 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Mon, 13 Nov 2006 11:47:01 -0700 Subject: [Fedora-directory-commits] ldapserver configure.ac, 1.8, 1.9 configure, 1.9, 1.10 Message-ID: <200611131847.kADIl1ta004739@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4703 Modified Files: configure.ac configure Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #10) Changes: if --with-fhs is set, bindir, libdir, and datadir starts w/ $prefix/usr Index: configure.ac =================================================================== RCS file: /cvs/dirsec/ldapserver/configure.ac,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- configure.ac 10 Nov 2006 23:59:15 -0000 1.8 +++ configure.ac 13 Nov 2006 18:46:58 -0000 1.9 @@ -128,7 +128,11 @@ AC_SUBST(netsnmp_link) # installation paths -dnl bindir=/usr/bin +if test "$with_fhs" = "yes"; then + bindir=$prefix/usr/bin + libdir=$prefix/usr/lib + datadir=$prefix/usr/share +fi # relative to sysconfdir configdir=/fedora-ds/config # relative to datadir Index: configure =================================================================== RCS file: /cvs/dirsec/ldapserver/configure,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- configure 10 Nov 2006 23:59:15 -0000 1.9 +++ configure 13 Nov 2006 18:46:58 -0000 1.10 @@ -25029,6 +25029,11 @@ # installation paths +if test "$with_fhs" = "yes"; then + bindir=$prefix/usr/bin + libdir=$prefix/usr/lib + datadir=$prefix/usr/share +fi # relative to sysconfdir configdir=/fedora-ds/config # relative to datadir From fedora-directory-commits at redhat.com Mon Nov 13 23:45:46 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Mon, 13 Nov 2006 16:45:46 -0700 Subject: [Fedora-directory-commits] ldapserver configure.ac, 1.9, 1.10 configure, 1.10, 1.11 Message-ID: <200611132345.kADNjkfk025496@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25445 Modified Files: configure.ac configure Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #13) Changes: configure.ac: $prefix should have been @prefix at . $prefix is replaced with the value of --prefix, but not with AC_PREFIX_DEFAULT when --prefix is not given. create_instance.[ch]: depending upon the macro IS_FHS, change swich the LIBDIR, BINDIR, DATADIR, and DOCDIR. ds_newinst.pl.in: use @libdir@ to get the ds_newinst path. Index: configure.ac =================================================================== RCS file: /cvs/dirsec/ldapserver/configure.ac,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- configure.ac 13 Nov 2006 18:46:58 -0000 1.9 +++ configure.ac 13 Nov 2006 23:45:42 -0000 1.10 @@ -129,9 +129,9 @@ # installation paths if test "$with_fhs" = "yes"; then - bindir=$prefix/usr/bin - libdir=$prefix/usr/lib - datadir=$prefix/usr/share + bindir=@prefix@/usr/bin + libdir=@prefix@/usr/lib + datadir=@prefix@/usr/share fi # relative to sysconfdir configdir=/fedora-ds/config Index: configure =================================================================== RCS file: /cvs/dirsec/ldapserver/configure,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- configure 13 Nov 2006 18:46:58 -0000 1.10 +++ configure 13 Nov 2006 23:45:42 -0000 1.11 @@ -25030,9 +25030,9 @@ # installation paths if test "$with_fhs" = "yes"; then - bindir=$prefix/usr/bin - libdir=$prefix/usr/lib - datadir=$prefix/usr/share + bindir=@prefix@/usr/bin + libdir=@prefix@/usr/lib + datadir=@prefix@/usr/share fi # relative to sysconfdir configdir=/fedora-ds/config From fedora-directory-commits at redhat.com Mon Nov 13 23:45:46 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Mon, 13 Nov 2006 16:45:46 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src ds_newinst.pl.in, NONE, 1.1 create_instance.c, 1.35, 1.36 create_instance.h, 1.11, 1.12 Message-ID: <200611132345.kADNjkCV025502@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/admin/src In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25445/ldap/admin/src Modified Files: create_instance.c create_instance.h Added Files: ds_newinst.pl.in Log Message: Resolves: #214533 Summary: configure needs to support --with-fhs (Comment #13) Changes: configure.ac: $prefix should have been @prefix at . $prefix is replaced with the value of --prefix, but not with AC_PREFIX_DEFAULT when --prefix is not given. create_instance.[ch]: depending upon the macro IS_FHS, change swich the LIBDIR, BINDIR, DATADIR, and DOCDIR. ds_newinst.pl.in: use @libdir@ to get the ds_newinst path. --- NEW FILE ds_newinst.pl.in --- #!/usr/bin/env perl # BEGIN COPYRIGHT BLOCK # This Program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software # Foundation; version 2 of the License. # # This Program is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS # FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along with # this Program; if not, write to the Free Software Foundation, Inc., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA. # # In addition, as a special exception, Red Hat, Inc. gives You the additional # right to link the code of this Program with code not covered under the GNU # General Public License ("Non-GPL Code") and to distribute linked combinations # including the two, subject to the limitations in this paragraph. Non-GPL Code # permitted under this exception must only link to the code of this Program # through those well defined interfaces identified in the file named EXCEPTION # found in the source code files (the "Approved Interfaces"). The files of # Non-GPL Code may instantiate templates or use macros or inline functions from # the Approved Interfaces without causing the resulting work to be covered by # the GNU General Public License. Only Red Hat, Inc. may make changes or # additions to the list of Approved Interfaces. You must obey the GNU General # Public License in all respects for all of the Program code and other code used # in conjunction with the Program except the Non-GPL Code covered by this # exception. If you modify this file, you may extend this exception to your # version of the file, but you are not obligated to do so. If you do not wish to # provide this exception without modification, you must delete this exception # statement from your version and license this file solely under the GPL without # exception. # # # Copyright (C) 2005 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK use IPC::Open2; use Symbol; use CGI::Util qw(escape); use Cwd; use File::Basename; sub usage { my $msg = shift; print "Error: $msg\n"; print "Usage: $0 filename.inf\n"; exit 1 } sub getCgiContentAndLength { my $args = shift; my $content = ""; my $firsttime = 1; while (my ($kk, $vv) = each %{$args}) { next if (!$kk || !$vv); if ($firsttime) { $firsttime = 0; } else { $content = $content . "&"; } $content = $content . $kk . "=" . escape($vv); } my $length = length($content); return ($content, $length); } # fakes out the ds_newinst program into thinking it is getting cgi input sub cgiFake { my ($sroot, $verbose, $prog, $args) = @_; # construct content string my ($content, $length) = &getCgiContentAndLength($args); # setup CGI environment $ENV{REQUEST_METHOD} = "POST"; $ENV{CONTENT_LENGTH} = $length; $ENV{SERVER_NAMES} = 'slapd-' . $args->{servid}; # print "content = $content\n"; # open the program my $curdir = getcwd(); my $dir = dirname($prog); my $exe = basename($prog); chdir $dir; my $input = gensym(); my $output = gensym(); my $pid = open2($input, $output, "./$exe"); sleep(1); # allow prog to init stdin read buffers print $output $content, "\n"; close $output; if ($?) { print "Warning: $prog returned code $? and $!\n"; } my $exitCode = 1; my @lines; while (<$input>) { print $_ if ($verbose); push @lines, $_; if (/^NMC_Status:\s*(\d+)/) { $exitCode = $1; last; } } close $input; chdir $curdir; if ($exitCode) { print "CGI $prog failed with $exitCode: here is the output:\n"; map { print $_ } @lines; } if ($exitCode != 0) { print "Error: could not run $prog: $exitCode\n"; return $exitCode; } return 0; } sub addAndCheck { my $dest = shift; my $dkey = shift; my $source = shift; my $ssec = shift; my $skey = shift; if (! $source->{$ssec}->{$skey}) { usage("Missing required parameter $ssec - $skey\n"); } $dest->{$dkey} = $source->{$ssec}->{$skey}; } my $filename = $ARGV[0]; usage("$filename not found") if (! -f $filename); my $curSection; # each key in the table is a section name # the value is a hash ref of the items in that section # in that hash ref, each key is the config param name, # and the value is the config param value my %table = (); open(IN, $filename); while () { # e.g. [General] if (/^\[(.*?)\]/) { $curSection = $1; } elsif (/^\s*$/) { next; # skip blank lines } elsif (/^\s*\#/) { next; # skip comment lines } elsif (/^\s*(.*?)\s*=\s*(.*?)\s*$/) { $table{$curSection}->{$1} = $2; } } close IN; #printhash (\%table); # next, construct a hash table with our arguments my %cgiargs = (); my $brand_ds = "fedora-ds"; # the following items are always required addAndCheck(\%cgiargs, "sroot", \%table, "General", "ServerRoot"); addAndCheck(\%cgiargs, "servname", \%table, "General", "FullMachineName"); addAndCheck(\%cgiargs, "servuser", \%table, "General", "SuiteSpotUserID"); addAndCheck(\%cgiargs, "servport", \%table, "slapd", "ServerPort"); addAndCheck(\%cgiargs, "rootdn", \%table, "slapd", "RootDN"); addAndCheck(\%cgiargs, "rootpw", \%table, "slapd", "RootDNPwd"); addAndCheck(\%cgiargs, "servid", \%table, "slapd", "ServerIdentifier"); addAndCheck(\%cgiargs, "suffix", \%table, "slapd", "Suffix"); # the following items are optional $cgiargs{"lock_dir"} = $table{"slapd"}->{"lock_dir"}; $cgiargs{"log_dir"} = $table{"slapd"}->{"log_dir"}; $cgiargs{"run_dir"} = $table{"slapd"}->{"run_dir"}; $cgiargs{"db_dir"} = $table{"slapd"}->{"db_dir"}; $cgiargs{"bak_dir"} = $table{"slapd"}->{"bak_dir"}; $cgiargs{"ldif_dir"} = $table{"slapd"}->{"ldif_dir"}; $cgiargs{"tmp_dir"} = $table{"slapd"}->{"tmp_dir"}; $cgiargs{"cert_dir"} = $table{"slapd"}->{"cert_dir"}; $cgiargs{"localstatedir"} = $table{"slapd"}->{"localstatedir"}; $cgiargs{"sysconfdir"} = $table{"slapd"}->{"sysconfdir"}; $cgiargs{"bindir"} = $table{"slapd"}->{"bindir"}; $cgiargs{"datadir"} = $table{"slapd"}->{"datadir"}; $cgiargs{"docdir"} = $table{"slapd"}->{"docdir"}; $cgiargs{"inst_dir"} = $table{"slapd"}->{"inst_dir"}; $cgiargs{"config_dir"} = $table{"slapd"}->{"config_dir"}; $cgiargs{"schema_dir"} = $table{"slapd"}->{"schema_dir"}; $cgiargs{"sasl_path"} = $table{"slapd"}->{"sasl_path"}; # port number for Admin Server - used to configure some web apps $cgiargs{adminport} = $table{admin}->{Port}; # If this is set, the new DS instance will be set up for use as # a Configuration DS (e.g. o=NetscapeRoot) if ($table{slapd}->{SlapdConfigForMC} =~ /yes/i) { $cgiargs{cfg_sspt} = "1"; } # set this to 1 to register this DS with an existing Configuration DS # or 0 to create this DS as a new Configuration DS $cgiargs{use_existing_config_ds} = $table{slapd}->{UseExistingMC}; # set this to 1 when creating a new Configuration DS if you do not # want to configure the new DS to also serve user data $cgiargs{use_existing_user_ds} = $table{slapd}->{UseExistingUG}; # the following items are required to register this new instance with a config DS # or to make the new instance a Configuration DS if ($cgiargs{cfg_sspt} || $table{General}->{ConfigDirectoryAdminID} || $table{General}->{ConfigDirectoryAdminPwd} || $table{General}->{ConfigDirectoryLdapURL} || $table{General}->{AdminDomain}) { addAndCheck(\%cgiargs, "cfg_sspt_uid", \%table, "General", "ConfigDirectoryAdminID"); addAndCheck(\%cgiargs, "cfg_sspt_uid_pw", \%table, "General", "ConfigDirectoryAdminPwd"); addAndCheck(\%cgiargs, "ldap_url", \%table, "General", "ConfigDirectoryLdapURL"); addAndCheck(\%cgiargs, "admin_domain", \%table, "General", "AdminDomain"); } # if ($table{General}->{UserDirectoryLdapURL}) { $cgiargs{user_ldap_url} = $table{General}->{UserDirectoryLdapURL}; } else { $cgiargs{user_ldap_url} = $cgiargs{ldap_url}; } if ($table{General}->{prefix}) { $prefix = $table{General}->{prefix}; } $cgiargs{prefix} = $prefix; if ($table{General}->{BrandDs}) { $brand_ds = $table{General}->{BrandDs}; } # populate the DS with this file - the suffix in this file must # be the suffix specified in the suffix argument above # the filename should use the full absolute path $cgiargs{install_ldif_file} = $table{slapd}->{InstallLdifFile}; # if for some reason you do not want the server started after instance creation # the following line can be commented out - NOTE that if you are creating the # Configuration DS, it will be started anyway $cgiargs{start_server} = 1; my $sroot = $cgiargs{sroot}; my $rc = &cgiFake($sroot, $verbose, "@libdir@/$brand_ds/ds_newinst", \%cgiargs); if (!$rc) { print "Success! Your new directory server instance was created\n"; } else { print "Error: Could not create new directory server instance\n"; } sub printhash { my $table = shift; while (my ($key,$val) = each %{$table}) { print "[$key]\n"; while (my ($k2,$v2) = each %{$val}) { print "$k2 = $v2\n"; } } } Index: create_instance.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- create_instance.c 10 Nov 2006 23:44:33 -0000 1.35 +++ create_instance.c 13 Nov 2006 23:45:44 -0000 1.36 @@ -4346,8 +4346,8 @@ prefix = cf->prefix = PL_strdup("/"); } - cf->sroot = PR_smprintf("%s%cusr%clib%c%s", - prefix, FILE_PATHSEP, FILE_PATHSEP, FILE_PATHSEP, cf->brand_ds); + cf->sroot = PR_smprintf("%s%s%c%s", + prefix, LIBDIR, FILE_PATHSEP, cf->brand_ds); temp = ds_a_get_cgi_var("sasl_path", NULL, NULL); if (NULL != temp) { /* if sasl_path is given, we set it in the conf file regardless of Index: create_instance.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- create_instance.h 10 Nov 2006 23:44:33 -0000 1.11 +++ create_instance.h 13 Nov 2006 23:45:44 -0000 1.12 @@ -61,14 +61,23 @@ #define PRODUCT_BIN "ns-slapd" #define LOCALSTATEDIR "/var" #define SYSCONFDIR "/etc" +#if defined (IS_FHS) +#define LIBDIR "/usr/lib" #define BINDIR "/usr/bin" #define DATADIR "/usr/share" #define DOCDIR "/usr/doc" -#else # Windows +#else /* RPM */ +#define LIBDIR "/lib" +#define BINDIR "/bin" +#define DATADIR "/share" +#define DOCDIR "/doc" +#endif /* IS_FHS */ +#else /* Windows */ #define PRODUCT_NAME "slapd" #define PRODUCT_BIN "slapd" #define LOCALSTATEDIR "\\var" #define SYSCONFDIR "\\etc" +#define LIBDIR "\\usr\\lib" #define BINDIR "\\usr\\bin" #define DATADIR "\\usr\\share" #define DOCDIR "\\usr\\doc" From fedora-directory-commits at redhat.com Tue Nov 14 17:37:40 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Tue, 14 Nov 2006 10:37:40 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src Makefile, 1.20, 1.21 Message-ID: <200611141737.kAEHbeiO027843@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/admin/src In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27781 Modified Files: Makefile Log Message: Added -DIS_FHS; the old build only supports FHS. Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/Makefile,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- Makefile 10 Nov 2006 01:27:41 -0000 1.20 +++ Makefile 14 Nov 2006 17:37:38 -0000 1.21 @@ -59,7 +59,7 @@ INCLUDES += -I$(LDAP_SRC)/admin/include -DS_SERVER_DEFS = -DNS_DS +DS_SERVER_DEFS = -DNS_DS -DIS_FHS ifneq ($(ARCH), WINNT) EXTRALDFLAGS += $(SSLLIBFLAG) From fedora-directory-commits at redhat.com Tue Nov 14 21:23:48 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Tue, 14 Nov 2006 14:23:48 -0700 Subject: [Fedora-directory-commits] ldapserver config.h.in,NONE,1.1 Message-ID: <200611142123.kAELNmLG010669@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10647 Added Files: config.h.in Log Message: Auto-generated by autoheader; needs to be in CVS. --- NEW FILE config.h.in --- /* config.h.in. Generated from configure.ac by autoheader. */ /* Define to 1 if the `closedir' function returns void instead of `int'. */ #undef CLOSEDIR_VOID /* Define to 1 if you have the header file. */ #undef HAVE_ARPA_INET_H /* Define to 1 if your system has a working `chown' function. */ #undef HAVE_CHOWN /* Define to 1 if you have the declaration of `strerror_r', and to 0 if you don't. */ #undef HAVE_DECL_STRERROR_R /* Define to 1 if you have the header file, and it defines `DIR'. */ #undef HAVE_DIRENT_H /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H /* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ #undef HAVE_DOPRNT /* Define to 1 if you have the `endpwent' function. */ #undef HAVE_ENDPWENT /* Define to 1 if you have the header file. */ #undef HAVE_FCNTL_H /* Define to 1 if you have the `fork' function. */ #undef HAVE_FORK /* Define to 1 if you have the `ftruncate' function. */ #undef HAVE_FTRUNCATE /* Define to 1 if you have the `getcwd' function. */ #undef HAVE_GETCWD /* Define to 1 if you have the `gethostbyname' function. */ #undef HAVE_GETHOSTBYNAME /* Define to 1 if you have the `getpagesize' function. */ #undef HAVE_GETPAGESIZE /* Define to 1 if you have the `inet_ntoa' function. */ #undef HAVE_INET_NTOA /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H /* Define to 1 if you have the `localtime_r' function. */ #undef HAVE_LOCALTIME_R /* Define to 1 if `lstat' has the bug that it succeeds when given the zero-length file name argument. */ #undef HAVE_LSTAT_EMPTY_STRING_BUG /* Define to 1 if your system has a GNU libc compatible `malloc' function, and to 0 otherwise. */ #undef HAVE_MALLOC /* Define to 1 if you have the header file. */ #undef HAVE_MALLOC_H /* Define to 1 if you have the `memmove' function. */ #undef HAVE_MEMMOVE /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H /* Define to 1 if you have the `memset' function. */ #undef HAVE_MEMSET /* Define to 1 if you have the `mkdir' function. */ #undef HAVE_MKDIR /* Define to 1 if you have a working `mmap' system call. */ #undef HAVE_MMAP /* Define to 1 if you have the `munmap' function. */ #undef HAVE_MUNMAP /* Define to 1 if you have the header file, and it defines `DIR'. */ #undef HAVE_NDIR_H /* Define to 1 if you have the header file. */ #undef HAVE_NETDB_H /* Define to 1 if you have the header file. */ #undef HAVE_NETINET_IN_H /* Define to 1 if you have the `putenv' function. */ #undef HAVE_PUTENV /* Define to 1 if you have the `rmdir' function. */ #undef HAVE_RMDIR /* Define to 1 if you have the `setrlimit' function. */ #undef HAVE_SETRLIMIT /* Define to 1 if you have the `socket' function. */ #undef HAVE_SOCKET /* Define to 1 if `stat' has the bug that it succeeds when given the zero-length file name argument. */ #undef HAVE_STAT_EMPTY_STRING_BUG /* Define to 1 if stdbool.h conforms to C99. */ #undef HAVE_STDBOOL_H /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H /* Define to 1 if you have the header file. */ #undef HAVE_STDLIB_H /* Define to 1 if you have the `strcasecmp' function. */ #undef HAVE_STRCASECMP /* Define to 1 if you have the `strchr' function. */ #undef HAVE_STRCHR /* Define to 1 if you have the `strcspn' function. */ #undef HAVE_STRCSPN /* Define to 1 if you have the `strdup' function. */ #undef HAVE_STRDUP /* Define to 1 if you have the `strerror' function. */ #undef HAVE_STRERROR /* Define to 1 if you have the `strerror_r' function. */ #undef HAVE_STRERROR_R /* Define to 1 if you have the `strftime' function. */ #undef HAVE_STRFTIME /* Define to 1 if you have the header file. */ #undef HAVE_STRINGS_H /* Define to 1 if you have the header file. */ #undef HAVE_STRING_H /* Define to 1 if you have the `strncasecmp' function. */ #undef HAVE_STRNCASECMP /* Define to 1 if you have the `strpbrk' function. */ #undef HAVE_STRPBRK /* Define to 1 if you have the `strrchr' function. */ #undef HAVE_STRRCHR /* Define to 1 if you have the `strstr' function. */ #undef HAVE_STRSTR /* Define to 1 if you have the `strtol' function. */ #undef HAVE_STRTOL /* Define to 1 if you have the header file, and it defines `DIR'. */ #undef HAVE_SYS_DIR_H /* Define to 1 if you have the header file. */ #undef HAVE_SYS_FILE_H /* Define to 1 if you have the header file, and it defines `DIR'. */ #undef HAVE_SYS_NDIR_H /* Define to 1 if you have the header file. */ #undef HAVE_SYS_SOCKET_H /* Define to 1 if you have the header file. */ #undef HAVE_SYS_STAT_H /* Define to 1 if you have the header file. */ #undef HAVE_SYS_TIME_H /* Define to 1 if you have the header file. */ #undef HAVE_SYS_TYPES_H /* Define to 1 if you have that is POSIX.1 compatible. */ #undef HAVE_SYS_WAIT_H /* Define to 1 if you have the `tzset' function. */ #undef HAVE_TZSET /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H /* Define to 1 if you have the `vfork' function. */ #undef HAVE_VFORK /* Define to 1 if you have the header file. */ #undef HAVE_VFORK_H /* Define to 1 if you have the `vprintf' function. */ #undef HAVE_VPRINTF /* Define to 1 if `fork' works. */ #undef HAVE_WORKING_FORK /* Define to 1 if `vfork' works. */ #undef HAVE_WORKING_VFORK /* Define to 1 if the system has the type `_Bool'. */ #undef HAVE__BOOL /* Use FHS layout */ #undef IS_FHS /* LDAP debug flag */ #undef LDAP_DEBUG /* Don't use smartheap */ #undef LDAP_DONT_USE_SMARTHEAP /* Define to 1 if `lstat' dereferences a symlink specified with a trailing slash. */ #undef LSTAT_FOLLOWS_SLASHED_SYMLINK /* Define to 1 if your C compiler doesn't accept -c and -o together. */ #undef NO_MINUS_C_MINUS_O /* Name of package */ #undef PACKAGE /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT /* Define to the full name of this package. */ #undef PACKAGE_NAME /* Define to the full name and version of this package. */ #undef PACKAGE_STRING /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME /* Define to the version of this package. */ #undef PACKAGE_VERSION /* Define as the return type of signal handlers (`int' or `void'). */ #undef RETSIGTYPE /* Define to 1 if the `S_IS*' macros in do not work properly. */ #undef STAT_MACROS_BROKEN /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS /* Define to 1 if strerror_r returns char *. */ #undef STRERROR_R_CHAR_P /* Define to 1 if you can safely include both and . */ #undef TIME_WITH_SYS_TIME /* Define to 1 if your declares `struct tm'. */ #undef TM_IN_SYS_TIME /* Version number of package */ #undef VERSION /* Define to empty if `const' does not conform to ANSI C. */ #undef const /* Define to `int' if doesn't define. */ #undef gid_t /* Define to rpl_malloc if the replacement function should be used. */ #undef malloc /* Define to `int' if does not define. */ #undef pid_t /* Define to `unsigned' if does not define. */ #undef size_t /* Define to `int' if doesn't define. */ #undef uid_t /* Define as `fork' if `vfork' does not work. */ #undef vfork From fedora-directory-commits at redhat.com Wed Nov 15 02:07:33 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Tue, 14 Nov 2006 19:07:33 -0700 Subject: [Fedora-directory-commits] ldapserver configure.ac, 1.10, 1.11 configure, 1.11, 1.12 config.h.in, 1.1, 1.2 Message-ID: <200611150207.kAF27X1B029881@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29357 Modified Files: configure.ac configure config.h.in Log Message: Resolves: #215452 Summary: Replacing -D with AC_DEFINE to reduce the compile command line length Index: configure.ac =================================================================== RCS file: /cvs/dirsec/ldapserver/configure.ac,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- configure.ac 13 Nov 2006 23:45:42 -0000 1.10 +++ configure.ac 15 Nov 2006 02:07:27 -0000 1.11 @@ -47,29 +47,6 @@ AC_FUNC_VPRINTF AC_CHECK_FUNCS([setrlimit endpwent ftruncate getcwd gethostbyname inet_ntoa localtime_r memmove memset mkdir munmap putenv rmdir socket strcasecmp strchr strcspn strdup strerror strncasecmp strpbrk strrchr strstr strtol tzset]) -# Deal with platform dependent defines -case $host in - *-*-linux*) - platform_defs="-DXP_UNIX -DLinux -DLINUX -DLINUX2_0 -DLINUX2_2 -DLINUX2_4" - platform="linux" - ;; - ia64-hp-hpux*) - platform_defs="-DXP_UNIX -Dhpux -DHPUX -DHPUX11 -DHPUX11_11 -DCPU_ia64 -DOS_hpux -D_PR_NTHREAD" - platform="hpux" - ;; - hppa*-hp-hpux*) - platform_defs="-DXP_UNIX -Dhpux -DHPUX -DHPUX11 -DHPUX11_11 -DCPU_hppa -DOS_hpux -D_PR_NTHREAD" - platform="hpux" - ;; - sparc-sun-solaris*) - platform_defs="-DXP_UNIX -DSVR4 -D__svr4 -D__svr4__ -D_SVID_GETTOD -DSOLARIS -DCPU_sparc -DOS_solaris -Dsunos5 -DOSVERSION=509 -D_REENTRANT" - platform="solaris" - ;; - *) - platform_defs="" - platform="" - ;; -esac AC_SUBST([platform_defs]) AM_CONDITIONAL(SOLARIS,test $platform = solaris) @@ -159,6 +136,56 @@ # cygnus, mingw, or the like and using cmd.exe as the shell AM_CONDITIONAL([WINNT], false) +# Deal with platform dependent defines +case $host in + *-*-linux*) + AC_DEFINE([XP_UNIX], [1], [UNIX]) + AC_DEFINE([Linux], [1], [Linux]) + AC_DEFINE([LINUX], [1], [Linux]) + AC_DEFINE([LINUX2_0], [1], [Linux 2.0]) + AC_DEFINE([LINUX2_2], [1], [Linux 2.2]) + AC_DEFINE([LINUX2_4], [1], [Linux 2.4]) + platform="linux" + ;; + ia64-hp-hpux*) + AC_DEFINE([XP_UNIX], [1], [UNIX]) + AC_DEFINE([hpux], [1], [HP-UX]) + AC_DEFINE([HPUX], [1], [HP-UX]) + AC_DEFINE([HPUX11], [1], [HP-UX 11]) + AC_DEFINE([HPUX11_23], [1], [HP-UX 11.23]) + AC_DEFINE([CPU_ia64], [], [cpu type ia64]) + AC_DEFINE([OS_hpux], [1], [OS HP-UX]) + platform="hpux" + ;; + hppa*-hp-hpux*) + AC_DEFINE([XP_UNIX], [1], [UNIX]) + AC_DEFINE([hpux], [1], [HP-UX]) + AC_DEFINE([HPUX], [1], [HP-UX]) + AC_DEFINE([HPUX11], [1], [HP-UX 11]) + AC_DEFINE([HPUX11_11], [1], [HP-UX 11.11]) + AC_DEFINE([CPU_hppa], [], [cpu type pa-risc]) + AC_DEFINE([OS_hpux], [1], [OS HP-UX]) + platform="hpux" + ;; + sparc-sun-solaris*) + AC_DEFINE([XP_UNIX], [1], [UNIX]) + AC_DEFINE([SVR4], [1], [SVR4]) + AC_DEFINE([__svr4], [1], [SVR4]) + AC_DEFINE([__svr4__], [1], [SVR4]) + AC_DEFINE([_SVID_GETTOD], [1], [SVID_GETTOD]) + AC_DEFINE([SOLARIS], [1], [SOLARIS]) + AC_DEFINE([CPU_sparc], [], [cpu type sparc]) + AC_DEFINE([OS_solaris], [1], [OS SOLARIS]) + AC_DEFINE([sunos5], [1], [SunOS5]) + AC_DEFINE([OSVERSION], [509], [OS version]) + AC_DEFINE([_REENTRANT], [1], [_REENTRANT]) + platform="solaris" + ;; + *) + platform_defs="" + platform="" + ;; +esac AC_DEFINE([LDAP_DEBUG], [1], [LDAP debug flag]) AC_DEFINE([LDAP_DONT_USE_SMARTHEAP], [1], [Don't use smartheap]) Index: configure =================================================================== RCS file: /cvs/dirsec/ldapserver/configure,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- configure 13 Nov 2006 23:45:42 -0000 1.11 +++ configure 15 Nov 2006 02:07:27 -0000 1.12 @@ -23375,29 +23375,6 @@ done -# Deal with platform dependent defines -case $host in - *-*-linux*) - platform_defs="-DXP_UNIX -DLinux -DLINUX -DLINUX2_0 -DLINUX2_2 -DLINUX2_4" - platform="linux" - ;; - ia64-hp-hpux*) - platform_defs="-DXP_UNIX -Dhpux -DHPUX -DHPUX11 -DHPUX11_11 -DCPU_ia64 -DOS_hpux -D_PR_NTHREAD" - platform="hpux" - ;; - hppa*-hp-hpux*) - platform_defs="-DXP_UNIX -Dhpux -DHPUX -DHPUX11 -DHPUX11_11 -DCPU_hppa -DOS_hpux -D_PR_NTHREAD" - platform="hpux" - ;; - sparc-sun-solaris*) - platform_defs="-DXP_UNIX -DSVR4 -D__svr4 -D__svr4__ -D_SVID_GETTOD -DSOLARIS -DCPU_sparc -DOS_solaris -Dsunos5 -DOSVERSION=509 -D_REENTRANT" - platform="solaris" - ;; - *) - platform_defs="" - platform="" - ;; -esac @@ -25069,6 +25046,180 @@ fi +# Deal with platform dependent defines +case $host in + *-*-linux*) + +cat >>confdefs.h <<\_ACEOF +#define XP_UNIX 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define Linux 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define LINUX 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define LINUX2_0 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define LINUX2_2 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define LINUX2_4 1 +_ACEOF + + platform="linux" + ;; + ia64-hp-hpux*) + +cat >>confdefs.h <<\_ACEOF +#define XP_UNIX 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define hpux 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define HPUX 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define HPUX11 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define HPUX11_23 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define CPU_ia64 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define OS_hpux 1 +_ACEOF + + platform="hpux" + ;; + hppa*-hp-hpux*) + +cat >>confdefs.h <<\_ACEOF +#define XP_UNIX 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define hpux 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define HPUX 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define HPUX11 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define HPUX11_11 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define CPU_hppa +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define OS_hpux 1 +_ACEOF + + platform="hpux" + ;; + sparc-sun-solaris*) + +cat >>confdefs.h <<\_ACEOF +#define XP_UNIX 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define SVR4 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define __svr4 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define __svr4__ 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define _SVID_GETTOD 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define SOLARIS 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define CPU_sparc +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define OS_solaris 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define sunos5 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define OSVERSION 509 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define _REENTRANT 1 +_ACEOF + + platform="solaris" + ;; + *) + platform_defs="" + platform="" + ;; +esac cat >>confdefs.h <<\_ACEOF #define LDAP_DEBUG 1 Index: config.h.in =================================================================== RCS file: /cvs/dirsec/ldapserver/config.h.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- config.h.in 14 Nov 2006 21:23:45 -0000 1.1 +++ config.h.in 15 Nov 2006 02:07:27 -0000 1.2 @@ -3,6 +3,15 @@ /* Define to 1 if the `closedir' function returns void instead of `int'. */ #undef CLOSEDIR_VOID +/* cpu type pa-risc */ +#undef CPU_hppa + +/* cpu type ia64 */ +#undef CPU_ia64 + +/* cpu type sparc */ +#undef CPU_sparc + /* Define to 1 if you have the header file. */ #undef HAVE_ARPA_INET_H @@ -208,6 +217,18 @@ /* Define to 1 if the system has the type `_Bool'. */ #undef HAVE__BOOL +/* HP-UX */ +#undef HPUX + +/* HP-UX 11 */ +#undef HPUX11 + +/* HP-UX 11.11 */ +#undef HPUX11_11 + +/* HP-UX 11.23 */ +#undef HPUX11_23 + /* Use FHS layout */ #undef IS_FHS @@ -217,13 +238,37 @@ /* Don't use smartheap */ #undef LDAP_DONT_USE_SMARTHEAP +/* Linux */ +#undef LINUX + +/* Linux 2.0 */ +#undef LINUX2_0 + +/* Linux 2.2 */ +#undef LINUX2_2 + +/* Linux 2.4 */ +#undef LINUX2_4 + /* Define to 1 if `lstat' dereferences a symlink specified with a trailing slash. */ #undef LSTAT_FOLLOWS_SLASHED_SYMLINK +/* Linux */ +#undef Linux + /* Define to 1 if your C compiler doesn't accept -c and -o together. */ #undef NO_MINUS_C_MINUS_O +/* OS version */ +#undef OSVERSION + +/* OS HP-UX */ +#undef OS_hpux + +/* OS SOLARIS */ +#undef OS_solaris + /* Name of package */ #undef PACKAGE @@ -245,6 +290,9 @@ /* Define as the return type of signal handlers (`int' or `void'). */ #undef RETSIGTYPE +/* SOLARIS */ +#undef SOLARIS + /* Define to 1 if the `S_IS*' macros in do not work properly. */ #undef STAT_MACROS_BROKEN @@ -254,6 +302,9 @@ /* Define to 1 if strerror_r returns char *. */ #undef STRERROR_R_CHAR_P +/* SVR4 */ +#undef SVR4 + /* Define to 1 if you can safely include both and . */ #undef TIME_WITH_SYS_TIME @@ -263,12 +314,30 @@ /* Version number of package */ #undef VERSION +/* UNIX */ +#undef XP_UNIX + +/* _REENTRANT */ +#undef _REENTRANT + +/* SVID_GETTOD */ +#undef _SVID_GETTOD + +/* SVR4 */ +#undef __svr4 + +/* SVR4 */ +#undef __svr4__ + /* Define to empty if `const' does not conform to ANSI C. */ #undef const /* Define to `int' if doesn't define. */ #undef gid_t +/* HP-UX */ +#undef hpux + /* Define to rpl_malloc if the replacement function should be used. */ #undef malloc @@ -278,6 +347,9 @@ /* Define to `unsigned' if does not define. */ #undef size_t +/* SunOS5 */ +#undef sunos5 + /* Define to `int' if doesn't define. */ #undef uid_t From fedora-directory-commits at redhat.com Wed Nov 15 17:17:41 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 15 Nov 2006 10:17:41 -0700 Subject: [Fedora-directory-commits] ldapserver Makefile.am, 1.12, 1.13 Makefile.in, 1.13, 1.14 aclocal.m4, 1.4, 1.5 compile, 1.3, 1.4 config.guess, 1.3, 1.4 config.sub, 1.3, 1.4 configure, 1.12, 1.13 depcomp, 1.3, 1.4 install-sh, 1.3, 1.4 missing, 1.3, 1.4 Message-ID: <200611151717.kAFHHfa2003055@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2981/ldapserver Modified Files: Makefile.am Makefile.in aclocal.m4 compile config.guess config.sub configure depcomp install-sh missing Log Message: Resolves: bug 215669 Bug Description: Define LIBDIR, BINDIR, etc. in Makefile Reviewed by: nkinder (Thanks!) Fix Description: The paths LIBDIR, BINDIR, et. al. are #define'd in create_instance.h to hard coded values. We should be able to set these values in configure and override the built in values. We can't simply set them via AC_DEFINE in configure.ac because we are using config.h and this would render the definition like this: #define BINDIR "${exec_prefix}/bin" instead of #define BINDIR "/usr/bin" So we instead define them in Makefile.am and add their definitions to AM_CPPFLAGS, and quote them properly to make sure the value includes the quotation marks when expanded in the C code. I tested this with both an rpmbuild and a regular developer type build. Platforms tested: RHEL4/FC5 Flag Day: no Doc impact: no Index: Makefile.am =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.am,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- Makefile.am 10 Nov 2006 23:59:15 -0000 1.12 +++ Makefile.am 15 Nov 2006 17:17:37 -0000 1.13 @@ -9,7 +9,20 @@ DEBUG_DEFINES = @debug_defs@ DS_DEFINES = -DBUILD_NUM=$(BUILDNUM) DS_INCLUDES = -I$(srcdir)/ldap/include -I$(srcdir)/ldap/servers/slapd -I$(srcdir)/include -I. -AM_CPPFLAGS = $(PLATFORM_DEFINES) $(DEBUG_DEFINES) $(DS_DEFINES) $(DS_INCLUDES) +# these paths are dependent on the settings of prefix and exec_prefix which may be specified +# at make time. So we cannot use AC_DEFINE in the configure.ac because that would set the +# values prior to their being defined. Defining them here ensures that they are properly +# expanded before use. See create_instance.h for more details. The quoting ensures that +# the values are quoted for the shell command, and the value expands to a quoted string +# value in the header file e.g. +# #define LOCALSTATEDIR "/var" +# without the quotes, it would be +# #define LOCALSTATEDIR /var +# which would be an error +PATH_DEFINES = -DLOCALSTATEDIR="\"$(localstatedir)\"" -DSYSCONFDIR="\"$(sysconfdir)\"" \ + -DLIBDIR="\"$(libdir)\"" -DBINDIR="\"$(bindir)\"" \ + -DDATADIR="\"$(datadir)\"" -DDOCDIR="\"$(docdir)\"" +AM_CPPFLAGS = $(PLATFORM_DEFINES) $(DEBUG_DEFINES) $(DS_DEFINES) $(DS_INCLUDES) $(PATH_DEFINES) PLUGIN_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@ #------------------------ View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.13 -r 1.14 Makefile.in Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.in,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- Makefile.in 10 Nov 2006 23:59:15 -0000 1.13 +++ Makefile.in 15 Nov 2006 17:17:37 -0000 1.14 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.2 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,8 +18,6 @@ -SOURCES = $(libavl_a_SOURCES) $(libldaputil_a_SOURCES) $(libacl_plugin_la_SOURCES) $(libattr_unique_plugin_la_SOURCES) $(libback_ldbm_la_SOURCES) $(libchainingdb_plugin_la_SOURCES) $(libcollation_plugin_la_SOURCES) $(libcos_plugin_la_SOURCES) $(libdes_plugin_la_SOURCES) $(libdistrib_plugin_la_SOURCES) $(libds_admin_la_SOURCES) $(libhttp_client_plugin_la_SOURCES) $(libns_dshttpd_la_SOURCES) $(libpam_passthru_plugin_la_SOURCES) $(libpassthru_plugin_la_SOURCES) $(libpresence_plugin_la_SOURCES) $(libpwdstorage_plugin_la_SOURCES) $(libreferint_plugin_la_SOURCES) $(libreplication_plugin_la_SOURCES) $(libretrocl_plugin_la_SOURCES) $(libroles_plugin_la_SOURCES) $(libslapd_la_SOURCES) $(libstatechange_plugin_la_SOURCES) $(libsyntax_plugin_la_SOURCES) $(libviews_plugin_la_SOURCES) $(dbscan_bin_SOURCES) $(ds_newinst_bin_SOURCES) $(dsktune_bin_SOURCES) $(infadd_bin_SOURCES) $(ldap_agent_bin_SOURCES) $(ldclt_bin_SOURCES) $(ldif_bin_SOURCES) $(makstrdb_SOURCES) $(migratecred_bin_SOURCES)! $(mmldif_bin_SOURCES) $(ns_slapd_SOURCES) $(pwdhash_bin_SOURCES) $(rsearch_bin_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -676,19 +674,19 @@ am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \ +LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \ +LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \ +CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(libavl_a_SOURCES) $(libldaputil_a_SOURCES) \ $(libacl_plugin_la_SOURCES) \ @@ -915,7 +913,21 @@ DEBUG_DEFINES = @debug_defs@ DS_DEFINES = -DBUILD_NUM=$(BUILDNUM) DS_INCLUDES = -I$(srcdir)/ldap/include -I$(srcdir)/ldap/servers/slapd -I$(srcdir)/include -I. -AM_CPPFLAGS = $(PLATFORM_DEFINES) $(DEBUG_DEFINES) $(DS_DEFINES) $(DS_INCLUDES) +# these paths are dependent on the settings of prefix and exec_prefix which may be specified +# at make time. So we cannot use AC_DEFINE in the configure.ac because that would set the +# values prior to their being defined. Defining them here ensures that they are properly +# expanded before use. See create_instance.h for more details. The quoting ensures that +# the values are quoted for the shell command, and the value expands to a quoted string +# value in the header file e.g. +# #define LOCALSTATEDIR "/var" +# without the quotes, it would be +# #define LOCALSTATEDIR /var +# which would be an error +PATH_DEFINES = -DLOCALSTATEDIR="\"$(localstatedir)\"" -DSYSCONFDIR="\"$(sysconfdir)\"" \ + -DLIBDIR="\"$(libdir)\"" -DBINDIR="\"$(bindir)\"" \ + -DDATADIR="\"$(datadir)\"" -DDOCDIR="\"$(docdir)\"" + +AM_CPPFLAGS = $(PLATFORM_DEFINES) $(DEBUG_DEFINES) $(DS_DEFINES) $(DS_INCLUDES) $(PATH_DEFINES) PLUGIN_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@ #------------------------ @@ -4997,2279 +5009,2279 @@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libldaputil_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/ldaputil/libldaputil_a-vtable.obj `if test -f 'lib/ldaputil/vtable.c'; then $(CYGPATH_W) 'lib/ldaputil/vtable.c'; else $(CYGPATH_W) '$(srcdir)/lib/ldaputil/vtable.c'; fi` ldap/servers/plugins/acl/libacl_plugin_la-acl.lo: ldap/servers/plugins/acl/acl.c - at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acl.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl.lo `test -f 'ldap/servers/plugins/acl/acl.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl.c; \ + at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acl.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl.lo `test -f 'ldap/servers/plugins/acl/acl.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/plugins/acl/acl.c' object='ldap/servers/plugins/acl/libacl_plugin_la-acl.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl.lo `test -f 'ldap/servers/plugins/acl/acl.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl.c + at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl.lo `test -f 'ldap/servers/plugins/acl/acl.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl.c ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo: ldap/servers/plugins/acl/acl_ext.c - at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl_ext.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo `test -f 'ldap/servers/plugins/acl/acl_ext.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl_ext.c; \ + at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl_ext.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo `test -f 'ldap/servers/plugins/acl/acl_ext.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl_ext.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl_ext.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl_ext.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl_ext.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/plugins/acl/acl_ext.c' object='ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo `test -f 'ldap/servers/plugins/acl/acl_ext.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl_ext.c + at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo `test -f 'ldap/servers/plugins/acl/acl_ext.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl_ext.c ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo: ldap/servers/plugins/acl/aclanom.c - at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclanom.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo `test -f 'ldap/servers/plugins/acl/aclanom.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclanom.c; \ + at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclanom.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo `test -f 'ldap/servers/plugins/acl/aclanom.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclanom.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclanom.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclanom.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclanom.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/plugins/acl/aclanom.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo `test -f 'ldap/servers/plugins/acl/aclanom.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclanom.c + at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo `test -f 'ldap/servers/plugins/acl/aclanom.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclanom.c ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo: ldap/servers/plugins/acl/acleffectiverights.c - at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acleffectiverights.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo `test -f 'ldap/servers/plugins/acl/acleffectiverights.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acleffectiverights.c; \ + at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acleffectiverights.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo `test -f 'ldap/servers/plugins/acl/acleffectiverights.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acleffectiverights.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acleffectiverights.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acleffectiverights.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acleffectiverights.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/plugins/acl/acleffectiverights.c' object='ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo `test -f 'ldap/servers/plugins/acl/acleffectiverights.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acleffectiverights.c + at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo `test -f 'ldap/servers/plugins/acl/acleffectiverights.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acleffectiverights.c ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo: ldap/servers/plugins/acl/aclgroup.c - at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclgroup.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo `test -f 'ldap/servers/plugins/acl/aclgroup.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclgroup.c; \ + at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclgroup.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo `test -f 'ldap/servers/plugins/acl/aclgroup.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclgroup.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclgroup.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclgroup.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclgroup.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/plugins/acl/aclgroup.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo `test -f 'ldap/servers/plugins/acl/aclgroup.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclgroup.c + at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo `test -f 'ldap/servers/plugins/acl/aclgroup.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclgroup.c ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo: ldap/servers/plugins/acl/aclinit.c - at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclinit.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo `test -f 'ldap/servers/plugins/acl/aclinit.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclinit.c; \ + at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclinit.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo `test -f 'ldap/servers/plugins/acl/aclinit.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclinit.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclinit.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclinit.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclinit.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/plugins/acl/aclinit.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo `test -f 'ldap/servers/plugins/acl/aclinit.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclinit.c + at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo `test -f 'ldap/servers/plugins/acl/aclinit.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclinit.c ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo: ldap/servers/plugins/acl/acllas.c - at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllas.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo `test -f 'ldap/servers/plugins/acl/acllas.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllas.c; \ + at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllas.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo `test -f 'ldap/servers/plugins/acl/acllas.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllas.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllas.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllas.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllas.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/plugins/acl/acllas.c' object='ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo `test -f 'ldap/servers/plugins/acl/acllas.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllas.c + at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo `test -f 'ldap/servers/plugins/acl/acllas.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllas.c ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo: ldap/servers/plugins/acl/acllist.c - at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllist.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo `test -f 'ldap/servers/plugins/acl/acllist.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllist.c; \ + at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllist.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo `test -f 'ldap/servers/plugins/acl/acllist.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllist.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllist.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllist.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllist.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/plugins/acl/acllist.c' object='ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo `test -f 'ldap/servers/plugins/acl/acllist.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllist.c + at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo `test -f 'ldap/servers/plugins/acl/acllist.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllist.c ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo: ldap/servers/plugins/acl/aclparse.c - at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclparse.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo `test -f 'ldap/servers/plugins/acl/aclparse.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclparse.c; \ + at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclparse.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo `test -f 'ldap/servers/plugins/acl/aclparse.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclparse.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclparse.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclparse.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclparse.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/plugins/acl/aclparse.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo `test -f 'ldap/servers/plugins/acl/aclparse.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclparse.c + at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo `test -f 'ldap/servers/plugins/acl/aclparse.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclparse.c ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo: ldap/servers/plugins/acl/aclplugin.c - at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclplugin.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo `test -f 'ldap/servers/plugins/acl/aclplugin.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclplugin.c; \ + at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclplugin.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo `test -f 'ldap/servers/plugins/acl/aclplugin.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclplugin.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclplugin.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclplugin.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclplugin.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/plugins/acl/aclplugin.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo `test -f 'ldap/servers/plugins/acl/aclplugin.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclplugin.c + at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo `test -f 'ldap/servers/plugins/acl/aclplugin.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclplugin.c ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo: ldap/servers/plugins/acl/aclproxy.c - at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclproxy.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo `test -f 'ldap/servers/plugins/acl/aclproxy.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclproxy.c; \ + at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclproxy.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo `test -f 'ldap/servers/plugins/acl/aclproxy.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclproxy.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclproxy.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclproxy.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclproxy.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/plugins/acl/aclproxy.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo `test -f 'ldap/servers/plugins/acl/aclproxy.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclproxy.c + at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo `test -f 'ldap/servers/plugins/acl/aclproxy.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclproxy.c ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo: ldap/servers/plugins/acl/aclutil.c - at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclutil.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo `test -f 'ldap/servers/plugins/acl/aclutil.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclutil.c; \ + at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclutil.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo `test -f 'ldap/servers/plugins/acl/aclutil.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclutil.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclutil.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclutil.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclutil.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/plugins/acl/aclutil.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo `test -f 'ldap/servers/plugins/acl/aclutil.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclutil.c + at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo `test -f 'ldap/servers/plugins/acl/aclutil.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclutil.c ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-7bit.lo: ldap/servers/plugins/uiduniq/7bit.c - at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libattr_unique_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-7bit.lo -MD -MP -MF "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-7bit.Tpo" -c -o ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-7bit.lo `test -f 'ldap/servers/plugins/uiduniq/7bit.c' || echo '$(srcdir)/'`ldap/servers/plugins/uiduniq/7bit.c; \ + at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libattr_unique_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-7bit.lo -MD -MP -MF "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-7bit.Tpo" -c -o ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-7bit.lo `test -f 'ldap/servers/plugins/uiduniq/7bit.c' || echo '$(srcdir)/'`ldap/servers/plugins/uiduniq/7bit.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-7bit.Tpo" "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-7bit.Plo"; else rm -f "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-7bit.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/plugins/uiduniq/7bit.c' object='ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-7bit.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libattr_unique_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-7bit.lo `test -f 'ldap/servers/plugins/uiduniq/7bit.c' || echo '$(srcdir)/'`ldap/servers/plugins/uiduniq/7bit.c + at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libattr_unique_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-7bit.lo `test -f 'ldap/servers/plugins/uiduniq/7bit.c' || echo '$(srcdir)/'`ldap/servers/plugins/uiduniq/7bit.c ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-uid.lo: ldap/servers/plugins/uiduniq/uid.c - at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libattr_unique_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-uid.lo -MD -MP -MF "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-uid.Tpo" -c -o ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-uid.lo `test -f 'ldap/servers/plugins/uiduniq/uid.c' || echo '$(srcdir)/'`ldap/servers/plugins/uiduniq/uid.c; \ + at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libattr_unique_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-uid.lo -MD -MP -MF "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-uid.Tpo" -c -o ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-uid.lo `test -f 'ldap/servers/plugins/uiduniq/uid.c' || echo '$(srcdir)/'`ldap/servers/plugins/uiduniq/uid.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-uid.Tpo" "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-uid.Plo"; else rm -f "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-uid.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/plugins/uiduniq/uid.c' object='ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-uid.lo' libtool=yes @AMDEPBACKSLASH@ [...2970 lines suppressed...] lib/libaccess/libns_dshttpd_la-nseframe.lo: lib/libaccess/nseframe.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-nseframe.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nseframe.Tpo" -c -o lib/libaccess/libns_dshttpd_la-nseframe.lo `test -f 'lib/libaccess/nseframe.cpp' || echo '$(srcdir)/'`lib/libaccess/nseframe.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-nseframe.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nseframe.Tpo" -c -o lib/libaccess/libns_dshttpd_la-nseframe.lo `test -f 'lib/libaccess/nseframe.cpp' || echo '$(srcdir)/'`lib/libaccess/nseframe.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nseframe.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nseframe.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nseframe.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/libaccess/nseframe.cpp' object='lib/libaccess/libns_dshttpd_la-nseframe.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-nseframe.lo `test -f 'lib/libaccess/nseframe.cpp' || echo '$(srcdir)/'`lib/libaccess/nseframe.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-nseframe.lo `test -f 'lib/libaccess/nseframe.cpp' || echo '$(srcdir)/'`lib/libaccess/nseframe.cpp lib/libaccess/libns_dshttpd_la-nsautherr.lo: lib/libaccess/nsautherr.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-nsautherr.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nsautherr.Tpo" -c -o lib/libaccess/libns_dshttpd_la-nsautherr.lo `test -f 'lib/libaccess/nsautherr.cpp' || echo '$(srcdir)/'`lib/libaccess/nsautherr.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-nsautherr.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nsautherr.Tpo" -c -o lib/libaccess/libns_dshttpd_la-nsautherr.lo `test -f 'lib/libaccess/nsautherr.cpp' || echo '$(srcdir)/'`lib/libaccess/nsautherr.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nsautherr.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nsautherr.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nsautherr.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/libaccess/nsautherr.cpp' object='lib/libaccess/libns_dshttpd_la-nsautherr.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-nsautherr.lo `test -f 'lib/libaccess/nsautherr.cpp' || echo '$(srcdir)/'`lib/libaccess/nsautherr.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-nsautherr.lo `test -f 'lib/libaccess/nsautherr.cpp' || echo '$(srcdir)/'`lib/libaccess/nsautherr.cpp lib/libaccess/libns_dshttpd_la-oneeval.lo: lib/libaccess/oneeval.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-oneeval.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-oneeval.Tpo" -c -o lib/libaccess/libns_dshttpd_la-oneeval.lo `test -f 'lib/libaccess/oneeval.cpp' || echo '$(srcdir)/'`lib/libaccess/oneeval.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-oneeval.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-oneeval.Tpo" -c -o lib/libaccess/libns_dshttpd_la-oneeval.lo `test -f 'lib/libaccess/oneeval.cpp' || echo '$(srcdir)/'`lib/libaccess/oneeval.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-oneeval.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-oneeval.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-oneeval.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/libaccess/oneeval.cpp' object='lib/libaccess/libns_dshttpd_la-oneeval.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-oneeval.lo `test -f 'lib/libaccess/oneeval.cpp' || echo '$(srcdir)/'`lib/libaccess/oneeval.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-oneeval.lo `test -f 'lib/libaccess/oneeval.cpp' || echo '$(srcdir)/'`lib/libaccess/oneeval.cpp lib/libaccess/libns_dshttpd_la-register.lo: lib/libaccess/register.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-register.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-register.Tpo" -c -o lib/libaccess/libns_dshttpd_la-register.lo `test -f 'lib/libaccess/register.cpp' || echo '$(srcdir)/'`lib/libaccess/register.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-register.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-register.Tpo" -c -o lib/libaccess/libns_dshttpd_la-register.lo `test -f 'lib/libaccess/register.cpp' || echo '$(srcdir)/'`lib/libaccess/register.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-register.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-register.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-register.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/libaccess/register.cpp' object='lib/libaccess/libns_dshttpd_la-register.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-register.lo `test -f 'lib/libaccess/register.cpp' || echo '$(srcdir)/'`lib/libaccess/register.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-register.lo `test -f 'lib/libaccess/register.cpp' || echo '$(srcdir)/'`lib/libaccess/register.cpp lib/libaccess/libns_dshttpd_la-symbols.lo: lib/libaccess/symbols.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-symbols.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-symbols.Tpo" -c -o lib/libaccess/libns_dshttpd_la-symbols.lo `test -f 'lib/libaccess/symbols.cpp' || echo '$(srcdir)/'`lib/libaccess/symbols.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-symbols.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-symbols.Tpo" -c -o lib/libaccess/libns_dshttpd_la-symbols.lo `test -f 'lib/libaccess/symbols.cpp' || echo '$(srcdir)/'`lib/libaccess/symbols.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-symbols.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-symbols.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-symbols.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/libaccess/symbols.cpp' object='lib/libaccess/libns_dshttpd_la-symbols.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-symbols.lo `test -f 'lib/libaccess/symbols.cpp' || echo '$(srcdir)/'`lib/libaccess/symbols.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-symbols.lo `test -f 'lib/libaccess/symbols.cpp' || echo '$(srcdir)/'`lib/libaccess/symbols.cpp lib/libaccess/libns_dshttpd_la-usi.lo: lib/libaccess/usi.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-usi.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usi.Tpo" -c -o lib/libaccess/libns_dshttpd_la-usi.lo `test -f 'lib/libaccess/usi.cpp' || echo '$(srcdir)/'`lib/libaccess/usi.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-usi.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usi.Tpo" -c -o lib/libaccess/libns_dshttpd_la-usi.lo `test -f 'lib/libaccess/usi.cpp' || echo '$(srcdir)/'`lib/libaccess/usi.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usi.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usi.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usi.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/libaccess/usi.cpp' object='lib/libaccess/libns_dshttpd_la-usi.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-usi.lo `test -f 'lib/libaccess/usi.cpp' || echo '$(srcdir)/'`lib/libaccess/usi.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-usi.lo `test -f 'lib/libaccess/usi.cpp' || echo '$(srcdir)/'`lib/libaccess/usi.cpp lib/libaccess/libns_dshttpd_la-usrcache.lo: lib/libaccess/usrcache.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-usrcache.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usrcache.Tpo" -c -o lib/libaccess/libns_dshttpd_la-usrcache.lo `test -f 'lib/libaccess/usrcache.cpp' || echo '$(srcdir)/'`lib/libaccess/usrcache.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-usrcache.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usrcache.Tpo" -c -o lib/libaccess/libns_dshttpd_la-usrcache.lo `test -f 'lib/libaccess/usrcache.cpp' || echo '$(srcdir)/'`lib/libaccess/usrcache.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usrcache.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usrcache.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usrcache.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/libaccess/usrcache.cpp' object='lib/libaccess/libns_dshttpd_la-usrcache.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-usrcache.lo `test -f 'lib/libaccess/usrcache.cpp' || echo '$(srcdir)/'`lib/libaccess/usrcache.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-usrcache.lo `test -f 'lib/libaccess/usrcache.cpp' || echo '$(srcdir)/'`lib/libaccess/usrcache.cpp lib/base/libns_dshttpd_la-crit.lo: lib/base/crit.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-crit.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-crit.Tpo" -c -o lib/base/libns_dshttpd_la-crit.lo `test -f 'lib/base/crit.cpp' || echo '$(srcdir)/'`lib/base/crit.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-crit.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-crit.Tpo" -c -o lib/base/libns_dshttpd_la-crit.lo `test -f 'lib/base/crit.cpp' || echo '$(srcdir)/'`lib/base/crit.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-crit.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-crit.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-crit.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/crit.cpp' object='lib/base/libns_dshttpd_la-crit.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-crit.lo `test -f 'lib/base/crit.cpp' || echo '$(srcdir)/'`lib/base/crit.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-crit.lo `test -f 'lib/base/crit.cpp' || echo '$(srcdir)/'`lib/base/crit.cpp lib/base/libns_dshttpd_la-dns.lo: lib/base/dns.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-dns.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-dns.Tpo" -c -o lib/base/libns_dshttpd_la-dns.lo `test -f 'lib/base/dns.cpp' || echo '$(srcdir)/'`lib/base/dns.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-dns.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-dns.Tpo" -c -o lib/base/libns_dshttpd_la-dns.lo `test -f 'lib/base/dns.cpp' || echo '$(srcdir)/'`lib/base/dns.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-dns.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-dns.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-dns.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/dns.cpp' object='lib/base/libns_dshttpd_la-dns.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-dns.lo `test -f 'lib/base/dns.cpp' || echo '$(srcdir)/'`lib/base/dns.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-dns.lo `test -f 'lib/base/dns.cpp' || echo '$(srcdir)/'`lib/base/dns.cpp lib/base/libns_dshttpd_la-dnsdmain.lo: lib/base/dnsdmain.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-dnsdmain.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-dnsdmain.Tpo" -c -o lib/base/libns_dshttpd_la-dnsdmain.lo `test -f 'lib/base/dnsdmain.cpp' || echo '$(srcdir)/'`lib/base/dnsdmain.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-dnsdmain.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-dnsdmain.Tpo" -c -o lib/base/libns_dshttpd_la-dnsdmain.lo `test -f 'lib/base/dnsdmain.cpp' || echo '$(srcdir)/'`lib/base/dnsdmain.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-dnsdmain.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-dnsdmain.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-dnsdmain.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/dnsdmain.cpp' object='lib/base/libns_dshttpd_la-dnsdmain.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-dnsdmain.lo `test -f 'lib/base/dnsdmain.cpp' || echo '$(srcdir)/'`lib/base/dnsdmain.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-dnsdmain.lo `test -f 'lib/base/dnsdmain.cpp' || echo '$(srcdir)/'`lib/base/dnsdmain.cpp lib/base/libns_dshttpd_la-ereport.lo: lib/base/ereport.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-ereport.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-ereport.Tpo" -c -o lib/base/libns_dshttpd_la-ereport.lo `test -f 'lib/base/ereport.cpp' || echo '$(srcdir)/'`lib/base/ereport.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-ereport.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-ereport.Tpo" -c -o lib/base/libns_dshttpd_la-ereport.lo `test -f 'lib/base/ereport.cpp' || echo '$(srcdir)/'`lib/base/ereport.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-ereport.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-ereport.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-ereport.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/ereport.cpp' object='lib/base/libns_dshttpd_la-ereport.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-ereport.lo `test -f 'lib/base/ereport.cpp' || echo '$(srcdir)/'`lib/base/ereport.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-ereport.lo `test -f 'lib/base/ereport.cpp' || echo '$(srcdir)/'`lib/base/ereport.cpp lib/base/libns_dshttpd_la-file.lo: lib/base/file.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-file.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Tpo" -c -o lib/base/libns_dshttpd_la-file.lo `test -f 'lib/base/file.cpp' || echo '$(srcdir)/'`lib/base/file.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-file.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Tpo" -c -o lib/base/libns_dshttpd_la-file.lo `test -f 'lib/base/file.cpp' || echo '$(srcdir)/'`lib/base/file.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/file.cpp' object='lib/base/libns_dshttpd_la-file.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-file.lo `test -f 'lib/base/file.cpp' || echo '$(srcdir)/'`lib/base/file.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-file.lo `test -f 'lib/base/file.cpp' || echo '$(srcdir)/'`lib/base/file.cpp lib/base/libns_dshttpd_la-fsmutex.lo: lib/base/fsmutex.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-fsmutex.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Tpo" -c -o lib/base/libns_dshttpd_la-fsmutex.lo `test -f 'lib/base/fsmutex.cpp' || echo '$(srcdir)/'`lib/base/fsmutex.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-fsmutex.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Tpo" -c -o lib/base/libns_dshttpd_la-fsmutex.lo `test -f 'lib/base/fsmutex.cpp' || echo '$(srcdir)/'`lib/base/fsmutex.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/fsmutex.cpp' object='lib/base/libns_dshttpd_la-fsmutex.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-fsmutex.lo `test -f 'lib/base/fsmutex.cpp' || echo '$(srcdir)/'`lib/base/fsmutex.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-fsmutex.lo `test -f 'lib/base/fsmutex.cpp' || echo '$(srcdir)/'`lib/base/fsmutex.cpp lib/base/libns_dshttpd_la-lexer.lo: lib/base/lexer.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-lexer.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Tpo" -c -o lib/base/libns_dshttpd_la-lexer.lo `test -f 'lib/base/lexer.cpp' || echo '$(srcdir)/'`lib/base/lexer.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-lexer.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Tpo" -c -o lib/base/libns_dshttpd_la-lexer.lo `test -f 'lib/base/lexer.cpp' || echo '$(srcdir)/'`lib/base/lexer.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/lexer.cpp' object='lib/base/libns_dshttpd_la-lexer.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-lexer.lo `test -f 'lib/base/lexer.cpp' || echo '$(srcdir)/'`lib/base/lexer.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-lexer.lo `test -f 'lib/base/lexer.cpp' || echo '$(srcdir)/'`lib/base/lexer.cpp lib/base/libns_dshttpd_la-net.lo: lib/base/net.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-net.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Tpo" -c -o lib/base/libns_dshttpd_la-net.lo `test -f 'lib/base/net.cpp' || echo '$(srcdir)/'`lib/base/net.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-net.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Tpo" -c -o lib/base/libns_dshttpd_la-net.lo `test -f 'lib/base/net.cpp' || echo '$(srcdir)/'`lib/base/net.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/net.cpp' object='lib/base/libns_dshttpd_la-net.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-net.lo `test -f 'lib/base/net.cpp' || echo '$(srcdir)/'`lib/base/net.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-net.lo `test -f 'lib/base/net.cpp' || echo '$(srcdir)/'`lib/base/net.cpp lib/base/libns_dshttpd_la-plist.lo: lib/base/plist.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-plist.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Tpo" -c -o lib/base/libns_dshttpd_la-plist.lo `test -f 'lib/base/plist.cpp' || echo '$(srcdir)/'`lib/base/plist.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-plist.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Tpo" -c -o lib/base/libns_dshttpd_la-plist.lo `test -f 'lib/base/plist.cpp' || echo '$(srcdir)/'`lib/base/plist.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/plist.cpp' object='lib/base/libns_dshttpd_la-plist.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-plist.lo `test -f 'lib/base/plist.cpp' || echo '$(srcdir)/'`lib/base/plist.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-plist.lo `test -f 'lib/base/plist.cpp' || echo '$(srcdir)/'`lib/base/plist.cpp lib/base/libns_dshttpd_la-pool.lo: lib/base/pool.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-pool.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Tpo" -c -o lib/base/libns_dshttpd_la-pool.lo `test -f 'lib/base/pool.cpp' || echo '$(srcdir)/'`lib/base/pool.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-pool.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Tpo" -c -o lib/base/libns_dshttpd_la-pool.lo `test -f 'lib/base/pool.cpp' || echo '$(srcdir)/'`lib/base/pool.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/pool.cpp' object='lib/base/libns_dshttpd_la-pool.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-pool.lo `test -f 'lib/base/pool.cpp' || echo '$(srcdir)/'`lib/base/pool.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-pool.lo `test -f 'lib/base/pool.cpp' || echo '$(srcdir)/'`lib/base/pool.cpp lib/base/libns_dshttpd_la-rwlock.lo: lib/base/rwlock.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-rwlock.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Tpo" -c -o lib/base/libns_dshttpd_la-rwlock.lo `test -f 'lib/base/rwlock.cpp' || echo '$(srcdir)/'`lib/base/rwlock.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-rwlock.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Tpo" -c -o lib/base/libns_dshttpd_la-rwlock.lo `test -f 'lib/base/rwlock.cpp' || echo '$(srcdir)/'`lib/base/rwlock.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/rwlock.cpp' object='lib/base/libns_dshttpd_la-rwlock.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-rwlock.lo `test -f 'lib/base/rwlock.cpp' || echo '$(srcdir)/'`lib/base/rwlock.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-rwlock.lo `test -f 'lib/base/rwlock.cpp' || echo '$(srcdir)/'`lib/base/rwlock.cpp lib/base/libns_dshttpd_la-shexp.lo: lib/base/shexp.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-shexp.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Tpo" -c -o lib/base/libns_dshttpd_la-shexp.lo `test -f 'lib/base/shexp.cpp' || echo '$(srcdir)/'`lib/base/shexp.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-shexp.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Tpo" -c -o lib/base/libns_dshttpd_la-shexp.lo `test -f 'lib/base/shexp.cpp' || echo '$(srcdir)/'`lib/base/shexp.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/shexp.cpp' object='lib/base/libns_dshttpd_la-shexp.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-shexp.lo `test -f 'lib/base/shexp.cpp' || echo '$(srcdir)/'`lib/base/shexp.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-shexp.lo `test -f 'lib/base/shexp.cpp' || echo '$(srcdir)/'`lib/base/shexp.cpp lib/base/libns_dshttpd_la-system.lo: lib/base/system.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-system.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Tpo" -c -o lib/base/libns_dshttpd_la-system.lo `test -f 'lib/base/system.cpp' || echo '$(srcdir)/'`lib/base/system.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-system.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Tpo" -c -o lib/base/libns_dshttpd_la-system.lo `test -f 'lib/base/system.cpp' || echo '$(srcdir)/'`lib/base/system.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/system.cpp' object='lib/base/libns_dshttpd_la-system.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-system.lo `test -f 'lib/base/system.cpp' || echo '$(srcdir)/'`lib/base/system.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-system.lo `test -f 'lib/base/system.cpp' || echo '$(srcdir)/'`lib/base/system.cpp lib/base/libns_dshttpd_la-systhr.lo: lib/base/systhr.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-systhr.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Tpo" -c -o lib/base/libns_dshttpd_la-systhr.lo `test -f 'lib/base/systhr.cpp' || echo '$(srcdir)/'`lib/base/systhr.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-systhr.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Tpo" -c -o lib/base/libns_dshttpd_la-systhr.lo `test -f 'lib/base/systhr.cpp' || echo '$(srcdir)/'`lib/base/systhr.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/systhr.cpp' object='lib/base/libns_dshttpd_la-systhr.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-systhr.lo `test -f 'lib/base/systhr.cpp' || echo '$(srcdir)/'`lib/base/systhr.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-systhr.lo `test -f 'lib/base/systhr.cpp' || echo '$(srcdir)/'`lib/base/systhr.cpp lib/base/libns_dshttpd_la-util.lo: lib/base/util.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-util.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Tpo" -c -o lib/base/libns_dshttpd_la-util.lo `test -f 'lib/base/util.cpp' || echo '$(srcdir)/'`lib/base/util.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-util.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Tpo" -c -o lib/base/libns_dshttpd_la-util.lo `test -f 'lib/base/util.cpp' || echo '$(srcdir)/'`lib/base/util.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/util.cpp' object='lib/base/libns_dshttpd_la-util.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-util.lo `test -f 'lib/base/util.cpp' || echo '$(srcdir)/'`lib/base/util.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-util.lo `test -f 'lib/base/util.cpp' || echo '$(srcdir)/'`lib/base/util.cpp mostlyclean-libtool: -rm -f *.lo View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.4 -r 1.5 aclocal.m4 Index: aclocal.m4 =================================================================== RCS file: /cvs/dirsec/ldapserver/aclocal.m4,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- aclocal.m4 3 Nov 2006 22:33:16 -0000 1.4 +++ aclocal.m4 15 Nov 2006 17:17:37 -0000 1.5 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.9.2 -*- Autoconf -*- +# generated automatically by aclocal 1.9.6 -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,7 +13,7 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# serial 47 AC_PROG_LIBTOOL +# serial 48 AC_PROG_LIBTOOL # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) @@ -123,7 +123,7 @@ # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. -Xsed='sed -e s/^X//' +Xsed='sed -e 1s/^X//' [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] # Same as above, but do not quote variable references. @@ -143,7 +143,7 @@ default_ofile=libtool can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except M$VC, +# All known linkers require a `.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a ltmain="$ac_aux_dir/ltmain.sh" @@ -163,6 +163,7 @@ test -z "$AS" && AS=as test -z "$CC" && CC=cc test -z "$LTCC" && LTCC=$CC +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS test -z "$DLLTOOL" && DLLTOOL=dlltool test -z "$LD" && LD=ld test -z "$LN_S" && LN_S="ln -s" @@ -182,15 +183,17 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ;; *) - old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ;; esac old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" fi +_LT_CC_BASENAME([$compiler]) + # Only perform the check for file, if the check method requires it case $deplibs_check_method in file_magic*) @@ -231,11 +234,56 @@ # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + # Allow CC to be a program name with arguments. compiler=$CC ])# _LT_AC_SYS_COMPILER +# _LT_CC_BASENAME(CC) +# ------------------- +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +AC_DEFUN([_LT_CC_BASENAME], +[for cc_temp in $1""; do + case $cc_temp in + compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; + distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +]) + + +# _LT_COMPILER_BOILERPLATE +# ------------------------ +# Check for compiler boilerplate output or warnings with +# the simple compiler test code. +AC_DEFUN([_LT_COMPILER_BOILERPLATE], +[ac_outfile=conftest.$ac_objext +printf "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$rm conftest* +])# _LT_COMPILER_BOILERPLATE + + +# _LT_LINKER_BOILERPLATE +# ---------------------- +# Check for linker boilerplate output or warnings with +# the simple link test code. +AC_DEFUN([_LT_LINKER_BOILERPLATE], +[ac_outfile=conftest.$ac_objext +printf "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$rm conftest* +])# _LT_LINKER_BOILERPLATE + + # _LT_AC_SYS_LIBPATH_AIX # ---------------------- # Links a minimal program and checks the executable @@ -308,15 +356,15 @@ # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. -if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH if test -z "$ECHO"; then if test "X${echo_test_string+set}" != Xset; then # find a string as large as possible, as long as the shell can cope with it for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if (echo_test_string="`eval $cmd`") 2>/dev/null && - echo_test_string="`eval $cmd`" && + if (echo_test_string=`eval $cmd`) 2>/dev/null && + echo_test_string=`eval $cmd` && (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null then break @@ -485,7 +533,7 @@ # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case "`/usr/bin/file conftest.o`" in + case `/usr/bin/file conftest.o` in *32-bit*) case $host in x86_64-*linux*) @@ -536,6 +584,22 @@ CFLAGS="$SAVE_CFLAGS" fi ;; +sparc*-*solaris*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) LD="${LD-ld} -m elf64_sparc" ;; + *) LD="${LD-ld} -64" ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], [*-*-cygwin* | *-*-mingw* | *-*-pw32*) AC_CHECK_TOOL(DLLTOOL, dlltool, false) @@ -567,7 +631,7 @@ # with a dollar sign (not a hyphen), so the echo should work correctly. # The option is referenced via a variable to avoid confusing sed. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) @@ -577,8 +641,10 @@ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - if test ! -s conftest.err; then + # So say no if there are warnings other than the usual output. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 [...3307 lines suppressed...] +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 3 +# serial 4 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ @@ -6694,27 +7027,16 @@ fi ]) +# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + # AM_PROG_MKDIR_P # --------------- # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. - -# Copyright (C) 2003, 2004 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - +# # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories # created by `make install' are always world readable, even if the # installer happens to have an overly restrictive umask (e.g. 077). @@ -6768,26 +7090,15 @@ fi AC_SUBST([mkdir_p])]) -# Helper functions for option handling. -*- Autoconf -*- +# Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# serial 2 +# serial 3 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -6812,28 +7123,16 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# -# Check to make sure that the build environment is sane. -# - -# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# Check to make sure that the build environment is sane. -*- Autoconf -*- -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 4 # AM_SANITY_CHECK # --------------- @@ -6876,25 +7175,14 @@ fi AC_MSG_RESULT(yes)]) -# AM_PROG_INSTALL_STRIP - -# Copyright (C) 2001, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. +# AM_PROG_INSTALL_STRIP +# --------------------- # One issue with vendor `install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip @@ -6917,25 +7205,13 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 1 +# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. +# serial 2 # _AM_PROG_TAR(FORMAT) # -------------------- Index: compile =================================================================== RCS file: /cvs/dirsec/ldapserver/compile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- compile 3 Nov 2006 22:33:16 -0000 1.3 +++ compile 15 Nov 2006 17:17:37 -0000 1.4 @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand `-c -o'. -scriptversion=2004-09-10.20 +scriptversion=2005-05-14.22 -# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -18,7 +18,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -47,11 +47,11 @@ Report bugs to . EOF - exit 0 + exit $? ;; -v | --v*) echo "compile $scriptversion" - exit 0 + exit $? ;; esac @@ -125,6 +125,8 @@ if test -f "$cofile"; then mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + mv "${cofile}bj" "$ofile" fi rmdir "$lockdir" Index: config.guess =================================================================== RCS file: /cvs/dirsec/ldapserver/config.guess,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- config.guess 3 Nov 2006 22:33:16 -0000 1.3 +++ config.guess 15 Nov 2006 17:17:37 -0000 1.4 @@ -1,9 +1,9 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -timestamp='2004-09-07' +timestamp='2005-07-08' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -17,13 +17,15 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. + # Originally written by Per Bothner . # Please send patches to . Submit a context # diff and a properly formatted ChangeLog entry. @@ -53,7 +55,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -66,11 +68,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; + echo "$timestamp" ; exit ;; --version | -v ) - echo "$version" ; exit 0 ;; + echo "$version" ; exit ;; --help | --h* | -h ) - echo "$usage"; exit 0 ;; + echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -123,7 +125,7 @@ ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ;' +esac ; set_cc_for_build= ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi at noc.rutgers.edu 1994-08-24) @@ -196,55 +198,20 @@ # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" - exit 0 ;; - amd64:OpenBSD:*:*) - echo x86_64-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - cats:OpenBSD:*:*) - echo arm-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - luna88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mac68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - macppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvmeppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sgi:OpenBSD:*:*) - echo mips64-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sun3:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + exit ;; *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + exit ;; *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit 0 ;; + exit ;; macppc:MirBSD:*:*) echo powerppc-unknown-mirbsd${UNAME_RELEASE} - exit 0 ;; + exit ;; *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} - exit 0 ;; + exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -297,37 +264,43 @@ # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit 0 ;; + exit ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead # of the specific Alpha model? echo alpha-pc-interix - exit 0 ;; + exit ;; 21064:Windows_NT:50:3) echo alpha-dec-winnt3.5 - exit 0 ;; + exit ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 - exit 0;; + exit ;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos - exit 0 ;; + exit ;; *:[Mm]orph[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-morphos - exit 0 ;; + exit ;; *:OS/390:*:*) echo i370-ibm-openedition - exit 0 ;; + exit ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe + exit ;; *:OS400:*:*) echo powerpc-ibm-os400 - exit 0 ;; + exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} - exit 0;; + exit ;; + arm:riscos:*:*|arm:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp - exit 0;; + exit ;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. if test "`(/bin/universe) 2>/dev/null`" = att ; then @@ -335,32 +308,32 @@ else echo pyramid-pyramid-bsd fi - exit 0 ;; + exit ;; NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 - exit 0 ;; + exit ;; DRS?6000:unix:4.0:6*) echo sparc-icl-nx6 - exit 0 ;; - DRS?6000:UNIX_SV:4.2*:7*) + exit ;; + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7 && exit 0 ;; + sparc) echo sparc-icl-nx7; exit ;; esac ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; i86pc:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:*:*) case "`/usr/bin/arch -k`" in Series*|S4*) @@ -369,10 +342,10 @@ esac # Japanese Language versions have a version number like `4.1.3-JL'. echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit 0 ;; + exit ;; sun3*:SunOS:*:*) echo m68k-sun-sunos${UNAME_RELEASE} - exit 0 ;; + exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 @@ -384,10 +357,10 @@ echo sparc-sun-sunos${UNAME_RELEASE} ;; esac - exit 0 ;; + exit ;; aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} - exit 0 ;; + exit ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -398,40 +371,40 @@ # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) echo m68k-milan-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) echo m68k-hades-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} - exit 0 ;; + exit ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} - exit 0 ;; + exit ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 - exit 0 ;; + exit ;; RISC*:ULTRIX:*:*) echo mips-dec-ultrix${UNAME_RELEASE} - exit 0 ;; + exit ;; VAX*:ULTRIX*:*:*) echo vax-dec-ultrix${UNAME_RELEASE} - exit 0 ;; + exit ;; 2020:CLIX:*:* | 2430:CLIX:*:*) echo clipper-intergraph-clix${UNAME_RELEASE} - exit 0 ;; + exit ;; mips:*:*:UMIPS | mips:*:*:RISCos) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -455,32 +428,33 @@ exit (-1); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c \ - && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && exit 0 + $CC_FOR_BUILD -o $dummy $dummy.c && + dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`$dummy $dummyarg` && + { echo "$SYSTEM_NAME"; exit; } echo mips-mips-riscos${UNAME_RELEASE} - exit 0 ;; + exit ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax - exit 0 ;; + exit ;; Motorola:*:4.3:PL8-*) echo powerpc-harris-powermax - exit 0 ;; + exit ;; Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) echo powerpc-harris-powermax - exit 0 ;; + exit ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix - exit 0 ;; + exit ;; m88k:CX/UX:7*:*) echo m88k-harris-cxux7 - exit 0 ;; + exit ;; m88k:*:4*:R4*) echo m88k-motorola-sysv4 - exit 0 ;; + exit ;; m88k:*:3*:R3*) echo m88k-motorola-sysv3 - exit 0 ;; + exit ;; AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` @@ -496,29 +470,29 @@ else echo i586-dg-dgux${UNAME_RELEASE} fi - exit 0 ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 - exit 0 ;; + exit ;; M88*:*:R3*:*) # Delta 88k system running SVR3 echo m88k-motorola-sysv3 - exit 0 ;; + exit ;; XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) echo m88k-tektronix-sysv3 - exit 0 ;; + exit ;; Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) echo m68k-tektronix-bsd - exit 0 ;; + exit ;; *:IRIX*:*:*) echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit 0 ;; + exit ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' i*86:AIX:*:*) echo i386-ibm-aix - exit 0 ;; + exit ;; ia64:AIX:*:*) if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` @@ -526,7 +500,7 @@ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit 0 ;; + exit ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then eval $set_cc_for_build @@ -541,14 +515,18 @@ exit(0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 - echo rs6000-ibm-aix3.2.5 + if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + then + echo "$SYSTEM_NAME" + else + echo rs6000-ibm-aix3.2.5 + fi elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 else echo rs6000-ibm-aix3.2 fi - exit 0 ;; + exit ;; *:AIX:*:[45]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then @@ -562,28 +540,28 @@ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit 0 ;; + exit ;; *:AIX:*:*) echo rs6000-ibm-aix - exit 0 ;; + exit ;; ibmrt:4.4BSD:*|romp-ibm:BSD:*) echo romp-ibm-bsd4.4 - exit 0 ;; + exit ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit 0 ;; # report: romp-ibm BSD 4.3 + exit ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx - exit 0 ;; + exit ;; DPX/2?00:B.O.S.:*:*) echo m68k-bull-sysv3 - exit 0 ;; + exit ;; 9000/[34]??:4.3bsd:1.*:*) echo m68k-hp-bsd - exit 0 ;; + exit ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) echo m68k-hp-bsd4.4 - exit 0 ;; + exit ;; 9000/[34678]??:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` case "${UNAME_MACHINE}" in @@ -645,9 +623,19 @@ esac if [ ${HP_ARCH} = "hppa2.0w" ] then - # avoid double evaluation of $set_cc_for_build - test -n "$CC_FOR_BUILD" || eval $set_cc_for_build - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null + eval $set_cc_for_build + + # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating + # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler + # generating 64-bit code. GNU and HP use different nomenclature: + # + # $ CC_FOR_BUILD=cc ./config.guess + # => hppa2.0w-hp-hpux11.23 + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + grep __LP64__ >/dev/null then HP_ARCH="hppa2.0w" else @@ -655,11 +643,11 @@ fi fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit 0 ;; + exit ;; ia64:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` echo ia64-hp-hpux${HPUX_REV} - exit 0 ;; + exit ;; 3050*:HI-UX:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -687,158 +675,166 @@ exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 + $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } echo unknown-hitachi-hiuxwe2 - exit 0 ;; + exit ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) echo hppa1.1-hp-bsd - exit 0 ;; + exit ;; 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd - exit 0 ;; + exit ;; *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix - exit 0 ;; + exit ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) echo hppa1.1-hp-osf - exit 0 ;; + exit ;; hp8??:OSF1:*:*) echo hppa1.0-hp-osf - exit 0 ;; + exit ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then echo ${UNAME_MACHINE}-unknown-osf1mk else echo ${UNAME_MACHINE}-unknown-osf1 fi - exit 0 ;; + exit ;; parisc*:Lites*:*:*) echo hppa1.1-hp-lites - exit 0 ;; + exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit 0 ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit 0 ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit 0 ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit 0 ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit 0 ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*[A-Z]90:*:*:*) echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; *:UNICOS/mp:*:*) echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit 0 ;; + exit ;; 5000:UNIX_System_V:4.*:*) FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit 0 ;; + exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; sparc*:BSD/OS:*:*) echo sparc-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; *:BSD/OS:*:*) echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; *:FreeBSD:*:*) echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit 0 ;; + exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin - exit 0 ;; + exit ;; i*:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 - exit 0 ;; + exit ;; + i*:windows32*:*) + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 + exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 - exit 0 ;; + exit ;; x86:Interix*:[34]*) echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' - exit 0 ;; + exit ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks - exit 0 ;; + exit ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we # UNAME_MACHINE based on the output of uname instead of i386? echo i586-pc-interix - exit 0 ;; + exit ;; i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin - exit 0 ;; + exit ;; + amd64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; p*:CYGWIN*:*) echo powerpcle-unknown-cygwin - exit 0 ;; + exit ;; prep*:SunOS:5.*:*) echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; *:GNU:*:*) # the GNU system echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit 0 ;; + exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu - exit 0 ;; + exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix - exit 0 ;; + exit ;; arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; cris:Linux:*:*) echo cris-axis-linux-gnu - exit 0 ;; + exit ;; crisv32:Linux:*:*) echo crisv32-axis-linux-gnu - exit 0 ;; + exit ;; frv:Linux:*:*) echo frv-unknown-linux-gnu - exit 0 ;; + exit ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; m32r*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; mips:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -856,7 +852,7 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; mips64:Linux:*:*) eval $set_cc_for_build @@ -875,14 +871,14 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; ppc:Linux:*:*) echo powerpc-unknown-linux-gnu - exit 0 ;; + exit ;; ppc64:Linux:*:*) echo powerpc64-unknown-linux-gnu - exit 0 ;; + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -896,7 +892,7 @@ objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit 0 ;; + exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -904,25 +900,25 @@ PA8*) echo hppa2.0-unknown-linux-gnu ;; *) echo hppa-unknown-linux-gnu ;; esac - exit 0 ;; + exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) echo hppa64-unknown-linux-gnu - exit 0 ;; + exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux - exit 0 ;; + exit ;; sh64*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu - exit 0 ;; + exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent @@ -940,15 +936,15 @@ ;; a.out-i386-linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit 0 ;; + exit ;; coff-i386) echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit 0 ;; + exit ;; "") # Either a pre-BFD a.out linker (linux-gnuoldld) or # one that does not give us useful --help. echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit 0 ;; + exit ;; esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build @@ -976,15 +972,18 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 - test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 + test x"${LIBC}" != x && { + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + exit + } + test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both # sysname and nodename. echo i386-sequent-sysv4 - exit 0 ;; + exit ;; i*86:UNIX_SV:4.2MP:2.*) # Unixware is an offshoot of SVR4, but it has its own version # number series starting with 2... @@ -992,27 +991,27 @@ # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit 0 ;; + exit ;; i*86:OS/2:*:*) # If we were able to find `uname', then EMX Unix compatibility # is probably installed. echo ${UNAME_MACHINE}-pc-os2-emx - exit 0 ;; + exit ;; i*86:XTS-300:*:STOP) echo ${UNAME_MACHINE}-unknown-stop - exit 0 ;; + exit ;; i*86:atheos:*:*) echo ${UNAME_MACHINE}-unknown-atheos - exit 0 ;; - i*86:syllable:*:*) + exit ;; + i*86:syllable:*:*) echo ${UNAME_MACHINE}-pc-syllable - exit 0 ;; + exit ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; i*86:*DOS:*:*) echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit 0 ;; + exit ;; i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then @@ -1020,15 +1019,16 @@ else echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi - exit 0 ;; - i*86:*:5:[78]*) + exit ;; + i*86:*:5:[678]*) + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit 0 ;; + exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null 2>&1 ; then echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 fi - exit 0 ;; + exit ;; mini*:CTIX:SYS*5:*) # "miniframe" echo m68010-convergent-sysv - exit 0 ;; + exit ;; mc68k:UNIX:SYSTEM5:3.51m) echo m68k-convergent-sysv - exit 0 ;; + exit ;; M680?0:D-NIX:5.3:*) echo m68k-diab-dnix - exit 0 ;; + exit ;; M68*:*:R3V[5678]*:*) - test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; + test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4.3${OS_REL} && exit 0 + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4 && exit 0 ;; + && { echo i486-ncr-sysv4; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 - exit 0 ;; + exit ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} - exit 0 ;; + exit ;; RM*:ReliantUNIX-*:*:*) echo mips-sni-sysv4 - exit 0 ;; + exit ;; RM*:SINIX-*:*:*) echo mips-sni-sysv4 - exit 0 ;; + exit ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` @@ -1120,61 +1120,65 @@ else echo ns32k-sni-sysv fi - exit 0 ;; + exit ;; PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort # says echo i586-unisys-sysv4 - exit 0 ;; + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm echo hppa1.1-stratus-sysv4 - exit 0 ;; + exit ;; *:*:*:FTX*) # From seanf at swdc.stratus.com. echo i860-stratus-sysv4 - exit 0 ;; + exit ;; + i*86:VOS:*:*) + # From Paul.Green at stratus.com. + echo ${UNAME_MACHINE}-stratus-vos + exit ;; *:VOS:*:*) # From Paul.Green at stratus.com. echo hppa1.1-stratus-vos - exit 0 ;; + exit ;; mc68*:A/UX:*:*) echo m68k-apple-aux${UNAME_RELEASE} - exit 0 ;; + exit ;; news*:NEWS-OS:6*:*) echo mips-sony-newsos6 - exit 0 ;; + exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then echo mips-nec-sysv${UNAME_RELEASE} else echo mips-unknown-sysv${UNAME_RELEASE} fi - exit 0 ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos - exit 0 ;; + exit ;; BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. echo powerpc-apple-beos - exit 0 ;; + exit ;; BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos - exit 0 ;; + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; SX-5:SUPER-UX:*:*) echo sx5-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Rhapsody:*:*) echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown case $UNAME_PROCESSOR in @@ -1182,7 +1186,7 @@ unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit 0 ;; + exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` if test "$UNAME_PROCESSOR" = "x86"; then @@ -1190,22 +1194,25 @@ UNAME_MACHINE=pc fi echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit 0 ;; + exit ;; *:QNX:*:4*) echo i386-pc-qnx - exit 0 ;; + exit ;; + NSE-?:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} - exit 0 ;; + exit ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux - exit 0 ;; + exit ;; BS2000:POSIX*:*:*) echo bs2000-siemens-sysv - exit 0 ;; + exit ;; DS/*:UNIX_System_V:*:*) echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 @@ -1216,38 +1223,44 @@ UNAME_MACHINE="$cputype" fi echo ${UNAME_MACHINE}-unknown-plan9 - exit 0 ;; + exit ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 - exit 0 ;; + exit ;; *:TENEX:*:*) echo pdp10-unknown-tenex - exit 0 ;; + exit ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) echo pdp10-dec-tops20 - exit 0 ;; + exit ;; XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) echo pdp10-xkl-tops20 - exit 0 ;; + exit ;; *:TOPS-20:*:*) echo pdp10-unknown-tops20 - exit 0 ;; + exit ;; *:ITS:*:*) echo pdp10-unknown-its - exit 0 ;; + exit ;; SEI:*:*:SEIUX) echo mips-sei-seiux${UNAME_RELEASE} - exit 0 ;; + exit ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit 0 ;; + exit ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms && exit 0 ;; - I*) echo ia64-dec-vms && exit 0 ;; - V*) echo vax-dec-vms && exit 0 ;; - esac + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; + V*) echo vax-dec-vms ; exit ;; + esac ;; + *:XENIX:*:SysV) + echo i386-pc-xenix + exit ;; + i*86:skyos:*:*) + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1279,7 +1292,7 @@ #endif #if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix"); exit (0); + printf ("arm-acorn-riscix\n"); exit (0); #endif #if defined (hp300) && !defined (hpux) @@ -1368,11 +1381,12 @@ } EOF -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } # Apollos put the system type in the environment. -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } # Convex versions that predate uname can use getsysinfo(1) @@ -1381,22 +1395,22 @@ case `getsysinfo -f cpu_type` in c1*) echo c1-convex-bsd - exit 0 ;; + exit ;; c2*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit 0 ;; + exit ;; c34*) echo c34-convex-bsd - exit 0 ;; + exit ;; c38*) echo c38-convex-bsd - exit 0 ;; + exit ;; c4*) echo c4-convex-bsd - exit 0 ;; + exit ;; esac fi @@ -1407,7 +1421,9 @@ the operating system you are using. It is advised that you download the most up to date version of the config scripts from - ftp://ftp.gnu.org/pub/gnu/config/ + http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess +and + http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub If the version you run ($0) is already up to date, please send the following data and any information you think might be Index: config.sub =================================================================== RCS file: /cvs/dirsec/ldapserver/config.sub,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- config.sub 3 Nov 2006 22:33:16 -0000 1.3 +++ config.sub 15 Nov 2006 17:17:37 -0000 1.4 @@ -1,9 +1,9 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -timestamp='2004-08-29' +timestamp='2005-07-08' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,14 +21,15 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. - +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. +# # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. + # Please send patches to . Submit a context # diff and a properly formatted ChangeLog entry. # @@ -70,7 +71,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -83,11 +84,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; + echo "$timestamp" ; exit ;; --version | -v ) - echo "$version" ; exit 0 ;; + echo "$version" ; exit ;; --help | --h* | -h ) - echo "$usage"; exit 0 ;; + echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -99,7 +100,7 @@ *local*) # First pass through any local machine types. echo $1 - exit 0;; + exit ;; * ) break ;; @@ -231,13 +232,14 @@ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ + | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | m32r | m32rle | m68000 | m68k | m88k | mcore \ + | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -246,6 +248,7 @@ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ | mipsisa64 | mipsisa64el \ @@ -254,23 +257,28 @@ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | ms1 \ | msp430 \ | ns16k | ns32k \ - | openrisc | or32 \ + | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ + | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b \ | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xscale | xstormy16 | xtensa \ + | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; + m32c) + basic_machine=$basic_machine-unknown + ;; m6811 | m68hc11 | m6812 | m68hc12) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown @@ -298,7 +306,7 @@ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* \ - | bs2000-* \ + | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ @@ -310,7 +318,7 @@ | ip2k-* | iq2000-* \ | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | mcore-* \ + | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -319,6 +327,7 @@ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ | mipsisa64-* | mipsisa64el-* \ @@ -327,6 +336,7 @@ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ + | ms1-* \ | msp430-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ @@ -334,20 +344,23 @@ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ + | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ - | xtensa-* \ + | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ + | xstormy16-* | xtensa-* \ | ymp-* \ | z8k-*) ;; + m32c-*) + ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) @@ -489,6 +502,10 @@ basic_machine=m88k-motorola os=-sysv3 ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; dpx20 | dpx20-*) basic_machine=rs6000-bull os=-bosx @@ -754,9 +771,8 @@ basic_machine=hppa1.1-oki os=-proelf ;; - or32 | or32-*) + openrisc | openrisc-*) basic_machine=or32-unknown - os=-coff ;; os400) basic_machine=powerpc-ibm @@ -1029,6 +1045,10 @@ basic_machine=hppa1.1-winbond os=-proelf ;; + xbox) + basic_machine=i686-pc + os=-mingw32 + ;; xps | xps100) basic_machine=xps100-honeywell ;; @@ -1078,12 +1098,9 @@ we32k) basic_machine=we32k-att ;; - sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) + sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sh64) - basic_machine=sh64-unknown - ;; sparc | sparcv8 | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; @@ -1170,7 +1187,8 @@ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | -haiku*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1188,7 +1206,7 @@ os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; -mac*) @@ -1297,6 +1315,9 @@ -kaos*) os=-kaos ;; + -zvmoe) + os=-zvmoe + ;; -none) ;; *) @@ -1374,6 +1395,9 @@ *-be) os=-beos ;; + *-haiku) + os=-haiku + ;; *-ibm) os=-aix ;; @@ -1545,7 +1569,7 @@ esac echo $basic_machine$os -exit 0 +exit # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.12 -r 1.13 configure Index: configure =================================================================== RCS file: /cvs/dirsec/ldapserver/configure,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- configure 15 Nov 2006 02:07:27 -0000 1.12 +++ configure 15 Nov 2006 17:17:37 -0000 1.13 @@ -280,15 +280,15 @@ # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. -if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH if test -z "$ECHO"; then if test "X${echo_test_string+set}" != Xset; then # find a string as large as possible, as long as the shell can cope with it for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if (echo_test_string="`eval $cmd`") 2>/dev/null && - echo_test_string="`eval $cmd`" && + if (echo_test_string=`eval $cmd`) 2>/dev/null && + echo_test_string=`eval $cmd` && (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null then break @@ -3824,7 +3824,7 @@ # Add /usr/xpg4/bin/sed as it is typically found on Solaris # along with /bin/sed that truncates output. for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && break + test ! -f $lt_ac_sed && continue cat /dev/null > conftest.in lt_ac_count=0 echo $ECHO_N "0123456789$ECHO_C" >conftest.in @@ -3849,10 +3849,10 @@ fi done done -SED=$lt_cv_path_SED fi +SED=$lt_cv_path_SED echo "$as_me:$LINENO: result: $SED" >&5 echo "${ECHO_T}$SED" >&6 @@ -3929,7 +3929,7 @@ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then lt_cv_path_LD="$ac_dir/$ac_prog" # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. + # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 &6 else - # I'd rather use --version here, but apparently some GNU ld's only accept -v. + # I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 &5 echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6 @@ -4003,36 +4012,43 @@ # Let the user override the test. lt_cv_path_NM="$NM" else - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/${ac_tool_prefix}nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) - lt_cv_path_NM="$tmp_nm -B" - break - ;; - *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in - */dev/null*) - lt_cv_path_NM="$tmp_nm -p" + lt_nm_to_check="${ac_tool_prefix}nm" + if test -n "$ac_tool_prefix" && test "$build" = "$host"; then + lt_nm_to_check="$lt_nm_to_check nm" + fi + for lt_tmp_nm in $lt_nm_to_check; do + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + tmp_nm="$ac_dir/$lt_tmp_nm" + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + # Check to see if the nm accepts a BSD-compat flag. + # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # nm: unknown option "B" ignored + # Tru64's nm complains that /dev/null is an invalid object file + case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in + */dev/null* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" break ;; *) - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" + break + ;; + *) + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but + continue # so that we can try to find one that supports BSD flags + ;; + esac ;; esac - esac - fi + fi + done + IFS="$lt_save_ifs" done - IFS="$lt_save_ifs" test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm fi fi @@ -4079,7 +4095,7 @@ lt_cv_deplibs_check_method=pass_all ;; -bsdi4*) +bsdi[45]*) lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' lt_cv_file_magic_cmd='/usr/bin/file -L' lt_cv_file_magic_test_file=/shlib/libc.so @@ -4102,13 +4118,13 @@ lt_cv_deplibs_check_method=pass_all ;; -freebsd* | kfreebsd*-gnu) +freebsd* | kfreebsd*-gnu | dragonfly*) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library' + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; @@ -4124,7 +4140,7 @@ hpux10.20* | hpux11*) lt_cv_file_magic_cmd=/usr/bin/file - case "$host_cpu" in + case $host_cpu in ia64*) lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so @@ -4140,6 +4156,11 @@ esac ;; +interix3*) + # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' + ;; + irix5* | irix6* | nonstopux*) case $LD in *-32|*"-32 ") libmagic=32-bit;; @@ -4152,15 +4173,6 @@ # This must be Linux ELF. linux*) [...8431 lines suppressed...] + +uts4*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; +*) + dynamic_linker=no + ;; +esac +echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +echo "${ECHO_T}$dynamic_linker" >&6 +test "$dynamic_linker" = no && can_build_shared=no +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 - fi - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - ;; - esac +echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +hardcode_action_GCJ= +if test -n "$hardcode_libdir_flag_spec_GCJ" || \ + test -n "$runpath_var_GCJ" || \ + test "X$hardcode_automatic_GCJ" = "Xyes" ; then - case $lt_cv_dlopen_self in - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; - *) enable_dlopen_self=unknown ;; - esac + # We can hardcode non-existant directories. + if test "$hardcode_direct_GCJ" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no && + test "$hardcode_minus_L_GCJ" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action_GCJ=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action_GCJ=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action_GCJ=unsupported +fi +echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 +echo "${ECHO_T}$hardcode_action_GCJ" >&6 - case $lt_cv_dlopen_self_static in - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; - *) enable_dlopen_self_static=unknown ;; - esac +if test "$hardcode_action_GCJ" = relink; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless fi @@ -18393,7 +17810,7 @@ # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ SED SHELL STRIP \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ @@ -18494,6 +17911,12 @@ # The host system. host_alias=$host_alias host=$host +host_os=$host_os + +# The build system. +build_alias=$build_alias +build=$build +build_os=$build_os # An echo program that does not interpret backslashes. echo=$lt_echo @@ -18505,6 +17928,9 @@ # A C compiler. LTCC=$lt_LTCC +# LTCC compiler flags. +LTCFLAGS=$lt_LTCFLAGS + # A language-specific compiler. CC=$lt_compiler_GCJ @@ -18570,7 +17996,7 @@ # Does compiler simultaneously support -c and -o options? compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ -# Must we lock files when doing compilation ? +# Must we lock files when doing compilation? need_locks=$lt_need_locks # Do we need the lib prefix for modules? @@ -18814,15 +18240,42 @@ # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + # Allow CC to be a program name with arguments. compiler=$CC +# save warnings/boilerplate of simple test code +ac_outfile=conftest.$ac_objext +printf "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$rm conftest* + +ac_outfile=conftest.$ac_objext +printf "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$rm conftest* + + # Allow CC to be a program name with arguments. lt_save_CC="$CC" CC=${RC-"windres"} compiler=$CC compiler_RC=$CC +for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` + lt_cv_prog_compiler_c_o_RC=yes # The else clause should only fire when bootstrapping the @@ -18838,7 +18291,7 @@ # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ SED SHELL STRIP \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ @@ -18939,6 +18392,12 @@ # The host system. host_alias=$host_alias host=$host +host_os=$host_os + +# The build system. +build_alias=$build_alias +build=$build +build_os=$build_os # An echo program that does not interpret backslashes. echo=$lt_echo @@ -18950,6 +18409,9 @@ # A C compiler. LTCC=$lt_LTCC +# LTCC compiler flags. +LTCFLAGS=$lt_LTCFLAGS + # A language-specific compiler. CC=$lt_compiler_RC @@ -19015,7 +18477,7 @@ # Does compiler simultaneously support -c and -o options? compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC -# Must we lock files when doing compilation ? +# Must we lock files when doing compilation? need_locks=$lt_need_locks # Do we need the lib prefix for modules? Index: depcomp =================================================================== RCS file: /cvs/dirsec/ldapserver/depcomp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- depcomp 3 Nov 2006 22:33:16 -0000 1.3 +++ depcomp 15 Nov 2006 17:17:38 -0000 1.4 @@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2004-05-31.23 +scriptversion=2005-07-09.11 -# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -50,11 +50,11 @@ Report bugs to . EOF - exit 0 + exit $? ;; -v | --v*) echo "depcomp $scriptversion" - exit 0 + exit $? ;; esac @@ -287,36 +287,43 @@ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` if test "$libtool" = yes; then - # Dependencies are output in .lo.d with libtool 1.4. - # With libtool 1.5 they are output both in $dir.libs/$base.o.d - # and in $dir.libs/$base.o.d and $dir$base.o.d. We process the - # latter, because the former will be cleaned when $dir.libs is - # erased. - tmpdepfile1="$dir.libs/$base.lo.d" - tmpdepfile2="$dir$base.o.d" - tmpdepfile3="$dir.libs/$base.d" + # With Tru64 cc, shared objects can also be used to make a + # static library. This mecanism is used in libtool 1.4 series to + # handle both shared and static libraries in a single compilation. + # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. + # + # With libtool 1.5 this exception was removed, and libtool now + # generates 2 separate objects for the 2 libraries. These two + # compilations output dependencies in in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is + # automatically cleaned when .libs/ is deleted, while ignoring + # the former would cause a distcleancheck panic. + tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 + tmpdepfile2=$dir$base.o.d # libtool 1.5 + tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 + tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 "$@" -Wc,-MD else - tmpdepfile1="$dir$base.o.d" - tmpdepfile2="$dir$base.d" - tmpdepfile3="$dir$base.d" + tmpdepfile1=$dir$base.o.d + tmpdepfile2=$dir$base.d + tmpdepfile3=$dir$base.d + tmpdepfile4=$dir$base.d "$@" -MD fi stat=$? if test $stat -eq 0; then : else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" exit $stat fi - if test -f "$tmpdepfile1"; then - tmpdepfile="$tmpdepfile1" - elif test -f "$tmpdepfile2"; then - tmpdepfile="$tmpdepfile2" - else - tmpdepfile="$tmpdepfile3" - fi + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" + do + test -f "$tmpdepfile" && break + done if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" # That's a tab and a space in the []. @@ -460,7 +467,8 @@ done "$@" -E | - sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | + sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" Index: install-sh =================================================================== RCS file: /cvs/dirsec/ldapserver/install-sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- install-sh 3 Nov 2006 22:33:16 -0000 1.3 +++ install-sh 15 Nov 2006 17:17:38 -0000 1.4 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2004-09-10.20 +scriptversion=2005-05-14.22 # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -109,7 +109,7 @@ shift continue;; - --help) echo "$usage"; exit 0;; + --help) echo "$usage"; exit $?;; -m) chmodcmd="$chmodprog $2" shift @@ -134,7 +134,7 @@ shift continue;; - --version) echo "$0 $scriptversion"; exit 0;; + --version) echo "$0 $scriptversion"; exit $?;; *) # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. @@ -213,7 +213,7 @@ fi # This sed command emulates the dirname command. - dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` + dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` # Make sure that the destination directory exists. @@ -226,7 +226,8 @@ oIFS=$IFS # Some sh's can't handle IFS=/ for some reason. IFS='%' - set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` + set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` + shift IFS=$oIFS pathcomp= @@ -295,7 +296,7 @@ || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ || { echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 - (exit 1); exit + (exit 1); exit 1 } else : @@ -306,12 +307,12 @@ $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" } } - fi || { (exit 1); exit; } + fi || { (exit 1); exit 1; } done # The final little trick to "correctly" pass the exit status to the exit trap. { - (exit 0); exit + (exit 0); exit 0 } # Local variables: Index: missing =================================================================== RCS file: /cvs/dirsec/ldapserver/missing,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- missing 3 Nov 2006 22:33:16 -0000 1.3 +++ missing 15 Nov 2006 17:17:38 -0000 1.4 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2004-09-07.08 +scriptversion=2005-06-08.21 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. @@ -19,8 +19,8 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -87,12 +87,12 @@ yacc create \`y.tab.[ch]', if possible, from existing .[ch] Send bug reports to ." - exit 0 + exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) echo "missing $scriptversion (GNU Automake)" - exit 0 + exit $? ;; -*) @@ -288,11 +288,18 @@ call might also be the consequence of using a buggy \`make' (AIX, DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." + # The file to touch is that specified with -o ... file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` if test -z "$file"; then - file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file` - fi + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` + file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 touch $file ;; From fedora-directory-commits at redhat.com Wed Nov 15 17:17:41 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 15 Nov 2006 10:17:41 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src create_instance.h, 1.12, 1.13 Message-ID: <200611151717.kAFHHfxI003067@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/admin/src In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2981/ldapserver/ldap/admin/src Modified Files: create_instance.h Log Message: Resolves: bug 215669 Bug Description: Define LIBDIR, BINDIR, etc. in Makefile Reviewed by: nkinder (Thanks!) Fix Description: The paths LIBDIR, BINDIR, et. al. are #define'd in create_instance.h to hard coded values. We should be able to set these values in configure and override the built in values. We can't simply set them via AC_DEFINE in configure.ac because we are using config.h and this would render the definition like this: #define BINDIR "${exec_prefix}/bin" instead of #define BINDIR "/usr/bin" So we instead define them in Makefile.am and add their definitions to AM_CPPFLAGS, and quote them properly to make sure the value includes the quotation marks when expanded in the C code. I tested this with both an rpmbuild and a regular developer type build. Platforms tested: RHEL4/FC5 Flag Day: no Doc impact: no Index: create_instance.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- create_instance.h 13 Nov 2006 23:45:44 -0000 1.12 +++ create_instance.h 15 Nov 2006 17:17:39 -0000 1.13 @@ -54,23 +54,45 @@ extern "C" { /* Assume C declarations for C++ */ #endif /* __cplusplus */ +#ifndef BRAND_DS #define BRAND_DS "fedora-ds" +#endif #ifdef XP_UNIX #define PRODUCT_NAME "slapd" #define PRODUCT_BIN "ns-slapd" +#ifndef LOCALSTATEDIR #define LOCALSTATEDIR "/var" +#endif +#ifndef SYSCONFDIR #define SYSCONFDIR "/etc" +#endif #if defined (IS_FHS) +#ifndef LIBDIR #define LIBDIR "/usr/lib" +#endif +#ifndef BINDIR #define BINDIR "/usr/bin" +#endif +#ifndef DATADIR #define DATADIR "/usr/share" +#endif +#ifndef DOCDIR #define DOCDIR "/usr/doc" +#endif #else /* RPM */ +#ifndef LIBDIR #define LIBDIR "/lib" +#endif +#ifndef BINDIR #define BINDIR "/bin" +#endif +#ifndef DATADIR #define DATADIR "/share" +#endif +#ifndef DOCDIR #define DOCDIR "/doc" +#endif #endif /* IS_FHS */ #else /* Windows */ #define PRODUCT_NAME "slapd" From fedora-directory-commits at redhat.com Wed Nov 15 17:48:00 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 15 Nov 2006 10:48:00 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/replication cl5_api.c, 1.11, 1.12 Message-ID: <200611151748.kAFHm0ER003704@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/replication In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3673/ldapserver/ldap/servers/plugins/replication Modified Files: cl5_api.c Log Message: Resolves: bug 214851 Bug Description: integrating db43 into ds70 Reviewed by: nkinder (Thanks!) Fix Description: I took the original diffs posted by Ulf and merged them in with our code which has changed slightly since the diffs were originally generated. I also put #if directives like the following: #if 1000*DB_VERSION_MAJOR + 100*DB_VERSION_MINOR >= 4300 ... db43 features ... #else ... db42 features ... #endif so that we can use both db42 and db43. Platforms tested: RHEL4/FC5 Flag Day: no Doc impact: no Index: cl5_api.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/cl5_api.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- cl5_api.c 10 Nov 2006 23:45:17 -0000 1.11 +++ cl5_api.c 15 Nov 2006 17:47:58 -0000 1.12 @@ -364,7 +364,11 @@ static int _cl5GetRUV2Purge2 (Object *fileObj, RUV **ruv); /* db error processing */ +#if 1000*DB_VERSION_MAJOR + 100*DB_VERSION_MINOR >= 4300 +static void _cl5DBLogPrint(const DB_ENV *dbenv, const char* prefix, const char *buffer); +#else /* assume 42 */ static void _cl5DBLogPrint(const char* prefix, char *buffer); +#endif /* bakup/recovery, import/export */ static PRBool _cl5IsLogFile (const char *name); @@ -384,7 +388,12 @@ static int _cl5FileEndsWith(const char *filename, const char *ext); /* Callback function for libdb to spit error info into our log */ +#if 1000*DB_VERSION_MAJOR + 100*DB_VERSION_MINOR >= 4300 +static void dblayer_log_print(const DB_ENV *dbenv, const char* prefix, + const char *buffer) +#else static void dblayer_log_print(const char* prefix, char *buffer) +#endif { /* We ignore the prefix since we know who we are anyway */ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, "libdb: %s\n", buffer); @@ -3796,7 +3805,11 @@ if (s_cl5Desc.dbConfig.verbose) { int on = 1; +#if 1000*DB_VERSION_MAJOR + 100*DB_VERSION_MINOR >= 4300 + /* DB_VERB_CHKPOINT removed in 43 */ +#else dbEnv->set_verbose(dbEnv, DB_VERB_CHKPOINT, on); +#endif dbEnv->set_verbose(dbEnv, DB_VERB_DEADLOCK, on); dbEnv->set_verbose(dbEnv, DB_VERB_RECOVERY, on); dbEnv->set_verbose(dbEnv, DB_VERB_WAITSFOR, on); @@ -3810,7 +3823,12 @@ #endif } +#if 1000*DB_VERSION_MAJOR + 100*DB_VERSION_MINOR >= 4300 +static void _cl5DBLogPrint(const DB_ENV *dbenv, const char* prefix, + const char *buffer) +#else static void _cl5DBLogPrint(const char* prefix, char *buffer) +#endif { /* We ignore the prefix since we know who we are anyway */ slapi_log_error (SLAPI_LOG_FATAL, repl_plugin_name_cl, "cl5: %s\n", buffer); @@ -4549,7 +4567,10 @@ return CL5_SUCCESS; case DB_NOTFOUND: file->entryCount = 0; -#if 1000*DB_VERSION_MAJOR + 100*DB_VERSION_MINOR >= 3300 + +#if 1000*DB_VERSION_MAJOR + 100*DB_VERSION_MINOR >= 4300 + rc = file->db->stat(file->db, NULL, (void*)&stats, 0); +#elif 1000*DB_VERSION_MAJOR + 100*DB_VERSION_MINOR >= 3300 rc = file->db->stat(file->db, (void*)&stats, 0); #else rc = file->db->stat(file->db, (void*)&stats, malloc, 0); From fedora-directory-commits at redhat.com Wed Nov 15 17:48:01 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 15 Nov 2006 10:48:01 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/back-ldbm dbhelp.c, 1.6, 1.7 dblayer.c, 1.14, 1.15 dblayer.h, 1.6, 1.7 Message-ID: <200611151748.kAFHm1j2003712@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3673/ldapserver/ldap/servers/slapd/back-ldbm Modified Files: dbhelp.c dblayer.c dblayer.h Log Message: Resolves: bug 214851 Bug Description: integrating db43 into ds70 Reviewed by: nkinder (Thanks!) Fix Description: I took the original diffs posted by Ulf and merged them in with our code which has changed slightly since the diffs were originally generated. I also put #if directives like the following: #if 1000*DB_VERSION_MAJOR + 100*DB_VERSION_MINOR >= 4300 ... db43 features ... #else ... db42 features ... #endif so that we can use both db42 and db43. Platforms tested: RHEL4/FC5 Flag Day: no Doc impact: no Index: dbhelp.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/dbhelp.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- dbhelp.c 10 Nov 2006 23:45:39 -0000 1.6 +++ dbhelp.c 15 Nov 2006 17:47:58 -0000 1.7 @@ -225,7 +225,11 @@ { pEnv->set_errpfx(pEnv, "ns-slapd"); if (priv->dblayer_verbose) { +#if 1000*DB_VERSION_MAJOR + 100*DB_VERSION_MINOR >= 4300 + /* DB_VERB_CHKPOINT removed in 43 */ +#else pEnv->set_verbose(pEnv, DB_VERB_CHKPOINT, 1); /* 1 means on */ +#endif pEnv->set_verbose(pEnv, DB_VERB_DEADLOCK, 1); /* 1 means on */ pEnv->set_verbose(pEnv, DB_VERB_RECOVERY, 1); /* 1 means on */ pEnv->set_verbose(pEnv, DB_VERB_WAITSFOR, 1); /* 1 means on */ Index: dblayer.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/dblayer.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- dblayer.c 10 Nov 2006 23:45:39 -0000 1.14 +++ dblayer.c 15 Nov 2006 17:47:58 -0000 1.15 @@ -325,7 +325,12 @@ } /* Callback function for libdb to spit error info into our log */ +#if 1000*DB_VERSION_MAJOR + 100*DB_VERSION_MINOR >= 4300 +void dblayer_log_print(const DB_ENV *dbenv, const char* prefix, + const char *buffer) +#else void dblayer_log_print(const char* prefix, char *buffer) +#endif { /* We ignore the prefix since we know who we are anyway */ LDAPDebug(LDAP_DEBUG_ANY,"libdb: %s\n", buffer, 0, 0); @@ -400,6 +405,16 @@ return (ret < 0) ? errno : 0; } +/* Helper function for large seeks, db4.3 */ +static int dblayer_seek43_large(int fd, off64_t offset, int whence) +{ + int ret = 0; + + ret = lseek64(fd, offset, whence); + + return (ret < 0) ? errno : 0; +} + /* helper function for large fstat -- this depends on 'struct stat64' having * the following members: * off64_t st_size; @@ -464,7 +479,11 @@ #endif /* !irix */ db_env_set_func_ioinfo(dblayer_ioinfo_large); db_env_set_func_exists((int (*)())dblayer_exists_large); +#if 1000*DB_VERSION_MAJOR + 100*DB_VERSION_MINOR >= 4300 + db_env_set_func_seek((int (*)())dblayer_seek43_large); +#else db_env_set_func_seek((int (*)())dblayer_seek24_large); +#endif LDAPDebug(LDAP_DEBUG_TRACE, "Enabled 64-bit files\n", 0, 0, 0); #endif /* DB_USE_64LFS */ Index: dblayer.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/dblayer.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- dblayer.h 10 Nov 2006 23:45:39 -0000 1.6 +++ dblayer.h 15 Nov 2006 17:47:58 -0000 1.7 @@ -170,7 +170,12 @@ int dblayer_lock_config; }; +#if 1000*DB_VERSION_MAJOR + 100*DB_VERSION_MINOR >= 4300 +void dblayer_log_print(const DB_ENV *dbenv, const char* prefix, + const char *buffer); +#else void dblayer_log_print(const char* prefix, char *buffer); +#endif int dblayer_db_remove(dblayer_private_env * env, char const path[], char const dbName[]); From fedora-directory-commits at redhat.com Wed Nov 15 21:31:43 2006 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Wed, 15 Nov 2006 14:31:43 -0700 Subject: [Fedora-directory-commits] mod_admserv LICENSE, NONE, 1.1 Makefile.in, 1.20, 1.21 aclocal.m4, 1.12, 1.13 config.guess, 1.3, 1.4 config.sub, 1.3, 1.4 configure, 1.22, 1.23 configure.in, 1.18, 1.19 depcomp, 1.3, 1.4 httpd.conf.tmpl, 1.2, 1.3 install-sh, 1.3, 1.4 ltmain.sh, 1.4, 1.5 missing, 1.3, 1.4 mkinstalldirs, 1.3, 1.4 mod_admserv.c, 1.27, 1.28 mod_admserv.h, 1.3, 1.4 AUTHORS, 1.1.1.1, NONE COPYING, 1.1.1.1, NONE INSTALL, 1.3, NONE NEWS, 1.1.1.1, NONE Message-ID: <200611152131.kAFLVhQJ019009@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/mod_admserv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18973 Modified Files: Makefile.in aclocal.m4 config.guess config.sub configure configure.in depcomp httpd.conf.tmpl install-sh ltmain.sh missing mkinstalldirs mod_admserv.c mod_admserv.h Added Files: LICENSE Removed Files: AUTHORS COPYING INSTALL NEWS Log Message: Resolves: 215788 Summary: Addressed some licensing and copyright issues in mod_admserv source code. --- NEW FILE LICENSE --- Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION 1. Definitions. "License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. "Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. "Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. "You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. "Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. "Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. "Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). "Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. "Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." "Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. 2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. 3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. 4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and (b) You must cause any modified files to carry prominent notices stating that You changed the files; and (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. 5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. 6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. 7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. 8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. 9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. END OF TERMS AND CONDITIONS APPENDIX: How to apply the Apache License to your work. To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives. Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/mod_admserv/Makefile.in,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- Makefile.in 10 Oct 2006 02:45:51 -0000 1.20 +++ Makefile.in 15 Nov 2006 21:31:39 -0000 1.21 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.6.3 from Makefile.am. +# Makefile.in generated by automake 1.9.2 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,179 +13,257 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -SHELL = @SHELL@ + +SOURCES = $(libmodadmserv_la_SOURCES) srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = . - -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) -transform = @program_transform_name@ +transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -host_alias = @host_alias@ +build_triplet = @build@ host_triplet = @host@ - -EXEEXT = @EXEEXT@ -OBJEXT = @OBJEXT@ -PATH_SEPARATOR = @PATH_SEPARATOR@ +DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(top_srcdir)/configure ChangeLog \ + INSTALL config.guess config.sub depcomp install-sh ltmain.sh \ + missing mkinstalldirs +subdir = . +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno configure.status.lineno +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_CLEAN_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(libdir)" +libLTLIBRARIES_INSTALL = $(INSTALL) +LTLIBRARIES = $(lib_LTLIBRARIES) +libmodadmserv_la_LIBADD = +am_libmodadmserv_la_OBJECTS = mod_admserv.lo +libmodadmserv_la_OBJECTS = $(am_libmodadmserv_la_OBJECTS) +DEFAULT_INCLUDES = -I. -I$(srcdir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +SOURCES = $(libmodadmserv_la_SOURCES) +DIST_SOURCES = $(libmodadmserv_la_SOURCES) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +distdir = $(PACKAGE)-$(VERSION) +top_distdir = $(distdir) +am__remove_distdir = \ + { test ! -d $(distdir) \ + || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -fr $(distdir); }; } +DIST_ARCHIVES = $(distdir).tar.gz +GZIP_ENV = --best +distuninstallcheck_listfiles = find . -type f -print +distcleancheck_listfiles = find . -type f -print +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ APR_CONFIG = @APR_CONFIG@ APXS = @APXS@ -AS = @AS@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ ICU_CONFIG = @ICU_CONFIG@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @adminutil_lib@ -ladminutil at adminutil_ver@ -ladmsslutil at adminutil_ver@ @icu_lib@ -licui18n -licuuc -licudata @ldapsdk_lib@ -lssldap at ldapsdk_ver@ -lprldap at ldapsdk_ver@ -lldap at ldapsdk_ver@ @nss_lib@ -lssl3 -lnss3 @nspr_lib@ -lnspr4 -lplc4 LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -OBJDUMP = @OBJDUMP@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ adminutil_inc = @adminutil_inc@ adminutil_lib = @adminutil_lib@ adminutil_ver = @adminutil_ver@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ apache_bin = @apache_bin@ apache_conf = @apache_conf@ apache_inc = @apache_inc@ apache_prefix = @apache_prefix@ apr_inc = @apr_inc@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ extra_cppflags = @extra_cppflags@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ icu_lib = @icu_lib@ +includedir = @includedir@ +infodir = @infodir@ install_sh = @install_sh@ ldapsdk_inc = @ldapsdk_inc@ ldapsdk_lib = @ldapsdk_lib@ ldapsdk_ver = @ldapsdk_ver@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ nspr_inc = @nspr_inc@ nspr_lib = @nspr_lib@ nss_inc = @nss_inc@ nss_lib = @nss_lib@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ lib_LTLIBRARIES = libmodadmserv.la - libmodadmserv_la_SOURCES = mod_admserv.c - #libmodadmserv_la_LDFLAGS = -module -avoid-version INCLUDES = -I at apache_inc@ @apr_inc@ @adminutil_inc@ @nspr_inc@ @ldapsdk_inc@ @nss_inc@ - -LIBS = @adminutil_lib@ -ladminutil at adminutil_ver@ -ladmsslutil at adminutil_ver@ @icu_lib@ -licui18n -licuuc -licudata @ldapsdk_lib@ -lssldap at ldapsdk_ver@ -lprldap at ldapsdk_ver@ -lldap at ldapsdk_ver@ @nss_lib@ -lssl3 -lnss3 @nspr_lib@ -lnspr4 -lplc4 - EXTRA_CPPFLAGS = @extra_cppflags@ - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) $(EXTRA_CPPFLAGS) - LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -subdir = . -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_CLEAN_FILES = -LTLIBRARIES = $(lib_LTLIBRARIES) - -libmodadmserv_la_LDFLAGS = -libmodadmserv_la_LIBADD = -am_libmodadmserv_la_OBJECTS = mod_admserv.lo -libmodadmserv_la_OBJECTS = $(am_libmodadmserv_la_OBJECTS) - -DEFS = @DEFS@ -DEFAULT_INCLUDES = -I. -I$(srcdir) -CPPFLAGS = @CPPFLAGS@ -LDFLAGS = @LDFLAGS@ -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles - at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/mod_admserv.Plo -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -CFLAGS = @CFLAGS@ -DIST_SOURCES = $(libmodadmserv_la_SOURCES) -DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ - Makefile.in NEWS aclocal.m4 config.guess config.sub configure \ - configure.in depcomp install-sh ltmain.sh missing mkinstalldirs -SOURCES = $(libmodadmserv_la_SOURCES) - all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj - -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +am--refresh: + @: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \ + cd $(srcdir) && $(AUTOMAKE) --foreign \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) + $(AUTOMAKE) --foreign Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + echo ' $(SHELL) ./config.status'; \ + $(SHELL) ./config.status;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + esac; -$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck -$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) - cd $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): configure.in +$(top_srcdir)/configure: $(am__configure_deps) + cd $(srcdir) && $(AUTOCONF) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -libLTLIBRARIES_INSTALL = $(INSTALL) uninstall-libLTLIBRARIES: @$(NORMAL_UNINSTALL) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - p="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \ - $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ + @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ done clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test -z "$dir" && dir=.; \ + test "$$dir" != "$$p" || dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done @@ -193,34 +271,33 @@ $(LINK) -rpath $(libdir) $(libmodadmserv_la_LDFLAGS) $(libmodadmserv_la_OBJECTS) $(libmodadmserv_la_LIBADD) $(LIBS) mostlyclean-compile: - -rm -f *.$(OBJEXT) core *.core + -rm -f *.$(OBJEXT) distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_admserv.Plo at am__quote@ -distclean-depend: - -rm -rf ./$(DEPDIR) - .c.o: - at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ + at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi + at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + at am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: - at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(COMPILE) -c `cygpath -w $<` + at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ + at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi + at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: - at AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ - at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< -CCDEPMODE = @CCDEPMODE@ + at am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ + at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi + at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + at am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -232,11 +309,6 @@ -rm -f libtool uninstall-info-am: -ETAGS = etags -ETAGSFLAGS = - -tags: TAGS - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -245,6 +317,7 @@ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ mkid -fID $$unique +tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -256,8 +329,24 @@ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique GTAGS: @@ -266,29 +355,23 @@ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = . -distdir = $(PACKAGE)-$(VERSION) - -am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } - -GZIP_ENV = --best -distcleancheck_listfiles = find . -type f -print + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) - @list='$(DISTFILES)'; for file in $$list; do \ + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -309,26 +392,54 @@ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r $(distdir) dist-gzip: distdir - $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) + +dist-bzip2: distdir + tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + $(am__remove_distdir) + +dist-tarZ: distdir + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z + $(am__remove_distdir) + +dist-shar: distdir + shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + $(am__remove_distdir) + +dist-zip: distdir + -rm -f $(distdir).zip + zip -rq $(distdir).zip $(distdir) $(am__remove_distdir) dist dist-all: distdir - $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another # tarfile. distcheck: dist - $(am__remove_distdir) - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - + case '$(DIST_ARCHIVES)' in \ + *.tar.gz*) \ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ + bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ + *.zip*) \ + unzip $(distdir).zip ;;\ + esac chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/=build - mkdir $(distdir)/=inst + mkdir $(distdir)/_build + mkdir $(distdir)/_inst chmod a-w $(distdir) - dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \ - && cd $(distdir)/=build \ - && ../configure --srcdir=.. --prefix=$$dc_install_base \ + dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ + && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ + && cd $(distdir)/_build \ + && ../configure --srcdir=.. --prefix="$$dc_install_base" \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ @@ -336,32 +447,49 @@ && $(MAKE) $(AM_MAKEFLAGS) install \ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ && $(MAKE) $(AM_MAKEFLAGS) uninstall \ - && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \ - || { echo "ERROR: files left after uninstall:" ; \ - find $$dc_install_base -type f -print ; \ - exit 1; } >&2 ) \ - && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ - && rm -f $(distdir).tar.gz \ + && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ + distuninstallcheck \ + && chmod -R a-w "$$dc_install_base" \ + && ({ \ + (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ + distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ + } || { rm -rf "$$dc_destdir"; exit 1; }) \ + && rm -rf "$$dc_destdir" \ + && $(MAKE) $(AM_MAKEFLAGS) dist \ + && rm -rf $(DIST_ARCHIVES) \ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck $(am__remove_distdir) - @echo "$(distdir).tar.gz is ready for distribution" | \ - sed 'h;s/./=/g;p;x;p;x' + @(echo "$(distdir) archives ready for distribution: "; \ + list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ + sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' +distuninstallcheck: + @cd $(distuninstallcheck_dir) \ + && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + || { echo "ERROR: files left after uninstall:" ; \ + if test -n "$(DESTDIR)"; then \ + echo " (check DESTDIR support)"; \ + fi ; \ + $(distuninstallcheck_listfiles) ; \ + exit 1; } >&2 distcleancheck: distclean - if test '$(srcdir)' = . ; then \ + @if test '$(srcdir)' = . ; then \ echo "ERROR: distcleancheck can only run from a VPATH build" ; \ exit 1 ; \ fi - test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left after distclean:" ; \ + @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ + || { echo "ERROR: files left in build directory after distclean:" ; \ $(distcleancheck_listfiles) ; \ exit 1; } >&2 check-am: all-am check: check-am all-am: Makefile $(LTLIBRARIES) - installdirs: - $(mkinstalldirs) $(DESTDIR)$(libdir) - + for dir in "$(DESTDIR)$(libdir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -373,7 +501,7 @@ installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -381,7 +509,7 @@ clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -393,13 +521,17 @@ distclean: distclean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) -distclean-am: clean-am distclean-compile distclean-depend \ - distclean-generic distclean-libtool distclean-tags + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-libtool distclean-tags dvi: dvi-am dvi-am: +html: html-am + info: info-am info-am: @@ -416,7 +548,9 @@ maintainer-clean: maintainer-clean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf autom4te.cache + -rm -rf $(top_srcdir)/autom4te.cache + -rm -rf ./$(DEPDIR) + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am @@ -424,20 +558,30 @@ mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES -.PHONY: GTAGS all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool dist dist-all dist-gzip \ - distcheck distclean distclean-compile distclean-depend \ - distclean-generic distclean-libtool distclean-tags \ - distcleancheck distdir dvi dvi-am info info-am install \ - install-am install-data install-data-am install-exec \ +.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ + clean-generic clean-libLTLIBRARIES clean-libtool ctags dist \ + dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \ + distcheck distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distcleancheck distdir \ + distuninstallcheck dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-exec \ install-exec-am install-info install-info-am \ install-libLTLIBRARIES install-man install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool tags uninstall \ - uninstall-am uninstall-info-am uninstall-libLTLIBRARIES + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-info-am \ + uninstall-libLTLIBRARIES install-libLTLIBRARIES: libmodadmserv.la View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.12 -r 1.13 aclocal.m4 Index: aclocal.m4 =================================================================== RCS file: /cvs/dirsec/mod_admserv/aclocal.m4,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- aclocal.m4 10 Oct 2006 02:45:51 -0000 1.12 +++ aclocal.m4 15 Nov 2006 21:31:39 -0000 1.13 @@ -1,6 +1,6 @@ -# aclocal.m4t generated automatically by aclocal 1.6.3 -*- Autoconf -*- +# generated automatically by aclocal 1.9.2 -*- Autoconf -*- -# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 # Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11,4389 +11,6935 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# Do all the work for Automake. -*- Autoconf -*- +# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# This macro actually does too much some checks are only needed if -# your package does certain things. But this isn't really a big deal. +# serial 47 AC_PROG_LIBTOOL -# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 -# Free Software Foundation, Inc. -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. +# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) +# ----------------------------------------------------------- +# If this macro is not defined by Autoconf, define it here. +m4_ifdef([AC_PROVIDE_IFELSE], + [], + [m4_define([AC_PROVIDE_IFELSE], + [m4_ifdef([AC_PROVIDE_$1], + [$2], [$3])])]) -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# AC_PROG_LIBTOOL +# --------------- +AC_DEFUN([AC_PROG_LIBTOOL], +[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl +dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX +dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. + AC_PROVIDE_IFELSE([AC_PROG_CXX], + [AC_LIBTOOL_CXX], + [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX + ])]) +dnl And a similar setup for Fortran 77 support + AC_PROVIDE_IFELSE([AC_PROG_F77], + [AC_LIBTOOL_F77], + [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 +])]) + +dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. +dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run +dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. + AC_PROVIDE_IFELSE([AC_PROG_GCJ], + [AC_LIBTOOL_GCJ], + [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], + [AC_LIBTOOL_GCJ], + [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], + [AC_LIBTOOL_GCJ], + [ifdef([AC_PROG_GCJ], + [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) + ifdef([A][M_PROG_GCJ], + [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) + ifdef([LT_AC_PROG_GCJ], + [define([LT_AC_PROG_GCJ], + defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) +])])# AC_PROG_LIBTOOL + + +# _AC_PROG_LIBTOOL +# ---------------- +AC_DEFUN([_AC_PROG_LIBTOOL], +[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl +AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl +AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl +AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl -# serial 8 +# This can be used to rebuild libtool when needed +LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be -# written in clear, in which case automake, when reading aclocal.m4, -# will think it sees a *use*, and therefore will trigger all it's -# C support machinery. Also note that it means that autoscan, seeing -# CC etc. in the Makefile, will ask for an AC_PROG_CC use... +# Always use our own libtool. +LIBTOOL='$(SHELL) $(top_builddir)/libtool' +AC_SUBST(LIBTOOL)dnl +# Prevent multiple expansion +define([AC_PROG_LIBTOOL], []) +])# _AC_PROG_LIBTOOL -AC_PREREQ([2.52]) -# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow -# the ones we care about. -m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +# AC_LIBTOOL_SETUP +# ---------------- +AC_DEFUN([AC_LIBTOOL_SETUP], +[AC_PREREQ(2.50)dnl +AC_REQUIRE([AC_ENABLE_SHARED])dnl +AC_REQUIRE([AC_ENABLE_STATIC])dnl +AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl +AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([AC_PROG_LD])dnl +AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl +AC_REQUIRE([AC_PROG_NM])dnl -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -# AM_INIT_AUTOMAKE([OPTIONS]) -# ----------------------------------------------- -# The call with PACKAGE and VERSION arguments is the old style -# call (pre autoconf-2.50), which is being phased out. PACKAGE -# and VERSION should now be passed to AC_INIT and removed from -# the call to AM_INIT_AUTOMAKE. -# We support both call styles for the transition. After -# the next Automake release, Autoconf can make the AC_INIT -# arguments mandatory, and then we can depend on a new Autoconf -# release and drop the old call support. -AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl - AC_REQUIRE([AC_PROG_INSTALL])dnl -# test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) -fi +AC_REQUIRE([AC_PROG_LN_S])dnl +AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl +# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! +AC_REQUIRE([AC_OBJEXT])dnl +AC_REQUIRE([AC_EXEEXT])dnl +dnl -# Define the identity of the package. -dnl Distinguish between old-style and new-style calls. -m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl - AC_SUBST([PACKAGE], [$1])dnl - AC_SUBST([VERSION], [$2])], -[_AM_SET_OPTIONS([$1])dnl - AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl - AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl +AC_LIBTOOL_SYS_MAX_CMD_LEN +AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE +AC_LIBTOOL_OBJDIR -_AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +_LT_AC_PROG_ECHO_BACKSLASH -# Some tools Automake needs. -AC_REQUIRE([AM_SANITY_CHECK])dnl -AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) -AM_MISSING_PROG(AMTAR, tar) -AM_PROG_INSTALL_SH -AM_PROG_INSTALL_STRIP -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([AC_PROG_MAKE_SET])dnl +case $host_os in +aix3*) + # AIX sometimes has problems with the GCC collect2 program. For some + # reason, if we set the COLLECT_NAMES environment variable, the problems + # vanish in a puff of smoke. + if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES [...10421 lines suppressed...] - if test x"$enable_ltdl_install" = x"yes"; then - ac_configure_args="$ac_configure_args --enable-ltdl-install" - LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la - LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) - else - ac_configure_args="$ac_configure_args --enable-ltdl-install=no" - LIBLTDL="-lltdl" - LTDLINCL= - fi - # For backwards non-gettext consistent compatibility... - INCLTDL="$LTDLINCL" -]) +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. -# old names -AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) -AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) -AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) -AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) -AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) -AC_DEFUN([AM_PROG_LD], [AC_PROG_LD]) -AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) +# serial 1 -# This is just to silence aclocal about the macro not being used -ifelse([AC_DISABLE_FAST_INSTALL]) -# NOTE: This macro has been submitted for inclusion into # -# GNU Autoconf as AC_PROG_SED. When it is available in # -# a released version of Autoconf we should remove this # -# macro and use it instead. # -# LT_AC_PROG_SED -# -------------- -# Check for a fully-functional sed program, that truncates -# as few characters as possible. Prefer GNU sed if found. -AC_DEFUN([LT_AC_PROG_SED], -[AC_MSG_CHECKING([for a sed that does not truncate output]) -AC_CACHE_VAL(lt_cv_path_SED, -[# Loop through the user's path and test for sed and gsed. -# Then use that list of sed's as ones to test for truncation. -as_executable_p="test -f" -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH +# _AM_PROG_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# FORMAT should be one of `v7', `ustar', or `pax'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. +AM_MISSING_PROG([AMTAR], [tar]) +m4_if([$1], [v7], + [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [m4_case([$1], [ustar],, [pax],, + [m4_fatal([Unknown tar format])]) +AC_MSG_CHECKING([how to create a $1 tar archive]) +# Loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +_am_tools=${am_cv_prog_tar_$1-$_am_tools} +# Do not fold the above two line into one, because Tru64 sh and +# Solaris sh will not grok spaces in the rhs of `-'. +for _am_tool in $_am_tools do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then - _sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext" - fi + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; + do + AM_RUN_LOG([$_am_tar --version]) && break done - done -done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac - # Create a temporary directory, and hook for its removal unless debugging. -$debug || -{ - trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 -} + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break -# Create a (secure) tmp directory for tmp files. -: ${TMPDIR=/tmp} -{ - tmp=`(umask 077 && mktemp -d -q "$TMPDIR/sedXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" -} || -{ - tmp=$TMPDIR/sed$$-$RANDOM - (umask 077 && mkdir $tmp) -} || -{ - echo "$me: cannot create a temporary directory in $TMPDIR" >&2 - { (exit 1); exit 1; } -} - _max=0 - _count=0 - # Add /usr/xpg4/bin/sed as it is typically found on Solaris - # along with /bin/sed that truncates output. - for _sed in $_sed_list /usr/xpg4/bin/sed; do - test ! -f ${_sed} && break - cat /dev/null > "$tmp/sed.in" - _count=0 - echo ${ECHO_N-$ac_n} "0123456789${ECHO_C-$ac_c}" >"$tmp/sed.in" - # Check for GNU sed and select it if it is found. - if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then - lt_cv_path_SED=${_sed} - break - fi - while true; do - cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp" - mv "$tmp/sed.tmp" "$tmp/sed.in" - cp "$tmp/sed.in" "$tmp/sed.nl" - echo >>"$tmp/sed.nl" - ${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break - cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break - # 40000 chars as input seems more than enough - test $_count -gt 10 && break - _count=`expr $_count + 1` - if test $_count -gt $_max; then - _max=$_count - lt_cv_path_SED=$_sed - fi - done - done - rm -rf "$tmp" -]) -if test "X$SED" != "X"; then - lt_cv_path_SED=$SED -else - SED=$lt_cv_path_SED -fi -AC_MSG_RESULT([$SED]) -]) + # tar/untar a dummy directory, and stop if the command works + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi +done +rm -rf conftest.dir + +AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) +AC_MSG_RESULT([$am_cv_prog_tar_$1])]) +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR Index: config.guess =================================================================== RCS file: /cvs/dirsec/mod_admserv/config.guess,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- config.guess 10 Oct 2006 02:45:51 -0000 1.3 +++ config.guess 15 Nov 2006 21:31:39 -0000 1.4 @@ -1,9 +1,9 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -# Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -timestamp='2001-09-04' +timestamp='2004-09-07' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -24,8 +24,9 @@ # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. -# Written by Per Bothner . -# Please send patches to . +# Originally written by Per Bothner . +# Please send patches to . Submit a context +# diff and a properly formatted ChangeLog entry. # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and @@ -52,7 +53,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -87,30 +88,42 @@ exit 1 fi +trap 'exit 1' 1 2 15 -dummy=dummy-$$ -trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15 +# CC_FOR_BUILD -- compiler used by this script. Note that the use of a +# compiler to aid in system detection is discouraged as it requires +# temporary files to be created and, as you can see below, it is a +# headache to deal with in a portable fashion. -# CC_FOR_BUILD -- compiler used by this script. # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still # use `HOST_CC' if defined, but it is deprecated. -set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int dummy(){}" > $dummy.c ; - for c in cc gcc c89 ; do - ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; - if test $? = 0 ; then +# Portable tmp directory creation inspired by the Autoconf team. + +set_cc_for_build=' +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; +: ${TMPDIR=/tmp} ; + { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +dummy=$tmp/dummy ; +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; +case $CC_FOR_BUILD,$HOST_CC,$CC in + ,,) echo "int x;" > $dummy.c ; + for c in cc gcc c89 c99 ; do + if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then CC_FOR_BUILD="$c"; break ; fi ; done ; - rm -f $dummy.c $dummy.o $dummy.rel ; if test x"$CC_FOR_BUILD" = x ; then CC_FOR_BUILD=no_compiler_found ; fi ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac' +esac ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi at noc.rutgers.edu 1994-08-24) @@ -127,29 +140,30 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) - # Netbsd (nbsd) targets should (where applicable) match one or + # NetBSD (nbsd) targets should (where applicable) match one or # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward # compatibility and a consistent mechanism for selecting the # object file format. - # Determine the machine/vendor (is the vendor relevant). - case "${UNAME_MACHINE}" in - amiga) machine=m68k-unknown ;; - arm32) machine=arm-unknown ;; - atari*) machine=m68k-atari ;; - sun3*) machine=m68k-sun ;; - mac68k) machine=m68k-apple ;; - macppc) machine=powerpc-apple ;; - hp3[0-9][05]) machine=m68k-hp ;; - ibmrt|romp-ibm) machine=romp-ibm ;; - *) machine=${UNAME_MACHINE}-unknown ;; + # + # Note: NetBSD doesn't particularly care about the vendor + # portion of the name. We always set it to "unknown". + sysctl="sysctl -n hw.machine_arch" + UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + case "${UNAME_MACHINE_ARCH}" in + armeb) machine=armeb-unknown ;; + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently, or will in the future. - case "${UNAME_MACHINE}" in - i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k) + case "${UNAME_MACHINE_ARCH}" in + arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep __ELF__ >/dev/null @@ -166,74 +180,123 @@ ;; esac # The OS release - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + # Debian GNU/NetBSD machines have a different userland, and + # thus, need a distinct triplet. However, they do not need + # kernel version information, so it can be replaced with a + # suitable tag, in the style of linux-gnu. + case "${UNAME_VERSION}" in + Debian*) + release='-gnu' + ;; + *) + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + ;; + esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit 0 ;; + amd64:OpenBSD:*:*) + echo x86_64-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + amiga:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + cats:OpenBSD:*:*) + echo arm-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + hp300:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + luna88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mac68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + macppc:OpenBSD:*:*) + echo powerpc-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvmeppc:OpenBSD:*:*) + echo powerpc-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + sgi:OpenBSD:*:*) + echo mips64-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + sun3:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + *:OpenBSD:*:*) + echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit 0 ;; + macppc:MirBSD:*:*) + echo powerppc-unknown-mirbsd${UNAME_RELEASE} + exit 0 ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit 0 ;; alpha:OSF1:*:*) - if test $UNAME_RELEASE = "V4.0"; then + case $UNAME_RELEASE in + *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - fi + ;; + *5.*) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on + # OSF/1 and Tru64 systems produced since 1995. I hope that + # covers most systems running today. This code pipes the CPU + # types through head -n 1, so we only detect the type of CPU 0. + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` + case "$ALPHA_CPU_TYPE" in + "EV4 (21064)") + UNAME_MACHINE="alpha" ;; + "EV4.5 (21064)") + UNAME_MACHINE="alpha" ;; + "LCA4 (21066/21068)") + UNAME_MACHINE="alpha" ;; + "EV5 (21164)") + UNAME_MACHINE="alphaev5" ;; + "EV5.6 (21164A)") + UNAME_MACHINE="alphaev56" ;; + "EV5.6 (21164PC)") + UNAME_MACHINE="alphapca56" ;; + "EV5.7 (21164PC)") + UNAME_MACHINE="alphapca57" ;; + "EV6 (21264)") + UNAME_MACHINE="alphaev6" ;; + "EV6.7 (21264A)") + UNAME_MACHINE="alphaev67" ;; + "EV6.8CB (21264C)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8AL (21264B)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8CX (21264D)") + UNAME_MACHINE="alphaev68" ;; + "EV6.9A (21264/EV69A)") + UNAME_MACHINE="alphaev69" ;; + "EV7 (21364)") + UNAME_MACHINE="alphaev7" ;; + "EV7.9 (21364A)") + UNAME_MACHINE="alphaev79" ;; + esac + # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - cat <$dummy.s - .data -\$Lformat: - .byte 37,100,45,37,120,10,0 # "%d-%x\n" - - .text - .globl main - .align 4 - .ent main -main: - .frame \$30,16,\$26,0 - ldgp \$29,0(\$27) - .prologue 1 - .long 0x47e03d80 # implver \$0 - lda \$2,-1 - .long 0x47e20c21 # amask \$2,\$1 - lda \$16,\$Lformat - mov \$0,\$17 - not \$1,\$18 - jsr \$26,printf - ldgp \$29,0(\$26) - mov 0,\$16 - jsr \$26,exit - .end main -EOF - eval $set_cc_for_build - $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null - if test "$?" = 0 ; then - case `./$dummy` in - 0-0) - UNAME_MACHINE="alpha" - ;; - 1-0) - UNAME_MACHINE="alphaev5" - ;; - 1-1) - UNAME_MACHINE="alphaev56" - ;; - 1-101) - UNAME_MACHINE="alphapca56" - ;; - 2-303) - UNAME_MACHINE="alphaev6" - ;; - 2-307) - UNAME_MACHINE="alphaev67" - ;; - 2-1307) - UNAME_MACHINE="alphaev68" - ;; - esac - fi - rm -f $dummy.s $dummy - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` exit 0 ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? @@ -247,33 +310,18 @@ Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 exit 0;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos exit 0 ;; - arc64:OpenBSD:*:*) - echo mips64el-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - arc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - hkmips:OpenBSD:*:*) - echo mips-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - pmax:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sgi:OpenBSD:*:*) - echo mips-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - wgrisc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} + *:[Mm]orph[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-morphos exit 0 ;; *:OS/390:*:*) echo i370-ibm-openedition exit 0 ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit 0 ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit 0;; @@ -291,6 +339,13 @@ NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 exit 0 ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 + exit 0 ;; + DRS?6000:UNIX_SV:4.2*:7*) + case `/usr/bin/uname -p` in + sparc) echo sparc-icl-nx7 && exit 0 ;; + esac ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit 0 ;; @@ -319,7 +374,7 @@ echo m68k-sun-sunos${UNAME_RELEASE} exit 0 ;; sun*:*:4.2BSD:*) - UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) @@ -333,12 +388,6 @@ aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} exit 0 ;; - sparc*:NetBSD:*) - echo `uname -p`-unknown-netbsd${UNAME_RELEASE} - exit 0 ;; - atari*:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -365,17 +414,8 @@ *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} exit 0 ;; - sun3*:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mac68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} exit 0 ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} @@ -415,15 +455,20 @@ exit (-1); } EOF - $CC_FOR_BUILD $dummy.c -o $dummy \ - && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && rm -f $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy + $CC_FOR_BUILD -o $dummy $dummy.c \ + && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ + && exit 0 echo mips-mips-riscos${UNAME_RELEASE} exit 0 ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax exit 0 ;; + Motorola:*:4.3:PL8-*) + echo powerpc-harris-powermax + exit 0 ;; + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) + echo powerpc-harris-powermax + exit 0 ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix exit 0 ;; @@ -496,8 +541,7 @@ exit(0); } EOF - $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 echo rs6000-ibm-aix3.2.5 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 @@ -506,7 +550,7 @@ fi exit 0 ;; *:AIX:*:[45]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'` + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else @@ -546,10 +590,8 @@ 9000/31? ) HP_ARCH=m68000 ;; 9000/[34]?? ) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) - case "${HPUX_REV}" in - 11.[0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` case "${sc_cpu_version}" in 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 @@ -558,13 +600,13 @@ case "${sc_kernel_bits}" in 32) HP_ARCH="hppa2.0n" ;; 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 esac ;; esac - fi ;; - esac - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c #define _HPUX_SOURCE #include @@ -597,11 +639,21 @@ exit (0); } EOF - (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` - if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi - rm -f $dummy.c $dummy - fi ;; + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa + fi ;; esac + if [ ${HP_ARCH} = "hppa2.0w" ] + then + # avoid double evaluation of $set_cc_for_build + test -n "$CC_FOR_BUILD" || eval $set_cc_for_build + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null + then + HP_ARCH="hppa2.0w" + else + HP_ARCH="hppa64" + fi + fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} exit 0 ;; ia64:HP-UX:*:*) @@ -635,8 +687,7 @@ exit (0); } EOF - $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 echo unknown-hitachi-hiuxwe2 exit 0 ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) @@ -664,9 +715,6 @@ parisc*:Lites*:*:*) echo hppa1.1-hp-lites exit 0 ;; - hppa*:OpenBSD:*:*) - echo hppa-unknown-openbsd - exit 0 ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd exit 0 ;; @@ -685,9 +733,6 @@ C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd exit 0 ;; - CRAY*X-MP:*:*:*) - echo xmp-cray-unicos - exit 0 ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; @@ -700,26 +745,25 @@ CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; - CRAY*T3D:*:*:*) - echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; - CRAY-2:*:*:*) - echo cray2-cray-unicos - exit 0 ;; + *:UNICOS/mp:*:*) + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit 0 ;; - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit 0 ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} @@ -733,9 +777,6 @@ *:FreeBSD:*:*) echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit 0 ;; - *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - exit 0 ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit 0 ;; @@ -745,11 +786,17 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit 0 ;; + x86:Interix*:[34]*) + echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' + exit 0 ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks + exit 0 ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we # UNAME_MACHINE based on the output of uname instead of i386? - echo i386-pc-interix + echo i586-pc-interix exit 0 ;; i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin @@ -761,25 +808,74 @@ echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit 0 ;; *:GNU:*:*) + # the GNU system echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit 0 ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + exit 0 ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit 0 ;; arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; + cris:Linux:*:*) + echo cris-axis-linux-gnu + exit 0 ;; + crisv32:Linux:*:*) + echo crisv32-axis-linux-gnu + exit 0 ;; + frv:Linux:*:*) + echo frv-unknown-linux-gnu + exit 0 ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; mips:Linux:*:*) - case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in - big) echo mips-unknown-linux-gnu && exit 0 ;; - little) echo mipsel-unknown-linux-gnu && exit 0 ;; - esac + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef mips + #undef mipsel + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=mipsel + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=mips + #else + CPU= + #endif + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 + ;; + mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef mips64 + #undef mips64el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=mips64el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=mips64 + #else + CPU= + #endif + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 ;; ppc:Linux:*:*) echo powerpc-unknown-linux-gnu @@ -815,6 +911,9 @@ s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux exit 0 ;; + sh64*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; @@ -828,7 +927,8 @@ # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent # problems with other programs or directories called `ld' in the path. - ld_supported_targets=`cd /; ld --help 2>&1 \ + # Set LC_ALL=C to ensure ld outputs messages in English. + ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ | sed -ne '/supported targets:/!d s/[ ][ ]*/ /g s/.*supported targets: *// @@ -840,7 +940,7 @@ ;; a.out-i386-linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit 0 ;; + exit 0 ;; coff-i386) echo "${UNAME_MACHINE}-pc-linux-gnucoff" exit 0 ;; @@ -852,32 +952,31 @@ esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build - cat >$dummy.c < -#ifdef __cplusplus -#include /* for printf() prototype */ - int main (int argc, char *argv[]) { -#else - int main (argc, argv) int argc; char *argv[]; { -#endif -#ifdef __ELF__ -# ifdef __GLIBC__ -# if __GLIBC__ >= 2 - printf ("%s-pc-linux-gnu\n", argv[1]); -# else - printf ("%s-pc-linux-gnulibc1\n", argv[1]); -# endif -# else - printf ("%s-pc-linux-gnulibc1\n", argv[1]); -# endif -#else - printf ("%s-pc-linux-gnuaout\n", argv[1]); -#endif - return 0; -} + sed 's/^ //' << EOF >$dummy.c + #include + #ifdef __ELF__ + # ifdef __GLIBC__ + # if __GLIBC__ >= 2 + LIBC=gnu + # else + LIBC=gnulibc1 + # endif + # else + LIBC=gnulibc1 + # endif + #else + #ifdef __INTEL_COMPILER + LIBC=gnu + #else + LIBC=gnuaout + #endif + #endif + #ifdef __dietlibc__ + LIBC=dietlibc + #endif EOF - $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` + test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 ;; i*86:DYNIX/ptx:4*:*) @@ -894,6 +993,26 @@ # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit 0 ;; + i*86:OS/2:*:*) + # If we were able to find `uname', then EMX Unix compatibility + # is probably installed. + echo ${UNAME_MACHINE}-pc-os2-emx + exit 0 ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop + exit 0 ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos + exit 0 ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit 0 ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp + exit 0 ;; i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then @@ -915,22 +1034,19 @@ UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then - UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` - (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 - (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ + UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` + (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 + (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ && UNAME_MACHINE=i586 - (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \ + (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ && UNAME_MACHINE=i686 - (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \ + (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ && UNAME_MACHINE=i686 echo ${UNAME_MACHINE}-pc-sco$UNAME_REL else echo ${UNAME_MACHINE}-pc-sysv32 fi exit 0 ;; - i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit 0 ;; pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about @@ -954,9 +1070,15 @@ # "miniframe" echo m68010-convergent-sysv exit 0 ;; - M68*:*:R3V[567]*:*) + mc68k:UNIX:SYSTEM5:3.51m) + echo m68k-convergent-sysv + exit 0 ;; + M680?0:D-NIX:5.3:*) + echo m68k-diab-dnix + exit 0 ;; + M68*:*:R3V[5678]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0) + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` @@ -973,9 +1095,6 @@ mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 exit 0 ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} exit 0 ;; @@ -1047,6 +1166,9 @@ SX-5:SUPER-UX:*:*) echo sx5-nec-superux${UNAME_RELEASE} exit 0 ;; + SX-6:SUPER-UX:*:*) + echo sx6-nec-superux${UNAME_RELEASE} + exit 0 ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit 0 ;; @@ -1054,18 +1176,25 @@ echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} exit 0 ;; *:Darwin:*:*) - echo `uname -p`-apple-darwin${UNAME_RELEASE} + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in + *86) UNAME_PROCESSOR=i686 ;; + unknown) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit 0 ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) - if test "${UNAME_MACHINE}" = "x86pc"; then + UNAME_PROCESSOR=`uname -p` + if test "$UNAME_PROCESSOR" = "x86"; then + UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi - echo `uname -p`-${UNAME_MACHINE}-nto-qnx + echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} exit 0 ;; *:QNX:*:4*) echo i386-pc-qnx exit 0 ;; - NSR-[KW]:NONSTOP_KERNEL:*:*) + NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit 0 ;; *:NonStop-UX:*:*) @@ -1088,11 +1217,6 @@ fi echo ${UNAME_MACHINE}-unknown-plan9 exit 0 ;; - i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility - # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx - exit 0 ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 exit 0 ;; @@ -1111,12 +1235,19 @@ *:ITS:*:*) echo pdp10-unknown-its exit 0 ;; - i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop + SEI:*:*:SEIUX) + echo mips-sei-seiux${UNAME_RELEASE} exit 0 ;; - i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit 0 ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms && exit 0 ;; + I*) echo ia64-dec-vms && exit 0 ;; + V*) echo vax-dec-vms && exit 0 ;; + esac esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1237,8 +1368,7 @@ } EOF -$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0 -rm -f $dummy.c $dummy +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 # Apollos put the system type in the environment. Index: config.sub =================================================================== RCS file: /cvs/dirsec/mod_admserv/config.sub,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- config.sub 10 Oct 2006 02:45:51 -0000 1.3 +++ config.sub 15 Nov 2006 21:31:39 -0000 1.4 @@ -1,9 +1,9 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -# Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -timestamp='2001-09-07' +timestamp='2004-08-29' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -29,7 +29,8 @@ # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. -# Please send patches to . +# Please send patches to . Submit a context +# diff and a properly formatted ChangeLog entry. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -69,7 +70,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -117,7 +118,8 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*) + nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ + kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -143,7 +145,7 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis) + -apple | -axis | -knuth | -cray) os= basic_machine=$1 ;; @@ -226,32 +228,46 @@ 1750a | 580 \ | a29k \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ | c4x | clipper \ - | d10v | d30v | dsp16xx \ - | fr30 \ + | d10v | d30v | dlx | dsp16xx \ + | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ - | m32r | m68000 | m68k | m88k | mcore \ - | mips16 | mips64 | mips64el | mips64orion | mips64orionel \ - | mips64vr4100 | mips64vr4100el | mips64vr4300 \ - | mips64vr4300el | mips64vr5000 | mips64vr5000el \ - | mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \ - | mipsisa32 \ + | ip2k | iq2000 \ + | m32r | m32rle | m68000 | m68k | m88k | mcore \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ + | mips64vr | mips64vrel \ + | mips64orion | mips64orionel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | msp430 \ | ns16k | ns32k \ - | openrisc \ + | openrisc | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | s390 | s390x \ - | sh | sh[34] | sh[34]eb | shbe | shle \ - | sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \ - | stormy16 | strongarm \ - | tahoe | thumb | tic80 | tron \ - | v850 \ + | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ + | strongarm \ + | tahoe | thumb | tic4x | tic80 | tron \ + | v850 | v850e \ | we32k \ - | x86 | xscale \ + | x86 | xscale | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; @@ -278,38 +294,57 @@ 580-* \ | a29k-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alphapca5[67]-* | arc-* \ - | arm-* | armbe-* | armle-* | armv*-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* \ | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c54x-* \ - | clipper-* | cray2-* | cydra-* \ - | d10v-* | d30v-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | fx80-* \ + | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ - | m32r-* \ - | m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \ + | ip2k-* | iq2000-* \ + | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | mcore-* \ - | mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \ - | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \ - | mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ + | mips64vr-* | mips64vrel-* \ + | mips64orion-* | mips64orionel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ + | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | msp430-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | s390-* | s390x-* \ - | sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \ - | sparc-* | sparc64-* | sparc86x-* | sparclite-* \ - | sparcv9-* | sparcv9b-* | stormy16-* | strongarm-* | sv1-* \ - | t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \ - | v850-* | vax-* \ + | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | tahoe-* | thumb-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tron-* \ + | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \ + | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ + | xtensa-* \ | ymp-* \ | z8k-*) ;; @@ -329,6 +364,9 @@ basic_machine=a29k-amd os=-udi ;; + abacus) + basic_machine=abacus-unknown + ;; adobe68k) basic_machine=m68010-adobe os=-scout @@ -343,6 +381,12 @@ basic_machine=a29k-none os=-bsd ;; + amd64) + basic_machine=x86_64-pc + ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; amdahl) basic_machine=580-amdahl os=-sysv @@ -374,6 +418,10 @@ basic_machine=ns32k-sequent os=-dynix ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; convex-c1) basic_machine=c1-convex os=-bsd @@ -394,30 +442,45 @@ basic_machine=c38-convex os=-bsd ;; - cray | ymp) - basic_machine=ymp-cray + cray | j90) + basic_machine=j90-cray os=-unicos ;; - cray2) - basic_machine=cray2-cray - os=-unicos + craynv) + basic_machine=craynv-cray + os=-unicosmp ;; - [cjt]90) - basic_machine=${basic_machine}-cray - os=-unicos + cr16c) + basic_machine=cr16c-unknown + os=-elf ;; crds | unos) basic_machine=m68k-crds ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; cris | cris-* | etrax*) basic_machine=cris-axis ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; da30 | da30-*) basic_machine=m68k-da30 ;; decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) basic_machine=mips-dec ;; + decsystem10* | dec10*) + basic_machine=pdp10-dec + os=-tops10 + ;; + decsystem20* | dec20*) + basic_machine=pdp10-dec + os=-tops20 + ;; delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) basic_machine=m68k-motorola @@ -598,28 +661,20 @@ basic_machine=m68k-atari os=-mint ;; - mipsel*-linux*) - basic_machine=mipsel-unknown - os=-linux-gnu - ;; - mips*-linux*) - basic_machine=mips-unknown - os=-linux-gnu - ;; mips3*-*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` ;; mips3*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown ;; - mmix*) - basic_machine=mmix-knuth - os=-mmixware - ;; monitor) basic_machine=m68k-rom68k os=-coff ;; + morphos) + basic_machine=powerpc-unknown + os=-morphos + ;; msdos) basic_machine=i386-pc os=-msdos @@ -699,6 +754,14 @@ basic_machine=hppa1.1-oki os=-proelf ;; + or32 | or32-*) + basic_machine=or32-unknown + os=-coff + ;; + os400) + basic_machine=powerpc-ibm + os=-os400 + ;; OSE68000 | ose68000) basic_machine=m68000-ericsson os=-ose @@ -721,49 +784,55 @@ pbb) basic_machine=m68k-tti ;; - pc532 | pc532-*) + pc532 | pc532-*) basic_machine=ns32k-pc532 ;; - pentium | p5 | k5 | k6 | nexgen) + pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; - pentiumpro | p6 | 6x86 | athlon) + pentiumpro | p6 | 6x86 | athlon | athlon_*) basic_machine=i686-pc ;; - pentiumii | pentium2) + pentiumii | pentium2 | pentiumiii | pentium3) basic_machine=i686-pc ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-*) + pentium4) + basic_machine=i786-pc + ;; + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pentiumpro-* | p6-* | 6x86-* | athlon-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - pentiumii-* | pentium2-*) + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; + pentium4-*) + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pn) basic_machine=pn-gould ;; power) basic_machine=power-ibm ;; ppc) basic_machine=powerpc-unknown - ;; + ;; ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown - ;; + ;; ppcle-* | powerpclittle-*) basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64) basic_machine=powerpc64-unknown - ;; + ;; ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64le | powerpc64little | ppc64-le | powerpc64-little) basic_machine=powerpc64le-unknown - ;; + ;; ppc64le-* | powerpc64little-*) basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` ;; @@ -784,10 +853,26 @@ rtpc | rtpc-*) basic_machine=romp-ibm ;; + s390 | s390-*) + basic_machine=s390-ibm + ;; + s390x | s390x-*) + basic_machine=s390x-ibm + ;; sa29200) basic_machine=a29k-amd os=-udi ;; + sb1) + basic_machine=mipsisa64sb1-unknown + ;; + sb1el) + basic_machine=mipsisa64sb1el-unknown + ;; + sei) + basic_machine=mips-sei + os=-seiux + ;; sequent) basic_machine=i386-sequent ;; @@ -795,7 +880,10 @@ basic_machine=sh-hitachi os=-hms ;; - sparclite-wrs) + sh64) + basic_machine=sh64-unknown + ;; + sparclite-wrs | simso-wrs) basic_machine=sparclite-wrs os=-vxworks ;; @@ -862,22 +950,42 @@ os=-dynix ;; t3e) - basic_machine=t3e-cray + basic_machine=alphaev5-cray + os=-unicos + ;; + t90) + basic_machine=t90-cray os=-unicos ;; tic54x | c54x*) basic_machine=tic54x-unknown os=-coff ;; + tic55x | c55x*) + basic_machine=tic55x-unknown + os=-coff + ;; + tic6x | c6x*) + basic_machine=tic6x-unknown + os=-coff + ;; tx39) basic_machine=mipstx39-unknown ;; tx39el) basic_machine=mipstx39el-unknown ;; + toad1) + basic_machine=pdp10-xkl + os=-tops20 + ;; tower | tower-32) basic_machine=m68k-ncr ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; udi29k) basic_machine=a29k-amd os=-udi @@ -899,8 +1007,8 @@ os=-vms ;; vpp*|vx|vx-*) - basic_machine=f301-fujitsu - ;; + basic_machine=f301-fujitsu + ;; vxworks960) basic_machine=i960-wrs os=-vxworks @@ -921,17 +1029,13 @@ basic_machine=hppa1.1-winbond os=-proelf ;; - windows32) - basic_machine=i386-pc - os=-windows32-msvcrt + xps | xps100) + basic_machine=xps100-honeywell ;; - xmp) - basic_machine=xmp-cray + ymp) + basic_machine=ymp-cray os=-unicos ;; - xps | xps100) - basic_machine=xps100-honeywell - ;; z8k-*-coff) basic_machine=z8k-unknown os=-sim @@ -952,16 +1056,12 @@ op60c) basic_machine=hppa1.1-oki ;; - mips) - if [ x$os = x-linux-gnu ]; then - basic_machine=mips-unknown - else - basic_machine=mips-mips - fi - ;; romp) basic_machine=romp-ibm ;; + mmix) + basic_machine=mmix-knuth + ;; rs6000) basic_machine=rs6000-ibm ;; @@ -978,13 +1078,16 @@ we32k) basic_machine=we32k-att ;; - sh3 | sh4 | sh3eb | sh4eb) + sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sparc | sparcv9 | sparcv9b) + sh64) + basic_machine=sh64-unknown + ;; + sparc | sparcv8 | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; - cydra) + cydra) basic_machine=cydra-cydrome ;; orion) @@ -999,10 +1102,6 @@ pmac | pmac-mpw) basic_machine=powerpc-apple ;; - c4x*) - basic_machine=c4x-none - os=-coff - ;; *-unknown) # Make sure to match an already-canonicalized machine name. ;; @@ -1058,17 +1157,20 @@ | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ - | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ + | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos*) + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1080,8 +1182,10 @@ ;; esac ;; + -nto-qnx*) + ;; -nto*) - os=-nto-qnx + os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ @@ -1090,6 +1194,9 @@ -mac*) os=`echo $os | sed -e 's|mac|macos|'` ;; + -linux-dietlibc) + os=-linux-dietlibc + ;; -linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; @@ -1102,6 +1209,9 @@ -opened*) os=-openedition ;; + -os400*) + os=-os400 + ;; -wince*) os=-wince ;; @@ -1120,14 +1230,23 @@ -acis*) os=-aos ;; + -atheos*) + os=-atheos + ;; + -syllable*) + os=-syllable + ;; -386bsd) os=-bsd ;; -ctix* | -uts*) os=-sysv ;; + -nova*) + os=-rtmk-nova + ;; -ns2 ) - os=-nextstep2 + os=-nextstep2 ;; -nsk*) os=-nsk @@ -1139,6 +1258,9 @@ -sinix*) os=-sysv4 ;; + -tpf*) + os=-tpf + ;; -triton*) os=-sysv3 ;; @@ -1166,8 +1288,14 @@ -xenix) os=-xenix ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - os=-mint + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + os=-mint + ;; + -aros*) + os=-aros + ;; + -kaos*) + os=-kaos ;; -none) ;; @@ -1200,10 +1328,14 @@ arm*-semi) os=-aout ;; + c4x-* | tic4x-*) + os=-coff + ;; + # This must come before the *-dec entry. pdp10-*) os=-tops20 ;; - pdp11-*) + pdp11-*) os=-none ;; *-dec | vax-*) @@ -1230,6 +1362,9 @@ mips*-*) os=-elf ;; + or32-*) + os=-coff + ;; *-tti) # must be before sparc entry or we get the wrong os. os=-sysv3 ;; @@ -1242,6 +1377,9 @@ *-ibm) os=-aix ;; + *-knuth) + os=-mmixware + ;; *-wec) os=-proelf ;; @@ -1293,19 +1431,19 @@ *-next) os=-nextstep3 ;; - *-gould) + *-gould) os=-sysv ;; - *-highlevel) + *-highlevel) os=-bsd ;; *-encore) os=-bsd ;; - *-sgi) + *-sgi) os=-irix ;; - *-siemens) + *-siemens) os=-sysv4 ;; *-masscomp) @@ -1374,10 +1512,16 @@ -mvs* | -opened*) vendor=ibm ;; + -os400*) + vendor=ibm + ;; -ptx*) vendor=sequent ;; - -vxsim* | -vxworks*) + -tpf*) + vendor=ibm + ;; + -vxsim* | -vxworks* | -windiss*) vendor=wrs ;; -aux*) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.22 -r 1.23 configure Index: configure =================================================================== RCS file: /cvs/dirsec/mod_admserv/configure,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- configure 10 Oct 2006 02:45:51 -0000 1.22 +++ configure 15 Nov 2006 21:31:39 -0000 1.23 @@ -1,9 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.57. +# Generated by GNU Autoconf 2.59 for mod_admserv 1.0. # -# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 -# Free Software Foundation, Inc. +# Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## @@ -20,9 +19,10 @@ elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi +DUALCASE=1; export DUALCASE # for MKS sh # Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then as_unset=unset else as_unset=false @@ -41,7 +41,7 @@ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ LC_TELEPHONE LC_TIME do - if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else $as_unset $as_var @@ -218,16 +218,17 @@ if mkdir -p . 2>/dev/null; then as_mkdir_p=: else + test -d ./-p && rmdir ./-p as_mkdir_p=false fi as_executable_p="test -f" # Sed expression to map a string onto a valid CPP name. -as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" # Sed expression to map a string onto a valid variable name. -as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" # IFS @@ -240,17 +241,6 @@ $as_unset CDPATH -# Find the correct PATH separator. Usually this is `:', but -# DJGPP uses `;' like DOS. -if test "X${PATH_SEPARATOR+set}" != Xset; then - UNAME=${UNAME-`uname 2>/dev/null`} - case X$UNAME in - *-DOS) lt_cv_sys_path_separator=';' ;; - *) lt_cv_sys_path_separator=':' ;; - esac - PATH_SEPARATOR=$lt_cv_sys_path_separator -fi - # Check that we are running under the correct shell. SHELL=${CONFIG_SHELL-/bin/sh} @@ -269,7 +259,7 @@ elif test "X$1" = X--fallback-echo; then # Avoid inline document here, it may be left over : -elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then +elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then # Yippee, $echo works! : else @@ -281,7 +271,7 @@ # used as fallback echo shift cat </dev/null`" = 'X\t' && echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && @@ -325,7 +316,7 @@ break fi done - IFS="$save_ifs" + IFS="$lt_save_ifs" if test "X$echo" = Xecho; then # We didn't find a better echo, so look for alternatives. @@ -399,6 +390,11 @@ + +tagnames=${tagnames+${tagnames},}CXX + +tagnames=${tagnames+${tagnames},}F77 + # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, # so uname gets run too. @@ -423,11 +419,11 @@ : ${ac_max_here_lines=38} # Identity of this package. -PACKAGE_NAME= -PACKAGE_TARNAME= -PACKAGE_VERSION= -PACKAGE_STRING= -PACKAGE_BUGREPORT= +PACKAGE_NAME='mod_admserv' +PACKAGE_TARNAME='mod_admserv' +PACKAGE_VERSION='1.0' +PACKAGE_STRING='mod_admserv 1.0' +PACKAGE_BUGREPORT='' # Factoring default headers for most tests. ac_includes_default="\ @@ -466,7 +462,7 @@ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO RANLIB ac_ct_RANLIB CPP EGREP LIBTOOL APR_CONFIG APXS PKG_CONFIG ICU_CONFIG apr_inc apache_inc apache_conf apache_prefix apache_bin nspr_inc nspr_lib ldapsdk_inc ldapsdk_lib ldapsdk_ver adminutil_inc adminutil_lib adminutil_ver icu_lib nss_inc nss_lib extra_c! ppflags LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL APR_CONFIG APXS! PKG_CONFIG ICU_CONFIG apr_inc apache_inc apache_conf apache_prefix apache_bin nspr_inc nspr_lib ldapsdk_inc ldapsdk_lib ldapsdk_ver adminutil_inc adminutil_lib adminutil_ver icu_lib nss_inc nss_lib extra_cppflags LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -825,7 +821,7 @@ # Be sure to have absolute paths. for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ - localstatedir libdir includedir oldincludedir infodir mandir + localstatedir libdir includedir oldincludedir infodir mandir do eval ac_val=$`echo $ac_var` case $ac_val in @@ -865,10 +861,10 @@ # Try the directory containing this script, then its parent. ac_confdir=`(dirname "$0") 2>/dev/null || $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$0" : 'X\(//\)[^/]' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$0" : 'X\(//\)[^/]' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$0" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -927,6 +923,26 @@ ac_env_CPP_value=$CPP ac_cv_env_CPP_set=${CPP+set} ac_cv_env_CPP_value=$CPP +ac_env_CXX_set=${CXX+set} +ac_env_CXX_value=$CXX +ac_cv_env_CXX_set=${CXX+set} +ac_cv_env_CXX_value=$CXX +ac_env_CXXFLAGS_set=${CXXFLAGS+set} +ac_env_CXXFLAGS_value=$CXXFLAGS +ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set} +ac_cv_env_CXXFLAGS_value=$CXXFLAGS +ac_env_CXXCPP_set=${CXXCPP+set} +ac_env_CXXCPP_value=$CXXCPP +ac_cv_env_CXXCPP_set=${CXXCPP+set} +ac_cv_env_CXXCPP_value=$CXXCPP +ac_env_F77_set=${F77+set} +ac_env_F77_value=$F77 +ac_cv_env_F77_set=${F77+set} +ac_cv_env_F77_value=$F77 +ac_env_FFLAGS_set=${FFLAGS+set} [...20436 lines suppressed...] - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 + if test -f "$f"; then + # Build tree + echo "$f" + elif test -f "$srcdir/$f"; then + # Source tree + echo "$srcdir/$f" + else + # /dev/null tree + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } - fi;; + fi;; esac done` || { (exit 1); exit 1; } _ACEOF @@ -9987,16 +21466,41 @@ ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` ac_dir=`(dirname "$ac_dest") 2>/dev/null || $as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_dest" : 'X\(//\)[^/]' \| \ - X"$ac_dest" : 'X\(//\)$' \| \ - X"$ac_dest" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$ac_dest" : 'X\(//\)[^/]' \| \ + X"$ac_dest" : 'X\(//\)$' \| \ + X"$ac_dest" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$ac_dest" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` + { if $as_mkdir_p; then + mkdir -p "$ac_dir" + else + as_dir="$ac_dir" + as_dirs= + while test ! -d "$as_dir"; do + as_dirs="$as_dir $as_dirs" + as_dir=`(dirname "$as_dir") 2>/dev/null || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + done + test ! -n "$as_dirs" || mkdir $as_dirs + fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 +echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} + { (exit 1); exit 1; }; }; } + ac_builddir=. if test "$ac_dir" != .; then @@ -10022,12 +21526,45 @@ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac -# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be -# absolute. -ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` -ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` -ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` -ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` + +# Do not use `cd foo && pwd` to compute absolute paths, because +# the directories may not exist. +case `pwd` in +.) ac_abs_builddir="$ac_dir";; +*) + case "$ac_dir" in + .) ac_abs_builddir=`pwd`;; + [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; + *) ac_abs_builddir=`pwd`/"$ac_dir";; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_builddir=${ac_top_builddir}.;; +*) + case ${ac_top_builddir}. in + .) ac_abs_top_builddir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; + *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_srcdir=$ac_srcdir;; +*) + case $ac_srcdir in + .) ac_abs_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; + *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_srcdir=$ac_top_srcdir;; +*) + case $ac_top_srcdir in + .) ac_abs_top_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; + *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; + esac;; +esac { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 @@ -10045,10 +21582,10 @@ if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then dirpart=`(dirname "$mf") 2>/dev/null || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ - X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$mf" : 'X\(//\)[^/]' \| \ + X"$mf" : 'X\(//\)$' \| \ + X"$mf" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$mf" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -10058,36 +21595,30 @@ else continue fi - grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue - # Extract the definition of DEP_FILES from the Makefile without - # running `make'. - DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n -e '/^U = / s///p' < "$mf"` - test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" - # We invoke sed twice because it is the simplest approach to - # changing $(DEPDIR) to its actual value in the expansion. - for file in `sed -n -e ' - /^DEP_FILES = .*\\\\$/ { - s/^DEP_FILES = // - :loop - s/\\\\$// - p - n - /\\\\$/ b loop - p - } - /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`(dirname "$file") 2>/dev/null || $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$file" : 'X\(//\)[^/]' \| \ - X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$file" : 'X\(//\)[^/]' \| \ + X"$file" : 'X\(//\)$' \| \ + X"$file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -10103,10 +21634,10 @@ as_dirs="$as_dir $as_dirs" as_dir=`(dirname "$as_dir") 2>/dev/null || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } Index: configure.in =================================================================== RCS file: /cvs/dirsec/mod_admserv/configure.in,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- configure.in 5 Oct 2006 23:22:19 -0000 1.18 +++ configure.in 15 Nov 2006 21:31:40 -0000 1.19 @@ -1,8 +1,8 @@ # Required initializer -AC_INIT +AC_INIT(mod_admserv, 1.0) # Automake initialization -AM_INIT_AUTOMAKE(mod_admserv, 1.0) +AM_INIT_AUTOMAKE([1.9 foreign]) # Add a test for a compiler. AC_PROG_CC Index: depcomp =================================================================== RCS file: /cvs/dirsec/mod_admserv/depcomp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- depcomp 10 Oct 2006 02:45:51 -0000 1.3 +++ depcomp 15 Nov 2006 21:31:40 -0000 1.4 @@ -1,7 +1,9 @@ #! /bin/sh - # depcomp - compile a program generating dependencies as side-effects -# Copyright 1999, 2000 Free Software Foundation, Inc. + +scriptversion=2004-05-31.23 + +# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -25,22 +27,45 @@ # Originally written by Alexandre Oliva . +case $1 in + '') + echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: depcomp [--help] [--version] PROGRAM [ARGS] + +Run PROGRAMS ARGS to compile a file, generating dependencies +as side-effects. + +Environment variables: + depmode Dependency tracking mode. + source Source file read by `PROGRAMS ARGS'. + object Object file output by `PROGRAMS ARGS'. + DEPDIR directory where to store dependencies. + depfile Dependency file to output. + tmpdepfile Temporary file to use when outputing dependencies. + libtool Whether libtool is used (yes/no). + +Report bugs to . +EOF + exit 0 + ;; + -v | --v*) + echo "depcomp $scriptversion" + exit 0 + ;; +esac + if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 exit 1 fi -# `libtool' can also be set to `yes' or `no'. - -if test -z "$depfile"; then - base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'` - dir=`echo "$object" | sed 's,/.*$,/,'` - if test "$dir" = "$object"; then - dir= - fi - # FIXME: should be _deps on DOS. - depfile="$dir.deps/$base" -fi +# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. +depfile=${depfile-`echo "$object" | + sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} rm -f "$tmpdepfile" @@ -172,19 +197,25 @@ aix) # The C for AIX Compiler uses -M and outputs the dependencies - # in a .u file. This file always lives in the current directory. - # Also, the AIX compiler puts `$object:' at the start of each line; - # $object doesn't have directory information. - stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'` + # in a .u file. In older versions, this file always lives in the + # current directory. Also, the AIX compiler puts `$object:' at the + # start of each line; $object doesn't have directory information. + # Version 6 uses the directory in both cases. + stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'` tmpdepfile="$stripped.u" - outname="$stripped.o" if test "$libtool" = yes; then "$@" -Wc,-M else "$@" -M fi - stat=$? + + if test -f "$tmpdepfile"; then : + else + stripped=`echo "$stripped" | sed 's,^.*/,,'` + tmpdepfile="$stripped.u" + fi + if test $stat -eq 0; then : else rm -f "$tmpdepfile" @@ -192,6 +223,7 @@ fi if test -f "$tmpdepfile"; then + outname="$stripped.o" # Each line is of the form `foo.o: dependent.h'. # Do two passes, one to just change these to # `$object: dependent.h' and one to simply `dependent.h:'. @@ -206,6 +238,44 @@ rm -f "$tmpdepfile" ;; +icc) + # Intel's C compiler understands `-MD -MF file'. However on + # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c + # ICC 7.0 will fill foo.d with something like + # foo.o: sub/foo.c + # foo.o: sub/foo.h + # which is wrong. We want: + # sub/foo.o: sub/foo.c + # sub/foo.o: sub/foo.h + # sub/foo.c: + # sub/foo.h: + # ICC 7.1 will output + # foo.o: sub/foo.c sub/foo.h + # and will wrap long lines using \ : + # foo.o: sub/foo.c ... \ + # sub/foo.h ... \ + # ... + + "$@" -MD -MF "$tmpdepfile" + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + # Each line is of the form `foo.o: dependent.h', + # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. + # Do two passes, one to just change these to + # `$object: dependent.h' and one to simply `dependent.h:'. + sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" + # Some versions of the HPUX 10.20 sed can't process this invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | + sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + tru64) # The Tru64 compiler uses -MD to generate dependencies as a side # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. @@ -217,31 +287,40 @@ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` if test "$libtool" = yes; then + # Dependencies are output in .lo.d with libtool 1.4. + # With libtool 1.5 they are output both in $dir.libs/$base.o.d + # and in $dir.libs/$base.o.d and $dir$base.o.d. We process the + # latter, because the former will be cleaned when $dir.libs is + # erased. tmpdepfile1="$dir.libs/$base.lo.d" - tmpdepfile2="$dir.libs/$base.d" + tmpdepfile2="$dir$base.o.d" + tmpdepfile3="$dir.libs/$base.d" "$@" -Wc,-MD else tmpdepfile1="$dir$base.o.d" tmpdepfile2="$dir$base.d" + tmpdepfile3="$dir$base.d" "$@" -MD fi stat=$? if test $stat -eq 0; then : else - rm -f "$tmpdepfile1" "$tmpdepfile2" + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi if test -f "$tmpdepfile1"; then tmpdepfile="$tmpdepfile1" - else + elif test -f "$tmpdepfile2"; then tmpdepfile="$tmpdepfile2" + else + tmpdepfile="$tmpdepfile3" fi if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a space and a tab in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + # That's a tab and a space in the []. + sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else echo "#dummy" > "$depfile" fi @@ -254,7 +333,7 @@ dashmstdout) # Important note: in order to support this mode, a compiler *must* - # always write the proprocessed file to stdout, regardless of -o. + # always write the preprocessed file to stdout, regardless of -o. "$@" || exit $? # Remove the call to Libtool. @@ -265,9 +344,7 @@ shift fi - # Remove `-o $object'. We will use -o /dev/null later, - # however we can't do the remplacement now because - # `-o $object' might simply not be used + # Remove `-o $object'. IFS=" " for arg do @@ -287,7 +364,11 @@ done test -z "$dashmflag" && dashmflag=-M - "$@" -o /dev/null $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + # Require at least two characters before searching for `:' + # in the target name. This is to cope with DOS-style filenames: + # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. + "$@" $dashmflag | + sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" tr ' ' ' @@ -306,6 +387,13 @@ makedepend) "$@" || exit $? + # Remove any Libtool call + if test "$libtool" = yes; then + while test $1 != '--mode=compile'; do + shift + done + shift + fi # X makedepend shift cleared=no @@ -318,7 +406,9 @@ case "$arg" in -D*|-I*) set fnord "$@" "$arg"; shift ;; - -*) + # Strip any option that makedepend may not understand. Remove + # the object too, otherwise makedepend will parse it as a source file. + -*|$object) ;; *) set fnord "$@" "$arg"; shift ;; @@ -339,7 +429,7 @@ cpp) # Important note: in order to support this mode, a compiler *must* - # always write the proprocessed file to stdout. + # always write the preprocessed file to stdout. "$@" || exit $? # Remove the call to Libtool. @@ -381,7 +471,7 @@ msvisualcpp) # Important note: in order to support this mode, a compiler *must* - # always write the proprocessed file to stdout, regardless of -o, + # always write the preprocessed file to stdout, regardless of -o, # because we must use -o when running libtool. "$@" || exit $? IFS=" " @@ -421,3 +511,12 @@ esac exit 0 + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: Index: httpd.conf.tmpl =================================================================== RCS file: /cvs/dirsec/mod_admserv/httpd.conf.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- httpd.conf.tmpl 27 Jun 2005 20:49:02 -0000 1.2 +++ httpd.conf.tmpl 15 Nov 2006 21:31:40 -0000 1.3 @@ -1,3 +1,22 @@ +# BEGIN COPYRIGHT BLOCK +# +# Copyright (C) 2005 Red Hat, Inc. +# All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# END COPYRIGHT BLOCK + # To get the Admin Express working properly, add the following to # apache, either directly or thru an Include /path/to/this.conf Index: install-sh =================================================================== RCS file: /cvs/dirsec/mod_admserv/install-sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- install-sh 10 Oct 2006 02:45:51 -0000 1.3 +++ install-sh 15 Nov 2006 21:31:40 -0000 1.4 @@ -1,19 +1,38 @@ #!/bin/sh -# # install - install a program, script, or datafile -# This comes from X11R5 (mit/util/scripts/install.sh). + +scriptversion=2004-09-10.20 + +# This originates from X11R5 (mit/util/scripts/install.sh), which was +# later released in X11R6 (xc/config/util/install.sh) with the +# following copyright and license. +# +# Copyright (C) 1994 X Consortium +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. # -# Copyright 1991 by the Massachusetts Institute of Technology +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- +# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -# Permission to use, copy, modify, distribute, and sell this software and its -# documentation for any purpose is hereby granted without fee, provided that -# the above copyright notice appear in all copies and that both that -# copyright notice and this permission notice appear in supporting -# documentation, and that the name of M.I.T. not be used in advertising or -# publicity pertaining to distribution of the software without specific, -# written prior permission. M.I.T. makes no representations about the -# suitability of this software for any purpose. It is provided "as is" -# without express or implied warranty. +# Except as contained in this notice, the name of the X Consortium shall not +# be used in advertising or otherwise to promote the sale, use or other deal- +# ings in this Software without prior written authorization from the X Consor- +# tium. +# +# +# FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent # `make' implicit rules from creating a file called install from it @@ -23,13 +42,11 @@ # from scratch. It can only install one file at a time, a restriction # shared with many OS's install programs. - # set DOITPROG to echo to test this script # Don't use :- since 4.3BSD and earlier shells don't like it. doit="${DOITPROG-}" - # put in absolute paths if you don't have them in your path; or use env. vars. mvprog="${MVPROG-mv}" @@ -41,211 +58,265 @@ rmprog="${RMPROG-rm}" mkdirprog="${MKDIRPROG-mkdir}" -transformbasename="" -transform_arg="" -instcmd="$mvprog" chmodcmd="$chmodprog 0755" -chowncmd="" -chgrpcmd="" -stripcmd="" +chowncmd= +chgrpcmd= +stripcmd= rmcmd="$rmprog -f" mvcmd="$mvprog" -src="" -dst="" -dir_arg="" - -while [ x"$1" != x ]; do - case $1 in - -c) instcmd="$cpprog" - shift - continue;; - - -d) dir_arg=true - shift - continue;; - - -m) chmodcmd="$chmodprog $2" - shift - shift - continue;; - - -o) chowncmd="$chownprog $2" - shift - shift - continue;; - - -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; - - -s) stripcmd="$stripprog" - shift - continue;; - - -t=*) transformarg=`echo $1 | sed 's/-t=//'` - shift - continue;; - - -b=*) transformbasename=`echo $1 | sed 's/-b=//'` - shift - continue;; - - *) if [ x"$src" = x ] - then - src=$1 - else - # this colon is to work around a 386BSD /bin/sh bug - : - dst=$1 - fi - shift - continue;; - esac -done - -if [ x"$src" = x ] -then - echo "install: no input file specified" - exit 1 -else - : -fi - -if [ x"$dir_arg" != x ]; then - dst=$src - src="" - - if [ -d $dst ]; then - instcmd=: - chmodcmd="" - else - instcmd=$mkdirprog - fi -else - -# Waiting for this to be detected by the "$instcmd $src $dsttmp" command -# might cause directories to be created, which would be especially bad -# if $src (and thus $dsttmp) contains '*'. - - if [ -f "$src" ] || [ -d "$src" ] - then - : - else - echo "install: $src does not exist" - exit 1 - fi - - if [ x"$dst" = x ] - then - echo "install: no destination specified" - exit 1 - else - : - fi - -# If destination is a directory, append the input filename; if your system -# does not like double slashes in filenames, you may need to add some logic - - if [ -d $dst ] - then - dst="$dst"/`basename $src` - else - : - fi -fi - -## this sed command emulates the dirname command -dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` - -# Make sure that the destination directory exists. -# this part is taken from Noah Friedman's mkinstalldirs script +src= +dst= +dir_arg= +dstarg= +no_target_directory= + +usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY + or: $0 [OPTION]... -t DIRECTORY SRCFILES... + or: $0 [OPTION]... -d DIRECTORIES... + +In the 1st form, copy SRCFILE to DSTFILE. +In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. +In the 4th, create DIRECTORIES. + +Options: +-c (ignored) +-d create directories instead of installing files. +-g GROUP $chgrpprog installed files to GROUP. +-m MODE $chmodprog installed files to MODE. +-o USER $chownprog installed files to USER. +-s $stripprog installed files. +-t DIRECTORY install into DIRECTORY. +-T report an error if DSTFILE is a directory. +--help display this help and exit. +--version display version info and exit. + +Environment variables override the default commands: + CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG +" + +while test -n "$1"; do + case $1 in + -c) shift + continue;; + + -d) dir_arg=true + shift + continue;; + + -g) chgrpcmd="$chgrpprog $2" + shift + shift + continue;; + + --help) echo "$usage"; exit 0;; + + -m) chmodcmd="$chmodprog $2" + shift + shift + continue;; + + -o) chowncmd="$chownprog $2" + shift + shift + continue;; + + -s) stripcmd=$stripprog + shift + continue;; -# Skip lots of stat calls in the usual case. -if [ ! -d "$dstdir" ]; then -defaultIFS=' - ' -IFS="${IFS-${defaultIFS}}" - -oIFS="${IFS}" -# Some sh's can't handle IFS=/ for some reason. -IFS='%' -set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'` -IFS="${oIFS}" - -pathcomp='' + -t) dstarg=$2 + shift + shift + continue;; -while [ $# -ne 0 ] ; do - pathcomp="${pathcomp}${1}" + -T) no_target_directory=true shift + continue;; - if [ ! -d "${pathcomp}" ] ; - then - $mkdirprog "${pathcomp}" - else - : - fi + --version) echo "$0 $scriptversion"; exit 0;; - pathcomp="${pathcomp}/" + *) # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + test -n "$dir_arg$dstarg" && break + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dstarg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dstarg" + shift # fnord + fi + shift # arg + dstarg=$arg + done + break;; + esac done -fi - -if [ x"$dir_arg" != x ] -then - $doit $instcmd $dst && - - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi -else - -# If we're going to rename the final executable, determine the name now. - - if [ x"$transformarg" = x ] - then - dstfile=`basename $dst` - else - dstfile=`basename $dst $transformbasename | - sed $transformarg`$transformbasename - fi - -# don't allow the sed command to completely eliminate the filename - - if [ x"$dstfile" = x ] - then - dstfile=`basename $dst` - else - : - fi - -# Make a temp file name in the proper directory. - - dsttmp=$dstdir/#inst.$$# - -# Move or copy the file name to the temp name - $doit $instcmd $src $dsttmp && - - trap "rm -f ${dsttmp}" 0 && - -# and set any options; do chmod last to preserve setuid bits - -# If any of these fail, we abort the whole thing. If we want to -# ignore errors from any of these, just make sure not to ignore -# errors from the above "$doit $instcmd $src $dsttmp" command. - - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi && - -# Now rename the file to the real destination. - - $doit $rmcmd -f $dstdir/$dstfile && - $doit $mvcmd $dsttmp $dstdir/$dstfile +if test -z "$1"; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 + fi + # It's OK to call `install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 +fi -fi && +for src +do + # Protect names starting with `-'. + case $src in + -*) src=./$src ;; + esac + + if test -n "$dir_arg"; then + dst=$src + src= + + if test -d "$dst"; then + mkdircmd=: + chmodcmd= + else + mkdircmd=$mkdirprog + fi + else + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. + if test ! -f "$src" && test ! -d "$src"; then + echo "$0: $src does not exist." >&2 + exit 1 + fi + + if test -z "$dstarg"; then + echo "$0: no destination specified." >&2 + exit 1 + fi + + dst=$dstarg + # Protect names starting with `-'. + case $dst in + -*) dst=./$dst ;; + esac + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then + if test -n "$no_target_directory"; then + echo "$0: $dstarg: Is a directory" >&2 + exit 1 + fi + dst=$dst/`basename "$src"` + fi + fi + + # This sed command emulates the dirname command. + dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` + + # Make sure that the destination directory exists. + + # Skip lots of stat calls in the usual case. + if test ! -d "$dstdir"; then + defaultIFS=' + ' + IFS="${IFS-$defaultIFS}" + + oIFS=$IFS + # Some sh's can't handle IFS=/ for some reason. + IFS='%' + set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` + IFS=$oIFS + + pathcomp= + + while test $# -ne 0 ; do + pathcomp=$pathcomp$1 + shift + if test ! -d "$pathcomp"; then + $mkdirprog "$pathcomp" + # mkdir can fail with a `File exist' error in case several + # install-sh are creating the directory concurrently. This + # is OK. + test -d "$pathcomp" || exit + fi + pathcomp=$pathcomp/ + done + fi + + if test -n "$dir_arg"; then + $doit $mkdircmd "$dst" \ + && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } + + else + dstfile=`basename "$dst"` + + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ + + # Trap to clean up those temp files at exit. + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 + trap '(exit $?); exit' 1 2 13 15 + + # Copy the file name to the temp name. + $doit $cpprog "$src" "$dsttmp" && + + # and set any options; do chmod last to preserve setuid bits. + # + # If any of these fail, we abort the whole thing. If we want to + # ignore errors from any of these, just make sure not to ignore + # errors from the above "$doit $cpprog $src $dsttmp" command. + # + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && + + # Now rename the file to the real destination. + { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ + || { + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + if test -f "$dstdir/$dstfile"; then + $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ + || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ + || { + echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 + (exit 1); exit + } + else + : + fi + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" + } + } + fi || { (exit 1); exit; } +done -exit 0 +# The final little trick to "correctly" pass the exit status to the exit trap. +{ + (exit 0); exit +} + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.4 -r 1.5 ltmain.sh Index: ltmain.sh =================================================================== RCS file: /cvs/dirsec/mod_admserv/ltmain.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ltmain.sh 10 Oct 2006 02:45:51 -0000 1.4 +++ ltmain.sh 15 Nov 2006 21:31:40 -0000 1.5 @@ -1,7 +1,7 @@ # ltmain.sh - Provide generalized library-building support services. # NOTE: Changing this file will not affect anything until you rerun configure. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 # Free Software Foundation, Inc. # Originally by Gordon Matzigkeit , 1996 # @@ -17,13 +17,41 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. +basename="s,^.*/,,g" + +# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh +# is ksh but when the shell is invoked as "sh" and the current value of +# the _XPG environment variable is not equal to 1 (one), the special +# positional parameter $0, within a function call, is the name of the +# function. +progpath="$0" + +# The name of this program: +progname=`echo "$progpath" | $SED $basename` +modename="$progname" + +# Global variables: +EXIT_SUCCESS=0 +EXIT_FAILURE=1 + +PROGRAM=ltmain.sh +PACKAGE=libtool +VERSION=1.5.22 +TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)" + +# See if we are running on zsh, and set the options which allow our +# commands through without removal of \ escapes. +if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST +fi + # Check that we have a working $echo. if test "X$1" = X--no-reexec; then # Discard the --no-reexec flag, and continue. @@ -36,7 +64,7 @@ : else # Restart under the correct shell, and then maybe $echo will work. - exec $SHELL "$0" --no-reexec ${1+"$@"} + exec $SHELL "$progpath" --no-reexec ${1+"$@"} fi if test "X$1" = X--fallback-echo; then @@ -45,22 +73,9 @@ cat <&2 - echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 - exit 1 + $echo "$modename: not configured to build any kind of library" 1>&2 + $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 + exit $EXIT_FAILURE fi # Global variables. @@ -114,11 +132,268 @@ show="$echo" show_help= execute_dlfiles= +duplicate_deps=no +preserve_args= lo2o="s/\\.lo\$/.${objext}/" o2lo="s/\\.${objext}\$/.lo/" +##################################### +# Shell function definitions: +# This seems to be the best place for them + +# func_mktempdir [string] +# Make a temporary directory that won't clash with other running +# libtool processes, and avoids race conditions if possible. If +# given, STRING is the basename for that directory. +func_mktempdir () +{ + my_template="${TMPDIR-/tmp}/${1-$progname}" + + if test "$run" = ":"; then + # Return a directory name, but don't create it in dry-run mode + my_tmpdir="${my_template}-$$" + else + + # If mktemp works, use that first and foremost + my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` + + if test ! -d "$my_tmpdir"; then + # Failing that, at least try and use $RANDOM to avoid a race + my_tmpdir="${my_template}-${RANDOM-0}$$" + + save_mktempdir_umask=`umask` + umask 0077 + $mkdir "$my_tmpdir" + umask $save_mktempdir_umask + fi + + # If we're not in dry-run mode, bomb out on failure + test -d "$my_tmpdir" || { + $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2 + exit $EXIT_FAILURE + } + fi + + $echo "X$my_tmpdir" | $Xsed +} + + +# func_win32_libid arg +# return the library type of file 'arg' +# +# Need a lot of goo to handle *both* DLLs and import libs +# Has to be a shell function in order to 'eat' the argument +# that is supplied when $file_magic_command is called. +func_win32_libid () +{ [...5511 lines suppressed...] - eval cmds=\"$postuninstall_cmds\" + cmds=$postuninstall_cmds save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" + eval cmd=\"$cmd\" $show "$cmd" $run eval "$cmd" - if test $? != 0 && test "$rmforce" != yes; then + if test "$?" -ne 0 && test "$rmforce" != yes; then exit_status=1 fi done @@ -4849,40 +6536,72 @@ if test -n "$old_library"; then # Do each command in the old_postuninstall commands. - eval cmds=\"$old_postuninstall_cmds\" + cmds=$old_postuninstall_cmds save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" + eval cmd=\"$cmd\" $show "$cmd" $run eval "$cmd" - if test $? != 0 && test "$rmforce" != yes; then + if test "$?" -ne 0 && test "$rmforce" != yes; then exit_status=1 fi done IFS="$save_ifs" fi # FIXME: should reinstall the best remaining shared library. - fi + ;; + esac fi ;; *.lo) - if test "$build_old_libs" = yes; then - oldobj=`$echo "X$name" | $Xsed -e "$lo2o"` - rmfiles="$rmfiles $dir/$oldobj" + # Possibly a libtool object, so verify it. + if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then + + # Read the .lo file + . $dir/$name + + # Add PIC object to the list of files to remove. + if test -n "$pic_object" \ + && test "$pic_object" != none; then + rmfiles="$rmfiles $dir/$pic_object" + fi + + # Add non-PIC object to the list of files to remove. + if test -n "$non_pic_object" \ + && test "$non_pic_object" != none; then + rmfiles="$rmfiles $dir/$non_pic_object" + fi fi ;; *) - # Do a test to see if this is a libtool program. - if test $mode = clean && - (${SED} -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - relink_command= - . $dir/$file + if test "$mode" = clean ; then + noexename=$name + case $file in + *.exe) + file=`$echo $file|${SED} 's,.exe$,,'` + noexename=`$echo $name|${SED} 's,.exe$,,'` + # $file with .exe has already been added to rmfiles, + # add $file without .exe + rmfiles="$rmfiles $file" + ;; + esac + # Do a test to see if this is a libtool program. + if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then + relink_command= + . $dir/$noexename - rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" - if test "$fast_install" = yes && test -n "$relink_command"; then - rmfiles="$rmfiles $objdir/lt-$name" + # note $name still contains .exe if it was in $file originally + # as does the version of $file that was added into $rmfiles + rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" + if test "$fast_install" = yes && test -n "$relink_command"; then + rmfiles="$rmfiles $objdir/lt-$name" + fi + if test "X$noexename" != "X$name" ; then + rmfiles="$rmfiles $objdir/lt-${noexename}.c" + fi fi fi ;; @@ -4890,6 +6609,7 @@ $show "$rm $rmfiles" $run $rm $rmfiles || exit_status=1 done + objdir="$origobjdir" # Try to remove the ${objdir}s in the directories where we deleted files for dir in $rmdirs; do @@ -4905,20 +6625,20 @@ "") $echo "$modename: you must specify a MODE" 1>&2 $echo "$generic_help" 1>&2 - exit 1 + exit $EXIT_FAILURE ;; esac if test -z "$exec_cmd"; then $echo "$modename: invalid operation mode \`$mode'" 1>&2 $echo "$generic_help" 1>&2 - exit 1 + exit $EXIT_FAILURE fi fi # test -z "$show_help" if test -n "$exec_cmd"; then eval exec $exec_cmd - exit 1 + exit $EXIT_FAILURE fi # We need to display help for each of the modes. @@ -4937,6 +6657,7 @@ --mode=MODE use operation mode MODE [default=inferred from MODE-ARGS] --quiet same as \`--silent' --silent don't print informational messages + --tag=TAG use configuration variables from tag TAG --version print version information MODE must be one of the following: @@ -4950,8 +6671,10 @@ uninstall remove libraries from an installed directory MODE-ARGS vary depending on the MODE. Try \`$modename --help --mode=MODE' for -a more detailed description of MODE." - exit 0 +a more detailed description of MODE. + +Report bugs to ." + exit $EXIT_SUCCESS ;; clean) @@ -5062,6 +6785,9 @@ -no-install link a not-installable executable -no-undefined declare that a library does not refer to external symbols -o OUTPUT-FILE create OUTPUT-FILE from the specified objects + -objectlist FILE Use a list of object files found in FILE to specify objects + -precious-files-regex REGEX + don't remove output files matching REGEX -release RELEASE specify package release information -rpath LIBDIR the created library will eventually be installed in LIBDIR -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries @@ -5103,14 +6829,33 @@ *) $echo "$modename: invalid operation mode \`$mode'" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE ;; esac -echo +$echo $echo "Try \`$modename --help' for more information about other modes." -exit 0 +exit $? + +# The TAGs below are defined such that we never get into a situation +# in which we disable both kinds of libraries. Given conflicting +# choices, we go for a static library, that is the most portable, +# since we can't tell whether shared libraries were disabled because +# the user asked for that or because the platform doesn't support +# them. This is particularly important on AIX, because we don't +# support having both static and shared libraries enabled at the same +# time on that platform, so we default to a shared-only configuration. +# If a disable-shared tag is given, we'll fallback to a static-only +# configuration. But we'll never go from static-only to shared-only. + +# ### BEGIN LIBTOOL TAG CONFIG: disable-shared +disable_libs=shared +# ### END LIBTOOL TAG CONFIG: disable-shared + +# ### BEGIN LIBTOOL TAG CONFIG: disable-static +disable_libs=static +# ### END LIBTOOL TAG CONFIG: disable-static # Local Variables: # mode:shell-script Index: missing =================================================================== RCS file: /cvs/dirsec/mod_admserv/missing,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- missing 10 Oct 2006 02:45:51 -0000 1.3 +++ missing 15 Nov 2006 21:31:40 -0000 1.4 @@ -1,6 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc. + +scriptversion=2004-09-07.08 + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004 +# Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -38,18 +42,24 @@ configure_ac=configure.in fi +msg="missing on your system" + case "$1" in --run) # Try to run requested program, and just exit if it succeeds. run= shift "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in -h|--h|--he|--hel|--help) echo "\ @@ -74,11 +84,15 @@ lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch]" + yacc create \`y.tab.[ch]', if possible, from existing .[ch] + +Send bug reports to ." + exit 0 ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.4 - GNU automake" + echo "missing $scriptversion (GNU Automake)" + exit 0 ;; -*) @@ -87,14 +101,44 @@ exit 1 ;; - aclocal*) +esac + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). +case "$1" in + lex|yacc) + # Not GNU programs, they don't have --version. + ;; + + tar) + if test -n "$run"; then + echo 1>&2 "ERROR: \`tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 fi + ;; +esac +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case "$1" in + aclocal*) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." @@ -102,13 +146,8 @@ ;; autoconf) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." @@ -116,13 +155,8 @@ ;; autoheader) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." @@ -140,13 +174,8 @@ ;; automake*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." @@ -156,16 +185,11 @@ ;; autom4te) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: \`$1' is needed, but is $msg. + You might have modified some files without having the proper tools for further handling them. - You can get \`$1Help2man' as part of \`Autoconf' from any GNU + You can get \`$1' as part of \`Autoconf' from any GNU archive site." file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` @@ -185,7 +209,7 @@ bison|yacc) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." @@ -215,7 +239,7 @@ lex|flex) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." @@ -237,13 +261,8 @@ ;; help2man) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." @@ -262,13 +281,8 @@ ;; makeinfo) - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then - # We have makeinfo, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious call might also be the consequence of using a buggy \`make' (AIX, @@ -284,10 +298,6 @@ tar) shift - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - fi # We have already tried tar in the generic part. # Look for gnutar/gtar before invocation to avoid ugly error @@ -323,10 +333,10 @@ *) echo 1>&2 "\ -WARNING: \`$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: \`$1' is needed, and is $msg. + You might have modified some files without having the proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequirements for installing + it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case some other package would contain this missing \`$1' program." exit 1 @@ -334,3 +344,10 @@ esac exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: Index: mkinstalldirs =================================================================== RCS file: /cvs/dirsec/mod_admserv/mkinstalldirs,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mkinstalldirs 10 Oct 2006 02:45:51 -0000 1.3 +++ mkinstalldirs 15 Nov 2006 21:31:40 -0000 1.4 @@ -1,29 +1,56 @@ #! /bin/sh # mkinstalldirs --- make directory hierarchy -# Author: Noah Friedman + +scriptversion=2004-02-15.20 + +# Original author: Noah Friedman # Created: 1993-05-16 -# Public domain +# Public domain. +# +# This file is maintained in Automake, please report +# bugs to or send patches to +# . errstatus=0 dirmode="" usage="\ -Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..." +Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... + +Create each directory DIR (with mode MODE, if specified), including all +leading file name components. + +Report bugs to ." # process command line arguments while test $# -gt 0 ; do - case "${1}" in - -h | --help | --h* ) # -h for help - echo "${usage}" 1>&2; exit 0 ;; - -m ) # -m PERM arg - shift - test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; } - dirmode="${1}" - shift ;; - -- ) shift; break ;; # stop option processing - -* ) echo "${usage}" 1>&2; exit 1 ;; # unknown option - * ) break ;; # first non-opt arg - esac + case $1 in + -h | --help | --h*) # -h for help + echo "$usage" + exit 0 + ;; + -m) # -m PERM arg + shift + test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } + dirmode=$1 + shift + ;; + --version) + echo "$0 $scriptversion" + exit 0 + ;; + --) # stop option processing + shift + break + ;; + -*) # unknown option + echo "$usage" 1>&2 + exit 1 + ;; + *) # first non-opt arg + break + ;; + esac done for file @@ -36,64 +63,88 @@ done case $# in -0) exit 0 ;; + 0) exit 0 ;; esac +# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and +# mkdir -p a/c at the same time, both will detect that a is missing, +# one will create a, then the other will try to create a and die with +# a "File exists" error. This is a problem when calling mkinstalldirs +# from a parallel make. We use --version in the probe to restrict +# ourselves to GNU mkdir, which is thread-safe. case $dirmode in -'') - if mkdir -p -- . 2>/dev/null; then - echo "mkdir -p -- $*" - exec mkdir -p -- "$@" - fi ;; -*) - if mkdir -m "$dirmode" -p -- . 2>/dev/null; then - echo "mkdir -m $dirmode -p -- $*" - exec mkdir -m "$dirmode" -p -- "$@" - fi ;; + '') + if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then + echo "mkdir -p -- $*" + exec mkdir -p -- "$@" + else + # On NextStep and OpenStep, the `mkdir' command does not + # recognize any option. It will interpret all options as + # directories to create, and then abort because `.' already + # exists. + test -d ./-p && rmdir ./-p + test -d ./--version && rmdir ./--version + fi + ;; + *) + if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && + test ! -d ./--version; then + echo "mkdir -m $dirmode -p -- $*" + exec mkdir -m "$dirmode" -p -- "$@" + else + # Clean up after NextStep and OpenStep mkdir. + for d in ./-m ./-p ./--version "./$dirmode"; + do + test -d $d && rmdir $d + done + fi + ;; esac for file do - set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` - shift + set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` + shift + + pathcomp= + for d + do + pathcomp="$pathcomp$d" + case $pathcomp in + -*) pathcomp=./$pathcomp ;; + esac + + if test ! -d "$pathcomp"; then + echo "mkdir $pathcomp" + + mkdir "$pathcomp" || lasterr=$? + + if test ! -d "$pathcomp"; then + errstatus=$lasterr + else + if test ! -z "$dirmode"; then + echo "chmod $dirmode $pathcomp" + lasterr="" + chmod "$dirmode" "$pathcomp" || lasterr=$? - pathcomp= - for d - do - pathcomp="$pathcomp$d" - case "$pathcomp" in - -* ) pathcomp=./$pathcomp ;; - esac - - if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" - - mkdir "$pathcomp" || lasterr=$? - - if test ! -d "$pathcomp"; then - errstatus=$lasterr - else - if test ! -z "$dirmode"; then - echo "chmod $dirmode $pathcomp" - - lasterr="" - chmod "$dirmode" "$pathcomp" || lasterr=$? - - if test ! -z "$lasterr"; then - errstatus=$lasterr - fi + if test ! -z "$lasterr"; then + errstatus=$lasterr fi fi - fi + fi + fi - pathcomp="$pathcomp/" - done + pathcomp="$pathcomp/" + done done exit $errstatus # Local Variables: # mode: shell-script -# sh-indentation: 3 +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" # End: -# mkinstalldirs ends here Index: mod_admserv.c =================================================================== RCS file: /cvs/dirsec/mod_admserv/mod_admserv.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- mod_admserv.c 8 Aug 2006 20:04:43 -0000 1.27 +++ mod_admserv.c 15 Nov 2006 21:31:40 -0000 1.28 @@ -1,4 +1,7 @@ -/* Copyright 2002-2004 The Apache Software Foundation +/** BEGIN COPYRIGHT BLOCK + * + * Copyright (C) 2005 Red Hat, Inc. + * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -11,7 +14,8 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - */ + * + * END COPYRIGHT BLOCK **/ /* * mod_admserv.c: Provides communication link between Console and Directory. Index: mod_admserv.h =================================================================== RCS file: /cvs/dirsec/mod_admserv/mod_admserv.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mod_admserv.h 27 Jun 2005 20:40:12 -0000 1.3 +++ mod_admserv.h 15 Nov 2006 21:31:40 -0000 1.4 @@ -2,6 +2,19 @@ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. * Copyright (C) 2005 Red Hat, Inc. * All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * * END COPYRIGHT BLOCK **/ /************************************************************/ /* */ --- AUTHORS DELETED --- --- COPYING DELETED --- --- INSTALL DELETED --- --- NEWS DELETED --- From fedora-directory-commits at redhat.com Thu Nov 16 18:56:06 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 16 Nov 2006 11:56:06 -0700 Subject: [Fedora-directory-commits] ldapserver Makefile.am, 1.13, 1.14 Makefile.in, 1.14, 1.15 configure, 1.13, 1.14 install-sh, 1.4, 1.5 compile, 1.4, 1.5 aclocal.m4, 1.5, 1.6 depcomp, 1.4, 1.5 missing, 1.4, 1.5 Message-ID: <200611161856.kAGIu67x027941@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27806/ldapserver Modified Files: Makefile.am Makefile.in configure install-sh compile aclocal.m4 depcomp missing Log Message: Resolves: bug 215995 Bug Description: autoconf build needs to link replication plugin with libdb Reviewed by: nhosoi (Thanks!) Fix Description: Add $(DB_LINK) to the replication plugin in Makefile.am Platforms tested: RHEL4/FC5 Flag Day: no Doc impact: no Index: Makefile.am =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.am,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- Makefile.am 15 Nov 2006 17:17:37 -0000 1.13 +++ Makefile.am 16 Nov 2006 18:56:03 -0000 1.14 @@ -681,7 +681,7 @@ ldap/servers/plugins/replication/windows_tot_protocol.c libreplication_plugin_la_CPPFLAGS = @icu_inc@ @db_inc@ $(PLUGIN_CPPFLAGS) -libreplication_plugin_la_LIBADD = $(ICU_LINK) +libreplication_plugin_la_LIBADD = $(ICU_LINK) $(DB_LINK) #------------------------ # libretrocl-plugin Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.in,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- Makefile.in 15 Nov 2006 17:17:37 -0000 1.14 +++ Makefile.in 16 Nov 2006 18:56:03 -0000 1.15 @@ -350,7 +350,8 @@ libreferint_plugin_la_LIBADD = am_libreferint_plugin_la_OBJECTS = ldap/servers/plugins/referint/libreferint_plugin_la-referint.lo libreferint_plugin_la_OBJECTS = $(am_libreferint_plugin_la_OBJECTS) -libreplication_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +libreplication_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) am_libreplication_plugin_la_OBJECTS = ldap/servers/plugins/replication/libreplication_plugin_la-cl5_api.lo \ ldap/servers/plugins/replication/libreplication_plugin_la-cl5_clcache.lo \ ldap/servers/plugins/replication/libreplication_plugin_la-cl5_config.lo \ @@ -1543,7 +1544,7 @@ ldap/servers/plugins/replication/windows_tot_protocol.c libreplication_plugin_la_CPPFLAGS = @icu_inc@ @db_inc@ $(PLUGIN_CPPFLAGS) -libreplication_plugin_la_LIBADD = $(ICU_LINK) +libreplication_plugin_la_LIBADD = $(ICU_LINK) $(DB_LINK) #------------------------ # libretrocl-plugin