Fixed nncp-daemon fail with --autotoss

diff --git a/doc/news.ru.texi b/doc/news.ru.texi
index e305914446c178c5db352cdb512da9ce0977c759..0a0edb02d5b80a59f7ac14c9452619647074a5f5 100644 (file)
--- a/doc/news.ru.texi
+++ b/doc/news.ru.texi
@@ -1,6 +1,16 @@
 @node Новости
 @section Новости
 
+@node Релиз 8.8.1
+@subsection Релиз 8.8.1
+@itemize
+
+@item
+Исправлено падение @command{nncp-daemon} при неопознанном подключении и
+включённом @option{-autotoss}.
+
+@end itemize
+
 @node Релиз 8.8.0
 @subsection Релиз 8.8.0
 @itemize

diff --git a/doc/news.texi b/doc/news.texi
index c640a9955386de4b7cb997670079abc710312eaf..de85706908ebed050e7094976c8f625a68a1a222 100644 (file)
--- a/doc/news.texi
+++ b/doc/news.texi
@@ -4,6 +4,16 @@
 
 See also this page @ref{Новости, on russian}.
 
+@node Release 8_8_1
+@section Release 8.8.1
+@itemize
+
+@item
+Fixed @command{nncp-daemon} failing with unauthenticated connection and
+enabled @option{-autotoss}.
+
+@end itemize
+
 @node Release 8_8_0
 @section Release 8.8.0
 @itemize

diff --git a/ports/nncp/Makefile b/ports/nncp/Makefile
index dbc14e44c0384568b14a6f9db99b1c57c6dfe091..920d86325681f0f9cb95cb4c394e6ae60d32740b 100644 (file)
--- a/ports/nncp/Makefile
+++ b/ports/nncp/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=      nncp
-DISTVERSION=   8.7.1
+DISTVERSION=   8.8.1
 CATEGORIES=    net
 MASTER_SITES=  http://www.nncpgo.org/download/
 

diff --git a/src/cmd/nncp-daemon/main.go b/src/cmd/nncp-daemon/main.go
index 710b687826fbb7b73f8a818ec1332779d9a08efa..bcd5bcda8ff72c80ad9baf5292b4df79a6e1fac7 100644 (file)
--- a/src/cmd/nncp-daemon/main.go
+++ b/src/cmd/nncp-daemon/main.go
@@ -222,7 +222,7 @@ func main() {
                        )
                }
                <-nodeIdC // call completion
-               if *autoToss {
+               if *autoToss && nodeId != nil {
                        close(autoTossFinish)
                        <-autoTossBadCode
                }
@@ -309,7 +309,7 @@ func main() {
                                )
                        }
                        <-nodeIdC // call completion
-                       if *autoToss {
+                       if *autoToss && nodeId != nil {
                                close(autoTossFinish)
                                <-autoTossBadCode
                        }

diff --git a/src/nncp.go b/src/nncp.go
index 31ba33be98d47461e70ba3d41225ed3d4619946e..a26152245282c49218e124483470cb4e51278d22 100644 (file)
--- a/src/nncp.go
+++ b/src/nncp.go
@@ -40,7 +40,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.`
 const Base32Encoded32Len = 52
 
 var (
-       Version string = "8.8.0"
+       Version string = "8.8.1"
 
        Base32Codec *base32.Encoding = base32.StdEncoding.WithPadding(base32.NoPadding)
 )