projects / packages / squid.git / blame
| Commit | Line | Data |
|---|---|---|
| b542cb60 MW |
1 | Index: squid/helpers/basic_auth/MSNT/usersfile.c |
| 2 | diff -c squid/helpers/basic_auth/MSNT/usersfile.c:1.1.2.3 squid/helpers/basic_auth/MSNT/usersfile.c:1.1.2.4 | |
| 3 | *** squid/helpers/basic_auth/MSNT/usersfile.c:1.1.2.3 Sat Jul 6 14:56:07 2002 | |
| 4 | --- squid/helpers/basic_auth/MSNT/usersfile.c Tue May 6 01:55:46 2003 | |
| 5 | *************** | |
| 6 | *** 107,115 **** | |
| 7 | uf->names = calloc(uf->Alloc, sizeof(*uf->names)); | |
| 8 | } else if (uf->Inuse == uf->Alloc) { | |
| 9 | uf->Alloc = uf->Alloc << 1; | |
| 10 | ! uf->names = realloc(uf->names, uf->Alloc); | |
| 11 | /* zero out the newly allocated memory */ | |
| 12 | ! memset(uf->names[uf->Alloc >> 1], | |
| 13 | '\0', | |
| 14 | (uf->Alloc >> 1) * sizeof(*uf->names)); | |
| 15 | } | |
| 16 | --- 107,115 ---- | |
| 17 | uf->names = calloc(uf->Alloc, sizeof(*uf->names)); | |
| 18 | } else if (uf->Inuse == uf->Alloc) { | |
| 19 | uf->Alloc = uf->Alloc << 1; | |
| 20 | ! uf->names = realloc(uf->names, uf->Alloc * sizeof(*uf->names)); | |
| 21 | /* zero out the newly allocated memory */ | |
| 22 | ! memset(&uf->names[uf->Alloc >> 1], | |
| 23 | '\0', | |
| 24 | (uf->Alloc >> 1) * sizeof(*uf->names)); | |
| 25 | } | |
| 26 | *************** | |
| 27 | *** 170,175 **** | |
| 28 | --- 170,178 ---- | |
| 29 | ||
| 30 | /* Stat the allowed users file. If it cannot be accessed, return. */ | |
| 31 | ||
| 32 | + if (uf->path == NULL) | |
| 33 | + return; | |
| 34 | + | |
| 35 | if (stat(uf->path, &ChkBuf) < 0) { | |
| 36 | if (errno == ENOENT) { | |
| 37 | uf->LMT = 0; | |
| 38 | *************** | |
| 39 | *** 186,191 **** | |
| 40 | /* | |
| 41 | * The file changed, so re-read it. | |
| 42 | */ | |
| 43 | ! syslog(LOG_INFO, "Check_forchange: Reloading user list."); | |
| 44 | Read_usersfile(NULL, uf); | |
| 45 | } | |
| 46 | --- 189,194 ---- | |
| 47 | /* | |
| 48 | * The file changed, so re-read it. | |
| 49 | */ | |
| 50 | ! syslog(LOG_INFO, "Check_forfilechange: Reloading user list '%s'.", uf->path); | |
| 51 | Read_usersfile(NULL, uf); | |
| 52 | } |