Attachment 2530 Details for Bug 15144 – Патч, добавляющий возможность очистить значения для прокси

[patch] Патч, добавляющий возможность очистить значения для прокси

proxy.patch (text/plain), 1.27 KB, created by Denis Yagofarov on 2008-03-29 21:11:10 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Denis Yagofarov

Created: 2008-03-29 21:11:10 MSK

Size: 1.27 KB

patch

obsolete

>--- /usr/lib/alterator/backend3/proxy	2008-01-18 16:09:57 +0200
>+++ /root/proxy2	2008-03-29 20:04:54 +0200
>@@ -89,6 +89,11 @@
> 	for var in $VARS; do
> 		shell_add_or_subst "export $var=" "$PROXY" "$SETTINGS"
> 	done
>+
>+	if [ "$in_server" = "" ] && [ "$in_portr" = "" ] && [ "$in_login" = "" ] && [ "$in_password" = "" ]; then
>+		echo > "$SETTINGS"
>+	fi
>+
> 	chmod 0755 "$SETTINGS"
> 
> 	echo '()'
>@@ -97,14 +102,18 @@
> 
> constraints()
> {
>-	local required="$([ "$in_orig_action" = "new" ] && echo "#t" || echo "#f")"
>-	echo '('
>-	printf 'server (required #t match ("^[[:alnum:].-]+$" "%s") label "%s")' \
>-	"`_ "invalid proxy hostname"`" "`_ "Server"`"
>-	printf 'port  (required #t match ("^[0-9]+$"  "%s")  default "3128" label "%s")' \
>-	"`_ "should be a number"`" \
>-	"`_ "Port"`"
>-	echo ')'
>+	if [ "$in_server" = "" ] && [ "$in_portr" = "" ] && [ "$in_login" = "" ] && [ "$in_password" = "" ]; then
>+		echo "#t"
>+	else
>+		local required="$([ "$in_orig_action" = "new" ] && echo "#t" || echo "#f")"
>+		echo '('
>+		printf 'server (required #t match ("^[[:alnum:].-]+$" "%s") label "%s")' \
>+		"`_ "invalid proxy hostname"`" "`_ "Server"`"
>+		printf 'port  (required #t match ("^[0-9]+$"  "%s")  default "3128" label "%s")' \
>+		"`_ "should be a number"`" \
>+		"`_ "Port"`"
>+		echo ')'
>+	fi
> }
> 
> _()

Actions: View | Diff

Attachments on bug 15144: 2530