9bfe3cbb88
* Fri Mar 02 2001 Nalin Dahyabhai <nalin@redhat.com> - rebuild in new environment * Thu Feb 08 2001 Nalin Dahyabhai <nalin@redhat.com> - back out pidfile patches, which interact weirdly with Linux threads - mark non-standard schema as such by moving them to a different directory * Mon Feb 05 2001 Nalin Dahyabhai <nalin@redhat.com> - update to MigrationTools 36, adds netgroup support * Mon Jan 29 2001 Nalin Dahyabhai <nalin@redhat.com> - fix thinko in that last patch * Thu Jan 25 2001 Nalin Dahyabhai <nalin@redhat.com> - try to work around some buffering problems * Tue Jan 23 2001 Nalin Dahyabhai <nalin@redhat.com> - gettextize the init script * Thu Jan 18 2001 Nalin Dahyabhai <nalin@redhat.com> - gettextize the init script * Fri Jan 12 2001 Nalin Dahyabhai <nalin@redhat.com> - move the RFCs to the base package (#21701) - update to MigrationTools 34 * Wed Jan 10 2001 Nalin Dahyabhai <nalin@redhat.com> - add support for additional OPTIONS, SLAPD_OPTIONS, and SLURPD_OPTIONS in a /etc/sysconfig/ldap file (#23549) * Fri Dec 29 2000 Nalin Dahyabhai <nalin@redhat.com> - change automount object OID from 1.3.6.1.1.1.2.9 to 1.3.6.1.1.1.2.13, per mail from the ldap-nis mailing list * Tue Dec 05 2000 Nalin Dahyabhai <nalin@redhat.com> - force -fPIC so that shared libraries don't fall over * Mon Dec 04 2000 Nalin Dahyabhai <nalin@redhat.com> - add Norbert Klasen's patch (via Del) to fix searches using ldaps URLs (OpenLDAP ITS #889) - add "-h ldaps:///" to server init when TLS is enabled, in order to support ldaps in addition to the regular STARTTLS (suggested by Del) * Mon Nov 27 2000 Nalin Dahyabhai <nalin@redhat.com> - correct mismatched-dn-cn bug in migrate_automount.pl * Mon Nov 20 2000 Nalin Dahyabhai <nalin@redhat.com> - update to the correct OIDs for automount and automountInformation - add notes on upgrading * Tue Nov 07 2000 Nalin Dahyabhai <nalin@redhat.com> - update to 2.0.7 - drop chdir patch (went mainstream) * Thu Nov 02 2000 Nalin Dahyabhai <nalin@redhat.com> - change automount object classes from auxiliary to structural * Tue Oct 31 2000 Nalin Dahyabhai <nalin@redhat.com> - update to Migration Tools 27 - change the sense of the last simple patch * Wed Oct 25 2000 Nalin Dahyabhai <nalin@redhat.com> - reorganize the patch list to separate MigrationTools and OpenLDAP patches - switch to Luke Howard's rfc822MailMember schema instead of the aliases.schema - configure slapd to run as the non-root user "ldap" (#19370) - chdir() before chroot() (we don't use chroot, though) (#19369) - disable saving of the pid file because the parent thread which saves it and the child thread which listens have different pids
102 lines
3.4 KiB
Diff
102 lines
3.4 KiB
Diff
--- MigrationTools-27/migrate_all_online.sh.simple 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.simple 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.simple 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.simple 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.simple 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.simple 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.simple 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.simple 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
|