Merge branch 'AuthPing'

* AuthPing:
  Add documentation for "RequireAuthPing" configuration option
  New configuration option "RequireAuthPing": PING-PONG on login

diff --cc doc/sample-ngircd.conf.tmpl
index f9c96562e45ac1ce9b6d215d3ac47531caf3a1b3,6e02048ffd93774bbe955f1490e05c43aaed80a9..b5a36b843ca35505f1d05d61d42cf14f00ae5ec9
--- 1/doc/sample-ngircd.conf.tmpl
--- 2/doc/sample-ngircd.conf.tmpl
+++ b/doc/sample-ngircd.conf.tmpl
@@@ -154,11 -154,11 +154,16 @@@
        # maximum nick name length!
        ;MaxNickLength = 9
  
 +      # Normally ngIRCd doesn't send any messages to a client until it is
 +      # registered. Enable this option to let the daemon send "NOTICE AUTH"
 +      # messages to clients while connecting.
 +      ;NoticeAuth = no
 +
+       # Let ngIRCd send an "authentication PING" when a new client connects,
+       # and register this client only after receiving the corresponding
+       # "PONG" reply.
+       ;RequireAuthPing = no
+ 
        # Set this hostname for every client instead of the real one.
        # Please note: don't use the percentage sign ("%"), it is reserved for
        # future extensions!

diff --cc man/ngircd.conf.5.tmpl
index b2ce02caa9eb97d6595ab48342f03c72f1ab93d6,bcdad1f85bd988ef72b947eca41324fc49c913bf..d1a0a64a8996a483edebc868a9f13931bbbf4381
--- 1/man/ngircd.conf.5.tmpl
--- 2/man/ngircd.conf.5.tmpl
+++ b/man/ngircd.conf.5.tmpl
@@@ -251,12 -251,12 +251,17 @@@ Maximum length of an user nick name (De
  note that all servers in an IRC network MUST use the same maximum nick name
  length!
  .TP
 -\fBRequireAuthPing\fR
 +\fBNoticeAuth\fR (boolean)
 +Normally ngIRCd doesn't send any messages to a client until it is registered.
 +Enable this option to let the daemon send "NOTICE AUTH" messages to clients
 +while connecting. Default: no.
 +.TP
++\fBRequireAuthPing\fR (boolean)
+ Let ngIRCd send an "authentication PING" when a new client connects, and
+ register this client only after receiving the corresponding "PONG" reply.
+ Default: no.
+ .TP
 -\fBCloakHost\fR
 +\fBCloakHost\fR (string)
  Set this hostname for every client instead of the real one. Default: empty,
  don't change.
  .PP

diff --cc src/ngircd/conf.c
index 568b9e7a9bb2d068de5a35399af2328799e702bf,452f744f0d103d906b8bfe905176848f687f2de8..a00049eef97cc29630a6d22af8e556f7efd61a2c
--- 1/src/ngircd/conf.c
--- 2/src/ngircd/conf.c
+++ b/src/ngircd/conf.c
@@@ -352,11 -352,13 +352,14 @@@ Conf_Test( void 
        printf("  MaxConnectionsIP = %d\n", Conf_MaxConnectionsIP);
        printf("  MaxJoins = %d\n", Conf_MaxJoins > 0 ? Conf_MaxJoins : -1);
        printf("  MaxNickLength = %u\n", Conf_MaxNickLength - 1);
 +      printf("  NoticeAuth = %s\n", yesno_to_str(Conf_NoticeAuth));
        printf("  CloakHost = %s\n", Conf_CloakHost);
-       printf("  CloakUserToNick = %s\n\n", yesno_to_str(Conf_CloakUserToNick));
+       printf("  CloakUserToNick = %s\n", yesno_to_str(Conf_CloakUserToNick));
+ #ifndef STRICT_RFC
+       printf("  RequireAuthPing = %s\n", yesno_to_str(Conf_AuthPing));
+ #endif
  
-       puts("[FEATURES]");
+       printf("\n[FEATURES]\n");
        printf("  DNS = %s\n", yesno_to_str(Conf_DNS));
        printf("  Ident = %s\n", yesno_to_str(Conf_Ident));
        printf("  PAM = %s\n", yesno_to_str(Conf_PAM));

diff --cc src/ngircd/conf.h
Simple merge

diff --cc src/ngircd/conn.c
Simple merge