From: Chaskiel M Grundman <cg2v@andrew.cmu.edu>
Date: Tue, 7 Dec 2004 06:04:18 +0000 (+0000)
Subject: STABLE14-libafsrpc-assertion-failed-20041202
X-Git-Tag: openafs-devel-1_3_75~34
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=6087e81797b8d6eff5c8d38196296ecb17961d3a;p=packages%2Fo%2Fopenafs.git

STABLE14-libafsrpc-assertion-failed-20041202

FIXES 16432

need AssertionFailed in libafsrpc. ndon't need casestrcpy in libafsauthent


(cherry picked from commit d8e6630fffbbc6635c49c8c6d45a4550144e7f94)
---

diff --git a/src/libafsauthent/Makefile.in b/src/libafsauthent/Makefile.in
index 04e57910d..083baaeb2 100644
--- a/src/libafsauthent/Makefile.in
+++ b/src/libafsauthent/Makefile.in
@@ -58,8 +58,7 @@ UTILOBJS = \
 	pthread_glock.o \
 	get_krbrlm.o \
 	dirpath.o \
-	fileutil.o \
-	casestrcpy.o
+	fileutil.o
 
 RXKADOBJS = \
 	rxkad_errs.o
@@ -182,9 +181,6 @@ dirpath.o: ${UTIL}/dirpath.c
 fileutil.o: ${UTIL}/fileutil.c
 	${CCRULE}
 
-casestrcpy.o: ${UTIL}/casestrcpy.c
-	${CCRULE}
-
 pthread_glock.o: ${UTIL}/pthread_glock.c
 	${CCRULE}
 
diff --git a/src/libafsrpc/Makefile.in b/src/libafsrpc/Makefile.in
index 4ff1ed871..7e3f8e22b 100644
--- a/src/libafsrpc/Makefile.in
+++ b/src/libafsrpc/Makefile.in
@@ -32,6 +32,7 @@ SYSOBJS =\
 	syscall.o
 
 UTILOBJS =\
+	assert.o \
 	casestrcpy.o \
 	base64.o
 
@@ -336,6 +337,9 @@ com_err.o: ${COMERR}/com_err.c
 casestrcpy.o: ${UTIL}/casestrcpy.c
 	${CCRULE} ${UTIL}/casestrcpy.c
 
+assert.o: ${UTIL}/assert.c
+	${CCRULE} ${UTIL}/assert.c
+
 base64.o: ${UTIL}/base64.c
 	${CCRULE} ${UTIL}/base64.c
 
diff --git a/src/shlibafsauthent/Makefile.in b/src/shlibafsauthent/Makefile.in
index 306423f26..ecc7c74a0 100644
--- a/src/shlibafsauthent/Makefile.in
+++ b/src/shlibafsauthent/Makefile.in
@@ -63,8 +63,7 @@ UTILOBJS = \
 	pthread_glock.o \
 	get_krbrlm.o \
 	dirpath.o \
-	fileutil.o \
-	casestrcpy.o
+	fileutil.o
 
 RXKADOBJS = \
 	rxkad_errs.o
@@ -197,9 +196,6 @@ dirpath.o: ${UTIL}/dirpath.c
 fileutil.o: ${UTIL}/fileutil.c
 	${CCRULE}
 
-casestrcpy.o: ${UTIL}/casestrcpy.c
-	${CCRULE}
-
 pthread_glock.o: ${UTIL}/pthread_glock.c
 	${CCRULE}
 
diff --git a/src/shlibafsrpc/Makefile.in b/src/shlibafsrpc/Makefile.in
index 675f7a47f..2c55f3d97 100644
--- a/src/shlibafsrpc/Makefile.in
+++ b/src/shlibafsrpc/Makefile.in
@@ -37,6 +37,7 @@ SYSOBJS =\
 	syscall.o
 
 UTILOBJS =\
+	assert.o \
 	casestrcpy.o \
 	base64.o
 
@@ -343,6 +344,9 @@ com_err.o: ${COMERR}/com_err.c
 casestrcpy.o: ${UTIL}/casestrcpy.c
 	${CCRULE}
 
+assert.o: ${UTIL}/assert.c
+	${CCRULE} ${UTIL}/assert.c
+
 base64.o: ${UTIL}/base64.c
 	${CCRULE}