projects / packages / MigrationTools.git / blame
| Commit | Line | Data |
|---|---|---|
| 4d17bf40 JR |
1 | Allow the calling user to pass in arguments to ldapadd/ldapmodify. |
| 2 | ||
| 3 | --- MigrationTools-27/migrate_all_online.sh Tue Oct 31 17:01:24 2000 | |
| 4 | +++ MigrationTools-27/migrate_all_online.sh Tue Oct 31 17:03:19 2000 | |
| 5 | @@ -181,13 +181,11 @@ | |
| 6 | ||
| 7 | echo "Importing into LDAP..." | |
| 8 | ||
| 9 | - if [ -x /usr/sbin/slapadd ]; then | |
| 10 | - $LDAPADD -x -h $LDAPHOST -D "$LDAP_BINDDN" -w "$LDAP_BINDCRED" -f $DB | |
| 11 | - elif [ -x /usr/local/sbin/slapadd ]; then | |
| 12 | - $LDAPADD -x -h $LDAPHOST -D "$LDAP_BINDDN" -w "$LDAP_BINDCRED" -f $DB | |
| 13 | - else | |
| 14 | - $LDAPADD -h $LDAPHOST -D "$LDAP_BINDDN" -w "$LDAP_BINDCRED" -f $DB | |
| 15 | - fi | |
| 16 | +if [ `basename $LDAPADD` = "slapadd" ]; then | |
| 36cfeb9d | 17 | + $LDAPADD -h $LDAPHOST -D "$LDAP_BINDDN" -w "$LDAP_BINDCRED" "$@" -f $DB |
| 4d17bf40 | 18 | +else |
| 36cfeb9d | 19 | + $LDAPADD -x -h $LDAPHOST -D "$LDAP_BINDDN" -w "$LDAP_BINDCRED" "$@" -f $DB |
| 4d17bf40 JR |
20 | +fi |
| 21 | ||
| 22 | if [ $? -ne 0 ]; then | |
| 23 | echo "$LDAPADD: returned non-zero exit status" | |
| 24 | --- MigrationTools-27/migrate_all_nis_online.sh Tue Oct 31 17:01:24 2000 | |
| 25 | +++ MigrationTools-27/migrate_all_nis_online.sh Tue Oct 31 17:02:51 2000 | |
| 26 | @@ -71,7 +71,7 @@ | |
| 27 | ypcat $DOMFLAG networks > $ETC_NETWORKS | |
| 28 | #ypcat $DOMFLAG -k aliases > $ETC_ALIASES | |
| 29 | ||
| 30 | -. ${INSTDIR}migrate_all_online.sh | |
| 36cfeb9d | 31 | +. ${INSTDIR}migrate_all_online.sh "$@" |
| 4d17bf40 JR |
32 | |
| 33 | rm -f $ETC_PASSWD | |
| 34 | rm -f $ETC_GROUP | |
| 35 | --- MigrationTools-27/migrate_all_offline.sh Tue Oct 31 17:02:00 2000 | |
| 36 | +++ MigrationTools-27/migrate_all_offline.sh Tue Oct 31 17:03:12 2000 | |
| 37 | @@ -137,9 +137,9 @@ | |
| 38 | $PERL -I${INSTDIR} ${INSTDIR}migrate_netgroup_byhost.pl $ETC_NETGROUP >> $DB | |
| 39 | echo "Preparing LDAP database..." | |
| 40 | if [ "X$SLAPADD" = "X" ]; then | |
| 41 | - $LDIF2LDBM -i $DB | |
| 36cfeb9d | 42 | + $LDIF2LDBM -i $DB "$@" |
| 4d17bf40 JR |
43 | else |
| 44 | - $SLAPADD -l $DB | |
| 36cfeb9d | 45 | + $SLAPADD -l $DB "$@" |
| 4d17bf40 JR |
46 | fi |
| 47 | EXITCODE=$? | |
| 48 | ||
| 49 | --- MigrationTools-27/migrate_all_nis_offline.sh Tue Oct 31 17:02:05 2000 | |
| 50 | +++ MigrationTools-27/migrate_all_nis_offline.sh Tue Oct 31 17:02:49 2000 | |
| 51 | @@ -71,7 +71,7 @@ | |
| 52 | ypcat $DOMFLAG networks > $ETC_NETWORKS | |
| 53 | #ypcat $DOMFLAG -k aliases > $ETC_ALIASES | |
| 54 | ||
| 55 | -. ${INSTDIR}migrate_all_offline.sh | |
| 36cfeb9d | 56 | +. ${INSTDIR}migrate_all_offline.sh "$@" |
| 4d17bf40 JR |
57 | |
| 58 | rm -f $ETC_PASSWD | |
| 59 | rm -f $ETC_GROUP | |
| 60 | --- MigrationTools-27/migrate_all_nisplus_online.sh Tue Oct 31 17:02:11 2000 | |
| 61 | +++ MigrationTools-27/migrate_all_nisplus_online.sh Tue Oct 31 17:02:59 2000 | |
| 62 | @@ -62,7 +62,7 @@ | |
| 63 | niscat networks.org_dir > $ETC_NETWORKS | |
| 64 | niscat mail_aliases.org_dir > $ETC_ALIASES | |
| 65 | ||
| 66 | -. ${INSTDIR}migrate_all_online.sh | |
| 36cfeb9d | 67 | +. ${INSTDIR}migrate_all_online.sh "$@" |
| 4d17bf40 JR |
68 | |
| 69 | rm -f $ETC_PASSWD | |
| 70 | rm -f $ETC_GROUP | |
| 71 | --- MigrationTools-27/migrate_all_netinfo_online.sh Tue Oct 31 17:02:17 2000 | |
| 72 | +++ MigrationTools-27/migrate_all_netinfo_online.sh Tue Oct 31 17:02:46 2000 | |
| 73 | @@ -69,7 +69,7 @@ | |
| 74 | nidump networks $DOM > $ETC_NETWORKS | |
| 75 | nidump aliases $DOM > $ETC_ALIASES | |
| 76 | ||
| 77 | -. ${INSTDIR}migrate_all_online.sh | |
| 36cfeb9d | 78 | +. ${INSTDIR}migrate_all_online.sh "$@" |
| 4d17bf40 JR |
79 | |
| 80 | rm -f $ETC_PASSWD | |
| 81 | rm -f $ETC_GROUP | |
| 82 | --- MigrationTools-27/migrate_all_netinfo_offline.sh Tue Oct 31 17:02:22 2000 | |
| 83 | +++ MigrationTools-27/migrate_all_netinfo_offline.sh Tue Oct 31 17:02:43 2000 | |
| 84 | @@ -69,7 +69,7 @@ | |
| 85 | nidump networks $DOM > $ETC_NETWORKS | |
| 86 | nidump aliases $DOM > $ETC_ALIASES | |
| 87 | ||
| 88 | -. ${INSTDIR}migrate_all_offline.sh | |
| 36cfeb9d | 89 | +. ${INSTDIR}migrate_all_offline.sh "$@" |
| 4d17bf40 JR |
90 | |
| 91 | rm -f $ETC_PASSWD | |
| 92 | rm -f $ETC_GROUP | |
| 93 | --- MigrationTools-27/migrate_all_nisplus_offline.sh Tue Oct 31 17:02:27 2000 | |
| 94 | +++ MigrationTools-27/migrate_all_nisplus_offline.sh Tue Oct 31 17:02:56 2000 | |
| 95 | @@ -62,7 +62,7 @@ | |
| 96 | niscat networks.org_dir > $ETC_NETWORKS | |
| 97 | niscat mail_aliases.org_dir > $ETC_ALIASES | |
| 98 | ||
| 99 | -. ${INSTDIR}migrate_all_offline.sh | |
| 36cfeb9d | 100 | +. ${INSTDIR}migrate_all_offline.sh "$@" |
| 4d17bf40 JR |
101 | |
| 102 | rm -f $ETC_PASSWD | |
| 103 | rm -f $ETC_GROUP |