[PC-BSD Commits] r18008 - pcbsd/current/src-sh/pc-adctl/krb

[svn at pcbsd.org]

Author: johnh
Date: 2012-07-30 23:10:49 +0000 (Mon, 30 Jul 2012)
New Revision: 18008

Modified:
   pcbsd/current/src-sh/pc-adctl/krb/krbconf.c
Log:
Add same logic as previously committed to new bindings.



Modified: pcbsd/current/src-sh/pc-adctl/krb/krbconf.c
===================================================================
--- pcbsd/current/src-sh/pc-adctl/krb/krbconf.c	2012-07-30 23:07:56 UTC (rev 18007)
+++ pcbsd/current/src-sh/pc-adctl/krb/krbconf.c	2012-07-30 23:10:49 UTC (rev 18008)
@@ -499,8 +499,6 @@
 					int bs = 0, found = 0;
 					struct krb_entry *node = last;
 
-					printf("last: %s (%d)\n", last->keb_name, last->type);
-
 					TAILQ_FOREACH_SAFE(fe, &fentries, fentries, fetmp) {
 						if (fe == node)
 							found = 1;
@@ -563,6 +561,25 @@
 					last = fe;
 				}
 
+				if (last != NULL && last->type == KRB_ENTRY_BINDING_START) {
+					int bs = 0, found = 0;
+					struct krb_entry *node = last;
+
+					TAILQ_FOREACH_SAFE(fe, &fentries, fentries, fetmp) {
+						if (fe == node)
+							found = 1;
+						if (fe->type == KRB_ENTRY_BINDING_START)
+							bs++;
+						if (fe->type == KRB_ENTRY_BINDING_END)
+							bs--;
+
+						last = fe;
+
+						if (found == 1 && bs == 0)
+							break;
+					}
+				}
+
 				if (last != NULL) {
 					TAILQ_INSERT_AFTER(&fentries, last, ke, fentries);
 					if (end != NULL)