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 afb7aa2b3cc2f0d59024284cb00fd845b88e9bdb..0c24228d92634c13b63db1d52c51f322ef4e41b3 100644 (file)
--- 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 62eb93523592aadd03f573961cbd100780e8050b..46479d8f07f5163cf5e579562a38fad53b428348 100644 (file)
--- 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 f6d90cf78ccc40f606a92fd6008f44af9b411785..86948233dff542939a0fe9f063a1a7323b509680 100644 (file)
--- 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);