3 files changed, 22 insertions, 0 deletions
diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 00c7d361f..22390f490 100644
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,5 +1,11 @@
 Sat Dec 21 01:26:11 1996  Theodore Y. Ts'o  <tytso@mit.edu>
 
+	* brand.c: New file, which allows a release engineer to "brand"
+ 		the krb5 library or a binary application program
+ 		statically linked against the krb5 library.  This file is
+		statically included by init_ctx.c, to force it be in a
+		binary library or application program.
+	
 	* init_ctx.c (krb5_init_context): Use new call krb5_vercheck() for
  		Windows timebomb checking; this call returns an error
 		code, which is returned to the user if the timebomb should
diff --git a/src/lib/krb5/krb/brand.c b/src/lib/krb5/krb/brand.c
new file mode 100644
index 000000000..de48d5880
--- /dev/null
+++ b/src/lib/krb5/krb/brand.c
@@ -0,0 +1,15 @@
+/*
+ * This file is used to put a "release brand" on a Krb5 library before
+ * it is released via some release engineering process.  This gives us
+ * an easy way to tell where a binary came from.
+ *
+ * It currently is manually maintained, because there's no good way to
+ * automatically have CVS do the right thing.  We could put RCS tags
+ * in every single file, but that (a) takes up lots of space, since we
+ * have lots of files in the Kerberos library, and (b) it makes CVS
+ * merges a real pain.
+ */
+
+/* Format: "KRB5_BRAND: <cvs tag> <date>" */
+
+static char krb5_brand[] = "KRB5_BRAND: Unbranded release";
diff --git a/src/lib/krb5/krb/init_ctx.c b/src/lib/krb5/krb/init_ctx.c
index 2794fbcf6..9daa7f8d1 100644
--- a/src/lib/krb5/krb/init_ctx.c
+++ b/src/lib/krb5/krb/init_ctx.c
@@ -25,6 +25,7 @@
 
 #include "k5-int.h"
 #include <ctype.h>
+#include "brand.c"
 
 #if (defined(_MSDOS) || defined(_WIN32))
 extern krb5_error_code krb5_vercheck();