svn rev #21563: trunk/src/slave/

[raeburn@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=21563
Commit By: raeburn
Log Message:
Some cleanup from Shawn Emery: Use INITIAL_TIMER macros instead of
hardcoding values; reset 'gfd' when turning off the alarm.



Changed Files:
U   trunk/src/slave/kpropd.c
Modified: trunk/src/slave/kpropd.c
===================================================================
--- trunk/src/slave/kpropd.c	2008-12-22 03:12:19 UTC (rev 21562)
+++ trunk/src/slave/kpropd.c	2008-12-22 03:49:30 UTC (rev 21563)
@@ -458,7 +458,7 @@
 		fprintf(stderr, "doit: setting resync alarm to 5s\n");
 	    signal(SIGALRM, resync_alarm);
 	    gfd = fd;
-	    if (alarm(5) != 0) {
+	    if (alarm(INITIAL_TIMER) != 0) {
 		if (debug) {
 		    fprintf(stderr,
 			    _("%s: alarm already set\n"), progname);
@@ -508,6 +508,7 @@
 	 * Turn off alarm upon successful authentication from master.
 	 */
 	alarm(0);
+	gfd = -1;
 
 	if (!authorized_principal(kpropd_context, client, etype)) {
 		char	*name;