From: Richard Basch <probe@mit.edu>
Date: Mon, 22 Apr 1996 00:35:52 +0000 (+0000)
Subject: 	One could not specify -c in inetd.conf, because of the
X-Git-Tag: krb5-1.0-beta6~184
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=21929ce19741f726e97a4a8b3ed293501bc779ba;p=krb5.git

	One could not specify -c in inetd.conf, because of the
	variable initialization; initialization has been corrected to
	allow either checksumming or ignoring the checksum.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7855 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index 944c04a9c..e389418a2 100644
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -4,6 +4,9 @@ Sun Apr 21 12:52:35 1996  Richard Basch  <basch@lehman.com>
 	defined, incorrect messages were being displayed for V4 clients.
 	Additionally, various errors were not being displayed with the
 	trailing newline.
+	Also, one could not specify -c in inetd.conf, because of the
+	variable initialization; initialization has been corrected to
+	allow either checksumming or ignoring the checksum.
 
 Sun Apr 21 00:30:28 1996  Sam Hartman  <hartmans@mit.edu>
 
diff --git a/src/appl/bsd/krshd.c b/src/appl/bsd/krshd.c
index c64f20381..222e330aa 100644
--- a/src/appl/bsd/krshd.c
+++ b/src/appl/bsd/krshd.c
@@ -206,7 +206,7 @@ int netf;
 #define AUTH_KRB5 (0x2)
 #define AUTH_RHOSTS (0x4)
 int auth_ok = 0, auth_sent = 0;
-int checksum_required = 0, checksum_ignored = 1;
+int checksum_required = 0, checksum_ignored = 0;
 char *progname;
 
 #define MAX_PROG_NAME 10
@@ -412,26 +412,25 @@ int main(argc, argv)
 	
 	fd = 0;
     }
-
-    if (checksum_required&&checksum_ignored) {
-      syslog( LOG_CRIT, "Checksums are required and ignored; these options are mutually exclusive--check the documentation.");
-      fatal(fd, "Configuration error: mutually exclusive options specified");
-    }
     
     if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, (char *)&on,
 		   sizeof (on)) < 0)
-      syslog(LOG_WARNING,
+	syslog(LOG_WARNING,
 	     "setsockopt (SO_KEEPALIVE): %m");
 #if defined(BSD) && BSD+0 >= 43
     linger.l_onoff = 1;
     linger.l_linger = 60;			/* XXX */
     if (setsockopt(fd, SOL_SOCKET, SO_LINGER, (char *)&linger,
 		   sizeof (linger)) < 0)
-      syslog(LOG_WARNING , "setsockopt (SO_LINGER): %m");
+	syslog(LOG_WARNING , "setsockopt (SO_LINGER): %m");
 #endif
+
+    if (!checksum_required && !checksum_ignored)
+	checksum_ignored = 1;
+
     if (checksum_required&&checksum_ignored) {
-      syslog( LOG_CRIT, "Checksums are required and ignored; these options are mutually exclusive--check the documentation.");
-      fatal(fd, "Configuration error: mutually exclusive options specified");
+	syslog(LOG_CRIT, "Checksums are required and ignored; these options are mutually exclusive--check the documentation.");
+	fatal(fd, "Configuration error: mutually exclusive options specified");
     }
 
     doit(dup(fd), &from);