From: Simon Josefsson <simon@josefsson.org>
Date: Tue, 10 Apr 2007 17:27:40 +0000 (+0000)
Subject: Respect ENABLE_AUTHZ.
X-Git-Tag: gnutls_1_7_8~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b7eb649c35d1c10992b29d538f8a80625e95bd89;p=thirdparty%2Fgnutls.git

Respect ENABLE_AUTHZ.
---

diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index 25ff260c9b..53092cf128 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -27,13 +27,17 @@ LDADD = libexamples.la \
 	../../lib/libgnutls.la	\
 	../../libextra/libgnutls-extra.la
 
-if ENABLE_SRP
-SRP_PROGRAM_FILES = ex-client-srp ex-serv-srp
-endif
 noinst_PROGRAMS = ex-cert-select ex-client1 ex-client2			\
 	ex-client-resume ex-client-tlsia ex-crq ex-serv1 ex-serv-anon	\
-	ex-serv-export ex-serv-pgp $(SRP_PROGRAM_FILES)			\
-	ex-client-authz ex-serv-authz
+	ex-serv-export ex-serv-pgp
+
+if ENABLE_SRP
+noinst_PROGRAMS += ex-client-srp ex-serv-srp
+endif
+
+if ENABLE_AUTHZ
+noinst_PROGRAMS += ex-serv-authz ex-client-authz
+endif
 
 noinst_LTLIBRARIES = libexamples.la
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 603f10059f..b20abb621d 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -74,7 +74,11 @@ COBJECTS = gnutls_record.c gnutls_compress.c debug.c gnutls_cipher.c	\
 	gnutls_x509.c ext_cert_type.c gnutls_rsa_export.c		\
 	auth_rsa_export.c ext_server_name.c auth_dh_common.c		\
 	gnutls_helper.c ext_inner_application.c gnutls_extra_hooks.c	\
-	gnutls_supplemental.c ext_authz.c
+	gnutls_supplemental.c
+
+if ENABLE_AUTHZ
+COBJECTS += ext_authz.c
+endif
 
 HFILES = debug.h gnutls_compress.h defines.h gnutls_cipher.h		\
 	gnutls_buffers.h gnutls_errors.h gnutls_int.h			\
diff --git a/src/cli.c b/src/cli.c
index 7382433ffa..f9564bbc5e 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -99,6 +99,8 @@ static int comp_priority[PRI_MAX];
 static int mac_priority[PRI_MAX];
 static int cert_type_priority[PRI_MAX];
 
+#ifdef ENABLE_AUTHZ
+
 static int authz_client_formats[PRI_MAX];
 static int authz_server_formats[PRI_MAX] = {
   GNUTLS_AUTHZ_X509_ATTR_CERT,
@@ -108,6 +110,8 @@ static int authz_server_formats[PRI_MAX] = {
   0
 };
 
+#endif
+
 /* end of global stuff */
 
 /* prototypes */
@@ -378,6 +382,7 @@ cert_callback (gnutls_session session,
 
 }
 
+#ifdef ENABLE_AUTHZ
 
 int
 authz_send_callback (gnutls_session_t session,
@@ -463,6 +468,8 @@ authz_recv_callback (gnutls_session_t session,
   return 0;
 }
 
+#endif
+
 /* initializes a gnutls_session with some defaults.
  */
 static gnutls_session
@@ -524,8 +531,10 @@ init_tls_session (const char *hostname)
 	}
     }
 
+#ifdef ENABLE_AUTHZ
   gnutls_authz_enable (session, authz_client_formats, authz_server_formats,
 		       authz_recv_callback, authz_send_callback);
+#endif
 
   return session;
 }
diff --git a/src/serv.c b/src/serv.c
index 7d67f754b8..c210597517 100644
--- a/src/serv.c
+++ b/src/serv.c
@@ -327,6 +327,8 @@ generate_rsa_params (void)
   return 0;
 }
 
+LIST_DECLARE_INIT (listener_list, listener_item, listener_free);
+
 static int protocol_priority[PRI_MAX];
 static int kx_priority[PRI_MAX];
 static int cipher_priority[PRI_MAX];
@@ -334,6 +336,7 @@ static int comp_priority[PRI_MAX];
 static int mac_priority[PRI_MAX];
 static int cert_type_priority[PRI_MAX];
 
+#ifdef ENABLE_AUTHZ
 static int authz_server_formats[PRI_MAX] = {
   0
 };
@@ -345,8 +348,6 @@ static int authz_client_formats[PRI_MAX] = {
   0
 };
 
-LIST_DECLARE_INIT (listener_list, listener_item, listener_free);
-
 int
 authz_send_callback (gnutls_session_t session,
 		     const int *client_formats,
@@ -430,6 +431,7 @@ authz_recv_callback (gnutls_session_t session,
 
   return 0;
 }
+#endif
 
 gnutls_session
 initialize_session (void)
@@ -481,8 +483,10 @@ initialize_session (void)
   else
     gnutls_certificate_server_set_request (session, GNUTLS_CERT_REQUEST);
 
+#ifdef ENABLE_AUTHZ
   gnutls_authz_enable (session, authz_client_formats, authz_server_formats,
 		       authz_recv_callback, authz_send_callback);
+#endif
 
   return session;
 }
@@ -1453,6 +1457,7 @@ gaa_parser (int argc, char **argv)
   parse_kx (info.kx, info.nkx, kx_priority);
   parse_comp (info.comp, info.ncomp, comp_priority);
 
+#ifdef ENABLE_AUTHZ
   {
     size_t authz_idx = 0;
     if (info.authz_x509_attr_cert)
@@ -1460,6 +1465,7 @@ gaa_parser (int argc, char **argv)
     if (info.authz_saml_assertion)
       authz_server_formats[authz_idx++] = GNUTLS_AUTHZ_SAML_ASSERTION;
   }
+#endif
 }
 
 void