[Fedora-directory-commits] ldapserver/include/libaccess nsauth.h, 1.4, 1.5 nsautherr.h, 1.4, 1.5

[Noriko Hosoi (nhosoi)]

Author: nhosoi

Update of /cvs/dirsec/ldapserver/include/libaccess
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13040/include/libaccess

Modified Files:
	nsauth.h nsautherr.h 
Log Message:
Resolves: #214728
Summary: Cleaning up obsolete macros in the build
Changes: eliminated macro CLIENT_AUTH (Comment #12)



Index: nsauth.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/include/libaccess/nsauth.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nsauth.h	19 Apr 2005 22:06:45 -0000	1.4
+++ nsauth.h	10 Nov 2006 01:40:44 -0000	1.5
@@ -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 @@
     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 */


Index: nsautherr.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/include/libaccess/nsautherr.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nsautherr.h	19 Apr 2005 22:06:45 -0000	1.4
+++ nsautherr.h	10 Nov 2006 01:40:44 -0000	1.5
@@ -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() */