From 215838d65734ad819d3bd27a2f715d1d6f68394a Mon Sep 17 00:00:00 2001
From: Russ Allbery <rra@stanford.edu>
Date: Sun, 12 Jul 2009 11:24:17 -0700
Subject: [PATCH] Add strlcat and strlcpy to libafsauthent and libafsrpc

Other functions included in libafsauthent and libafsrpc are using strlcpy
and strlcat, so include those objects in the libraries so that they stay
self-contained.

strlcat and strlcpy shouldn't be part of the public API for the libraries,
for various reasons including the fact that they're not built on all
platforms.  Therefore, don't add the functions to the library exports and
include them separately in each library.

Reviewed-on: http://gerrit.openafs.org/63
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Verified-by: Derrick Brashear <shadow@dementia.org>
---
 src/libafsauthent/Makefile.in   |  8 ++++++++
 src/libafsrpc/Makefile.in       | 10 +++++++++-
 src/shlibafsauthent/Makefile.in |  8 ++++++++
 src/shlibafsrpc/Makefile.in     | 10 +++++++++-
 4 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/src/libafsauthent/Makefile.in b/src/libafsauthent/Makefile.in
index b4e081e4a..413ef8cd7 100644
--- a/src/libafsauthent/Makefile.in
+++ b/src/libafsauthent/Makefile.in
@@ -64,6 +64,8 @@ UTILOBJS = \
 	dirpath.o \
 	serverLog.o \
 	snprintf.o \
+	strlcat.o \
+	strlcpy.o \
 	fileutil.o
 
 RXKADOBJS = \
@@ -191,6 +193,12 @@ serverLog.o: ${UTIL}/serverLog.c
 snprintf.o: ${UTIL}/snprintf.c
 	${CCRULE}
 
+strlcat.o: ${UTIL}/strlcat.c
+	${CCRULE}
+
+strlcpy.o: ${UTIL}/strlcpy.c
+	${CCRULE}
+
 fileutil.o: ${UTIL}/fileutil.c
 	${CCRULE}
 
diff --git a/src/libafsrpc/Makefile.in b/src/libafsrpc/Makefile.in
index fe8643832..e8eeeac0a 100644
--- a/src/libafsrpc/Makefile.in
+++ b/src/libafsrpc/Makefile.in
@@ -39,7 +39,9 @@ SYSOBJS =\
 UTILOBJS =\
 	assert.o \
 	casestrcpy.o \
-	base64.o
+	base64.o \
+	strlcat.o \
+	strlcpy.o
 
 COMERROBJS =\
 	error_msg.o \
@@ -351,6 +353,12 @@ assert.o: ${UTIL}/assert.c
 base64.o: ${UTIL}/base64.c
 	${CCRULE} ${UTIL}/base64.c
 
+strlcat.o: ${UTIL}/strlcat.c
+	${CCRULE} ${UTIL}/strlcat.c
+
+strlcpy.o: ${UTIL}/strlcpy.c
+	${CCRULE} ${UTIL}/strlcpy.c
+
 fasttime.o: ${LWP}/fasttime.c
 	${CCRULE} ${LWP}/fasttime.c
 
diff --git a/src/shlibafsauthent/Makefile.in b/src/shlibafsauthent/Makefile.in
index 54cf4af4e..63575babf 100644
--- a/src/shlibafsauthent/Makefile.in
+++ b/src/shlibafsauthent/Makefile.in
@@ -69,6 +69,8 @@ UTILOBJS = \
 	dirpath.o \
 	serverLog.o \
 	snprintf.o \
+	strlcat.o \
+	strlcpy.o \
 	fileutil.o
 
 RXKADOBJS = \
@@ -222,6 +224,12 @@ serverLog.o: ${UTIL}/serverLog.c
 snprintf.o: ${UTIL}/snprintf.c
 	${CCRULE}
 
+strlcat.o: ${UTIL}/strlcat.c
+	${CCRULE}
+
+strlcpy.o: ${UTIL}/strlcpy.c
+	${CCRULE}
+
 fileutil.o: ${UTIL}/fileutil.c
 	${CCRULE}
 
diff --git a/src/shlibafsrpc/Makefile.in b/src/shlibafsrpc/Makefile.in
index c59a58b63..d46ffbf3f 100644
--- a/src/shlibafsrpc/Makefile.in
+++ b/src/shlibafsrpc/Makefile.in
@@ -44,7 +44,9 @@ SYSOBJS =\
 UTILOBJS =\
 	assert.o \
 	casestrcpy.o \
-	base64.o
+	base64.o \
+	strlcat.o \
+	strlcpy.o
 
 COMERROBJS =\
 	error_msg.o \
@@ -370,6 +372,12 @@ assert.o: ${UTIL}/assert.c
 base64.o: ${UTIL}/base64.c
 	${CCRULE}
 
+strlcat.o: ${UTIL}/strlcat.c
+	${CCRULE}
+
+strlcpy.o: ${UTIL}/strlcpy.c
+	${CCRULE}
+
 fasttime.o: ${LWP}/fasttime.c
 	${CCRULE} ${LWP}/fasttime.c
 
-- 
2.39.5