kienan
/
AlternC
mirror of https://github.com/kienanstewart/AlternC.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixing dns/nodns issue (a bug in update_domains) Fixes #772

This commit is contained in:
Benjamin Sonntag 2007-09-09 20:01:34 +00:00
parent 1908e3bf27
commit 1ead7e1bbb
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bureau/admin/dom_edit.php
View File

@ -146,7 +146,9 @@ if (!$r[noerase]) {
<tr> <tr>
<td width="65%" valign="top"> <td width="65%" valign="top">
<p> <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> </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\""; ?> /> <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> </td>

4
debian/changelog vendored
View File

@ -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) * Choose english as default language, (#1047)
* parameter checking in subdomain creation (#1037) * parameter checking in subdomain creation (#1037)
* Changing ownership of /var/alternc/tmp, makes file upload work again (#1058) * Changing ownership of /var/alternc/tmp, makes file upload work again (#1058)

2
src/functions.sh
View File

@ -265,7 +265,7 @@ remove_zone() {
#sed -e "/^zone \"$escaped_domain\"/,/^};/d" \ #sed -e "/^zone \"$escaped_domain\"/,/^};/d" \
# That's for one-line template # That's for one-line template
grep -v "^zone \"$escaped_domain\"" \ 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" mv -f "$NAMED_CONF_FILE.$$" "$NAMED_CONF_FILE"
add_to_named_reload "all" add_to_named_reload "all"
fi fi

2
src/update_domains.sh
View File

@ -130,7 +130,7 @@ trap cleanup 0 1 2 15
$MYSQL_SELECT <<EOF | tail -n '+1' > "$DOMAINS_TMP_FILE" $MYSQL_SELECT <<EOF | tail -n '+1' > "$DOMAINS_TMP_FILE"
SELECT membres.login, SELECT membres.login,
domaines_standby.domaine, domaines_standby.domaine,
domaines_standby.mx, if (domaines_standby.mx = '', '@', domaines_standby.mx),
domaines_standby.gesdns, domaines_standby.gesdns,
domaines_standby.gesmx, domaines_standby.gesmx,
domaines_standby.action domaines_standby.action