From: Alexander Barton <alex@barton.de>
Date: Sun, 27 Mar 2011 18:58:18 +0000 (+0200)
Subject: Merge branch 'AuthPing'
X-Git-Tag: rel-18-rc1~25
X-Git-Url: https://arthur.barton.de/gitweb/?p=ngircd.git;a=commitdiff_plain;h=d61fbfc6e3a0a85ced036d8c1fa161fab0d9ba3d

Merge branch 'AuthPing'

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

d61fbfc6e3a0a85ced036d8c1fa161fab0d9ba3d
diff --cc doc/sample-ngircd.conf.tmpl
index f9c96562,6e02048f..b5a36b84
--- a/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 b2ce02ca,bcdad1f8..d1a0a64a
--- a/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 568b9e7a,452f744f..a00049ee
--- a/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));