From: Tom Yu <tlyu@mit.edu>
Date: Tue, 21 Dec 2004 20:24:10 +0000 (+0000)
Subject: pullup from trunk
X-Git-Tag: krb5-1.4.3-beta1~120
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=61f1c97a43257c7a856db7b115fce963e369f15d;p=krb5.git

pullup from trunk

ticket: 2796
version_fixed: 1.4

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-4@16980 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/util/ChangeLog b/src/util/ChangeLog
index 4de8fce38..5e792c8ac 100644
--- a/src/util/ChangeLog
+++ b/src/util/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-21  Tom Yu  <tlyu@mit.edu>
+
+	* def-check.pl: Check for PRIVATE or INTERNAL annotations in defs
+	file.
+
 2004-10-31  Tom Yu  <tlyu@mit.edu>
 
 	* mkrel: Rework quoting for RELTAIL check.  Don't check RELTAIL if
diff --git a/src/util/def-check.pl b/src/util/def-check.pl
index 9b7aee15e..447421e8e 100644
--- a/src/util/def-check.pl
+++ b/src/util/def-check.pl
@@ -219,7 +219,9 @@ while (! $d->eof()) {
     }
     s/[ \t]*//g;
     my($xconv);
-    if (/!CALLCONV/ || /KRB5_CALLCONV_WRONG/) {
+    if (/PRIVATE/ || /INTERNAL/) {
+	$xconv = "PRIVATE";
+    } elsif (/!CALLCONV/ || /KRB5_CALLCONV_WRONG/) {
 	$xconv = "KRB5_CALLCONV_WRONG";
     } elsif ($vararg{$_}) {
 	$xconv = "KRB5_CALLCONV_C";
@@ -227,6 +229,11 @@ while (! $d->eof()) {
 	$xconv = "KRB5_CALLCONV";
     }
     s/;.*$//;
+
+    if ($xconv eq "PRIVATE") {
+	print "\t private $_\n";
+	next LINE2;
+    }
     if (!defined($conv{$_})) {
 	print "No calling convention specified for $_!\n";
     } elsif (! ($conv{$_} eq $xconv)) {