Like, work.

[gnus] / etc / gnus / news-server.ast

diff --git a/etc/gnus/news-server.ast b/etc/gnus/news-server.ast
index dd98c12..d607be5 100644 (file)
--- a/etc/gnus/news-server.ast
+++ b/etc/gnus/news-server.ast
@@ -5,7 +5,7 @@
 @variable server :string (gnus-getenv-nntpserver)
 @variable port :number 119
 @validate (assistant-validate-connect-to-server server port)
-@result gnus-select-method (list server port)
+@result gnus-select-method (list 'nntp server (list 'nntp-server port))
 @text
 Usenet news is usually read from your Internet service prodider's news
 server.  If you don't know the name of this server, contact your ISP.
@@ -17,21 +17,42 @@ Port number: @variable{port}
 @end text
 @next t "User name and password"
 
+
 @node User name and password
+@type interstitial
+@next 
+(if (assistant-password-required-p)
+    "Enter user name and password"
+  "Want user name and password?")
+@end next
+
+
+@node Want user name and password?
+@variable passwordp (:radio ((item "Yes") (item "No"))) "No"
+@text
+Some news servers require that you enter a user name and a password.
+It doesn't look like your news server is one of them.
+
+Do you want to enter user name and password anyway?
+
+@variable{passwordp}
+
+@end text
+
+@next (equal passwordp "No") finish
+@next (not (equal passwordp "No")) "Enter user name and password"
+
+
+@node Enter user name and password
 @variable user-name :string (user-login-name)
 @variable password :password (or (assistant-authinfo-data server port 'password) "")
-@validate "... lots of code ..."
-@result ... er... put stuff in .authinfo, I guess
 @text
-Some news servers require that you enter a user name and
-a password.
 
-@if (password-required-p)
-It looks like your news server is one of those.
-@else
-It doesn't look like your news server requires passwords.
-@endif
+It looks like your news server requires you to enter a user name
+and a password:
 
 User name: @variable{user-name}
-Password: @variable{password}
+Password: @variable{user-name}
+
 @end text
+