Remove krb5_init_context macro hack; change all the calls except in

krb5_gss_init_context to calls to krb5_gss_init_context.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18015 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c
index b6c50f9f53a4f1599fcc611057d2b1487dc09267..ecda750f593ea7f51048933fce0c77405f6d4e4e 100644 (file)
--- a/src/lib/gssapi/krb5/accept_sec_context.c
+++ b/src/lib/gssapi/krb5/accept_sec_context.c
@@ -271,7 +271,7 @@ krb5_gss_accept_sec_context(minor_status, context_handle,
        return(GSS_S_FAILURE);
    }
 
-   code = krb5_init_context(&context);
+   code = krb5_gss_init_context(&context);
    if (code) {
        *minor_status = code;
        return GSS_S_FAILURE;

diff --git a/src/lib/gssapi/krb5/acquire_cred.c b/src/lib/gssapi/krb5/acquire_cred.c
index 58d3bdcabe9fa3cf3992aa87c8a692e7b225b2f5..09e0dc8a2ffa9406ea01896a7e7658b86df33f16 100644 (file)
--- a/src/lib/gssapi/krb5/acquire_cred.c
+++ b/src/lib/gssapi/krb5/acquire_cred.c
@@ -433,7 +433,7 @@ krb5_gss_acquire_cred(minor_status, desired_name, time_req,
        return GSS_S_FAILURE;
    }
 
-   code = krb5_init_context(&context);
+   code = krb5_gss_init_context(&context);
    if (code) {
        *minor_status = code;
        return GSS_S_FAILURE;

diff --git a/src/lib/gssapi/krb5/add_cred.c b/src/lib/gssapi/krb5/add_cred.c
index 6cb6605d9e56344561156e52cae2c719abc75723..6bcc2d1c9f2c9247d7c052d5f47d230f32a92b12 100644 (file)
--- a/src/lib/gssapi/krb5/add_cred.c
+++ b/src/lib/gssapi/krb5/add_cred.c
@@ -113,7 +113,7 @@ krb5_gss_add_cred(minor_status, input_cred_handle,
        return(GSS_S_DUPLICATE_ELEMENT);
     }
 
-    code = krb5_init_context(&context);
+    code = krb5_gss_init_context(&context);
     if (code) {
        *minor_status = code;
        return GSS_S_FAILURE;

diff --git a/src/lib/gssapi/krb5/compare_name.c b/src/lib/gssapi/krb5/compare_name.c
index 12201bf0017137bffdc7201de105d11d5a5adeab..805f9f1d70d52ba0aa5666b9afa132dbf224cdda 100644 (file)
--- a/src/lib/gssapi/krb5/compare_name.c
+++ b/src/lib/gssapi/krb5/compare_name.c
@@ -46,7 +46,7 @@ krb5_gss_compare_name(minor_status, name1, name2, name_equal)
       return(GSS_S_CALL_BAD_STRUCTURE|GSS_S_BAD_NAME);
    }
 
-   code = krb5_init_context(&context);
+   code = krb5_gss_init_context(&context);
    if (code) {
        *minor_status = code;
        return GSS_S_FAILURE;

diff --git a/src/lib/gssapi/krb5/copy_ccache.c b/src/lib/gssapi/krb5/copy_ccache.c
index fd408d7fb60b0effc5e59ada76548b586f6fc321..b0cc96fd8f498f4a2d88d9f55bf2e14d3c1e01bc 100644 (file)
--- a/src/lib/gssapi/krb5/copy_ccache.c
+++ b/src/lib/gssapi/krb5/copy_ccache.c
@@ -30,7 +30,7 @@ gss_krb5_copy_ccache(minor_status, cred_handle, out_ccache)
        return(GSS_S_FAILURE);
    }
 
-   code = krb5_init_context(&context);
+   code = krb5_gss_init_context(&context);
    if (code) {
        k5_mutex_unlock(&k5creds->lock);
        *minor_status = code;

diff --git a/src/lib/gssapi/krb5/disp_name.c b/src/lib/gssapi/krb5/disp_name.c
index 419f350b509adf3626138b49c09ac0e5944f03d4..5d3a042d43fdce85ef36af6a5817393808437a03 100644 (file)
--- a/src/lib/gssapi/krb5/disp_name.c
+++ b/src/lib/gssapi/krb5/disp_name.c
@@ -34,7 +34,7 @@ krb5_gss_display_name(minor_status, input_name, output_name_buffer,
    krb5_error_code code;
    char *str;
 
-   code = krb5_init_context(&context);
+   code = krb5_gss_init_context(&context);
    if (code) {
        *minor_status = code;
        return GSS_S_FAILURE;

diff --git a/src/lib/gssapi/krb5/duplicate_name.c b/src/lib/gssapi/krb5/duplicate_name.c
index ffb762952bcf21d53784f669d9f535086eab2c9f..a827717649d7485da0cad6cb77e40deaa92e5399 100644 (file)
--- a/src/lib/gssapi/krb5/duplicate_name.c
+++ b/src/lib/gssapi/krb5/duplicate_name.c
@@ -38,7 +38,7 @@ OM_uint32 krb5_gss_duplicate_name(OM_uint32  *minor_status,
        if (minor_status)
            *minor_status = 0;
 
-       code = krb5_init_context(&context);
+       code = krb5_gss_init_context(&context);
        if (code) {
            if (minor_status)
                *minor_status = code;

diff --git a/src/lib/gssapi/krb5/export_name.c b/src/lib/gssapi/krb5/export_name.c
index 7605d4342ad864f547832f0719195d93120a932d..ce19b04d8d7333a709c4fbc2add1e8e3adb01d0e 100644 (file)
--- a/src/lib/gssapi/krb5/export_name.c
+++ b/src/lib/gssapi/krb5/export_name.c
@@ -39,7 +39,7 @@ OM_uint32 krb5_gss_export_name(OM_uint32  *minor_status,
        if (minor_status)
                *minor_status = 0;
 
-       code = krb5_init_context(&context);
+       code = krb5_gss_init_context(&context);
        if (code) {
            if (minor_status)
                *minor_status = code;

diff --git a/src/lib/gssapi/krb5/gssapiP_krb5.h b/src/lib/gssapi/krb5/gssapiP_krb5.h
index 071ff3f978972e543c72a8adf4aa4ac6783b4a7c..3539ac7a91c28c8bc4ebf07554501e62e8f604c3 100644 (file)
--- a/src/lib/gssapi/krb5/gssapiP_krb5.h
+++ b/src/lib/gssapi/krb5/gssapiP_krb5.h
@@ -633,7 +633,6 @@ OM_uint32 gss_krb5int_unseal_token_v3(krb5_context *contextptr,
 
 extern k5_mutex_t kg_kdc_flag_mutex;
 krb5_error_code krb5_gss_init_context (krb5_context *ctxp);
-#define krb5_init_context(C) krb5_gss_init_context(C)
 
 krb5_error_code krb5_gss_use_kdc_context(void);
 

diff --git a/src/lib/gssapi/krb5/gssapi_krb5.c b/src/lib/gssapi/krb5/gssapi_krb5.c
index c188e6e5a8a34e7241ebbbcd3812469ec006a20f..94f11ef0321c5095f9274cb7e3061ff7c4eb9e46 100644 (file)
--- a/src/lib/gssapi/krb5/gssapi_krb5.c
+++ b/src/lib/gssapi/krb5/gssapi_krb5.c
@@ -190,7 +190,7 @@ kg_get_ccache_name (OM_uint32 *minor_status, const char **out_name)
 
        /* Reset the context default ccache (see text above), and then
           retrieve it.  */
-       err = krb5_init_context(&context);
+       err = krb5_gss_init_context(&context);
        if (!err)
            err = krb5_cc_set_default_name (context, NULL);
        if (!err) {

diff --git a/src/lib/gssapi/krb5/import_name.c b/src/lib/gssapi/krb5/import_name.c
index 75cad9e2f92681e3ab53ed8fcb7c154e86cd2e8b..db63c4b24f8ff33f6aa89df91f37b7022c1fd2a2 100644 (file)
--- a/src/lib/gssapi/krb5/import_name.c
+++ b/src/lib/gssapi/krb5/import_name.c
@@ -61,7 +61,7 @@ krb5_gss_import_name(minor_status, input_name_buffer,
    struct passwd *pw;
 #endif
 
-   code = krb5_init_context(&context);
+   code = krb5_gss_init_context(&context);
    if (code) {
        *minor_status = code;
        return GSS_S_FAILURE;

diff --git a/src/lib/gssapi/krb5/import_sec_context.c b/src/lib/gssapi/krb5/import_sec_context.c
index 84072f549e735aca5c1ce0c2ec20d2349879603a..1255ecc6cf4b78f692585fe093971b3e323ab787 100644 (file)
--- a/src/lib/gssapi/krb5/import_sec_context.c
+++ b/src/lib/gssapi/krb5/import_sec_context.c
@@ -84,7 +84,7 @@ krb5_gss_import_sec_context(minor_status, interprocess_token, context_handle)
        one when calling the serialization code.  However, one of the
        objects we're unpacking is a krb5 context, so when we finish,
        we can throw this one away.  */
-    kret = krb5_init_context(&context);
+    kret = krb5_gss_init_context(&context);
     if (kret) {
        *minor_status = kret;
        return GSS_S_FAILURE;

diff --git a/src/lib/gssapi/krb5/init_sec_context.c b/src/lib/gssapi/krb5/init_sec_context.c
index 23b18d09014b956710017da2273cf84abdd6987c..2ce795bb83ba42b478642002e07a76af151be3b9 100644 (file)
--- a/src/lib/gssapi/krb5/init_sec_context.c
+++ b/src/lib/gssapi/krb5/init_sec_context.c
@@ -847,7 +847,7 @@ krb5_gss_init_sec_context(minor_status, claimant_cred_handle,
    OM_uint32 tmp_min_stat;
 
    if (*context_handle == GSS_C_NO_CONTEXT) {
-       kerr = krb5_init_context(&context);
+       kerr = krb5_gss_init_context(&context);
        if (kerr) {
           *minor_status = kerr;
           return GSS_S_FAILURE;
@@ -987,7 +987,6 @@ krb5_gss_init_context (krb5_context *ctxp)
     if (is_kdc)
        return krb5int_init_context_kdc(ctxp);
     else
-#undef krb5_init_context
        return krb5_init_context(ctxp);
 }
 

diff --git a/src/lib/gssapi/krb5/inq_cred.c b/src/lib/gssapi/krb5/inq_cred.c
index 591a655c815b3525e7bde7bb07059394c6c1c95f..1f61384e9faed3ead5d857550ac1e20471820df3 100644 (file)
--- a/src/lib/gssapi/krb5/inq_cred.c
+++ b/src/lib/gssapi/krb5/inq_cred.c
@@ -94,7 +94,7 @@ krb5_gss_inquire_cred(minor_status, cred_handle, name, lifetime_ret,
    ret = GSS_S_FAILURE;
    ret_name = NULL;
 
-   code = krb5_init_context(&context);
+   code = krb5_gss_init_context(&context);
    if (code) {
        *minor_status = code;
        return GSS_S_FAILURE;

diff --git a/src/lib/gssapi/krb5/rel_cred.c b/src/lib/gssapi/krb5/rel_cred.c
index ed88abb433481473d061b5f6c418ed1162552370..b7db6f061b69bfcb734501a25a184cb9d1935622 100644 (file)
--- a/src/lib/gssapi/krb5/rel_cred.c
+++ b/src/lib/gssapi/krb5/rel_cred.c
@@ -31,7 +31,7 @@ krb5_gss_release_cred(minor_status, cred_handle)
    krb5_gss_cred_id_t cred;
    krb5_error_code code1, code2, code3;
 
-   code1 = krb5_init_context(&context);
+   code1 = krb5_gss_init_context(&context);
    if (code1) {
        *minor_status = code1;
        return GSS_S_FAILURE;

diff --git a/src/lib/gssapi/krb5/rel_name.c b/src/lib/gssapi/krb5/rel_name.c
index 961ccb29c9f2ef9359ed601ebfdf15eff3db004b..d906a70c0ca0043a40e9a73c029bc22833993364 100644 (file)
--- a/src/lib/gssapi/krb5/rel_name.c
+++ b/src/lib/gssapi/krb5/rel_name.c
@@ -30,7 +30,7 @@ krb5_gss_release_name(minor_status, input_name)
    krb5_context context;
    krb5_error_code code;
 
-   code = krb5_init_context(&context);
+   code = krb5_gss_init_context(&context);
    if (code) {
        *minor_status = code;
        return GSS_S_FAILURE;

diff --git a/src/lib/gssapi/krb5/val_cred.c b/src/lib/gssapi/krb5/val_cred.c
index 1fdb3c29861ba436551a1ae051422947b8199ea0..de4b0637ff16e4ac7f5d84e1356e3930c6d3ac45 100644 (file)
--- a/src/lib/gssapi/krb5/val_cred.c
+++ b/src/lib/gssapi/krb5/val_cred.c
@@ -77,7 +77,7 @@ krb5_gss_validate_cred(minor_status, cred_handle)
     krb5_error_code code;
     OM_uint32 maj;
 
-    code = krb5_init_context(&context);
+    code = krb5_gss_init_context(&context);
     if (code) {
        *minor_status = code;
        return GSS_S_FAILURE;