From: Ken Raeburn <raeburn@mit.edu>
Date: Mon, 23 Jun 2008 23:43:27 +0000 (+0000)
Subject: On failures other than bad parameters in the config file, sleep and
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fsun-iprop;p=thirdparty%2Fkrb5.git

On failures other than bad parameters in the config file, sleep and
then try again, rather than exiting.  This includes the case of not
being able to reach a KDC to get credentials.

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/sun-iprop@20463 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/slave/kpropd.c b/src/slave/kpropd.c
index 82de726b5f..fd46819a18 100644
--- a/src/slave/kpropd.c
+++ b/src/slave/kpropd.c
@@ -632,13 +632,21 @@ reinit:
 			(void) sleep(backoff_time);
 			goto reinit;
 		} else {
+			if (retval == KADM5_BAD_CLIENT_PARAMS ||
+			    retval == KADM5_BAD_SERVER_PARAMS) {
+			    com_err(progname, retval,
+				    _("while initializing %s interface"),
+				    progname);
+
+			    usage();
+			}
+			reinit_cnt++;
 			com_err(progname, retval,
-                                _("while initializing %s interface"),
+                                _("while initializing %s interface, retrying"),
 				progname);
-			if (retval == KADM5_BAD_CLIENT_PARAMS ||
-			    retval == KADM5_BAD_SERVER_PARAMS)
-				usage();
-			exit(1);
+			backoff_time = backoff_from_master(&reinit_cnt);
+			sleep(backoff_time);
+			goto reinit;
                 }
 	}