mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
Give back smaller and more readable ranges by default.
Instead of allocating a completely random start between 1M and 2G and a range of 1M values, give 10000 possible 200k ranges. They all start at a 200k boundary so they generate more readable IDs, at least until there arent't too many users/replicas involved.
This commit is contained in:
parent
6350686710
commit
a1edfe8c51
@ -1,7 +1,9 @@
|
|||||||
#! /usr/bin/python -E
|
#! /usr/bin/python -E
|
||||||
# Authors: Karl MacMillan <kmacmillan@mentalrootkit.com>
|
# Authors: Karl MacMillan <kmacmillan@mentalrootkit.com>
|
||||||
|
# Simo Sorce <ssorce@redhat.com>
|
||||||
|
# Rob Crittenden <rcritten@redhat.com>
|
||||||
#
|
#
|
||||||
# Copyright (C) 2007 Red Hat
|
# Copyright (C) 2007-2010 Red Hat
|
||||||
# see file 'COPYING' for use and warranty information
|
# see file 'COPYING' for use and warranty information
|
||||||
#
|
#
|
||||||
# This program is free software; you can redistribute it and/or
|
# This program is free software; you can redistribute it and/or
|
||||||
@ -60,11 +62,10 @@ from ipapython.config import IPAOptionParser
|
|||||||
pw_name = None
|
pw_name = None
|
||||||
uninstalling = False
|
uninstalling = False
|
||||||
|
|
||||||
# Used to determine the the highest possible uid/gid
|
|
||||||
MAXINT_32BIT = 2147483648
|
|
||||||
|
|
||||||
def parse_options():
|
def parse_options():
|
||||||
namespace = random.randint(1000000, (MAXINT_32BIT - 1000000))
|
# Guaranteed to give a random 200k range below the 2G mark (uint32_t limit)
|
||||||
|
namespace = random.randint(1, 10000) * 200000
|
||||||
parser = IPAOptionParser(version=version.VERSION)
|
parser = IPAOptionParser(version=version.VERSION)
|
||||||
parser.add_option("-u", "--user", dest="ds_user",
|
parser.add_option("-u", "--user", dest="ds_user",
|
||||||
help="ds user")
|
help="ds user")
|
||||||
@ -177,7 +178,7 @@ def parse_options():
|
|||||||
parser.error("--external-cert-file must use an absolute path")
|
parser.error("--external-cert-file must use an absolute path")
|
||||||
|
|
||||||
if options.idmax == 0:
|
if options.idmax == 0:
|
||||||
options.idmax = int(options.idstart) + 1000000 - 1
|
options.idmax = int(options.idstart) + 200000 - 1
|
||||||
|
|
||||||
if options.idmax < options.idstart:
|
if options.idmax < options.idstart:
|
||||||
parse.error("idmax (%u) cannot be smaller than idstart (%u)" %
|
parse.error("idmax (%u) cannot be smaller than idstart (%u)" %
|
||||||
|
Loading…
Reference in New Issue
Block a user