krb5 commit: Remove MAX_ULOGENTRIES

Greg Hudson ghudson at MIT.EDU
Fri Oct 5 15:32:30 EDT 2012


https://github.com/krb5/krb5/commit/1d7c107c9e9239674b5c7aed32931ab47c50f239
commit 1d7c107c9e9239674b5c7aed32931ab47c50f239
Author: Nicolas Williams <nico at cryptonector.com>
Date:   Mon Sep 24 17:48:48 2012 -0500

    Remove MAX_ULOGENTRIES
    
    If a master KDC uses only a 64-bit libkadm5srv then there is no reason
    to impose any limit on ulog size: the practical maximum will be given by
    the filesystem and available storage space.
    
    Even when using a 32-bit libkadm5srv the maximum practical ulog size
    will be found easily enough when mmap() fails.
    
    ticket: 7368

 src/include/kdb_log.h    |    1 -
 src/lib/kadm5/alt_prof.c |    4 +---
 2 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/src/include/kdb_log.h b/src/include/kdb_log.h
index beecdc1..c8d0288 100644
--- a/src/include/kdb_log.h
+++ b/src/include/kdb_log.h
@@ -53,7 +53,6 @@ extern "C" {
 /*
  * Default ulog file attributes
  */
-#define MAX_ULOGENTRIES 2500
 #define DEF_ULOGENTRIES 1000
 #define ULOG_IDLE_TIME  10              /* in seconds */
 /*
diff --git a/src/lib/kadm5/alt_prof.c b/src/lib/kadm5/alt_prof.c
index 769f5f9..2a587e4 100644
--- a/src/lib/kadm5/alt_prof.c
+++ b/src/lib/kadm5/alt_prof.c
@@ -817,9 +817,7 @@ krb5_error_code kadm5_get_config_params(context, use_kdc_config,
     } else {
         if (aprofile && !krb5_aprof_get_int32(aprofile, hierarchy,
                                               TRUE, &ivalue)) {
-            if (ivalue > MAX_ULOGENTRIES)
-                params.iprop_ulogsize = MAX_ULOGENTRIES;
-            else if (ivalue <= 0)
+            if (ivalue <= 0)
                 params.iprop_ulogsize = DEF_ULOGENTRIES;
             else
                 params.iprop_ulogsize = ivalue;


More information about the cvs-krb5 mailing list