From cb989e3a3ac69596235d4acc746143a2b6673c67 Mon Sep 17 00:00:00 2001
From: Zhanna Tsitkov <tsitkova@mit.edu>
Date: Thu, 7 Jan 2010 19:17:55 +0000
Subject: [PATCH] Move krb5_auth_con_getauthenticator into copy_athctr.c as a
 better logical location

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23606 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/lib/krb5/krb/auth_con.c    | 36 ++++++++++++++++++++++++++--------
 src/lib/krb5/krb/copy_athctr.c | 14 ++++++++++++-
 2 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/src/lib/krb5/krb/auth_con.c b/src/lib/krb5/krb/auth_con.c
index 1cb5c2bab..2283d1a93 100644
--- a/src/lib/krb5/krb/auth_con.c
+++ b/src/lib/krb5/krb/auth_con.c
@@ -1,4 +1,32 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+/*
+ * lib/krb5/krb/auth_con.c
+ *
+ * Copyright 2010 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
+ *
+ * Export of this software from the United States of America may
+ *   require a specific license from the United States Government.
+ *   It is the responsibility of any person or organization contemplating
+ *   export to obtain such a license before exporting.
+ *
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ * distribute this software and its documentation for any purpose and
+ * without fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright notice and
+ * this permission notice appear in supporting documentation, and that
+ * the name of M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission.  Furthermore if you modify this software you must label
+ * your software as modified software and not distribute it in such a
+ * fashion that it might be confused with the original M.I.T. software.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is" without express
+ * or implied warranty.
+ *
+ */
+
 #include "k5-int.h"
 #include "int-proto.h"
 #include "auth_con.h"
@@ -277,14 +305,6 @@ krb5_auth_con_getlocalseqnumber(krb5_context context, krb5_auth_context auth_con
     *seqnumber = auth_context->local_seq_number;
     return 0;
 }
-#ifndef LEAN_CLIENT
-krb5_error_code KRB5_CALLCONV
-krb5_auth_con_getauthenticator(krb5_context context, krb5_auth_context auth_context, krb5_authenticator **authenticator)
-{
-    return (krb5_copy_authenticator(context, auth_context->authentp,
-                                    authenticator));
-}
-#endif
 
 krb5_error_code KRB5_CALLCONV
 krb5_auth_con_getremoteseqnumber(krb5_context context, krb5_auth_context auth_context, krb5_int32 *seqnumber)
diff --git a/src/lib/krb5/krb/copy_athctr.c b/src/lib/krb5/krb/copy_athctr.c
index 3345486e4..9b942ba25 100644
--- a/src/lib/krb5/krb/copy_athctr.c
+++ b/src/lib/krb5/krb/copy_athctr.c
@@ -26,12 +26,16 @@
  *
  *
  * krb5_copy_authenticator()
+ * krb5_auth_con_getauthenticator()
  */
 
 #include "k5-int.h"
+#include "auth_con.h"
+
 #ifndef LEAN_CLIENT
 krb5_error_code KRB5_CALLCONV
-krb5_copy_authenticator(krb5_context context, const krb5_authenticator *authfrom, krb5_authenticator **authto)
+krb5_copy_authenticator(krb5_context context, const krb5_authenticator *authfrom,
+                        krb5_authenticator **authto)
 {
     krb5_error_code retval;
     krb5_authenticator *tempto;
@@ -80,4 +84,12 @@ krb5_copy_authenticator(krb5_context context, const krb5_authenticator *authfrom
     *authto = tempto;
     return 0;
 }
+
+krb5_error_code KRB5_CALLCONV
+krb5_auth_con_getauthenticator(krb5_context context, krb5_auth_context auth_context,
+                               krb5_authenticator **authenticator)
+{
+    return (krb5_copy_authenticator(context, auth_context->authentp,
+                                    authenticator));
+}
 #endif
-- 
2.26.2