Author: baggins Date: Mon Dec 7 14:05:22 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- use system libcom_err (patch from Debian)
---- Files affected:
packages/heimdal:
heimdal-shared-libcom_err.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/heimdal/heimdal-shared-libcom_err.patch
diff -u /dev/null packages/heimdal/heimdal-shared-libcom_err.patch:1.1
--- /dev/null Mon Dec 7 15:05:22 2009
+++ packages/heimdal/heimdal-shared-libcom_err.patch Mon Dec 7 15:05:17 2009
@@ -0,0 +1,54 @@
+Index: heimdal-1.3.1.dfsg.1/cf/check-compile-et.m4
+===================================================================
+--- heimdal-1.3.1.dfsg.1.orig/cf/check-compile-et.m4 2009-12-01
11:08:56.987035686 +1100
++++ heimdal-1.3.1.dfsg.1/cf/check-compile-et.m4 2009-12-01
11:09:20.935033942 +1100
+@@ -67,7 +67,6 @@
+ const char *p;
+ p = error_message(0);
+ initialize_error_table_r(0,0,0,0);
+- com_right_r(0, 0, 0, 0);
+ ]])],[krb_cv_com_err="yes"],[krb_cv_com_err="no";
CPPFLAGS="${save_CPPFLAGS}"])
+ AC_MSG_RESULT(${krb_cv_com_err})
+ LIBS="${krb_cv_save_LIBS}"
+Index: heimdal-1.3.1.dfsg.1/lib/krb5/error_string.c
+===================================================================
+--- heimdal-1.3.1.dfsg.1.orig/lib/krb5/error_string.c 2009-12-01
11:09:25.759036334 +1100
++++ heimdal-1.3.1.dfsg.1/lib/krb5/error_string.c 2009-12-01
11:12:54.587035833 +1100
+@@ -217,29 +217,16 @@
+ const char * KRB5_LIB_FUNCTION
+ krb5_get_error_message(krb5_context context, krb5_error_code code)
+ {
++ const char *cstr;
+ char *str;
+
+- HEIMDAL_MUTEX_lock(context->mutex);
+- if (context->error_string &&
+- (code == context->error_code || context->error_code == 0))
+- {
+- str = strdup(context->error_string);
+- if (str) {
+- HEIMDAL_MUTEX_unlock(context->mutex);
+- return str;
+- }
+- }
+- HEIMDAL_MUTEX_unlock(context->mutex);
+-
+- if (code == 0)
+- return strdup("Success");
+- {
+- const char *msg;
+- char buf[128];
+- msg = com_right_r(context->et_list, code, buf, sizeof(buf));
+- if (msg)
+- return strdup(msg);
+- }
++ str = krb5_get_error_string(context);
++ if (str)
++ return str;
++
++ cstr = krb5_get_err_text(context, code);
++ if (cstr)
++ return strdup(cstr);
+
+ if (asprintf(&str, "<unknown error: %d>", (int)code) == -1)
+ return NULL;
================================================================
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
