fa9c485527
* Thu Oct 23 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.22-8 - add another section to the ABI note for the TLS libdb so that it's marked as not needing an executable stack (from Arjan Van de Ven) * Thu Oct 16 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.22-7 - force bundled libdb to not use O_DIRECT by making it forget that we have it * Wed Oct 15 2003 Nalin Dahyabhai <nalin@redhat.com> - build bundled libdb for slapd dynamically to make the package smaller, among other things - on tls-capable arches, build libdb both with and without shared posix mutexes, otherwise just without - disable posix mutexes unconditionally for db 4.0, which shouldn't need them for the migration cases where it's used - update to MigrationTools 45 * Fri Sep 12 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.22-6 - drop rfc822-MailMember.schema, merged into upstream misc.schema at some point * Wed Aug 27 2003 Nalin Dahyabhai <nalin@redhat.com> - actually require newer libtool, as was intended back in 2.1.22-0, noted as missed by Jim Richardson * Fri Jul 25 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.22-5 - enable rlookups, they don't cost anything unless also enabled in slapd's configuration file * Tue Jul 22 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.22-4 - rebuild * Thu Jul 17 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.22-3 - rebuild * Wed Jul 16 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.22-2 - rebuild * Tue Jul 15 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.22-1 - build * Mon Jul 14 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.22-0 - 2.1.22 now badged stable - be more aggressive in what we index by default - use/require libtool 1.5 * Mon Jun 30 2003 Nalin Dahyabhai <nalin@redhat.com> - update to 2.1.22 * Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com> - rebuilt * Tue Jun 03 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.21-1 - update to 2.1.21 - enable ldap, meta, monitor, null, rewrite in slapd * Mon May 19 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.20-1 - update to 2.1.20 * Thu May 08 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.19-1 - update to 2.1.19 * Mon May 05 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.17-1 - switch to db with crypto * Fri May 02 2003 Nalin Dahyabhai <nalin@redhat.com> - install the db utils for the bundled libdb as %{_sbindir}/slapd_db_* - install slapcat/slapadd from 2.0.x for migration purposes * Wed Apr 30 2003 Nalin Dahyabhai <nalin@redhat.com> - update to 2.1.17 - disable the shell backend, not expected to work well with threads - drop the kerberosSecurityObject schema, the krbName attribute it contains is only used if slapd is built with v2 kbind support
104 lines
3.4 KiB
Diff
104 lines
3.4 KiB
Diff
Allow the calling user to pass in arguments to ldapadd/ldapmodify.
|
|
|
|
--- MigrationTools-27/migrate_all_online.sh Tue Oct 31 17:01:24 2000
|
|
+++ MigrationTools-27/migrate_all_online.sh Tue Oct 31 17:03:19 2000
|
|
@@ -181,13 +181,11 @@
|
|
|
|
echo "Importing into LDAP..."
|
|
|
|
- if [ -x /usr/sbin/slapadd ]; then
|
|
- $LDAPADD -x -h $LDAPHOST -D "$LDAP_BINDDN" -w "$LDAP_BINDCRED" -f $DB
|
|
- elif [ -x /usr/local/sbin/slapadd ]; then
|
|
- $LDAPADD -x -h $LDAPHOST -D "$LDAP_BINDDN" -w "$LDAP_BINDCRED" -f $DB
|
|
- else
|
|
- $LDAPADD -h $LDAPHOST -D "$LDAP_BINDDN" -w "$LDAP_BINDCRED" -f $DB
|
|
- fi
|
|
+if [ `basename $LDAPADD` = "slapadd" ]; then
|
|
+ $LDAPADD -h $LDAPHOST -D "$LDAP_BINDDN" -w "$LDAP_BINDCRED" "$@" -f $DB
|
|
+else
|
|
+ $LDAPADD -x -h $LDAPHOST -D "$LDAP_BINDDN" -w "$LDAP_BINDCRED" "$@" -f $DB
|
|
+fi
|
|
|
|
if [ $? -ne 0 ]; then
|
|
echo "$LDAPADD: returned non-zero exit status"
|
|
--- MigrationTools-27/migrate_all_nis_online.sh Tue Oct 31 17:01:24 2000
|
|
+++ MigrationTools-27/migrate_all_nis_online.sh Tue Oct 31 17:02:51 2000
|
|
@@ -71,7 +71,7 @@
|
|
ypcat $DOMFLAG networks > $ETC_NETWORKS
|
|
#ypcat $DOMFLAG -k aliases > $ETC_ALIASES
|
|
|
|
-. ${INSTDIR}migrate_all_online.sh
|
|
+. ${INSTDIR}migrate_all_online.sh "$@"
|
|
|
|
rm -f $ETC_PASSWD
|
|
rm -f $ETC_GROUP
|
|
--- MigrationTools-27/migrate_all_offline.sh Tue Oct 31 17:02:00 2000
|
|
+++ MigrationTools-27/migrate_all_offline.sh Tue Oct 31 17:03:12 2000
|
|
@@ -137,9 +137,9 @@
|
|
$PERL -I${INSTDIR} ${INSTDIR}migrate_netgroup_byhost.pl $ETC_NETGROUP >> $DB
|
|
echo "Preparing LDAP database..."
|
|
if [ "X$SLAPADD" = "X" ]; then
|
|
- $LDIF2LDBM -i $DB
|
|
+ $LDIF2LDBM -i $DB "$@"
|
|
else
|
|
- $SLAPADD -l $DB
|
|
+ $SLAPADD -l $DB "$@"
|
|
fi
|
|
EXITCODE=$?
|
|
|
|
--- MigrationTools-27/migrate_all_nis_offline.sh Tue Oct 31 17:02:05 2000
|
|
+++ MigrationTools-27/migrate_all_nis_offline.sh Tue Oct 31 17:02:49 2000
|
|
@@ -71,7 +71,7 @@
|
|
ypcat $DOMFLAG networks > $ETC_NETWORKS
|
|
#ypcat $DOMFLAG -k aliases > $ETC_ALIASES
|
|
|
|
-. ${INSTDIR}migrate_all_offline.sh
|
|
+. ${INSTDIR}migrate_all_offline.sh "$@"
|
|
|
|
rm -f $ETC_PASSWD
|
|
rm -f $ETC_GROUP
|
|
--- MigrationTools-27/migrate_all_nisplus_online.sh Tue Oct 31 17:02:11 2000
|
|
+++ MigrationTools-27/migrate_all_nisplus_online.sh Tue Oct 31 17:02:59 2000
|
|
@@ -62,7 +62,7 @@
|
|
niscat networks.org_dir > $ETC_NETWORKS
|
|
niscat mail_aliases.org_dir > $ETC_ALIASES
|
|
|
|
-. ${INSTDIR}migrate_all_online.sh
|
|
+. ${INSTDIR}migrate_all_online.sh "$@"
|
|
|
|
rm -f $ETC_PASSWD
|
|
rm -f $ETC_GROUP
|
|
--- MigrationTools-27/migrate_all_netinfo_online.sh Tue Oct 31 17:02:17 2000
|
|
+++ MigrationTools-27/migrate_all_netinfo_online.sh Tue Oct 31 17:02:46 2000
|
|
@@ -69,7 +69,7 @@
|
|
nidump networks $DOM > $ETC_NETWORKS
|
|
nidump aliases $DOM > $ETC_ALIASES
|
|
|
|
-. ${INSTDIR}migrate_all_online.sh
|
|
+. ${INSTDIR}migrate_all_online.sh "$@"
|
|
|
|
rm -f $ETC_PASSWD
|
|
rm -f $ETC_GROUP
|
|
--- MigrationTools-27/migrate_all_netinfo_offline.sh Tue Oct 31 17:02:22 2000
|
|
+++ MigrationTools-27/migrate_all_netinfo_offline.sh Tue Oct 31 17:02:43 2000
|
|
@@ -69,7 +69,7 @@
|
|
nidump networks $DOM > $ETC_NETWORKS
|
|
nidump aliases $DOM > $ETC_ALIASES
|
|
|
|
-. ${INSTDIR}migrate_all_offline.sh
|
|
+. ${INSTDIR}migrate_all_offline.sh "$@"
|
|
|
|
rm -f $ETC_PASSWD
|
|
rm -f $ETC_GROUP
|
|
--- MigrationTools-27/migrate_all_nisplus_offline.sh Tue Oct 31 17:02:27 2000
|
|
+++ MigrationTools-27/migrate_all_nisplus_offline.sh Tue Oct 31 17:02:56 2000
|
|
@@ -62,7 +62,7 @@
|
|
niscat networks.org_dir > $ETC_NETWORKS
|
|
niscat mail_aliases.org_dir > $ETC_ALIASES
|
|
|
|
-. ${INSTDIR}migrate_all_offline.sh
|
|
+. ${INSTDIR}migrate_all_offline.sh "$@"
|
|
|
|
rm -f $ETC_PASSWD
|
|
rm -f $ETC_GROUP
|