From 275291284c66794cce7dab07a2d2daea33c2e947 Mon Sep 17 00:00:00 2001
From: Noriko Hosoi <nhosoi@redhat.com>
Date: Fri, 10 Nov 2006 01:40:44 +0000
Subject: Resolves: #214728 Summary: Cleaning up obsolete macros in the build
 Changes: eliminated macro CLIENT_AUTH (Comment #12)

---
 include/libaccess/nsauth.h    | 13 -------------
 include/libaccess/nsautherr.h |  3 ---
 2 files changed, 16 deletions(-)

(limited to 'include/libaccess')

diff --git a/include/libaccess/nsauth.h b/include/libaccess/nsauth.h
index 91e5d64b..360485db 100644
--- a/include/libaccess/nsauth.h
+++ b/include/libaccess/nsauth.h
@@ -48,16 +48,9 @@
  *	into and out of authentication interface functions.
  */
 
-#ifdef CLIENT_AUTH
-
 #include "ssl.h"
 
-#if 0
-/* Removed for new ns security */
-#include "sec.h"		/* SECCertificate */
-#endif
 #include "cert.h"               /* CERTCertificate for new ns security bin */
-#endif /* CLIENT_AUTH */
 
 #include "usi.h"		/* identifier list support */
 #include "attrec.h"		/* attribute record types */
@@ -308,13 +301,7 @@ struct ClAuth_s {
     char * cla_dns;		/* DNS name string pointer */
     UserObj_t * cla_uoptr;	/* authenticated user object pointer */
     GroupObj_t * cla_goptr;	/* pointer to list of group objects */
-#ifdef CLIENT_AUTH
-#if 0
-  /* Removed for new ns security  */
-    SECCertificate * cla_cert;	/* certificate from SSL client auth */
-#endif
     CERTCertificate * cla_cert;	/* certificate from SSL client auth */
-#endif /* CLIENT_AUTH */
 };
 
 #endif /* __nsauth_h */
diff --git a/include/libaccess/nsautherr.h b/include/libaccess/nsautherr.h
index 43b30225..a73b6539 100644
--- a/include/libaccess/nsautherr.h
+++ b/include/libaccess/nsautherr.h
@@ -71,7 +71,6 @@
 #define NSAUERR3320	3320		/* insufficient dynamic memory */
 #define NSAUERR3340	3340		/* error opening group database */
 
-#if defined(CLIENT_AUTH)
 /* nsadbOpenClients() */
 #define NSAUERR3400	3400		/* invalid function argument */
 #define NSAUERR3420	3420		/* insufficient dynamic memory */
@@ -94,8 +93,6 @@
 /* nsadbRemoveCertUser() */
 #define NSAUERR3900	3900		/* error deleting entry in database */
 
-#endif /*  defined(CLIENT_AUTH) */
-
 /* Define error ids generated by nsamgmt.c */
 
 /* nsadbRemoveUser() */
-- 
cgit