sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-17 02:05:21 +03:00
Code

Extra little fix to vl's patch. Make sure the passdb and testparm messages

Browse Source 
say exactly the same thing - in particular that we can algorithmic rid base ==
1000, and use the BASE_RID macro to avoid the use of magic numbers.

Andrew Bartlett
(This used to be commit b70f2a8047ac549841bc103932b38951e9814186)
This commit is contained in:
Andrew Bartlett 2002-11-03 14:13:43 +00:00
parent 281284c819
commit a7f2feae31
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source3/passdb/passdb.c
View File

@ -509,9 +509,11 @@ static int algorithmic_rid_base(void)
rid_offset = lp_algorithmic_rid_base();
if (rid_offset < 1000) {
DEBUG(0, ("algorithmic rid base must be above 1000\n"));
rid_offset = 1000;
if (rid_offset < BASE_RID) {
/* Try to prevent admin foot-shooting, we can't put algorithmic
rids below 1000, that's the 'well known RIDs' on NT */
DEBUG(0, ("'algorithmic rid base' must be equal to or above %ld\n", BASE_RID));
rid_offset = BASE_RID;
}
if (rid_offset & 1) {
DEBUG(0, ("algorithmic rid base must be even\n"));

6
source3/utils/testparm.c
View File

@ -168,8 +168,10 @@ via the %%o substitution. With encrypted passwords this is not possible.\n", lp_
printf("'winbind separator = +' might cause problems with group membership.\n");
}
if (lp_algorithmic_rid_base() < 1000) {
printf("'algorithmic rid base' must be equal or above 1000.\n");
if (lp_algorithmic_rid_base() < BASE_RID) {
/* Try to prevent admin foot-shooting, we can't put algorithmic
rids below 1000, that's the 'well known RIDs' on NT */
printf("'algorithmic rid base' must be equal to or above %lu\n", BASE_RID);
}
if (lp_algorithmic_rid_base() & 1) {