From: Theodore Tso <tytso@mit.edu>
Date: Wed, 7 Jun 1995 20:12:18 +0000 (+0000)
Subject: Makefile.in (CFLAGS), srv_acl.c (acl_init): Use KRB5_DEFAULT_ADMIN_ACL
X-Git-Tag: krb5-1.0-beta6~1833
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8e63e252f9ad5a9c206be790f2d360d3872ab87c;p=krb5.git

Makefile.in (CFLAGS), srv_acl.c (acl_init): Use KRB5_DEFAULT_ADMIN_ACL
	defined in osconf.h

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5970 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/kadmin/v5server/ChangeLog b/src/kadmin/v5server/ChangeLog
index afb7aa2b3..0c24228d9 100644
--- a/src/kadmin/v5server/ChangeLog
+++ b/src/kadmin/v5server/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jun  7 12:03:10 1995    <tytso@rsx-11.mit.edu>
+
+	* Makefile.in (CFLAGS), srv_acl.c (acl_init): Use
+		KRB5_DEFAULT_ADMIN_ACL defined in osconf.h
+
 Tue Jun  6 19:42:18 1995  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
 	* srv_key.c (key_decrypt_keys): On error, when clearing keyblocks,
diff --git a/src/kadmin/v5server/Makefile.in b/src/kadmin/v5server/Makefile.in
index 62eb93523..46479d8f0 100644
--- a/src/kadmin/v5server/Makefile.in
+++ b/src/kadmin/v5server/Makefile.in
@@ -1,5 +1,4 @@
-CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) \
-	-DKRB5_DEFAULT_ACL_FILE='"'$(KRB5ROOT)$(S)krb5_adm.acl'"'
+CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) 
 LDFLAGS = -g
 
 COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
diff --git a/src/kadmin/v5server/srv_acl.c b/src/kadmin/v5server/srv_acl.c
index f6d90cf78..86948233d 100644
--- a/src/kadmin/v5server/srv_acl.c
+++ b/src/kadmin/v5server/srv_acl.c
@@ -63,10 +63,6 @@ static const aop_t acl_op_table[] = {
 static aent_t	*acl_list_head = (aent_t *) NULL;
 static aent_t	*acl_list_tail = (aent_t *) NULL;
 
-#ifndef	KRB5_DEFAULT_ACL_FILE
-#define	KRB5_DEFAULT_ACL_FILE	"/krb5/krb5_adm.acl";
-#endif	/* KRB5_DEFAULT_ACL_FILE */
-static const char *acl_default_file = KRB5_DEFAULT_ACL_FILE;
 static const char *acl_acl_file = (char *) NULL;
 static int acl_inited = 0;
 static int acl_debug_level = 0;
@@ -385,7 +381,7 @@ acl_init(kcontext, debug_level, acl_file)
     DPRINT(DEBUG_CALLS, acl_debug_level,
 	   ("* acl_init(afile=%s)\n",
 	    ((acl_file) ? acl_file : "(null)")));
-    acl_acl_file = (acl_file) ? acl_file : (char *) acl_default_file;
+    acl_acl_file = (acl_file) ? acl_file : (char *) KRB5_DEFAULT_ADMIN_ACL;
     acl_inited = acl_load_acl_file();
 #if	POSIX_SIGNALS
     (void) sigemptyset(&s_action.sa_mask);