s4:heimdal: import lorikeet-heimdal-202201172009 (commit 5a0b45cd723628b3690ea848548b...

[samba.git] / source4 / heimdal / lib / krb5 / misc.c

diff --git a/source4/heimdal/lib/krb5/misc.c b/source4/heimdal/lib/krb5/misc.c
index 39a3282354cad1f3c699fa0404c3008cc8454762..baf165c00a6e4c2fe454f174070c2c145ec2b688 100644 (file)
--- a/source4/heimdal/lib/krb5/misc.c
+++ b/source4/heimdal/lib/krb5/misc.c
@@ -48,52 +48,35 @@ _krb5_s4u2self_to_checksumdata(krb5_context context,
     size_t i;
 
     sp = krb5_storage_emem();
-    if (sp == NULL) {
-       krb5_clear_error_message(context);
-       return ENOMEM;
-    }
+    if (sp == NULL)
+       return krb5_enomem(context);
     krb5_storage_set_flags(sp, KRB5_STORAGE_BYTEORDER_LE);
     ret = krb5_store_int32(sp, self->name.name_type);
-    if (ret)
-       goto out;
+    if (ret) {
+       krb5_clear_error_message(context);
+       return ret;
+    }
     for (i = 0; i < self->name.name_string.len; i++) {
        size = strlen(self->name.name_string.val[i]);
        ssize = krb5_storage_write(sp, self->name.name_string.val[i], size);
-       if (ssize != (krb5_ssize_t)size) {
-           ret = ENOMEM;
-           goto out;
-       }
+       if (ssize != (krb5_ssize_t)size)
+           return krb5_enomem(context);
     }
     size = strlen(self->realm);
     ssize = krb5_storage_write(sp, self->realm, size);
-    if (ssize != (krb5_ssize_t)size) {
-       ret = ENOMEM;
-       goto out;
-    }
+    if (ssize != (krb5_ssize_t)size)
+       return krb5_enomem(context);
     size = strlen(self->auth);
     ssize = krb5_storage_write(sp, self->auth, size);
-    if (ssize != (krb5_ssize_t)size) {
-       ret = ENOMEM;
-       goto out;
-    }
+    if (ssize != (krb5_ssize_t)size)
+       return krb5_enomem(context);
 
     ret = krb5_storage_to_data(sp, data);
     krb5_storage_free(sp);
     return ret;
-
-out:
-    krb5_clear_error_message(context);
-    return ret;
-}
-
-krb5_error_code
-krb5_enomem(krb5_context context)
-{
-    krb5_set_error_message(context, ENOMEM, N_("malloc: out of memory", ""));
-    return ENOMEM;
 }
 
-void
+KRB5_LIB_FUNCTION void KRB5_LIB_CALL
 _krb5_debug_backtrace(krb5_context context)
 {
 #if defined(HAVE_BACKTRACE) && defined(HAVE_BACKTRACE_SYMBOLS) && !defined(HEIMDAL_SMALLER)
@@ -110,7 +93,7 @@ _krb5_debug_backtrace(krb5_context context)
 #endif
 }
 
-krb5_error_code
+KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
 _krb5_einval(krb5_context context, const char *func, unsigned long argn)
 {
 #ifndef HEIMDAL_SMALLER