From bef38a69d355343f84bf6c2a5b5787cdcd8f2208 Mon Sep 17 00:00:00 2001
From: Love Hornquist Astrand <lha@h5l.org>
Date: Sun, 13 Dec 2009 11:42:12 -0800
Subject: [PATCH] switch to rk_strerror_r

---
 lib/krb5/acl.c          |  2 +-
 lib/krb5/auth_context.c |  4 ++--
 lib/krb5/fcache.c       | 12 ++++++------
 lib/krb5/replay.c       | 10 +++++-----
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/lib/krb5/acl.c b/lib/krb5/acl.c
index d547dc50d..331232bdb 100644
--- a/lib/krb5/acl.c
+++ b/lib/krb5/acl.c
@@ -257,7 +257,7 @@ krb5_acl_match_file(krb5_context context,
     f = fopen(file, "r");
     if(f == NULL) {
 	int save_errno = errno;
-	strerror_r(save_errno, buf, sizeof(buf));
+	rk_rk_strerror_r(save_errno, buf, sizeof(buf));
 	krb5_set_error_message(context, save_errno,
 			       N_("open(%s): %s", "file, errno"),
 			       file, buf);
diff --git a/lib/krb5/auth_context.c b/lib/krb5/auth_context.c
index dfb9f6a0e..ae39d8117 100644
--- a/lib/krb5/auth_context.c
+++ b/lib/krb5/auth_context.c
@@ -173,7 +173,7 @@ krb5_auth_con_genaddrs(krb5_context context,
 	    if(getsockname(fd, local, &len) < 0) {
 		char buf[128];
 		ret = errno;
-		strerror_r(ret, buf, sizeof(buf));
+		rk_rk_strerror_r(ret, buf, sizeof(buf));
 		krb5_set_error_message(context, ret, "getsockname: %s", buf);
 		goto out;
 	    }
@@ -191,7 +191,7 @@ krb5_auth_con_genaddrs(krb5_context context,
 	if(getpeername(fd, remote, &len) < 0) {
 	    char buf[128];
 	    ret = errno;
-	    strerror_r(ret, buf, sizeof(buf));
+	    rk_rk_strerror_r(ret, buf, sizeof(buf));
 	    krb5_set_error_message(context, ret, "getpeername: %s", buf);
 	    goto out;
 	}
diff --git a/lib/krb5/fcache.c b/lib/krb5/fcache.c
index f1aeb31b0..df0658eb0 100644
--- a/lib/krb5/fcache.c
+++ b/lib/krb5/fcache.c
@@ -97,7 +97,7 @@ _krb5_xlock(krb5_context context, int fd, krb5_boolean exclusive,
 	break;
     default: {
 	char buf[128];
-	strerror_r(ret, buf, sizeof(buf));
+	rk_strerror_r(ret, buf, sizeof(buf));
 	krb5_set_error_message(context, ret,
 			       N_("error locking cache file %s: %s",
 				  "file, error"), filename, buf);
@@ -131,7 +131,7 @@ _krb5_xunlock(krb5_context context, int fd)
 	break;
     default: {
 	char buf[128];
-	strerror_r(ret, buf, sizeof(buf));
+	rk_strerror_r(ret, buf, sizeof(buf));
 	krb5_set_error_message(context, ret,
 			       N_("Failed to unlock file: %s", ""), buf);
 	break;
@@ -375,7 +375,7 @@ fcc_open(krb5_context context,
     if(fd < 0) {
 	char buf[128];
 	ret = errno;
-	strerror_r(ret, buf, sizeof(buf));
+	rk_strerror_r(ret, buf, sizeof(buf));
 	krb5_set_error_message(context, ret, N_("open(%s): %s", "file, error"),
 			       filename, buf);
 	return ret;
@@ -439,7 +439,7 @@ fcc_initialize(krb5_context context,
 	if (ret == 0) {
 	    char buf[128];
 	    ret = errno;
-	    strerror_r(ret, buf, sizeof(buf));
+	    rk_strerror_r(ret, buf, sizeof(buf));
 	    krb5_set_error_message (context, ret, N_("close %s: %s", ""),
 				    FILENAME(id), buf);
 	}
@@ -494,7 +494,7 @@ fcc_store_cred(krb5_context context,
     if (close(fd) < 0) {
 	if (ret == 0) {
 	    char buf[128];
-	    strerror_r(ret, buf, sizeof(buf));
+	    rk_strerror_r(ret, buf, sizeof(buf));
 	    ret = errno;
 	    krb5_set_error_message (context, ret, N_("close %s: %s", ""),
 				    FILENAME(id), buf);
@@ -887,7 +887,7 @@ fcc_move(krb5_context context, krb5_ccache from, krb5_ccache to)
     if (ret && errno != EXDEV) {
 	char buf[128];
 	ret = errno;
-	strerror_r(ret, buf, sizeof(buf));
+	rk_strerror_r(ret, buf, sizeof(buf));
 	krb5_set_error_message(context, ret,
 			       N_("Rename of file from %s "
 				  "to %s failed: %s", ""),
diff --git a/lib/krb5/replay.c b/lib/krb5/replay.c
index 0cad91e43..d6316febd 100644
--- a/lib/krb5/replay.c
+++ b/lib/krb5/replay.c
@@ -135,7 +135,7 @@ krb5_rc_initialize(krb5_context context,
     if(f == NULL) {
 	char buf[128];
 	ret = errno;
-	strerror_r(ret, buf, sizeof(buf));
+	rk_strerror_r(ret, buf, sizeof(buf));
 	krb5_set_error_message(context, ret, "open(%s): %s", id->name, buf);
 	return ret;
     }
@@ -161,7 +161,7 @@ krb5_rc_destroy(krb5_context context,
     if(remove(id->name) < 0) {
 	char buf[128];
 	ret = errno;
-	strerror_r(ret, buf, sizeof(buf));
+	rk_strerror_r(ret, buf, sizeof(buf));
 	krb5_set_error_message(context, ret, "remove(%s): %s", id->name, buf);
 	return ret;
     }
@@ -212,7 +212,7 @@ krb5_rc_store(krb5_context context,
     if(f == NULL) {
 	char buf[128];
 	ret = errno;
-	strerror_r(ret, buf, sizeof(buf));
+	rk_strerror_r(ret, buf, sizeof(buf));
 	krb5_set_error_message(context, ret, "open(%s): %s", id->name, buf);
 	return ret;
     }
@@ -232,7 +232,7 @@ krb5_rc_store(krb5_context context,
 	char buf[128];
 	ret = errno;
 	fclose(f);
-	strerror_r(ret, buf, sizeof(buf));
+	rk_strerror_r(ret, buf, sizeof(buf));
 	krb5_set_error_message(context, ret, "%s: %s",
 			       id->name, buf);
 	return ret;
@@ -241,7 +241,7 @@ krb5_rc_store(krb5_context context,
     f = fopen(id->name, "a");
     if(f == NULL) {
 	char buf[128];
-	strerror_r(errno, buf, sizeof(buf));
+	rk_strerror_r(errno, buf, sizeof(buf));
 	krb5_set_error_message(context, KRB5_RC_IO_UNKNOWN,
 			       "open(%s): %s", id->name, buf);
 	return KRB5_RC_IO_UNKNOWN;
-- 
2.11.4.GIT