diff options
| author | Gerald Carter <jerry@samba.org> | 2003-05-14 03:32:20 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2003-05-14 03:32:20 +0000 |
| commit | 5d16254f560ba26929bc473c28b85c87317ca368 (patch) | |
| tree | 5761dcb1e9e1ed5dfe610454759cb5cbd60a4388 /source3/lib | |
| parent | f1840747994ecbb8d7b2b3ef7dbbf4399b7b501e (diff) | |
| download | samba-5d16254f560ba26929bc473c28b85c87317ca368.tar.gz samba-5d16254f560ba26929bc473c28b85c87317ca368.tar.bz2 samba-5d16254f560ba26929bc473c28b85c87317ca368.zip | |
*****LDAP schema changes*****
New objectclass named sambaSamAccount which uses attribute
prefaced with the phrase 'samba' to prevent future name clashes.
Change in functionality of the 'ldap filter' parameter. This always
defaults to "(uid=%u)" now and is and'd with the approriate objectclass
depending on whether you are using ldapsam_compat or ldapsam
conversion script for migrating from sambaAccount to
sambaSamAccount will come next.
(This used to be commit 998586e65271daa919e47e1206c0007454cbca66)
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/snprintf.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source3/lib/snprintf.c b/source3/lib/snprintf.c index 062521e726..9b9ceb60ca 100644 --- a/source3/lib/snprintf.c +++ b/source3/lib/snprintf.c @@ -665,7 +665,7 @@ static void fmtfp (char *buffer, size_t *currlen, size_t maxlen, int padlen = 0; /* amount to pad */ int zpadlen = 0; int caps = 0; - int index; + int idx; double intpart; double fracpart; double temp; @@ -724,11 +724,11 @@ static void fmtfp (char *buffer, size_t *currlen, size_t maxlen, do { temp = intpart*0.1; my_modf(temp, &intpart); - index = (int) ((temp -intpart +0.05)* 10.0); - /* index = (int) (((double)(temp*0.1) -intpart +0.05) *10.0); */ - /* printf ("%llf, %f, %x\n", temp, intpart, index); */ + idx = (int) ((temp -intpart +0.05)* 10.0); + /* idx = (int) (((double)(temp*0.1) -intpart +0.05) *10.0); */ + /* printf ("%llf, %f, %x\n", temp, intpart, idx); */ iconvert[iplace++] = - (caps? "0123456789ABCDEF":"0123456789abcdef")[index]; + (caps? "0123456789ABCDEF":"0123456789abcdef")[idx]; } while (intpart && (iplace < 311)); if (iplace == 311) iplace--; iconvert[iplace] = 0; @@ -739,11 +739,11 @@ static void fmtfp (char *buffer, size_t *currlen, size_t maxlen, do { temp = fracpart*0.1; my_modf(temp, &fracpart); - index = (int) ((temp -fracpart +0.05)* 10.0); - /* index = (int) ((((temp/10) -fracpart) +0.05) *10); */ - /* printf ("%lf, %lf, %ld\n", temp, fracpart, index); */ + idx = (int) ((temp -fracpart +0.05)* 10.0); + /* idx = (int) ((((temp/10) -fracpart) +0.05) *10); */ + /* printf ("%lf, %lf, %ld\n", temp, fracpart, idx ); */ fconvert[fplace++] = - (caps? "0123456789ABCDEF":"0123456789abcdef")[index]; + (caps? "0123456789ABCDEF":"0123456789abcdef")[idx]; } while(fracpart && (fplace < 311)); if (fplace == 311) fplace--; } |