From 36cfeb9d50015dc72f1b5d8fee77ed1ba1ac6ac5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Mon, 5 Nov 2007 15:45:42 +0000 Subject: [PATCH] - renamed and added new fixes Changed files: MigrationTools-26-suffix.patch -> 1.2 MigrationTools-27-simple.patch -> 1.2 MigrationTools-36-mktemp.patch -> 1.3 MigrationTools-38-instdir.patch -> 1.3 MigrationTools-44-schema.patch -> 1.3 MigrationTools-instdir.patch -> 1.1 MigrationTools-mktemp.patch -> 1.1 MigrationTools-noaliases.patch -> 1.1 MigrationTools-noddp.patch -> 1.1 MigrationTools-schema.patch -> 1.1 MigrationTools-simple.patch -> 1.1 MigrationTools-suffix.patch -> 1.1 MigrationTools-unique-hosts.patch -> 1.1 --- MigrationTools-26-suffix.patch | 35 ------------ MigrationTools-44-schema.patch | 29 ---------- ...tdir.patch => MigrationTools-instdir.patch | 48 ++++++++-------- ...ktemp.patch => MigrationTools-mktemp.patch | 16 +++--- MigrationTools-noaliases.patch | 55 +++++++++++++++++++ MigrationTools-noddp.patch | 15 +++++ MigrationTools-schema.patch | 50 +++++++++++++++++ ...imple.patch => MigrationTools-simple.patch | 20 +++---- MigrationTools-suffix.patch | 36 ++++++++++++ MigrationTools-unique-hosts.patch | 23 ++++++++ 10 files changed, 221 insertions(+), 106 deletions(-) delete mode 100644 MigrationTools-26-suffix.patch delete mode 100644 MigrationTools-44-schema.patch rename MigrationTools-38-instdir.patch => MigrationTools-instdir.patch (90%) rename MigrationTools-36-mktemp.patch => MigrationTools-mktemp.patch (95%) create mode 100644 MigrationTools-noaliases.patch create mode 100644 MigrationTools-noddp.patch create mode 100644 MigrationTools-schema.patch rename MigrationTools-27-simple.patch => MigrationTools-simple.patch (89%) create mode 100644 MigrationTools-suffix.patch create mode 100644 MigrationTools-unique-hosts.patch diff --git a/MigrationTools-26-suffix.patch b/MigrationTools-26-suffix.patch deleted file mode 100644 index 8d26294..0000000 --- a/MigrationTools-26-suffix.patch +++ /dev/null @@ -1,35 +0,0 @@ -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..." - diff --git a/MigrationTools-44-schema.patch b/MigrationTools-44-schema.patch deleted file mode 100644 index 0cdcbc1..0000000 --- a/MigrationTools-44-schema.patch +++ /dev/null @@ -1,29 +0,0 @@ -Only in MigrationTools-46: .migrate_common.ph.swp -Common subdirectories: MigrationTools-46-orig/ads and MigrationTools-46/ads -diff -u MigrationTools-46-orig/migrate_common.ph MigrationTools-46/migrate_common.ph ---- MigrationTools-46-orig/migrate_common.ph 2004-10-28 10:38:46.000000000 +0200 -+++ MigrationTools-46/migrate_common.ph 2005-08-31 21:42:03.000000000 +0200 -@@ -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"; diff --git a/MigrationTools-38-instdir.patch b/MigrationTools-instdir.patch similarity index 90% rename from MigrationTools-38-instdir.patch rename to MigrationTools-instdir.patch index 84b22ae..e3200a4 100644 --- a/MigrationTools-38-instdir.patch +++ b/MigrationTools-instdir.patch @@ -7,7 +7,7 @@ magic to let them be called from anywhere. PATH=$PATH:. export PATH -+INSTDIR=/usr/share/MigrationTools/ ++INSTDIR=/usr/share/openldap/migration/ TMPDIR="/tmp" ETC_PASSWD="$TMPDIR/passwd.$$.ldap" @@ -26,7 +26,7 @@ magic to let them be called from anywhere. PATH=$PATH:. export PATH -+INSTDIR=/usr/share/MigrationTools/ ++INSTDIR=/usr/share/openldap/migration/ TMPDIR="/tmp" ETC_PASSWD="$TMPDIR/passwd.$$.ldap" @@ -45,7 +45,7 @@ magic to let them be called from anywhere. PATH=$PATH:. export PATH -+INSTDIR=/usr/share/MigrationTools/ ++INSTDIR=/usr/share/openldap/migration/ TMPDIR="/tmp" ETC_PASSWD="$TMPDIR/passwd.$$.ldap" @@ -65,7 +65,7 @@ magic to let them be called from anywhere. PATH=$PATH:. export PATH - -+INSTDIR=/usr/share/MigrationTools/ ++INSTDIR=/usr/share/openldap/migration/ TMPDIR="/tmp" ETC_PASSWD="$TMPDIR/passwd.$$.ldap" @@ -84,7 +84,7 @@ magic to let them be called from anywhere. PATH=$PATH:/usr/lib/nis:. export PATH -+INSTDIR=/usr/share/MigrationTools/ ++INSTDIR=/usr/share/openldap/migration/ TMPDIR="/tmp" ETC_PASSWD="$TMPDIR/passwd.$$.ldap" @@ -104,7 +104,7 @@ magic to let them be called from anywhere. PATH=$PATH:. export PATH - -+INSTDIR=/usr/share/MigrationTools/ ++INSTDIR=/usr/share/openldap/migration/ TMPDIR="/tmp" ETC_PASSWD="$TMPDIR/passwd.$$.ldap" @@ -123,7 +123,7 @@ magic to let them be called from anywhere. # Luke Howard April 1997 # -+INSTDIR=/usr/share/MigrationTools/ ++INSTDIR=/usr/share/openldap/migration/ DB="/tmp/nis.$$.ldif" if [ "X$ETC_ALIASES" = "X" ]; then @@ -179,7 +179,7 @@ magic to let them be called from anywhere. SHELL=/bin/sh export SHELL -+INSTDIR=/usr/share/MigrationTools/ ++INSTDIR=/usr/share/openldap/migration/ + DB=/tmp/nis.$$.ldif @@ -250,7 +250,7 @@ magic to let them be called from anywhere. # -require 'migrate_common.ph'; -+require '/usr/share/MigrationTools/migrate_common.ph'; ++require '/usr/share/openldap/migration/migrate_common.ph'; $PROGRAM = "migrate_aliases.pl"; $NAMINGCONTEXT = &getsuffix($PROGRAM); @@ -261,7 +261,7 @@ magic to let them be called from anywhere. # -require 'migrate_common.ph'; -+require '/usr/share/MigrationTools/migrate_common.ph'; ++require '/usr/share/openldap/migration/migrate_common.ph'; $PROGRAM = "migrate_automount.pl"; $NAMINGCONTEXT = &getsuffix($PROGRAM); @@ -272,7 +272,7 @@ magic to let them be called from anywhere. # -require 'migrate_common.ph'; -+require '/usr/share/MigrationTools/migrate_common.ph'; ++require '/usr/share/openldap/migration/migrate_common.ph'; $PROGRAM = "migrate_base.pl"; $NAMINGCONTEXT = &getsuffix($PROGRAM); @@ -283,7 +283,7 @@ magic to let them be called from anywhere. # -require 'migrate_common.ph'; -+require '/usr/share/MigrationTools/migrate_common.ph'; ++require '/usr/share/openldap/migration/migrate_common.ph'; $PROGRAM = "migrate_fstab.pl"; $NAMINGCONTEXT = &getsuffix($PROGRAM); @@ -294,7 +294,7 @@ magic to let them be called from anywhere. # -require 'migrate_common.ph'; -+require '/usr/share/MigrationTools/migrate_common.ph'; ++require '/usr/share/openldap/migration/migrate_common.ph'; $PROGRAM = "migrate_group.pl"; $NAMINGCONTEXT = &getsuffix($PROGRAM); @@ -305,7 +305,7 @@ magic to let them be called from anywhere. # -require 'migrate_common.ph'; -+require '/usr/share/MigrationTools/migrate_common.ph'; ++require '/usr/share/openldap/migration/migrate_common.ph'; $PROGRAM = "migrate_hosts.pl"; $NAMINGCONTEXT = &getsuffix($PROGRAM); @@ -316,7 +316,7 @@ magic to let them be called from anywhere. # -require 'migrate_common.ph'; -+require '/usr/share/MigrationTools/migrate_common.ph'; ++require '/usr/share/openldap/migration/migrate_common.ph'; $PROGRAM = "migrate_netgroup.pl"; $NAMINGCONTEXT = &getsuffix($PROGRAM); @@ -327,7 +327,7 @@ magic to let them be called from anywhere. # -require 'migrate_common.ph'; -+require '/usr/share/MigrationTools/migrate_common.ph'; ++require '/usr/share/openldap/migration/migrate_common.ph'; $PROGRAM = "migrate_netgroup_byhost.pl"; $NAMINGCONTEXT = &getsuffix($PROGRAM); @@ -338,7 +338,7 @@ magic to let them be called from anywhere. # -require 'migrate_common.ph'; -+require '/usr/share/MigrationTools/migrate_common.ph'; ++require '/usr/share/openldap/migration/migrate_common.ph'; $PROGRAM = "migrate_netgroup_byuser.pl"; $NAMINGCONTEXT = &getsuffix($PROGRAM); @@ -349,7 +349,7 @@ magic to let them be called from anywhere. # -require 'migrate_common.ph'; -+require '/usr/share/MigrationTools/migrate_common.ph'; ++require '/usr/share/openldap/migration/migrate_common.ph'; $PROGRAM = "migrate_networks.pl"; $NAMINGCONTEXT = &getsuffix($PROGRAM); @@ -360,7 +360,7 @@ magic to let them be called from anywhere. # -require 'migrate_common.ph'; -+require '/usr/share/MigrationTools/migrate_common.ph'; ++require '/usr/share/openldap/migration/migrate_common.ph'; $PROGRAM = "migrate_passwd.pl"; $NAMINGCONTEXT = &getsuffix($PROGRAM); @@ -371,7 +371,7 @@ magic to let them be called from anywhere. # -require 'migrate_common.ph'; -+require '/usr/share/MigrationTools/migrate_common.ph'; ++require '/usr/share/openldap/migration/migrate_common.ph'; $PROGRAM = "migrate_profile.pl"; @@ -382,7 +382,7 @@ magic to let them be called from anywhere. # -require 'migrate_common.ph'; -+require '/usr/share/MigrationTools/migrate_common.ph'; ++require '/usr/share/openldap/migration/migrate_common.ph'; $PROGRAM = "migrate_protocols.pl"; $NAMINGCONTEXT = &getsuffix($PROGRAM); @@ -393,7 +393,7 @@ magic to let them be called from anywhere. # -require 'migrate_common.ph'; -+require '/usr/share/MigrationTools/migrate_common.ph'; ++require '/usr/share/openldap/migration/migrate_common.ph'; $PROGRAM = "migrate_rpc.pl"; $NAMINGCONTEXT = &getsuffix($PROGRAM); @@ -404,7 +404,7 @@ magic to let them be called from anywhere. # -require 'migrate_common.ph'; -+require '/usr/share/MigrationTools/migrate_common.ph'; ++require '/usr/share/openldap/migration/migrate_common.ph'; $PROGRAM = "migrate_services.pl"; $NAMINGCONTEXT = &getsuffix($PROGRAM); @@ -415,7 +415,7 @@ magic to let them be called from anywhere. # -require 'migrate_common.ph'; -+require '/usr/share/MigrationTools/migrate_common.ph'; ++require '/usr/share/openldap/migration/migrate_common.ph'; $PROGRAM = "migrate_slapd_conf.pl"; diff --git a/MigrationTools-36-mktemp.patch b/MigrationTools-mktemp.patch similarity index 95% rename from MigrationTools-36-mktemp.patch rename to MigrationTools-mktemp.patch index 5a5d7fe..dad3c53 100644 --- a/MigrationTools-36-mktemp.patch +++ b/MigrationTools-mktemp.patch @@ -3,7 +3,7 @@ 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/MigrationTools/ + INSTDIR=/usr/share/openldap/migration/ TMPDIR="/tmp" -ETC_PASSWD="$TMPDIR/passwd.$$.ldap" @@ -30,7 +30,7 @@ Use mktemp to generate temporary files. --- 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/MigrationTools/ + INSTDIR=/usr/share/openldap/migration/ TMPDIR="/tmp" -ETC_PASSWD="$TMPDIR/passwd.$$.ldap" @@ -57,7 +57,7 @@ Use mktemp to generate temporary files. --- 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/MigrationTools/ + INSTDIR=/usr/share/openldap/migration/ TMPDIR="/tmp" -ETC_PASSWD="$TMPDIR/passwd.$$.ldap" @@ -86,7 +86,7 @@ Use mktemp to generate temporary files. --- 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/MigrationTools/ + INSTDIR=/usr/share/openldap/migration/ TMPDIR="/tmp" -ETC_PASSWD="$TMPDIR/passwd.$$.ldap" @@ -117,7 +117,7 @@ Use mktemp to generate temporary files. @@ -42,7 +42,7 @@ # - INSTDIR=/usr/share/MigrationTools/ + INSTDIR=/usr/share/openldap/migration/ -DB="/tmp/nis.$$.ldif" +DB=`mktemp /tmp/nis.ldif.XXXXXX` @@ -127,7 +127,7 @@ Use mktemp to generate temporary files. +++ MigrationTools-36/migrate_all_online.sh Mon Feb 5 11:39:14 2001 @@ -40,7 +40,7 @@ - INSTDIR=/usr/share/MigrationTools/ + INSTDIR=/usr/share/openldap/migration/ -DB=/tmp/nis.$$.ldif +DB=`mktemp /tmp/nis.ldif.XXXXXX` @@ -137,7 +137,7 @@ Use mktemp to generate temporary files. --- 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/MigrationTools/ + INSTDIR=/usr/share/openldap/migration/ TMPDIR="/tmp" -ETC_PASSWD="$TMPDIR/passwd.$$.ldap" @@ -164,7 +164,7 @@ Use mktemp to generate temporary files. --- 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/MigrationTools/ + INSTDIR=/usr/share/openldap/migration/ TMPDIR="/tmp" -ETC_PASSWD="$TMPDIR/passwd.$$.ldap" diff --git a/MigrationTools-noaliases.patch b/MigrationTools-noaliases.patch new file mode 100644 index 0000000..5afd876 --- /dev/null +++ b/MigrationTools-noaliases.patch @@ -0,0 +1,55 @@ +Don't migrate aliases by default, the schema used is no longer included in the +default server configuration. + +--- MigrationTools-45/migrate_all_offline.sh 2004-10-05 17:36:58.000000000 -0400 ++++ MigrationTools-45/migrate_all_offline.sh 2004-10-05 17:37:03.000000000 -0400 +@@ -44,9 +44,9 @@ + INSTDIR=/usr/share/openldap/migration/ + DB=`mktemp /tmp/nis.ldif.XXXXXX` + +-if [ "X$ETC_ALIASES" = "X" ]; then +- ETC_ALIASES=/etc/aliases +-fi ++#if [ "X$ETC_ALIASES" = "X" ]; then ++# ETC_ALIASES=/etc/aliases ++#fi + #if [ "X$ETC_FSTAB" = "X" ]; then + # ETC_FSTAB=/etc/fstab + #fi +@@ -110,8 +110,8 @@ + + echo "Creating naming context entries..." + $PERL -I${INSTDIR} ${INSTDIR}migrate_base.pl > $DB +-echo "Migrating aliases..." +-$PERL -I${INSTDIR} ${INSTDIR}migrate_aliases.pl $ETC_ALIASES >> $DB ++#echo "Migrating aliases..." ++#$PERL -I${INSTDIR} ${INSTDIR}migrate_aliases.pl $ETC_ALIASES >> $DB + #echo "Migrating fstab..." + #$PERL -I${INSTDIR} ${INSTDIR}migrate_fstab.pl $ETC_FSTAB >> $DB + echo "Migrating groups..." +--- MigrationTools-45/migrate_all_online.sh 2004-10-05 17:37:11.000000000 -0400 ++++ MigrationTools-45/migrate_all_online.sh 2004-10-05 17:37:26.000000000 -0400 +@@ -42,9 +42,9 @@ + + DB=`mktemp /tmp/nis.ldif.XXXXXX` + +-if [ "X$ETC_ALIASES" = "X" ]; then +- ETC_ALIASES=/etc/aliases +-fi ++#if [ "X$ETC_ALIASES" = "X" ]; then ++# ETC_ALIASES=/etc/aliases ++#fi + #if [ "X$ETC_FSTAB" = "X" ]; then + # ETC_FSTAB=/etc/fstab + #fi +@@ -167,8 +167,8 @@ + echo "Creating DUAConfigProfile entry..." + $PERL -I${INSTDIR} ${INSTDIR}migrate_profile.pl "$LDAPHOST" >> $DB + fi +-echo "Migrating aliases..." +-$PERL -I${INSTDIR} ${INSTDIR}migrate_aliases.pl $ETC_ALIASES >> $DB ++#echo "Migrating aliases..." ++#$PERL -I${INSTDIR} ${INSTDIR}migrate_aliases.pl $ETC_ALIASES >> $DB + #echo "Migrating fstab..." + #$PERL -I${INSTDIR} ${INSTDIR}migrate_fstab.pl $ETC_FSTAB >> $DB + echo "Migrating groups..." diff --git a/MigrationTools-noddp.patch b/MigrationTools-noddp.patch new file mode 100644 index 0000000..8e0a54b --- /dev/null +++ b/MigrationTools-noddp.patch @@ -0,0 +1,15 @@ +--- MigrationTools-46/migrate_services.pl.orig 2007-05-23 14:41:22.000000000 +0200 ++++ MigrationTools-46/migrate_services.pl 2007-05-23 14:42:55.000000000 +0200 +@@ -102,6 +102,12 @@ + my ($servicename, $portproto, @aliases) = split(m/\s+/o, $card); + my ($rawport, $proto) = split(m#[/,]#o, $portproto); + ++ # do not generate ddp services - it's AppleTalk, not IP ++ if ($proto eq "ddp") { ++ print STDERR "Skipping non-IP service '$servicename $portproto'\n"; ++ next; ++ } ++ + # Find services specifying a port range (e.g. X11.) + my $loport = ''; + my $hiport = ''; diff --git a/MigrationTools-schema.patch b/MigrationTools-schema.patch new file mode 100644 index 0000000..c48095f --- /dev/null +++ b/MigrationTools-schema.patch @@ -0,0 +1,50 @@ +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_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"; diff --git a/MigrationTools-27-simple.patch b/MigrationTools-simple.patch similarity index 89% rename from MigrationTools-27-simple.patch rename to MigrationTools-simple.patch index a8f3657..26c7ea3 100644 --- a/MigrationTools-27-simple.patch +++ b/MigrationTools-simple.patch @@ -14,9 +14,9 @@ Allow the calling user to pass in arguments to ldapadd/ldapmodify. - $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 ++ $LDAPADD -h $LDAPHOST -D "$LDAP_BINDDN" -w "$LDAP_BINDCRED" "$@" -f $DB +else -+ $LDAPADD -x -h $LDAPHOST -D "$LDAP_BINDDN" -w "$LDAP_BINDCRED" $@ -f $DB ++ $LDAPADD -x -h $LDAPHOST -D "$LDAP_BINDDN" -w "$LDAP_BINDCRED" "$@" -f $DB +fi if [ $? -ne 0 ]; then @@ -28,7 +28,7 @@ Allow the calling user to pass in arguments to ldapadd/ldapmodify. #ypcat $DOMFLAG -k aliases > $ETC_ALIASES -. ${INSTDIR}migrate_all_online.sh -+. ${INSTDIR}migrate_all_online.sh $@ ++. ${INSTDIR}migrate_all_online.sh "$@" rm -f $ETC_PASSWD rm -f $ETC_GROUP @@ -39,10 +39,10 @@ Allow the calling user to pass in arguments to ldapadd/ldapmodify. echo "Preparing LDAP database..." if [ "X$SLAPADD" = "X" ]; then - $LDIF2LDBM -i $DB -+ $LDIF2LDBM -i $DB $@ ++ $LDIF2LDBM -i $DB "$@" else - $SLAPADD -l $DB -+ $SLAPADD -l $DB $@ ++ $SLAPADD -l $DB "$@" fi EXITCODE=$? @@ -53,7 +53,7 @@ Allow the calling user to pass in arguments to ldapadd/ldapmodify. #ypcat $DOMFLAG -k aliases > $ETC_ALIASES -. ${INSTDIR}migrate_all_offline.sh -+. ${INSTDIR}migrate_all_offline.sh $@ ++. ${INSTDIR}migrate_all_offline.sh "$@" rm -f $ETC_PASSWD rm -f $ETC_GROUP @@ -64,7 +64,7 @@ Allow the calling user to pass in arguments to ldapadd/ldapmodify. niscat mail_aliases.org_dir > $ETC_ALIASES -. ${INSTDIR}migrate_all_online.sh -+. ${INSTDIR}migrate_all_online.sh $@ ++. ${INSTDIR}migrate_all_online.sh "$@" rm -f $ETC_PASSWD rm -f $ETC_GROUP @@ -75,7 +75,7 @@ Allow the calling user to pass in arguments to ldapadd/ldapmodify. nidump aliases $DOM > $ETC_ALIASES -. ${INSTDIR}migrate_all_online.sh -+. ${INSTDIR}migrate_all_online.sh $@ ++. ${INSTDIR}migrate_all_online.sh "$@" rm -f $ETC_PASSWD rm -f $ETC_GROUP @@ -86,7 +86,7 @@ Allow the calling user to pass in arguments to ldapadd/ldapmodify. nidump aliases $DOM > $ETC_ALIASES -. ${INSTDIR}migrate_all_offline.sh -+. ${INSTDIR}migrate_all_offline.sh $@ ++. ${INSTDIR}migrate_all_offline.sh "$@" rm -f $ETC_PASSWD rm -f $ETC_GROUP @@ -97,7 +97,7 @@ Allow the calling user to pass in arguments to ldapadd/ldapmodify. niscat mail_aliases.org_dir > $ETC_ALIASES -. ${INSTDIR}migrate_all_offline.sh -+. ${INSTDIR}migrate_all_offline.sh $@ ++. ${INSTDIR}migrate_all_offline.sh "$@" rm -f $ETC_PASSWD rm -f $ETC_GROUP diff --git a/MigrationTools-suffix.patch b/MigrationTools-suffix.patch new file mode 100644 index 0000000..788fb3d --- /dev/null +++ b/MigrationTools-suffix.patch @@ -0,0 +1,36 @@ +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,31 @@ + 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 frequently missing. ++NAMINGATTRNAME=`echo $LDAP_BASEDN | cut -f1 -d=` ++NAMINGATTRVALUE=`echo $LDAP_BASEDN | cut -f1 -d, | cut -f2 -d=` ++OBJECTCLASS= ++case "$NAMINGATTRNAME" in ++ dc) OBJECTCLASS=domain;; ++ o) OBJECTCLASS=organization;; ++ l) OBJECTCLASS=locality;; ++ c) OBJECTCLASS=country;; ++ nismapname) OBJECTCLASS=nisMap;; ++ cn) OBJECTCLASS=container;; ++esac ++ ++if test -n "$NAMINGATTRNAME" ; then ++if test -n "$NAMINGATTRVALUE" ; then ++if test -n "$OBJECTCLASS" ; then ++cat << EOF | $LDAPADD -h $LDAPHOST -D "$LDAP_BINDDN" -x -w "$LDAP_BINDCRED" ++dn: $LDAP_BASEDN ++$NAMINGATTRNAME: $NAMINGATTRVALUE ++objectClass: top ++objectClass: $OBJECTCLASS ++EOF ++fi ++fi ++fi ++ + echo "Importing into LDAP..." + diff --git a/MigrationTools-unique-hosts.patch b/MigrationTools-unique-hosts.patch new file mode 100644 index 0000000..f0db7ba --- /dev/null +++ b/MigrationTools-unique-hosts.patch @@ -0,0 +1,23 @@ +Prevent duplicities in hosts, which are read from NIS. +--- MigrationTools-46/migrate_all_nis_online.sh.orig 2007-05-24 11:21:54.000000000 +0200 ++++ MigrationTools-46/migrate_all_nis_online.sh 2007-05-24 11:26:30.000000000 +0200 +@@ -67,7 +67,7 @@ + ypcat $DOMFLAG protocols > $ETC_PROTOCOLS + touch $ETC_FSTAB + ypcat $DOMFLAG rpc.byname > $ETC_RPC +-ypcat $DOMFLAG hosts > $ETC_HOSTS ++ypcat $DOMFLAG hosts.byaddr > $ETC_HOSTS + ypcat $DOMFLAG networks > $ETC_NETWORKS + #ypcat $DOMFLAG -k aliases > $ETC_ALIASES + +--- MigrationTools-46/migrate_all_nis_offline.sh.orig 2007-05-24 11:21:54.000000000 +0200 ++++ MigrationTools-46/migrate_all_nis_offline.sh 2007-05-24 11:26:13.000000000 +0200 +@@ -67,7 +67,7 @@ + ypcat $DOMFLAG protocols > $ETC_PROTOCOLS + touch $ETC_FSTAB + ypcat $DOMFLAG rpc.byname > $ETC_RPC +-ypcat $DOMFLAG hosts > $ETC_HOSTS ++ypcat $DOMFLAG hosts.byaddr > $ETC_HOSTS + ypcat $DOMFLAG networks > $ETC_NETWORKS + #ypcat $DOMFLAG -k aliases > $ETC_ALIASES + -- 2.44.0