diff -ruN migrationtools-47.orig/ads/migrate_all_nis_online_ads.sh migrationtools-47/ads/migrate_all_nis_online_ads.sh
--- migrationtools-47.orig/ads/migrate_all_nis_online_ads.sh	2007-01-10 21:49:59.000000000 +0100
+++ migrationtools-47/ads/migrate_all_nis_online_ads.sh	2007-01-10 22:50:00.000000000 +0100
@@ -41,16 +41,19 @@
 export PATH
 
 
-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"
+TEMP_DIR="$(mktemp -dt)" || {
+	echo "Can't create temporary directory" >&2
+	exit 1
+}
+ETC_PASSWD="$TEMP_DIR/passwd.ldap"
+ETC_GROUP="$TEMP_DIR/group.ldap"
+#ETC_SERVICES="$TEMP_DIR/services.ldap"
+#ETC_PROTOCOLS="$TEMP_DIR/protocols.ldap"
+#ETC_FSTAB="$TEMP_DIR/fstab.ldap"
+#ETC_RPC="$TEMP_DIR/rpc.ldap"
+#ETC_HOSTS="$TEMP_DIR/hosts.ldap"
+#ETC_NETWORKS="$TEMP_DIR/networks.ldap"
+#ETC_ALIASES="$TEMP_DIR/aliases.ldap"
 EXIT=no
 
 question="Enter the NIS domain to import from (optional): "
@@ -83,4 +86,4 @@
 #rm -f $ETC_HOSTS
 #rm -f $ETC_NETWORKS
 #rm -f $ETC_ALIASES
-
+rm -d $TEMP_DIR
diff -ruN migrationtools-47.orig/ads/migrate_all_online_ads.sh migrationtools-47/ads/migrate_all_online_ads.sh
--- migrationtools-47.orig/ads/migrate_all_online_ads.sh	2007-01-10 21:49:59.000000000 +0100
+++ migrationtools-47/ads/migrate_all_online_ads.sh	2007-01-10 22:50:00.000000000 +0100
@@ -39,7 +39,10 @@
 SHELL=/bin/sh
 export SHELL
 
-DB=/tmp/nis.$$.ldif
+DB="$(mktemp -t nis.ldif.XXXXXXXXXX)" || {
+	echo "Can't create temporary file" >&2
+	exit 1
+}
 
 #if [ "X$ETC_ALIASES" = "X" ]; then
 #	ETC_ALIASES=/etc/aliases
diff -ruN migrationtools-47.orig/migrate_all_netinfo_offline.sh migrationtools-47/migrate_all_netinfo_offline.sh
--- migrationtools-47.orig/migrate_all_netinfo_offline.sh	2007-01-10 21:49:59.000000000 +0100
+++ migrationtools-47/migrate_all_netinfo_offline.sh	2007-01-10 22:50:00.000000000 +0100
@@ -39,16 +39,19 @@
 PATH=$PATH:.
 export PATH
 
-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"
+TEMP_DIR="$(mktemp -dt)" || {
+	echo "Can't create temporary directory" >&2
+	exit 1
+}
+ETC_PASSWD="$TEMP_DIR/passwd.ldap"
+ETC_GROUP="$TEMP_DIR/group.ldap"
+ETC_SERVICES="$TEMP_DIR/services.ldap"
+ETC_PROTOCOLS="$TEMP_DIR/protocols.ldap"
+ETC_FSTAB="$TEMP_DIR/fstab.ldap"
+ETC_RPC="$TEMP_DIR/rpc.ldap"
+ETC_HOSTS="$TEMP_DIR/hosts.ldap"
+ETC_NETWORKS="$TEMP_DIR/networks.ldap"
+ETC_ALIASES="$TEMP_DIR/aliases.ldap"
 EXIT=no
 
 question="Enter the NetInfo domain to import from [/]:"
@@ -79,4 +82,4 @@
 rm -f $ETC_HOSTS
 rm -f $ETC_NETWORKS
 rm -f $ETC_ALIASES
-
+rm -d $TEMP_DIR
diff -ruN migrationtools-47.orig/migrate_all_netinfo_online.sh migrationtools-47/migrate_all_netinfo_online.sh
--- migrationtools-47.orig/migrate_all_netinfo_online.sh	2007-01-10 21:49:59.000000000 +0100
+++ migrationtools-47/migrate_all_netinfo_online.sh	2007-01-10 22:50:00.000000000 +0100
@@ -39,16 +39,19 @@
 PATH=$PATH:.
 export PATH
 
-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"
+TEMP_DIR="$(mktemp -dt)" || {
+	echo "Can't create temporary directory" >&2
+	exit 1
+}
+ETC_PASSWD="$TEMP_DIR/passwd.ldap"
+ETC_GROUP="$TEMP_DIR/group.ldap"
+ETC_SERVICES="$TEMP_DIR/services.ldap"
+ETC_PROTOCOLS="$TEMP_DIR/protocols.ldap"
+ETC_FSTAB="$TEMP_DIR/fstab.ldap"
+ETC_RPC="$TEMP_DIR/rpc.ldap"
+ETC_HOSTS="$TEMP_DIR/hosts.ldap"
+ETC_NETWORKS="$TEMP_DIR/networks.ldap"
+ETC_ALIASES="$TEMP_DIR/aliases.ldap"
 EXIT=no
 
 question="Enter the NetInfo domain to import from [/]:"
@@ -79,4 +82,4 @@
 rm -f $ETC_HOSTS
 rm -f $ETC_NETWORKS
 rm -f $ETC_ALIASES
-
+rm -d $TEMP_DIR
diff -ruN migrationtools-47.orig/migrate_all_nis_offline.sh migrationtools-47/migrate_all_nis_offline.sh
--- migrationtools-47.orig/migrate_all_nis_offline.sh	2007-01-10 21:49:59.000000000 +0100
+++ migrationtools-47/migrate_all_nis_offline.sh	2007-01-10 22:50:00.000000000 +0100
@@ -39,16 +39,19 @@
 PATH=$PATH:.
 export PATH
 
-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"
+TEMP_DIR="$(mktemp -dt)" || {
+	echo "Can't create temporary directory" >&2
+	exit 1
+}
+ETC_PASSWD="$TEMP_DIR/passwd.ldap"
+ETC_GROUP="$TEMP_DIR/group.ldap"
+ETC_SERVICES="$TEMP_DIR/services.ldap"
+ETC_PROTOCOLS="$TEMP_DIR/protocols.ldap"
+ETC_FSTAB="$TEMP_DIR/fstab.ldap"
+ETC_RPC="$TEMP_DIR/rpc.ldap"
+ETC_HOSTS="$TEMP_DIR/hosts.ldap"
+ETC_NETWORKS="$TEMP_DIR/networks.ldap"
+ETC_ALIASES="$TEMP_DIR/aliases.ldap"
 EXIT=no
 
 question="Enter the NIS domain to import from (optional): "
@@ -81,4 +84,4 @@
 rm -f $ETC_HOSTS
 rm -f $ETC_NETWORKS
 rm -f $ETC_ALIASES
-
+rm -d $TEMP_DIR
diff -ruN migrationtools-47.orig/migrate_all_nis_online.sh migrationtools-47/migrate_all_nis_online.sh
--- migrationtools-47.orig/migrate_all_nis_online.sh	2007-01-10 21:49:59.000000000 +0100
+++ migrationtools-47/migrate_all_nis_online.sh	2007-01-10 22:50:00.000000000 +0100
@@ -40,16 +40,19 @@
 export PATH
 
 
-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"
+TEMP_DIR="$(mktemp -dt)" || {
+	echo "Can't create temporary directory" >&2
+	exit 1
+}
+ETC_PASSWD="$TEMP_DIR/passwd.ldap"
+ETC_GROUP="$TEMP_DIR/group.ldap"
+ETC_SERVICES="$TEMP_DIR/services.ldap"
+ETC_PROTOCOLS="$TEMP_DIR/protocols.ldap"
+ETC_FSTAB="$TEMP_DIR/fstab.ldap"
+ETC_RPC="$TEMP_DIR/rpc.ldap"
+ETC_HOSTS="$TEMP_DIR/hosts.ldap"
+ETC_NETWORKS="$TEMP_DIR/networks.ldap"
+ETC_ALIASES="$TEMP_DIR/aliases.ldap"
 EXIT=no
 
 question="Enter the NIS domain to import from (optional): "
@@ -82,4 +85,4 @@
 rm -f $ETC_HOSTS
 rm -f $ETC_NETWORKS
 rm -f $ETC_ALIASES
-
+rm -d $TEMP_DIR
diff -ruN migrationtools-47.orig/migrate_all_nisplus_offline.sh migrationtools-47/migrate_all_nisplus_offline.sh
--- migrationtools-47.orig/migrate_all_nisplus_offline.sh	2007-01-10 21:49:59.000000000 +0100
+++ migrationtools-47/migrate_all_nisplus_offline.sh	2007-01-10 22:50:00.000000000 +0100
@@ -39,17 +39,20 @@
 PATH=$PATH:/usr/lib/nis:.
 export PATH
 
-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"
+TEMP_DIR="$(mktemp -dt)" || {
+	echo "Can't create temporary directory" >&2
+	exit 1
+}
+ETC_PASSWD="$TEMP_DIR/passwd.ldap"
+ETC_GROUP="$TEMP_DIR/group.ldap"
+ETC_SERVICES="$TEMP_DIR/services.ldap"
+ETC_PROTOCOLS="$TEMP_DIR/protocols.ldap"
+ETC_FSTAB="$TEMP_DIR/fstab.ldap"
+ETC_RPC="$TEMP_DIR/rpc.ldap"
+ETC_HOSTS="$TEMP_DIR/hosts.ldap"
+ETC_NETWORKS="$TEMP_DIR/networks.ldap"
+ETC_NETGROUP="$TEMP_DIR/netgroup.ldap"
+ETC_ALIASES="$TEMP_DIR/aliases.ldap"
 EXIT=no
 
 question="Enter the NIS+ domain to import from (optional): "
@@ -84,4 +87,4 @@
 rm -f $ETC_NETWORKS
 rm -f $ETC_NETGROUP
 rm -f $ETC_ALIASES
-
+rm -d $TEMP_DIR
diff -ruN migrationtools-47.orig/migrate_all_nisplus_online.sh migrationtools-47/migrate_all_nisplus_online.sh
--- migrationtools-47.orig/migrate_all_nisplus_online.sh	2007-01-10 21:49:59.000000000 +0100
+++ migrationtools-47/migrate_all_nisplus_online.sh	2007-01-10 22:50:00.000000000 +0100
@@ -40,17 +40,20 @@
 export PATH
 
 
-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"
+TEMP_DIR="$(mktemp -dt)" || {
+	echo "Can't create temporary directory" >&2
+	exit 1
+}
+ETC_PASSWD="$TEMP_DIR/passwd.ldap"
+ETC_GROUP="$TEMP_DIR/group.ldap"
+ETC_SERVICES="$TEMP_DIR/services.ldap"
+ETC_PROTOCOLS="$TEMP_DIR/protocols.ldap"
+ETC_FSTAB="$TEMP_DIR/fstab.ldap"
+ETC_RPC="$TEMP_DIR/rpc.ldap"
+ETC_HOSTS="$TEMP_DIR/hosts.ldap"
+ETC_NETWORKS="$TEMP_DIR/networks.ldap"
+ETC_NETGROUP="$TEMP_DIR/netgroup.ldap"
+ETC_ALIASES="$TEMP_DIR/aliases.ldap"
 EXIT=no
 
 question="Enter the NIS+ domain to import from (optional): "
@@ -85,4 +88,4 @@
 rm -f $ETC_NETWORKS
 rm -f $ETC_NETGROUP
 rm -f $ETC_ALIASES
-
+rm -d $TEMP_DIR
diff -ruN migrationtools-47.orig/migrate_all_offline.sh migrationtools-47/migrate_all_offline.sh
--- migrationtools-47.orig/migrate_all_offline.sh	2007-01-10 21:49:59.000000000 +0100
+++ migrationtools-47/migrate_all_offline.sh	2007-01-10 22:50:00.000000000 +0100
@@ -41,7 +41,10 @@
 # Luke Howard <lukeh@padl.com> April 1997
 #
 
-DB="/tmp/nis.$$.ldif"
+DB="$(mktemp -t nis.ldif.XXXXXXXXXX)" || {
+	echo "Can't create temporary file" >&2
+	exit 1
+}
 
 if [ "X$ETC_ALIASES" = "X" ]; then
 	ETC_ALIASES=/etc/aliases
diff -ruN migrationtools-47.orig/migrate_all_online.sh migrationtools-47/migrate_all_online.sh
--- migrationtools-47.orig/migrate_all_online.sh	2007-01-10 21:49:59.000000000 +0100
+++ migrationtools-47/migrate_all_online.sh	2007-01-10 22:50:00.000000000 +0100
@@ -38,7 +38,10 @@
 SHELL=/bin/sh
 export SHELL
 
-DB=/tmp/nis.$$.ldif
+DB="$(mktemp -t nis.ldif.XXXXXXXXXX)" || {
+	echo "Can't create temporary file" >&2
+	exit 1
+}
 
 if [ "X$ETC_ALIASES" = "X" ]; then
 	ETC_ALIASES=/etc/aliases