From 1ead7e1bbbd863449a9fbcac0479cc93a6226c1b Mon Sep 17 00:00:00 2001
From: Benjamin Sonntag <benjamin@alternc.org>
Date: Sun, 9 Sep 2007 20:01:34 +0000
Subject: [PATCH] Fixing dns/nodns issue (a bug in update_domains) Fixes #772

---
 bureau/admin/dom_edit.php | 4 +++-
 debian/changelog          | 4 +++-
 src/functions.sh          | 2 +-
 src/update_domains.sh     | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/bureau/admin/dom_edit.php b/bureau/admin/dom_edit.php
index 1298fcac..b337032a 100644
--- a/bureau/admin/dom_edit.php
+++ b/bureau/admin/dom_edit.php
@@ -146,7 +146,9 @@ if (!$r[noerase]) {
 <tr>
 	<td width="65%" valign="top">
 	<p>
-<?php printf(_("help_dns_mx %s %s"),$L_MX,$L_HOSTING); ?>
+<?php printf(_("help_dns_mx %s %s"),$L_MX,$L_HOSTING); 
+ if (!$r["mx"] && !$r["dns"]) $r["mx"]=$L_MX;
+?>
 	</p>
 	<label for="mx"><?php __("MX Field"); ?> : </label><input type="text" class="int" name="mx" id="mx" value="<?php echo $r["mx"] ?>" <?php if (!$r["dns"]) echo "disabled=\"disabled\""; ?> />
 	</td>
diff --git a/debian/changelog b/debian/changelog
index 595b9e07..8254c5af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
-alternc (0.9.6.5) testing; urgency=low
+alternc (0.9.6.5-12) testing; urgency=low
 
+  * Fixing dns / nodns issue (#772)
+  * using apache-modconf again ...
   * Choose english as default language, (#1047)
   * parameter checking in subdomain creation (#1037)
   * Changing ownership of /var/alternc/tmp, makes file upload work again (#1058)
diff --git a/src/functions.sh b/src/functions.sh
index 548667ff..1e7bbab0 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -265,7 +265,7 @@ remove_zone() {
         #sed -e "/^zone \"$escaped_domain\"/,/^};/d" \
         # That's for one-line template
         grep -v "^zone \"$escaped_domain\"" \
-            < "$NAMED_CONF_FILE" > "$NAMED_CONF_FILE.$$"
+            < "$NAMED_CONF_FILE" > "$NAMED_CONF_FILE.$$" || true
         mv -f "$NAMED_CONF_FILE.$$" "$NAMED_CONF_FILE"
         add_to_named_reload "all"
     fi
diff --git a/src/update_domains.sh b/src/update_domains.sh
index 7818da01..1c39d4b7 100755
--- a/src/update_domains.sh
+++ b/src/update_domains.sh
@@ -130,7 +130,7 @@ trap cleanup 0 1 2 15
 $MYSQL_SELECT <<EOF | tail -n '+1' > "$DOMAINS_TMP_FILE"
 SELECT membres.login,
        domaines_standby.domaine,
-       domaines_standby.mx,
+       if (domaines_standby.mx = '', '@', domaines_standby.mx),
        domaines_standby.gesdns,
        domaines_standby.gesmx,
        domaines_standby.action