Author: hawk Date: Mon Sep 5 08:58:56 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: 6577071c711c2b03b7540813d6fd9bcb squid-2.5.STABLE10-64bit_cleanup.patch 0b3a36d933a5342138918a6d48ea4c69 squid-2.5.STABLE10-arp_ipfilter-2.patch 62f85558596e94c43959d9a877892725 squid-2.5.STABLE10-buildenv.patch d3e76dbab6c22dcb18eeaf63d125e174 squid-2.5.STABLE10-cacheClientTable.patch f22729393ededbe82acdf23bb298715b squid-2.5.STABLE10-cache_dir_change.patch 4f4c0a21d75d77b17b7c35d80c0bd65e squid-2.5.STABLE10-chroot-2.patch 0ed67d475016e10647112ca83988447f squid-2.5.STABLE10-chroot_dir.patch a3cc2465b99792e48c70963e0d08b1e0 squid-2.5.STABLE10-content_length.patch fa3e859b2850f30c5df8b6601bc32b72 squid-2.5.STABLE10-errmsg.patch a30ea35f5675532d3e6993df4e944766 squid-2.5.STABLE10-FORTIFY_SOURCE.patch 36e143222b2e337927e6264243183808 squid-2.5.STABLE10-ftp_250.patch a12a2ef50275589c65238a2383dae4b9 squid-2.5.STABLE10-ftp_basehref.patch b94e9fdd7a26942debb794df61670f61 squid-2.5.STABLE10-ftp_title-2.patch 520132a389135f09512324ec54412a3c squid-2.5.STABLE10-Greek.patch fe87792a7351c7d7a81a7b78f510ad60 squid-2.5.STABLE10-internal_date.patch 559d847418cb6e8bc0ac64ea83c6f1ce squid-2.5.STABLE10-ldap_auth-U.patch 8a944c1d3f3bac0d1dadcb7aace0ad68 squid-2.5.STABLE10-mail_from.patch a8cf7b7fea4c2dc7930d5eda88866e00 squid-2.5.STABLE10-mail_program.patch 3ab3faa007c77b763d4b11af5ebe694a squid-2.5.STABLE10-redirect_flags.patch 187e8312b9c3b1f80ce78eb6470f4d6d squid-2.5.STABLE10-snmp_getnext.patch 90764aa4d2bc198fcb9075d4380911de squid-2.5.STABLE10-Solaris_IPFilter.patch 7542771b1f5581661aeddffff424bb74 squid-2.5.STABLE10-spanish.patch f8e0a52bcd4771809b414e60108394ae squid-2.5.STABLE10-sslConnectTimeout.patch 6c523256183b8b71935f92163ef2446d squid-2.5.STABLE10-statHistAssert.patch 859947945228575403ba387d1a12f154 squid-2.5.STABLE10-STORE_PENDING.patch 0c40fb64d70670130115a3ac21c84ae8 squid-2.5.STABLE10-transparent-2.patch 6ae4e46ee7ba4c07fe159089d6ca43ad squid-2.5.STABLE10-wbinfo_groups.patch 1872b550bb3346a7817ecfff4b3c1c12 squid-2.5.STABLE10-wb_ntlm_auth_silent.patch
---- Files affected: SOURCES: squid-2.5.STABLE10-64bit_cleanup.patch (NONE -> 1.1) (NEW), squid-2.5.STABLE10-arp_ipfilter-2.patch (NONE -> 1.1) (NEW), squid-2.5.STABLE10-buildenv.patch (NONE -> 1.1) (NEW), squid-2.5.STABLE10-cacheClientTable.patch (NONE -> 1.1) (NEW), squid-2.5.STABLE10-cache_dir_change.patch (NONE -> 1.1) (NEW), squid-2.5.STABLE10-chroot-2.patch (NONE -> 1.1) (NEW), squid-2.5.STABLE10-chroot_dir.patch (NONE -> 1.1) (NEW), squid-2.5.STABLE10-content_length.patch (NONE -> 1.1) (NEW), squid-2.5.STABLE10-errmsg.patch (NONE -> 1.1) (NEW), squid-2.5.STABLE10-FORTIFY_SOURCE.patch (NONE -> 1.1) (NEW), squid-2.5.STABLE10-ftp_250.patch (NONE -> 1.1) (NEW), squid-2.5.STABLE10-ftp_basehref.patch (NONE -> 1.1) (NEW), squid-2.5.STABLE10-ftp_title-2.patch (NONE -> 1.1) (NEW), squid-2.5.STABLE10-Greek.patch (NONE -> 1.1) (NEW), squid-2.5.STABLE10-internal_date.patch (NONE -> 1.1) (NEW), squid-2.5.STABLE10-ldap_auth-U.patch (NONE -> 1.1) (NEW), squid-2.5.STABLE10-mail_from.patch (NONE! -> 1.1) (NEW), squid-2.5.STABLE10-mail_program.patch (NONE -> 1.1) (NEW), squid-2.5.STABLE10-redirect_flags.patch (NONE -> 1.1) (NEW), squid-2.5.STABLE10-snmp_getnext.patch (NONE -> 1.1) (NEW), squid-2.5.STABLE10-Solaris_IPFilter.patch (NONE -> 1.1) (NEW), squid-2.5.STABLE10-spanish.patch (NONE -> 1.1) (NEW), squid-2.5.STABLE10-sslConnectTimeout.patch (NONE -> 1.1) (NEW), squid-2.5.STABLE10-statHistAssert.patch (NONE -> 1.1) (NEW), squid-2.5.STABLE10-STORE_PENDING.patch (NONE -> 1.1) (NEW), squid-2.5.STABLE10-transparent-2.patch (NONE -> 1.1) (NEW), squid-2.5.STABLE10-wbinfo_groups.patch (NONE -> 1.1) (NEW), squid-2.5.STABLE10-wb_ntlm_auth_silent.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/squid-2.5.STABLE10-64bit_cleanup.patch diff -u /dev/null SOURCES/squid-2.5.STABLE10-64bit_cleanup.patch:1.1 --- /dev/null Mon Sep 5 10:58:56 2005 +++ SOURCES/squid-2.5.STABLE10-64bit_cleanup.patch Mon Sep 5 10:58:51 2005 @@ -0,0 +1,796 @@ +Index: squid/helpers/basic_auth/MSNT/smblib.c +diff -c squid/helpers/basic_auth/MSNT/smblib.c:1.1.2.3 squid/helpers/basic_auth/MSNT/smblib.c:1.1.2.4 +*** squid/helpers/basic_auth/MSNT/smblib.c:1.1.2.3 Wed Mar 9 07:28:32 2005 +--- squid/helpers/basic_auth/MSNT/smblib.c Thu Jun 30 12:50:55 2005 +*************** +*** 127,138 **** + * service we are going to call, sine some servers want it in uppercase */ + + for (i = 0; i < strlen(server); i++) +! called[i] = toupper(server[i]); + + called[strlen(server)] = 0; /* Make it a string */ + + for (i = 0; i < strlen(con->myname); i++) +! calling[i] = toupper(con->myname[i]); + + calling[strlen(con->myname)] = 0; /* Make it a string */ + +--- 127,138 ---- + * service we are going to call, sine some servers want it in uppercase */ + + for (i = 0; i < strlen(server); i++) +! called[i] = xtoupper(server[i]); + + called[strlen(server)] = 0; /* Make it a string */ + + for (i = 0; i < strlen(con->myname); i++) +! calling[i] = xtoupper(con->myname[i]); + + calling[strlen(con->myname)] = 0; /* Make it a string */ + +*************** +*** 229,240 **** + * service we are going to call, sine some servers want it in uppercase */ + + for (i = 0; i < strlen(host); i++) +! called[i] = toupper(host[i]); + + called[strlen(host)] = 0; /* Make it a string */ + + for (i = 0; i < strlen(con->myname); i++) +! calling[i] = toupper(con->myname[i]); + + calling[strlen(con->myname)] = 0; /* Make it a string */ + +--- 229,240 ---- + * service we are going to call, sine some servers want it in uppercase */ + + for (i = 0; i < strlen(host); i++) +! called[i] = xtoupper(host[i]); + + called[strlen(host)] = 0; /* Make it a string */ + + for (i = 0; i < strlen(con->myname); i++) +! calling[i] = xtoupper(con->myname[i]); + + calling[strlen(con->myname)] = 0; /* Make it a string */ + +Index: squid/helpers/basic_auth/MSNT/smblib.h +diff -c squid/helpers/basic_auth/MSNT/smblib.h:1.1.2.1 squid/helpers/basic_auth/MSNT/smblib.h:1.1.2.2 +*** squid/helpers/basic_auth/MSNT/smblib.h:1.1.2.1 Wed Jun 26 13:11:17 2002 +--- squid/helpers/basic_auth/MSNT/smblib.h Thu Jun 30 12:50:55 2005 +*************** +*** 23,28 **** +--- 23,29 ---- + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++ #include "util.h" + #include "std-defines.h" + #include "smblib-common.h" + +Index: squid/helpers/external_acl/winbind_group/wb_check_group.c +diff -c squid/helpers/external_acl/winbind_group/wb_check_group.c:1.2.2.11 squid/helpers/external_acl/winbind_group/wb_check_group.c:1.2.2.12 +*** squid/helpers/external_acl/winbind_group/wb_check_group.c:1.2.2.11 Fri Mar 25 19:50:50 2005 +--- squid/helpers/external_acl/winbind_group/wb_check_group.c Thu Jun 30 12:50:55 2005 +*************** +*** 127,133 **** + + static int strCaseCmp (const char *s1, const char *s2) + { +! while (*s1 && toupper (*s1) == toupper (*s2)) s1++, s2++; + return *s1 - *s2; + } + +--- 127,133 ---- + + static int strCaseCmp (const char *s1, const char *s2) + { +! while (*s1 && xtoupper (*s1) == xtoupper (*s2)) s1++, s2++; + return *s1 - *s2; + } + +Index: squid/helpers/ntlm_auth/SMB/ntlm_auth.c +diff -c squid/helpers/ntlm_auth/SMB/ntlm_auth.c:1.12.2.2 squid/helpers/ntlm_auth/SMB/ntlm_auth.c:1.12.2.3 +*** squid/helpers/ntlm_auth/SMB/ntlm_auth.c:1.12.2.2 Wed Mar 9 07:30:37 2005 +--- squid/helpers/ntlm_auth/SMB/ntlm_auth.c Thu Jun 30 12:50:55 2005 +*************** +*** 81,87 **** + { + char *p = string, c; + while ((c = *p)) { +! *p = toupper(c); + p++; + } + } +--- 81,87 ---- + { + char *p = string, c; + while ((c = *p)) { +! *p = xtoupper(c); + p++; + } + } +*************** +*** 92,98 **** + { + char *p = string, c; + while ((c = *p)) { +! *p = tolower(c); + p++; + } + } +--- 92,98 ---- + { + char *p = string, c; + while ((c = *p)) { +! *p = xtolower(c); + p++; + } + } +Index: squid/helpers/ntlm_auth/SMB/smbval/smbencrypt.c +diff -c squid/helpers/ntlm_auth/SMB/smbval/smbencrypt.c:1.3.2.2 squid/helpers/ntlm_auth/SMB/smbval/smbencrypt.c:1.3.2.3 +*** squid/helpers/ntlm_auth/SMB/smbval/smbencrypt.c:1.3.2.2 Wed Mar 9 07:33:01 2005 +--- squid/helpers/ntlm_auth/SMB/smbval/smbencrypt.c Thu Jun 30 12:50:55 2005 +*************** +*** 200,206 **** + * #endif *//* KANJI_WIN95_COMPATIBILITY */ + { + if (islower((int)(unsigned char)*s)) +! *s = toupper(*s); + s++; + } + } +--- 200,206 ---- + * #endif *//* KANJI_WIN95_COMPATIBILITY */ + { + if (islower((int)(unsigned char)*s)) +! *s = xtoupper(*s); + s++; + } + } +Index: squid/helpers/ntlm_auth/SMB/smbval/smblib.c +diff -c squid/helpers/ntlm_auth/SMB/smbval/smblib.c:1.3.2.2 squid/helpers/ntlm_auth/SMB/smbval/smblib.c:1.3.2.3 +*** squid/helpers/ntlm_auth/SMB/smbval/smblib.c:1.3.2.2 Wed Mar 9 07:28:32 2005 +--- squid/helpers/ntlm_auth/SMB/smbval/smblib.c Thu Jun 30 12:50:55 2005 +*************** +*** 170,181 **** + * service we are going to call, sine some servers want it in uppercase */ + + for (i = 0; i < strlen(server); i++) +! called[i] = toupper(server[i]); + + called[strlen(server)] = 0; /* Make it a string */ + + for (i = 0; i < strlen(con->myname); i++) +! calling[i] = toupper(con->myname[i]); + + calling[strlen(con->myname)] = 0; /* Make it a string */ + +--- 170,181 ---- + * service we are going to call, sine some servers want it in uppercase */ + + for (i = 0; i < strlen(server); i++) +! called[i] = xtoupper(server[i]); + + called[strlen(server)] = 0; /* Make it a string */ + + for (i = 0; i < strlen(con->myname); i++) +! calling[i] = xtoupper(con->myname[i]); + + calling[strlen(con->myname)] = 0; /* Make it a string */ + +*************** +*** 271,282 **** + * service we are going to call, sine some servers want it in uppercase */ + + for (i = 0; i < strlen(host); i++) +! called[i] = toupper(host[i]); + + called[strlen(host)] = 0; /* Make it a string */ + + for (i = 0; i < strlen(con->myname); i++) +! calling[i] = toupper(con->myname[i]); + + calling[strlen(con->myname)] = 0; /* Make it a string */ + +--- 271,282 ---- + * service we are going to call, sine some servers want it in uppercase */ + + for (i = 0; i < strlen(host); i++) +! called[i] = xtoupper(host[i]); + + called[strlen(host)] = 0; /* Make it a string */ + + for (i = 0; i < strlen(con->myname); i++) +! calling[i] = xtoupper(con->myname[i]); + + calling[strlen(con->myname)] = 0; /* Make it a string */ + +Index: squid/helpers/ntlm_auth/SMB/smbval/std-includes.h +diff -c squid/helpers/ntlm_auth/SMB/smbval/std-includes.h:1.2 squid/helpers/ntlm_auth/SMB/smbval/std-includes.h:1.2.2.1 +*** squid/helpers/ntlm_auth/SMB/smbval/std-includes.h:1.2 Fri Mar 9 17:55:38 2001 +--- squid/helpers/ntlm_auth/SMB/smbval/std-includes.h Thu Jun 30 12:50:55 2005 +*************** +*** 25,30 **** +--- 25,31 ---- + + /* the types are provided by squid's configure preocess */ + #include "squid_types.h" ++ #include "util.h" + #define BOOL int16_t + #define int16 int16_t + +Index: squid/helpers/ntlm_auth/fakeauth/fakeauth_auth.c +diff -c squid/helpers/ntlm_auth/fakeauth/fakeauth_auth.c:1.3.2.8 squid/helpers/ntlm_auth/fakeauth/fakeauth_auth.c:1.3.2.9 +*** squid/helpers/ntlm_auth/fakeauth/fakeauth_auth.c:1.3.2.8 Wed Mar 9 07:33:01 2005 +--- squid/helpers/ntlm_auth/fakeauth/fakeauth_auth.c Thu Jun 30 12:50:55 2005 +*************** +*** 57,63 **** + char *p = string; + char c; + while ((c = *p)) { +! *p = tolower(c); + p++; + } + } +--- 57,63 ---- + char *p = string; + char c; + while ((c = *p)) { +! *p = xtolower(c); + p++; + } + } +Index: squid/helpers/ntlm_auth/winbind/wb_ntlm_auth.c +diff -c squid/helpers/ntlm_auth/winbind/wb_ntlm_auth.c:1.1.2.8 squid/helpers/ntlm_auth/winbind/wb_ntlm_auth.c:1.1.2.9 +*** squid/helpers/ntlm_auth/winbind/wb_ntlm_auth.c:1.1.2.8 Sun Feb 20 12:07:45 2005 +--- squid/helpers/ntlm_auth/winbind/wb_ntlm_auth.c Thu Jun 30 12:50:56 2005 +*************** +*** 87,93 **** + { + char *p = string, c; + while ((c = *p)) { +! *p = tolower(c); + p++; + } + } +--- 87,93 ---- + { + char *p = string, c; + while ((c = *p)) { +! *p = xtolower(c); + p++; + } + } +*************** +*** 97,103 **** + { + char *p = string, c; + while ((c = *p)) { +! *p = toupper(c); + p++; + } + } +--- 97,103 ---- + { + char *p = string, c; + while ((c = *p)) { +! *p = xtoupper(c); + p++; + } + } +Index: squid/lib/Array.c +diff -c squid/lib/Array.c:1.7.2.1 squid/lib/Array.c:1.7.2.2 +*** squid/lib/Array.c:1.7.2.1 Thu Jun 9 01:51:46 2005 +--- squid/lib/Array.c Thu Jun 30 12:50:56 2005 +*************** +*** 65,78 **** + void + arrayInit(Array * a) + { +! assert(a); + memset(a, 0, sizeof(Array)); + } + + void + arrayClean(Array * a) + { +! assert(a); + /* could also warn if some objects are left */ + xfree(a->items); + a->items = NULL; +--- 65,78 ---- + void + arrayInit(Array * a) + { +! assert(a != NULL); + memset(a, 0, sizeof(Array)); + } + + void + arrayClean(Array * a) + { +! assert(a != NULL); + /* could also warn if some objects are left */ + xfree(a->items); + a->items = NULL; +*************** +*** 81,87 **** + void + arrayDestroy(Array * a) + { +! assert(a); + arrayClean(a); + xfree(a); + } +--- 81,87 ---- + void + arrayDestroy(Array * a) + { +! assert(a != NULL); + arrayClean(a); + xfree(a); + } +*************** +*** 89,95 **** + void + arrayAppend(Array * a, void *obj) + { +! assert(a); + if (a->count >= a->capacity) + arrayGrow(a, a->count + 1); + a->items[a->count++] = obj; +--- 89,95 ---- + void + arrayAppend(Array * a, void *obj) + { +! assert(a != NULL); + if (a->count >= a->capacity) + arrayGrow(a, a->count + 1); + a->items[a->count++] = obj; +*************** +*** 97,103 **** + + void arrayInsert(Array *a, void *obj, int position) + { +! assert(a); + if (a->count >= a->capacity) + arrayGrow(a, a->count + 1); + if (position > a->count) +--- 97,103 ---- + + void arrayInsert(Array *a, void *obj, int position) + { +! assert(a != NULL); + if (a->count >= a->capacity) + arrayGrow(a, a->count + 1); + if (position > a->count) +*************** +*** 112,118 **** + void + arrayPreAppend(Array * a, int app_count) + { +! assert(a); + if (a->count + app_count > a->capacity) + arrayGrow(a, a->count + app_count); + } +--- 112,118 ---- + void + arrayPreAppend(Array * a, int app_count) + { +! assert(a != NULL); + if (a->count + app_count > a->capacity) + arrayGrow(a, a->count + app_count); + } +Index: squid/lib/Stack.c +diff -c squid/lib/Stack.c:1.11 squid/lib/Stack.c:1.11.2.1 +*** squid/lib/Stack.c:1.11 Thu Jan 11 17:37:12 2001 +--- squid/lib/Stack.c Thu Jun 30 12:50:56 2005 +*************** +*** 50,62 **** + void * + stackPop(Stack * s) + { +! assert(s); + return s->count ? s->items[--s->count] : NULL; + } + + void * + stackTop(Stack * s) + { +! assert(s); + return s->count ? s->items[s->count - 1] : NULL; + } +--- 50,62 ---- + void * + stackPop(Stack * s) + { +! assert(s != NULL); + return s->count ? s->items[--s->count] : NULL; + } + + void * + stackTop(Stack * s) + { +! assert(s != NULL); + return s->count ? s->items[s->count - 1] : NULL; + } +Index: squid/lib/hash.c +diff -c squid/lib/hash.c:1.12 squid/lib/hash.c:1.12.2.1 +*** squid/lib/hash.c:1.12 Wed Mar 7 10:57:37 2001 +--- squid/lib/hash.c Thu Jun 30 12:50:56 2005 +*************** +*** 239,245 **** + void + hash_last(hash_table * hid) + { +! assert(hid); + hid->next = NULL; + hid->current_slot = 0; + } +--- 239,245 ---- + void + hash_last(hash_table * hid) + { +! assert(hid != NULL); + hid->next = NULL; + hid->current_slot = 0; + } +*************** +*** 307,313 **** + void + hashFreeMemory(hash_table * hid) + { +! assert(hid); + if (hid->buckets) + xfree(hid->buckets); + xfree(hid); +--- 307,313 ---- + void + hashFreeMemory(hash_table * hid) + { +! assert(hid != NULL); + if (hid->buckets) + xfree(hid->buckets); + xfree(hid); +Index: squid/lib/heap.c +diff -c squid/lib/heap.c:1.8 squid/lib/heap.c:1.8.2.1 +*** squid/lib/heap.c:1.8 Wed Feb 7 11:56:50 2001 +--- squid/lib/heap.c Thu Jun 30 12:50:56 2005 +*************** +*** 122,128 **** + delete_heap(heap * hp) + { + int i; +! assert(hp); + for (i = 0; i < hp->last; i++) { + xfree(hp->nodes[i]); + } +--- 122,128 ---- + delete_heap(heap * hp) + { + int i; +! assert(hp != NULL); + for (i = 0; i < hp->last; i++) { + xfree(hp->nodes[i]); + } +Index: squid/lib/rfc1123.c +diff -c squid/lib/rfc1123.c:1.29.2.2 squid/lib/rfc1123.c:1.29.2.3 +*** squid/lib/rfc1123.c:1.29.2.2 Wed Mar 9 07:51:39 2005 +--- squid/lib/rfc1123.c Sun Jul 3 02:18:38 2005 +*************** +*** 230,236 **** + #elif defined(_SQUID_AIX_) + #elif defined(_SQUID_CYGWIN_) + #else +! extern time_t timezone; + #endif + /* + * The following assumes a fixed DST offset of 1 hour, +--- 230,236 ---- + #elif defined(_SQUID_AIX_) + #elif defined(_SQUID_CYGWIN_) + #else +! extern long timezone; + #endif + /* + * The following assumes a fixed DST offset of 1 hour, +Index: squid/lib/util.c +diff -c squid/lib/util.c:1.83.2.2 squid/lib/util.c:1.83.2.3 +*** squid/lib/util.c:1.83.2.2 Sun Aug 11 19:22:37 2002 +--- squid/lib/util.c Thu Jun 30 12:50:56 2005 +*************** +*** 608,614 **** + xstrndup(const char *s, size_t n) + { + size_t sz; +! assert(s); + assert(n); + sz = strlen(s) + 1; + if (sz > n) +--- 608,614 ---- + xstrndup(const char *s, size_t n) + { + size_t sz; +! assert(s != NULL); + assert(n); + sz = strlen(s) + 1; + if (sz > n) +Index: squid/snmplib/mib.c +diff -c squid/snmplib/mib.c:1.22.2.1 squid/snmplib/mib.c:1.22.2.2 +*** squid/snmplib/mib.c:1.22.2.1 Wed Mar 9 07:33:02 2005 +--- squid/snmplib/mib.c Thu Jun 30 12:50:56 2005 +*************** +*** 128,138 **** + + while (*s1 && *s2) { + if (xisupper(*s1)) +! c1 = tolower(*s1); + else + c1 = *s1; + if (xisupper(*s2)) +! c2 = tolower(*s2); + else + c2 = *s2; + if (c1 != c2) +--- 128,138 ---- + + while (*s1 && *s2) { + if (xisupper(*s1)) +! c1 = xtolower(*s1); + else + c1 = *s1; + if (xisupper(*s2)) +! c2 = xtolower(*s2); + else + c2 = *s2; + if (c1 != c2) +Index: squid/snmplib/parse.c +diff -c squid/snmplib/parse.c:1.26.2.1 squid/snmplib/parse.c:1.26.2.2 +*** squid/snmplib/parse.c:1.26.2.1 Wed Mar 9 07:33:02 2005 +--- squid/snmplib/parse.c Thu Jun 30 12:50:56 2005 +*************** +*** 135,141 **** + #define WRITEONLY 20 + #undef NOACCESS + #define NOACCESS 21 +! #define STATUS 22 + #define MANDATORY 23 + #define OPTIONAL 24 + #define OBSOLETE 25 +--- 135,141 ---- + #define WRITEONLY 20 + #undef NOACCESS + #define NOACCESS 21 +! #define SNMP_STATUS 22 + #define MANDATORY 23 + #define OPTIONAL 24 + #define OBSOLETE 25 +*************** +*** 193,199 **** + {"read-only", sizeof("read-only") - 1, READONLY}, + {"ACCESS", sizeof("ACCESS") - 1, ACCESS}, + {"MAX-ACCESS", sizeof("MAX-ACCESS") - 1, ACCESS}, +! {"STATUS", sizeof("STATUS") - 1, STATUS}, + {"SYNTAX", sizeof("SYNTAX") - 1, SYNTAX}, + {"OBJECT-TYPE", sizeof("OBJECT-TYPE") - 1, OBJTYPE}, + {"{", sizeof("{") - 1, LEFTBRACKET}, +--- 193,199 ---- + {"read-only", sizeof("read-only") - 1, READONLY}, + {"ACCESS", sizeof("ACCESS") - 1, ACCESS}, + {"MAX-ACCESS", sizeof("MAX-ACCESS") - 1, ACCESS}, +! {"STATUS", sizeof("STATUS") - 1, SNMP_STATUS}, + {"SYNTAX", sizeof("SYNTAX") - 1, SYNTAX}, + {"OBJECT-TYPE", sizeof("OBJECT-TYPE") - 1, OBJTYPE}, + {"{", sizeof("{") - 1, LEFTBRACKET}, +*************** +*** 867,873 **** + return 0; + } <<Diff was trimmed, longer than 597 lines>> _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit