--- /dev/null
+Try adding the top-level object, which may be missing, but don't worry if
+the add operation fails.
+--- MigrationTools-26/migrate_all_online.sh Wed Oct 25 16:27:02 2000
++++ MigrationTools-26/migrate_all_online.sh Wed Oct 25 16:30:11 2000
+@@ -179,5 +179,30 @@
+ echo "Migrating netgroups (by host)..."
+ $PERL -I${INSTDIR} ${INSTDIR}migrate_netgroup_byhost.pl $ETC_NETGROUP >> $DB
+
++# Try to add the top-level object, because it's usually missing.
++TYPE=`echo $LDAP_BASEDN | cut -f1 -d=`
++TOP=`echo $LDAP_BASEDN | cut -f1 -d, | cut -f2 -d=`
++CLASS=$TYPE
++if [ "$CLASS" = "dc" ] ; then
++ CLASS=domain
++elif [ "$CLASS" = "o" ] ; then
++ CLASS=organization
++elif [ "$CLASS" = "l" ] ; then
++ CLASS=locality
++elif [ "$CLASS" = "c" ] ; then
++ CLASS=country
++elif [ "$CLASS" = "nismapname" ] ; then
++ CLASS=nisMap
++elif [ "$CLASS" = "cn" ] ; then
++ CLASS=container
++fi
++
++cat << EOF | $LDAPADD -h $LDAPHOST -D "$LDAP_BINDDN" -x -w "$LDAP_BINDCRED"
++dn: $LDAP_BASEDN
++$TYPE: $TOP
++objectClass: top
++objectClass: $CLASS
++EOF
++
+ echo "Importing into LDAP..."
+
--- /dev/null
+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
--- /dev/null
+Use mktemp to generate temporary files.
+
+--- MigrationTools-36/migrate_all_netinfo_offline.sh Mon Feb 5 11:39:14 2001
++++ MigrationTools-36/migrate_all_netinfo_offline.sh Mon Feb 5 11:39:14 2001
+@@ -41,15 +41,15 @@
+ INSTDIR=/usr/share/openldap/migration/
+
+ TMPDIR="/tmp"
+-ETC_PASSWD="$TMPDIR/passwd.$$.ldap"
+-ETC_GROUP="$TMPDIR/group.$$.ldap"
+-ETC_SERVICES="$TMPDIR/services.$$.ldap"
+-ETC_PROTOCOLS="$TMPDIR/protocols.$$.ldap"
+-ETC_FSTAB="$TMPDIR/fstab.$$.ldap"
+-ETC_RPC="$TMPDIR/rpc.$$.ldap"
+-ETC_HOSTS="$TMPDIR/hosts.$$.ldap"
+-ETC_NETWORKS="$TMPDIR/networks.$$.ldap"
+-ETC_ALIASES="$TMPDIR/aliases.$$.ldap"
++ETC_PASSWD=`mktemp $TMPDIR/passwd.ldap.XXXXXX`
++ETC_GROUP=`mktemp $TMPDIR/group.ldap.XXXXXX`
++ETC_SERVICES=`mktemp $TMPDIR/services.ldap.XXXXXX`
++ETC_PROTOCOLS=`mktemp $TMPDIR/protocols.ldap.XXXXXX`
++ETC_FSTAB=`mktemp $TMPDIR/fstab.ldap.XXXXXX`
++ETC_RPC=`mktemp $TMPDIR/rpc.ldap.XXXXXX`
++ETC_HOSTS=`mktemp $TMPDIR/hosts.ldap.XXXXXX`
++ETC_NETWORKS=`mktemp $TMPDIR/networks.ldap.XXXXXX`
++ETC_ALIASES=`mktemp $TMPDIR/aliases.ldap.XXXXXX`
+ EXIT=no
+
+ question="Enter the NetInfo domain to import from [/]:"
+--- MigrationTools-36/migrate_all_netinfo_online.sh Mon Feb 5 11:39:14 2001
++++ MigrationTools-36/migrate_all_netinfo_online.sh Mon Feb 5 11:39:14 2001
+@@ -41,15 +41,15 @@
+ INSTDIR=/usr/share/openldap/migration/
+
+ TMPDIR="/tmp"
+-ETC_PASSWD="$TMPDIR/passwd.$$.ldap"
+-ETC_GROUP="$TMPDIR/group.$$.ldap"
+-ETC_SERVICES="$TMPDIR/services.$$.ldap"
+-ETC_PROTOCOLS="$TMPDIR/protocols.$$.ldap"
+-ETC_FSTAB="$TMPDIR/fstab.$$.ldap"
+-ETC_RPC="$TMPDIR/rpc.$$.ldap"
+-ETC_HOSTS="$TMPDIR/hosts.$$.ldap"
+-ETC_NETWORKS="$TMPDIR/networks.$$.ldap"
+-ETC_ALIASES="$TMPDIR/aliases.$$.ldap"
++ETC_PASSWD=`mktemp $TMPDIR/passwd.ldap.XXXXXX`
++ETC_GROUP=`mktemp $TMPDIR/group.ldap.XXXXXX`
++ETC_SERVICES=`mktemp $TMPDIR/services.ldap.XXXXXX`
++ETC_PROTOCOLS=`mktemp $TMPDIR/protocols.ldap.XXXXXX`
++ETC_FSTAB=`mktemp $TMPDIR/fstab.ldap.XXXXXX`
++ETC_RPC=`mktemp $TMPDIR/rpc.ldap.XXXXXX`
++ETC_HOSTS=`mktemp $TMPDIR/hosts.ldap.XXXXXX`
++ETC_NETWORKS=`mktemp $TMPDIR/networks.ldap.XXXXXX`
++ETC_ALIASES=`mktemp $TMPDIR/aliases.ldap.XXXXXX`
+ EXIT=no
+
+ question="Enter the NetInfo domain to import from [/]:"
+--- MigrationTools-36/migrate_all_nisplus_offline.sh Mon Feb 5 11:39:14 2001
++++ MigrationTools-36/migrate_all_nisplus_offline.sh Mon Feb 5 11:43:23 2001
+@@ -41,16 +41,16 @@
+ INSTDIR=/usr/share/openldap/migration/
+
+ TMPDIR="/tmp"
+-ETC_PASSWD="$TMPDIR/passwd.$$.ldap"
+-ETC_GROUP="$TMPDIR/group.$$.ldap"
+-ETC_SERVICES="$TMPDIR/services.$$.ldap"
+-ETC_PROTOCOLS="$TMPDIR/protocols.$$.ldap"
+-ETC_FSTAB="$TMPDIR/fstab.$$.ldap"
+-ETC_RPC="$TMPDIR/rpc.$$.ldap"
+-ETC_HOSTS="$TMPDIR/hosts.$$.ldap"
+-ETC_NETWORKS="$TMPDIR/networks.$$.ldap"
+-ETC_NETGROUP="$TMPDIR/netgroup.$$.ldap"
+-ETC_ALIASES="$TMPDIR/aliases.$$.ldap"
++ETC_PASSWD=`mktemp $TMPDIR/passwd.ldap.XXXXXX`
++ETC_GROUP=`mktemp $TMPDIR/group.ldap.XXXXXX`
++ETC_SERVICES=`mktemp $TMPDIR/services.ldap.XXXXXX`
++ETC_PROTOCOLS=`mktemp $TMPDIR/protocols.ldap.XXXXXX`
++ETC_FSTAB=`mktemp $TMPDIR/fstab.ldap.XXXXXX`
++ETC_RPC=`mktemp $TMPDIR/rpc.ldap.XXXXXX`
++ETC_HOSTS=`mktemp $TMPDIR/hosts.ldap.XXXXXX`
++ETC_NETWORKS=`mktemp $TMPDIR/networks.ldap.XXXXXX`
++ETC_NETGROUP=`mktemp $TMPDIR/netgroup.ldap.XXXXXX`
++ETC_ALIASES=`mktemp $TMPDIR/aliases.ldap.XXXXXX`
+ EXIT=no
+
+ question="Enter the NIS+ domain to import from (optional): "
+--- MigrationTools-36/migrate_all_nisplus_online.sh Mon Feb 5 11:39:14 2001
++++ MigrationTools-36/migrate_all_nisplus_online.sh Mon Feb 5 11:45:18 2001
+@@ -41,16 +41,16 @@
+ INSTDIR=/usr/share/openldap/migration/
+
+ TMPDIR="/tmp"
+-ETC_PASSWD="$TMPDIR/passwd.$$.ldap"
+-ETC_GROUP="$TMPDIR/group.$$.ldap"
+-ETC_SERVICES="$TMPDIR/services.$$.ldap"
+-ETC_PROTOCOLS="$TMPDIR/protocols.$$.ldap"
+-ETC_FSTAB="$TMPDIR/fstab.$$.ldap"
+-ETC_RPC="$TMPDIR/rpc.$$.ldap"
+-ETC_HOSTS="$TMPDIR/hosts.$$.ldap"
+-ETC_NETWORKS="$TMPDIR/networks.$$.ldap"
+-ETC_NETGROUP="$TMPDIR/netgroup.$$.ldap"
+-ETC_ALIASES="$TMPDIR/aliases.$$.ldap"
++ETC_PASSWD=`mktemp $TMPDIR/passwd.ldap.XXXXXX`
++ETC_GROUP=`mktemp $TMPDIR/group.ldap.XXXXXX`
++ETC_SERVICES=`mktemp $TMPDIR/services.ldap.XXXXXX`
++ETC_PROTOCOLS=`mktemp $TMPDIR/protocols.ldap.XXXXXX`
++ETC_FSTAB=`mktemp $TMPDIR/fstab.ldap.XXXXXX`
++ETC_RPC=`mktemp $TMPDIR/rpc.ldap.XXXXXX`
++ETC_HOSTS=`mktemp $TMPDIR/hosts.ldap.XXXXXX`
++ETC_NETWORKS=`mktemp $TMPDIR/networks.ldap.XXXXXX`
++ETC_NETGROUP=`mktemp $TMPDIR/netgroup.ldap.XXXXXX`
++ETC_ALIASES=`mktemp $TMPDIR/aliases.ldap.XXXXXX`
+ EXIT=no
+
+ question="Enter the NIS+ domain to import from (optional): "
+--- MigrationTools-36/migrate_all_offline.sh Mon Feb 5 11:39:14 2001
++++ MigrationTools-36/migrate_all_offline.sh Mon Feb 5 11:39:14 2001
+@@ -42,7 +42,7 @@
+ #
+
+ INSTDIR=/usr/share/openldap/migration/
+-DB="/tmp/nis.$$.ldif"
++DB=`mktemp /tmp/nis.ldif.XXXXXX`
+
+ if [ "X$ETC_ALIASES" = "X" ]; then
+ ETC_ALIASES=/etc/aliases
+--- MigrationTools-36/migrate_all_online.sh Mon Feb 5 11:39:14 2001
++++ MigrationTools-36/migrate_all_online.sh Mon Feb 5 11:39:14 2001
+@@ -40,7 +40,7 @@
+
+ INSTDIR=/usr/share/openldap/migration/
+
+-DB=/tmp/nis.$$.ldif
++DB=`mktemp /tmp/nis.ldif.XXXXXX`
+
+ if [ "X$ETC_ALIASES" = "X" ]; then
+ ETC_ALIASES=/etc/aliases
+--- MigrationTools-36/migrate_all_nis_offline.sh Mon Feb 5 11:39:14 2001
++++ MigrationTools-36/migrate_all_nis_offline.sh Mon Feb 5 11:39:14 2001
+@@ -41,15 +41,15 @@
+ INSTDIR=/usr/share/openldap/migration/
+
+ TMPDIR="/tmp"
+-ETC_PASSWD="$TMPDIR/passwd.$$.ldap"
+-ETC_GROUP="$TMPDIR/group.$$.ldap"
+-ETC_SERVICES="$TMPDIR/services.$$.ldap"
+-ETC_PROTOCOLS="$TMPDIR/protocols.$$.ldap"
+-ETC_FSTAB="$TMPDIR/fstab.$$.ldap"
+-ETC_RPC="$TMPDIR/rpc.$$.ldap"
+-ETC_HOSTS="$TMPDIR/hosts.$$.ldap"
+-ETC_NETWORKS="$TMPDIR/networks.$$.ldap"
+-ETC_ALIASES="$TMPDIR/aliases.$$.ldap"
++ETC_PASSWD=`mktemp $TMPDIR/passwd.ldap.XXXXXX`
++ETC_GROUP=`mktemp $TMPDIR/group.ldap.XXXXXX`
++ETC_SERVICES=`mktemp $TMPDIR/services.ldap.XXXXXX`
++ETC_PROTOCOLS=`mktemp $TMPDIR/protocols.ldap.XXXXXX`
++ETC_FSTAB=`mktemp $TMPDIR/fstab.ldap.XXXXXX`
++ETC_RPC=`mktemp $TMPDIR/rpc.ldap.XXXXXX`
++ETC_HOSTS=`mktemp $TMPDIR/hosts.ldap.XXXXXX`
++ETC_NETWORKS=`mktemp $TMPDIR/networks.ldap.XXXXXX`
++ETC_ALIASES=`mktemp $TMPDIR/aliases.ldap.XXXXXX`
+ EXIT=no
+
+ question="Enter the NIS domain to import from (optional): "
+--- MigrationTools-36/migrate_all_nis_online.sh Mon Feb 5 11:39:14 2001
++++ MigrationTools-36/migrate_all_nis_online.sh Mon Feb 5 11:39:14 2001
+@@ -41,15 +41,15 @@
+ INSTDIR=/usr/share/openldap/migration/
+
+ TMPDIR="/tmp"
+-ETC_PASSWD="$TMPDIR/passwd.$$.ldap"
+-ETC_GROUP="$TMPDIR/group.$$.ldap"
+-ETC_SERVICES="$TMPDIR/services.$$.ldap"
+-ETC_PROTOCOLS="$TMPDIR/protocols.$$.ldap"
+-ETC_FSTAB="$TMPDIR/fstab.$$.ldap"
+-ETC_RPC="$TMPDIR/rpc.$$.ldap"
+-ETC_HOSTS="$TMPDIR/hosts.$$.ldap"
+-ETC_NETWORKS="$TMPDIR/networks.$$.ldap"
+-ETC_ALIASES="$TMPDIR/aliases.$$.ldap"
++ETC_PASSWD=`mktemp $TMPDIR/passwd.ldap.XXXXXX`
++ETC_GROUP=`mktemp $TMPDIR/group.ldap.XXXXXX`
++ETC_SERVICES=`mktemp $TMPDIR/services.ldap.XXXXXX`
++ETC_PROTOCOLS=`mktemp $TMPDIR/protocols.ldap.XXXXXX`
++ETC_FSTAB=`mktemp $TMPDIR/fstab.ldap.XXXXXX`
++ETC_RPC=`mktemp $TMPDIR/rpc.ldap.XXXXXX`
++ETC_HOSTS=`mktemp $TMPDIR/hosts.ldap.XXXXXX`
++ETC_NETWORKS=`mktemp $TMPDIR/networks.ldap.XXXXXX`
++ETC_ALIASES=`mktemp $TMPDIR/aliases.ldap.XXXXXX`
+ EXIT=no
+
+ question="Enter the NIS domain to import from (optional): "
--- /dev/null
+We know where these scripts are going to be installed, so add the necessary
+magic to let them be called from anywhere.
+
+--- MigrationTools-38/migrate_all_netinfo_offline.sh Thu Jul 16 07:51:12 1998
++++ MigrationTools-38/migrate_all_netinfo_offline.sh Wed Jun 20 18:19:17 2001
+@@ -38,6 +38,7 @@
+
+ PATH=$PATH:.
+ export PATH
++INSTDIR=/usr/share/openldap/migration/
+
+ TMPDIR="/tmp"
+ ETC_PASSWD="$TMPDIR/passwd.$$.ldap"
+@@ -68,7 +69,7 @@
+ nidump networks $DOM > $ETC_NETWORKS
+ nidump aliases $DOM > $ETC_ALIASES
+
+-. migrate_all_offline.sh
++. ${INSTDIR}migrate_all_offline.sh
+
+ rm -f $ETC_PASSWD
+ rm -f $ETC_GROUP
+--- MigrationTools-38/migrate_all_netinfo_online.sh Thu Jul 16 07:51:12 1998
++++ MigrationTools-38/migrate_all_netinfo_online.sh Wed Jun 20 18:19:17 2001
+@@ -38,6 +38,7 @@
+
+ PATH=$PATH:.
+ export PATH
++INSTDIR=/usr/share/openldap/migration/
+
+ TMPDIR="/tmp"
+ ETC_PASSWD="$TMPDIR/passwd.$$.ldap"
+@@ -68,7 +69,7 @@
+ nidump networks $DOM > $ETC_NETWORKS
+ nidump aliases $DOM > $ETC_ALIASES
+
+-. migrate_all_online.sh
++. ${INSTDIR}migrate_all_online.sh
+
+ rm -f $ETC_PASSWD
+ rm -f $ETC_GROUP
+--- MigrationTools-38/migrate_all_nis_offline.sh Thu Jul 16 07:51:12 1998
++++ MigrationTools-38/migrate_all_nis_offline.sh Wed Jun 20 18:19:17 2001
+@@ -38,6 +38,7 @@
+
+ PATH=$PATH:.
+ export PATH
++INSTDIR=/usr/share/openldap/migration/
+
+ TMPDIR="/tmp"
+ ETC_PASSWD="$TMPDIR/passwd.$$.ldap"
+@@ -70,7 +71,7 @@
+ ypcat $DOMFLAG networks > $ETC_NETWORKS
+ #ypcat $DOMFLAG -k aliases > $ETC_ALIASES
+
+-. migrate_all_offline.sh
++. ${INSTDIR}migrate_all_offline.sh
+
+ rm -f $ETC_PASSWD
+ rm -f $ETC_GROUP
+--- MigrationTools-38/migrate_all_nis_online.sh Thu Jul 16 07:51:12 1998
++++ MigrationTools-38/migrate_all_nis_online.sh Wed Jun 20 18:19:17 2001
+@@ -38,7 +38,7 @@
+
+ PATH=$PATH:.
+ export PATH
+-
++INSTDIR=/usr/share/openldap/migration/
+
+ TMPDIR="/tmp"
+ ETC_PASSWD="$TMPDIR/passwd.$$.ldap"
+@@ -71,7 +71,7 @@
+ ypcat $DOMFLAG networks > $ETC_NETWORKS
+ #ypcat $DOMFLAG -k aliases > $ETC_ALIASES
+
+-. migrate_all_online.sh
++. ${INSTDIR}migrate_all_online.sh
+
+ rm -f $ETC_PASSWD
+ rm -f $ETC_GROUP
+--- MigrationTools-38/migrate_all_nisplus_offline.sh Fri Feb 2 09:20:56 2001
++++ MigrationTools-38/migrate_all_nisplus_offline.sh Wed Jun 20 18:19:17 2001
+@@ -38,6 +38,7 @@
+
+ PATH=$PATH:/usr/lib/nis:.
+ export PATH
++INSTDIR=/usr/share/openldap/migration/
+
+ TMPDIR="/tmp"
+ ETC_PASSWD="$TMPDIR/passwd.$$.ldap"
+@@ -72,7 +73,7 @@
+ nisaddent -d netgroup $DOM > $ETC_NETGROUP
+ niscat mail_aliases.org_dir.$DOM > $ETC_ALIASES
+
+-. migrate_all_offline.sh
++. ${INSTDIR}migrate_all_offline.sh
+
+ rm -f $ETC_PASSWD
+ rm -f $ETC_GROUP
+--- MigrationTools-38/migrate_all_nisplus_online.sh Fri Feb 2 09:20:56 2001
++++ MigrationTools-38/migrate_all_nisplus_online.sh Wed Jun 20 18:19:17 2001
+@@ -38,7 +38,7 @@
+
+ PATH=$PATH:.
+ export PATH
+-
++INSTDIR=/usr/share/openldap/migration/
+
+ TMPDIR="/tmp"
+ ETC_PASSWD="$TMPDIR/passwd.$$.ldap"
+@@ -73,7 +73,7 @@
+ nisaddent -d netgroup $DOM > $ETC_NETGROUP
+ niscat mail_aliases.org_dir.$DOM > $ETC_ALIASES
+
+-. migrate_all_online.sh
++. ${INSTDIR}migrate_all_online.sh
+
+ rm -f $ETC_PASSWD
+ rm -f $ETC_GROUP
+--- MigrationTools-38/migrate_all_offline.sh Tue Oct 17 02:33:33 2000
++++ MigrationTools-38/migrate_all_offline.sh Wed Jun 20 18:19:17 2001
+@@ -41,6 +41,7 @@
+ # Luke Howard <lukeh@padl.com> April 1997
+ #
+
++INSTDIR=/usr/share/openldap/migration/
+ DB="/tmp/nis.$$.ldif"
+
+ if [ "X$ETC_ALIASES" = "X" ]; then
+@@ -108,32 +109,32 @@
+ fi
+
+ echo "Creating naming context entries..."
+-$PERL migrate_base.pl > $DB
++$PERL -I${INSTDIR} ${INSTDIR}migrate_base.pl > $DB
+ echo "Migrating aliases..."
+-$PERL migrate_aliases.pl $ETC_ALIASES >> $DB
++$PERL -I${INSTDIR} ${INSTDIR}migrate_aliases.pl $ETC_ALIASES >> $DB
+ #echo "Migrating fstab..."
+-#$PERL migrate_fstab.pl $ETC_FSTAB >> $DB
++#$PERL -I${INSTDIR} ${INSTDIR}migrate_fstab.pl $ETC_FSTAB >> $DB
+ echo "Migrating groups..."
+-$PERL migrate_group.pl $ETC_GROUP >> $DB
++$PERL -I${INSTDIR} ${INSTDIR}migrate_group.pl $ETC_GROUP >> $DB
+ echo "Migrating hosts..."
+-$PERL migrate_hosts.pl $ETC_HOSTS >> $DB
++$PERL -I${INSTDIR} ${INSTDIR}migrate_hosts.pl $ETC_HOSTS >> $DB
+ echo "Migrating networks..."
+-$PERL migrate_networks.pl $ETC_NETWORKS >> $DB
++$PERL -I${INSTDIR} ${INSTDIR}migrate_networks.pl $ETC_NETWORKS >> $DB
+ echo "Migrating users..."
+-$PERL migrate_passwd.pl $ETC_PASSWD >> $DB
++$PERL -I${INSTDIR} ${INSTDIR}migrate_passwd.pl $ETC_PASSWD >> $DB
+ echo "Migrating protocols..."
+-$PERL migrate_protocols.pl $ETC_PROTOCOLS >> $DB
++$PERL -I${INSTDIR} ${INSTDIR}migrate_protocols.pl $ETC_PROTOCOLS >> $DB
+ echo "Migrating rpcs..."
+-$PERL migrate_rpc.pl $ETC_RPC >> $DB
++$PERL -I${INSTDIR} ${INSTDIR}migrate_rpc.pl $ETC_RPC >> $DB
+ echo "Migrating services..."
+-$PERL migrate_services.pl $ETC_SERVICES >> $DB
++$PERL -I${INSTDIR} ${INSTDIR}migrate_services.pl $ETC_SERVICES >> $DB
+ echo "Migrating netgroups..."
+-$PERL migrate_netgroup.pl $ETC_NETGROUP >> $DB
++$PERL -I${INSTDIR} ${INSTDIR}migrate_netgroup.pl $ETC_NETGROUP >> $DB
+ echo "Importing into LDAP..."
+ echo "Migrating netgroups (by user)..."
+-$PERL migrate_netgroup_byuser.pl $ETC_NETGROUP >> $DB
++$PERL -I${INSTDIR} ${INSTDIR}migrate_netgroup_byuser.pl $ETC_NETGROUP >> $DB
+ echo "Migrating netgroups (by host)..."
+-$PERL migrate_netgroup_byhost.pl $ETC_NETGROUP >> $DB
++$PERL -I${INSTDIR} ${INSTDIR}migrate_netgroup_byhost.pl $ETC_NETGROUP >> $DB
+ echo "Preparing LDAP database..."
+ if [ "X$SLAPADD" = "X" ]; then
+ $LDIF2LDBM -i $DB
+--- MigrationTools-38/migrate_all_online.sh Sat Jan 6 22:39:20 2001
++++ MigrationTools-38/migrate_all_online.sh Wed Jun 20 18:19:17 2001
+@@ -38,6 +38,8 @@
+ SHELL=/bin/sh
+ export SHELL
+
++INSTDIR=/usr/share/openldap/migration/
++
+ DB=/tmp/nis.$$.ldif
+
+ if [ "X$ETC_ALIASES" = "X" ]; then
+@@ -104,7 +106,7 @@
+ fi
+
+ if [ "X$LDAP_BASEDN" = "X" ]; then
+- defaultcontext=`$PERL -e 'require "migrate_common.ph"; print \$DEFAULT_BASE';`
++ defaultcontext=`$PERL -I${INSTDIR} -e 'require "'${INSTDIR}migrate_common.ph'"; print \$DEFAULT_BASE';`
+ question="Enter the X.500 naming context you wish to import into: [$defaultcontext]"
+ echo "$question " | tr -d '\012' > /dev/tty
+ read LDAP_BASEDN
+@@ -160,35 +162,35 @@
+ echo "Importing into $LDAP_BASEDN..."
+ echo
+ echo "Creating naming context entries..."
+-$PERL migrate_base.pl -n > $DB
++$PERL -I${INSTDIR} ${INSTDIR}migrate_base.pl -n > $DB
+ if [ "X$LDAP_PROFILE" = "Xyes" ]; then
+ echo "Creating DUAConfigProfile entry..."
+- $PERL migrate_profile.pl "$LDAPHOST" >> $DB
++ $PERL -I${INSTDIR} ${INSTDIR}migrate_profile.pl "$LDAPHOST" >> $DB
+ fi
+ echo "Migrating aliases..."
+-$PERL migrate_aliases.pl $ETC_ALIASES >> $DB
++$PERL -I${INSTDIR} ${INSTDIR}migrate_aliases.pl $ETC_ALIASES >> $DB
+ #echo "Migrating fstab..."
+-#$PERL migrate_fstab.pl $ETC_FSTAB >> $DB
++#$PERL -I${INSTDIR} ${INSTDIR}migrate_fstab.pl $ETC_FSTAB >> $DB
+ echo "Migrating groups..."
+-$PERL migrate_group.pl $ETC_GROUP >> $DB
++$PERL -I${INSTDIR} ${INSTDIR}migrate_group.pl $ETC_GROUP >> $DB
+ echo "Migrating hosts..."
+-$PERL migrate_hosts.pl $ETC_HOSTS >> $DB
++$PERL -I${INSTDIR} ${INSTDIR}migrate_hosts.pl $ETC_HOSTS >> $DB
+ echo "Migrating networks..."
+-$PERL migrate_networks.pl $ETC_NETWORKS >> $DB
++$PERL -I${INSTDIR} ${INSTDIR}migrate_networks.pl $ETC_NETWORKS >> $DB
+ echo "Migrating users..."
+-$PERL migrate_passwd.pl $ETC_PASSWD >> $DB
++$PERL -I${INSTDIR} ${INSTDIR}migrate_passwd.pl $ETC_PASSWD >> $DB
+ echo "Migrating protocols..."
+-$PERL migrate_protocols.pl $ETC_PROTOCOLS >> $DB
++$PERL -I${INSTDIR} ${INSTDIR}migrate_protocols.pl $ETC_PROTOCOLS >> $DB
+ echo "Migrating rpcs..."
+-$PERL migrate_rpc.pl $ETC_RPC >> $DB
++$PERL -I${INSTDIR} ${INSTDIR}migrate_rpc.pl $ETC_RPC >> $DB
+ echo "Migrating services..."
+-$PERL migrate_services.pl $ETC_SERVICES >> $DB
++$PERL -I${INSTDIR} ${INSTDIR}migrate_services.pl $ETC_SERVICES >> $DB
+ echo "Migrating netgroups..."
+-$PERL migrate_netgroup.pl $ETC_NETGROUP >> $DB
++$PERL -I${INSTDIR} ${INSTDIR}migrate_netgroup.pl $ETC_NETGROUP >> $DB
+ echo "Migrating netgroups (by user)..."
+-$PERL migrate_netgroup_byuser.pl $ETC_NETGROUP >> $DB
++$PERL -I${INSTDIR} ${INSTDIR}migrate_netgroup_byuser.pl $ETC_NETGROUP >> $DB
+ echo "Migrating netgroups (by host)..."
+-$PERL migrate_netgroup_byhost.pl $ETC_NETGROUP >> $DB
++$PERL -I${INSTDIR} ${INSTDIR}migrate_netgroup_byhost.pl $ETC_NETGROUP >> $DB
+
+ echo "Importing into LDAP..."
+
+--- MigrationTools-38/migrate_aliases.pl Wed Jun 20 18:20:06 2001
++++ MigrationTools-38/migrate_aliases.pl Wed Jun 20 18:20:28 2001
+@@ -36,7 +36,7 @@
+ # thanks to Dave McPike
+ #
+
+-require 'migrate_common.ph';
++require '/usr/share/openldap/migration/migrate_common.ph';
+
+ $PROGRAM = "migrate_aliases.pl";
+ $NAMINGCONTEXT = &getsuffix($PROGRAM);
+--- MigrationTools-38/migrate_automount.pl Wed Jun 20 18:20:06 2001
++++ MigrationTools-38/migrate_automount.pl Wed Jun 20 18:20:35 2001
+@@ -33,7 +33,7 @@
+ # services migration tool
+ #
+
+-require 'migrate_common.ph';
++require '/usr/share/openldap/migration/migrate_common.ph';
+
+ $PROGRAM = "migrate_automount.pl";
+ $NAMINGCONTEXT = &getsuffix($PROGRAM);
+--- MigrationTools-38/migrate_base.pl Wed Jun 20 18:20:06 2001
++++ MigrationTools-38/migrate_base.pl Wed Jun 20 18:20:51 2001
+@@ -36,7 +36,7 @@
+ #
+ #
+
+-require 'migrate_common.ph';
++require '/usr/share/openldap/migration/migrate_common.ph';
+
+ $PROGRAM = "migrate_base.pl";
+ $NAMINGCONTEXT = &getsuffix($PROGRAM);
+--- MigrationTools-38/migrate_fstab.pl Wed Jun 20 18:20:06 2001
++++ MigrationTools-38/migrate_fstab.pl Wed Jun 20 18:20:57 2001
+@@ -37,7 +37,7 @@
+ # They are used by MacOS X Server, however.
+ #
+
+-require 'migrate_common.ph';
++require '/usr/share/openldap/migration/migrate_common.ph';
+
+ $PROGRAM = "migrate_fstab.pl";
+ $NAMINGCONTEXT = &getsuffix($PROGRAM);
+--- MigrationTools-38/migrate_group.pl Wed Jun 20 18:20:06 2001
++++ MigrationTools-38/migrate_group.pl Wed Jun 20 18:21:01 2001
+@@ -36,7 +36,7 @@
+ #
+ #
+
+-require 'migrate_common.ph';
++require '/usr/share/openldap/migration/migrate_common.ph';
+
+ $PROGRAM = "migrate_group.pl";
+ $NAMINGCONTEXT = &getsuffix($PROGRAM);
+--- MigrationTools-38/migrate_hosts.pl Wed Jun 20 18:20:06 2001
++++ MigrationTools-38/migrate_hosts.pl Wed Jun 20 18:21:03 2001
+@@ -36,7 +36,7 @@
+ #
+ #
+
+-require 'migrate_common.ph';
++require '/usr/share/openldap/migration/migrate_common.ph';
+
+ $PROGRAM = "migrate_hosts.pl";
+ $NAMINGCONTEXT = &getsuffix($PROGRAM);
+--- MigrationTools-38/migrate_netgroup.pl Wed Jun 20 18:20:06 2001
++++ MigrationTools-38/migrate_netgroup.pl Wed Jun 20 18:21:06 2001
+@@ -36,7 +36,7 @@
+ #
+ #
+
+-require 'migrate_common.ph';
++require '/usr/share/openldap/migration/migrate_common.ph';
+
+ $PROGRAM = "migrate_netgroup.pl";
+ $NAMINGCONTEXT = &getsuffix($PROGRAM);
+--- MigrationTools-38/migrate_netgroup_byhost.pl Wed Jun 20 18:20:06 2001
++++ MigrationTools-38/migrate_netgroup_byhost.pl Wed Jun 20 18:21:09 2001
+@@ -36,7 +36,7 @@
+ #
+ #
+
+-require 'migrate_common.ph';
++require '/usr/share/openldap/migration/migrate_common.ph';
+
+ $PROGRAM = "migrate_netgroup_byhost.pl";
+ $NAMINGCONTEXT = &getsuffix($PROGRAM);
+--- MigrationTools-38/migrate_netgroup_byuser.pl Wed Jun 20 18:20:06 2001
++++ MigrationTools-38/migrate_netgroup_byuser.pl Wed Jun 20 18:21:12 2001
+@@ -36,7 +36,7 @@
+ #
+ #
+
+-require 'migrate_common.ph';
++require '/usr/share/openldap/migration/migrate_common.ph';
+
+ $PROGRAM = "migrate_netgroup_byuser.pl";
+ $NAMINGCONTEXT = &getsuffix($PROGRAM);
+--- MigrationTools-38/migrate_networks.pl Wed Jun 20 18:20:06 2001
++++ MigrationTools-38/migrate_networks.pl Wed Jun 20 18:21:14 2001
+@@ -36,7 +36,7 @@
+ #
+ #
+
+-require 'migrate_common.ph';
++require '/usr/share/openldap/migration/migrate_common.ph';
+
+ $PROGRAM = "migrate_networks.pl";
+ $NAMINGCONTEXT = &getsuffix($PROGRAM);
+--- MigrationTools-38/migrate_passwd.pl Wed Jun 20 18:20:06 2001
++++ MigrationTools-38/migrate_passwd.pl Wed Jun 20 18:21:16 2001
+@@ -37,7 +37,7 @@
+ # Thanks to Peter Jacob Slot <peter@vision.auk.dk>.
+ #
+
+-require 'migrate_common.ph';
++require '/usr/share/openldap/migration/migrate_common.ph';
+
+ $PROGRAM = "migrate_passwd.pl";
+ $NAMINGCONTEXT = &getsuffix($PROGRAM);
+--- MigrationTools-38/migrate_profile.pl Wed Jun 20 18:20:06 2001
++++ MigrationTools-38/migrate_profile.pl Wed Jun 20 18:21:18 2001
+@@ -36,7 +36,7 @@
+ #
+ #
+
+-require 'migrate_common.ph';
++require '/usr/share/openldap/migration/migrate_common.ph';
+
+ $PROGRAM = "migrate_profile.pl";
+
+--- MigrationTools-38/migrate_protocols.pl Wed Jun 20 18:20:06 2001
++++ MigrationTools-38/migrate_protocols.pl Wed Jun 20 18:21:21 2001
+@@ -36,7 +36,7 @@
+ #
+ #
+
+-require 'migrate_common.ph';
++require '/usr/share/openldap/migration/migrate_common.ph';
+
+ $PROGRAM = "migrate_protocols.pl";
+ $NAMINGCONTEXT = &getsuffix($PROGRAM);
+--- MigrationTools-38/migrate_rpc.pl Wed Jun 20 18:20:06 2001
++++ MigrationTools-38/migrate_rpc.pl Wed Jun 20 18:21:23 2001
+@@ -36,7 +36,7 @@
+ #
+ #
+
+-require 'migrate_common.ph';
++require '/usr/share/openldap/migration/migrate_common.ph';
+
+ $PROGRAM = "migrate_rpc.pl";
+ $NAMINGCONTEXT = &getsuffix($PROGRAM);
+--- MigrationTools-38/migrate_services.pl Wed Jun 20 18:20:06 2001
++++ MigrationTools-38/migrate_services.pl Wed Jun 20 18:21:25 2001
+@@ -35,7 +35,7 @@
+ #
+ #
+
+-require 'migrate_common.ph';
++require '/usr/share/openldap/migration/migrate_common.ph';
+
+ $PROGRAM = "migrate_services.pl";
+ $NAMINGCONTEXT = &getsuffix($PROGRAM);
+--- MigrationTools-38/migrate_slapd_conf.pl Wed Jun 20 18:20:06 2001
++++ MigrationTools-38/migrate_slapd_conf.pl Wed Jun 20 18:21:29 2001
+@@ -36,7 +36,7 @@
+ #
+ #
+
+-require 'migrate_common.ph';
++require '/usr/share/openldap/migration/migrate_common.ph';
+
+ $PROGRAM = "migrate_slapd_conf.pl";
+
--- /dev/null
+Supply dummy descriptions which, due to typos, are required.
+
+diff -uNr MigrationTools/migrate_protocols.pl MigrationTools/migrate_protocols.pl
+--- MigrationTools/migrate_protocols.pl Thu Oct 12 00:50:34 2000
++++ MigrationTools/migrate_protocols.pl Thu Oct 12 00:50:11 2000
+@@ -72,6 +72,7 @@
+ foreach $_ (@aliases) {
+ print $HANDLE "cn: $_\n";
+ }
++ print $HANDLE "description: IP protocol $number ($name)\n";
+ print $HANDLE "\n";
+ }
+
+diff -uNr MigrationTools/migrate_rpc.pl MigrationTools/migrate_rpc.pl
+--- MigrationTools/migrate_rpc.pl Thu Oct 12 00:50:34 2000
++++ MigrationTools/migrate_rpc.pl Thu Oct 12 00:50:11 2000
+@@ -74,6 +74,7 @@
+ foreach $_ (@aliases) {
+ print $HANDLE "cn: $_\n";
+ }
++ print $HANDLE "description: ONC RPC number $rpcnumber ($rpcname)\n";
+ print $HANDLE "\n";
+ }
+
+--- MigrationTools/migrate_passwd.pl 2002-07-23 15:18:32.000000000 -0400
++++ MigrationTools/migrate_passwd.pl 2002-07-23 15:18:34.000000000 -0400
+@@ -127,9 +127,10 @@
+ print $HANDLE "objectClass: person\n";
+ print $HANDLE "objectClass: organizationalPerson\n";
+ print $HANDLE "objectClass: inetOrgPerson\n";
++ } else {
++ print $HANDLE "objectClass: account\n";
+ }
+
+- print $HANDLE "objectClass: account\n";
+ print $HANDLE "objectClass: posixAccount\n";
+ print $HANDLE "objectClass: top\n";
+
+--- MigrationTools/migrate_common.ph 2002-07-09 23:59:22.000000000 -0400
++++ MigrationTools/migrate_common.ph 2003-05-02 16:58:19.000000000 -0400
+@@ -83,7 +83,7 @@
+ ##### CUT HERE #####
+ # where /etc/mail/ldapdomains contains names of ldap_routed
+ # domains (similiar to MASQUERADE_DOMAIN_FILE).
+-$DEFAULT_MAIL_HOST = "mail.padl.com";
++# $DEFAULT_MAIL_HOST = "mail.padl.com";
+
+ # turn this on to support more general object clases
+ # such as person.
+@@ -120,10 +120,10 @@
+ }
+
+ # Default Kerberos realm
+-if ($EXTENDED_SCHEMA) {
+- $DEFAULT_REALM = $DEFAULT_MAIL_DOMAIN;
+- $DEFAULT_REALM =~ tr/a-z/A-Z/;
+-}
++#if ($EXTENDED_SCHEMA) {
++# $DEFAULT_REALM = $DEFAULT_MAIL_DOMAIN;
++# $DEFAULT_REALM =~ tr/a-z/A-Z/;
++#}
+
+ if (-x "/usr/sbin/revnetgroup") {
+ $REVNETGROUP = "/usr/sbin/revnetgroup";
projects / packages / MigrationTools.git / commitdiff