gensec_krb5: Rename gensec_krb5_util to gensec_krb5_heimdal

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/source4/auth/gensec/gensec_krb5.c b/source4/auth/gensec/gensec_krb5.c
index 2af6b145f6c91f870e8529388748c928a6834373..4198fef5012f6b7e89cc5915cafd0142dfec04e6 100644 (file)
--- a/source4/auth/gensec/gensec_krb5.c
+++ b/source4/auth/gensec/gensec_krb5.c
@@ -41,7 +41,7 @@
 #include "lib/util/util_net.h"
 #include "../lib/util/asn1.h"
 #include "auth/kerberos/pac_utils.h"
-#include "gensec_krb5_util.h"
+#include "gensec_krb5.h"
 
 _PUBLIC_ NTSTATUS gensec_krb5_init(void);
 

diff --git a/source4/auth/gensec/gensec_krb5_util.h b/source4/auth/gensec/gensec_krb5.h
similarity index 56%
rename from source4/auth/gensec/gensec_krb5_util.h
rename to source4/auth/gensec/gensec_krb5.h
index 09be3ff6a79e608408698feec300d733af6c51eb..230eadc748dfdc031b01ebbe2a3b552659d62002 100644 (file)
--- a/source4/auth/gensec/gensec_krb5_util.h
+++ b/source4/auth/gensec/gensec_krb5.h
@@ -1,10 +1,10 @@
 /* See gensec_krb5_util.c for the license */
 
-krb5_error_code smb_rd_req_return_stuff(krb5_context context, 
+krb5_error_code smb_rd_req_return_stuff(krb5_context context,
                                        krb5_auth_context *auth_context,
                                        const krb5_data *inbuf,
-                                       krb5_keytab keytab, 
+                                       krb5_keytab keytab,
                                        krb5_principal acceptor_principal,
-                                       krb5_data *outbuf, 
-                                       krb5_ticket **ticket, 
+                                       krb5_data *outbuf,
+                                       krb5_ticket **ticket,
                                        krb5_keyblock **keyblock);

diff --git a/source4/auth/gensec/gensec_krb5_util.c b/source4/auth/gensec/gensec_krb5_heimdal.c
similarity index 81%
rename from source4/auth/gensec/gensec_krb5_util.c
rename to source4/auth/gensec/gensec_krb5_heimdal.c
index 1e722938dfebcad97addf2b6d8895a501bc67313..150d9185204817ac121487bcf65e6321e5f3ae0c 100644 (file)
--- a/source4/auth/gensec/gensec_krb5_util.c
+++ b/source4/auth/gensec/gensec_krb5_heimdal.c
@@ -1,34 +1,34 @@
 /*
  * Copyright (c) 1997 - 2006 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden). 
- * All rights reserved. 
+ * (Royal Institute of Technology, Stockholm, Sweden).
+ * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions 
- * are met: 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
  *
- * 1. Redistributions of source code must retain the above copyright 
- *    notice, this list of conditions and the following disclaimer. 
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
  *
- * 2. Redistributions in binary form must reproduce the above copyright 
- *    notice, this list of conditions and the following disclaimer in the 
- *    documentation and/or other materials provided with the distribution. 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
  *
- * 3. Neither the name of the Institute nor the names of its contributors 
- *    may be used to endorse or promote products derived from this software 
- *    without specific prior written permission. 
+ * 3. Neither the name of the Institute nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND 
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE 
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
- * SUCH DAMAGE. 
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
  */
 
 /* This file for code taken from the Heimdal code, to preserve licence */
@@ -37,16 +37,16 @@
 #include "includes.h"
 #include "system/kerberos.h"
 #include "auth/kerberos/kerberos.h"
-#include "gensec_krb5_util.h"
+#include "gensec_krb5.h"
 
 /* Taken from  accept_sec_context.c,v 1.65 */
-krb5_error_code smb_rd_req_return_stuff(krb5_context context, 
+krb5_error_code smb_rd_req_return_stuff(krb5_context context,
                                        krb5_auth_context *auth_context,
                                        const krb5_data *inbuf,
-                                       krb5_keytab keytab, 
+                                       krb5_keytab keytab,
                                        krb5_principal acceptor_principal,
-                                       krb5_data *outbuf, 
-                                       krb5_ticket **ticket, 
+                                       krb5_data *outbuf,
+                                       krb5_ticket **ticket,
                                        krb5_keyblock **keyblock)
 {
        krb5_rd_req_in_ctx in = NULL;
@@ -80,7 +80,7 @@ krb5_error_code smb_rd_req_return_stuff(krb5_context context,
        /*
         * We need to remember some data on the context_handle.
         */
-       kret = krb5_rd_req_out_get_ticket(context, out, 
+       kret = krb5_rd_req_out_get_ticket(context, out,
                                          ticket);
        if (kret == 0) {
            kret = krb5_rd_req_out_get_keyblock(context, out,
@@ -100,4 +100,3 @@ krb5_error_code smb_rd_req_return_stuff(krb5_context context,
 
        return kret;
 }
-    

diff --git a/source4/auth/gensec/wscript_build b/source4/auth/gensec/wscript_build
index 3c7cc2e12b4efba14981dc58add637b7a4b91b9d..c4e69183b28af2c65d95a5f544a3316b0f3103c7 100755 (executable)
--- a/source4/auth/gensec/wscript_build
+++ b/source4/auth/gensec/wscript_build
@@ -6,7 +6,7 @@ bld.SAMBA_SUBSYSTEM('gensec_util',
                     autoproto='gensec_proto.h')
 
 bld.SAMBA_MODULE('gensec_krb5',
-       source='gensec_krb5.c gensec_krb5_util.c',
+       source='gensec_krb5.c gensec_krb5_heimdal.c',
        subsystem='gensec',
        init_function='gensec_krb5_init',
        deps='samba-credentials authkrb5 com_err gensec_util',