[SCM] Samba Shared Repository - branch master updated
Stefan Metzmacher
metze at samba.org
Mon Feb 8 03:00:27 MST 2010
The branch, master has been updated
via 4a4b2a5... s4:heimdal: regerenate files
via 42efa32... s4:heimdal_build: allow flex-2.5.35:bison-2.4.1 to regenerate files
via 02320cb... libreplace: add check for NSS_WRAPPER_DISABLE similar to SOCKET_WRAPPER_DISABLE
via 6e7bcaa... libreplace: Attempt to fix bug 5910, detect a broken getaddrinfo
from 9fed901... s3: Don't invalidate cache for uninitialized domains.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 4a4b2a5eafe89e87798d231522c756750d14ce60
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 8 09:57:31 2010 +0100
s4:heimdal: regerenate files
Andrew using cp like in commit ca12e7bc8ff4a91f2044c0a60550fec902e97a78
is wrong as that removes #include "config.h" and breaks the build on AIX.
metze
commit 42efa323ca7933f894a740765fd080ffe4c207c3
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 8 09:29:22 2010 +0100
s4:heimdal_build: allow flex-2.5.35:bison-2.4.1 to regenerate files
metze
commit 02320cb0e2728bb18e013e3ee22351293f3dd64e
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 8 08:55:44 2010 +0100
libreplace: add check for NSS_WRAPPER_DISABLE similar to SOCKET_WRAPPER_DISABLE
metze
commit 6e7bcaa878af80be338b18bfe4ec45c51ebbeeed
Author: Volker Lendecke <vl at samba.org>
Date: Sun Feb 7 18:09:11 2010 +0100
libreplace: Attempt to fix bug 5910, detect a broken getaddrinfo
Signed-off-by: Stefan Metzmacher <metze at samba.org>
-----------------------------------------------------------------------
Summary of changes:
lib/replace/libreplace_network.m4 | 25 +++++
lib/replace/system/passwd.h | 6 +-
source4/heimdal/lib/asn1/asn1parse.c | 188 +++++++++++++++++-----------------
source4/heimdal/lib/asn1/asn1parse.h | 4 +-
source4/heimdal/lib/asn1/lex.c | 33 +++++--
source4/heimdal/lib/com_err/lex.c | 33 +++++--
source4/heimdal/lib/com_err/parse.c | 30 +++---
source4/heimdal/lib/com_err/parse.h | 4 +-
source4/heimdal/lib/hx509/sel-gram.c | 62 ++++++------
source4/heimdal/lib/hx509/sel-gram.h | 4 +-
source4/heimdal/lib/hx509/sel-lex.c | 33 +++++--
source4/heimdal_build/internal.m4 | 10 ++-
12 files changed, 256 insertions(+), 176 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/replace/libreplace_network.m4 b/lib/replace/libreplace_network.m4
index b7d15ea..bccd773 100644
--- a/lib/replace/libreplace_network.m4
+++ b/lib/replace/libreplace_network.m4
@@ -226,6 +226,31 @@ ret = getnameinfo(&sa, sizeof(sa),
],
libreplace_cv_HAVE_GETADDRINFO=yes,libreplace_cv_HAVE_GETADDRINFO=no)])
+
+if test x"$libreplace_cv_HAVE_GETADDRINFO" = x"yes"; then
+ # getaddrinfo is broken on some AIX systems
+ # see bug 5910, use our replacements if we detect
+ # a broken system.
+ AC_TRY_RUN([
+ #include <stddef.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netdb.h>
+ int main(int argc, const char *argv[])
+ {
+ struct addrinfo hints = {0,};
+ struct addrinfo *ppres;
+ const char hostname[] = "0.0.0.0";
+ hints.ai_socktype = SOCK_STREAM;
+ hints.ai_family = AF_INET;
+ hints.ai_flags =
+ AI_NUMERICHOST|AI_PASSIVE|AI_ADDRCONFIG;
+ return getaddrinfo(hostname, NULL, &hints, &ppres) != 0 ? 1 : 0;
+ }],
+ libreplace_cv_HAVE_GETADDRINFO=yes,
+ libreplace_cv_HAVE_GETADDRINFO=no)
+fi
+
if test x"$libreplace_cv_HAVE_GETADDRINFO" = x"yes"; then
AC_DEFINE(HAVE_GETADDRINFO,1,[Whether the system has getaddrinfo])
AC_DEFINE(HAVE_GETNAMEINFO,1,[Whether the system has getnameinfo])
diff --git a/lib/replace/system/passwd.h b/lib/replace/system/passwd.h
index b41608c..aaea9c8 100644
--- a/lib/replace/system/passwd.h
+++ b/lib/replace/system/passwd.h
@@ -101,10 +101,12 @@ char *rep_getpass(const char *prompt);
#endif
#ifdef NSS_WRAPPER
+#ifndef NSS_WRAPPER_DISABLE
#ifndef NSS_WRAPPER_NOT_REPLACE
#define NSS_WRAPPER_REPLACE
-#endif
+#endif /* NSS_WRAPPER_NOT_REPLACE */
#include "../nss_wrapper/nss_wrapper.h"
-#endif
+#endif /* NSS_WRAPPER_DISABLE */
+#endif /* NSS_WRAPPER */
#endif
diff --git a/source4/heimdal/lib/asn1/asn1parse.c b/source4/heimdal/lib/asn1/asn1parse.c
index 429d2a1..41724f5 100644
--- a/source4/heimdal/lib/asn1/asn1parse.c
+++ b/source4/heimdal/lib/asn1/asn1parse.c
@@ -68,7 +68,7 @@
/* Copy the first part of user declarations. */
/* Line 189 of yacc.c */
-#line 36 "asn1parse.y"
+#line 36 "heimdal/lib/asn1/asn1parse.y"
#include <config.h>
@@ -99,11 +99,11 @@ struct string_list {
/* Line 189 of yacc.c */
-#line 103 "asn1parse.c"
+#line 103 "heimdal/lib/asn1/asn1parse.y"
/* Enabling traces. */
#ifndef YYDEBUG
-# define YYDEBUG 1
+# define YYDEBUG 0
#endif
/* Enabling verbose error messages. */
@@ -312,7 +312,7 @@ typedef union YYSTYPE
{
/* Line 214 of yacc.c */
-#line 65 "asn1parse.y"
+#line 65 "heimdal/lib/asn1/asn1parse.y"
int constant;
struct value *value;
@@ -330,7 +330,7 @@ typedef union YYSTYPE
/* Line 214 of yacc.c */
-#line 334 "asn1parse.c"
+#line 334 "heimdal/lib/asn1/asn1parse.y"
} YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -342,7 +342,7 @@ typedef union YYSTYPE
/* Line 264 of yacc.c */
-#line 346 "asn1parse.c"
+#line 346 "heimdal/lib/asn1/asn1parse.y"
#ifdef short
# undef short
@@ -1776,7 +1776,7 @@ yyreduce:
case 2:
/* Line 1455 of yacc.c */
-#line 235 "asn1parse.y"
+#line 235 "heimdal/lib/asn1/asn1parse.y"
{
checkundefined();
}
@@ -1785,28 +1785,28 @@ yyreduce:
case 4:
/* Line 1455 of yacc.c */
-#line 242 "asn1parse.y"
+#line 242 "heimdal/lib/asn1/asn1parse.y"
{ error_message("implicit tagging is not supported"); }
break;
case 5:
/* Line 1455 of yacc.c */
-#line 244 "asn1parse.y"
+#line 244 "heimdal/lib/asn1/asn1parse.y"
{ error_message("automatic tagging is not supported"); }
break;
case 7:
/* Line 1455 of yacc.c */
-#line 249 "asn1parse.y"
+#line 249 "heimdal/lib/asn1/asn1parse.y"
{ error_message("no extensibility options supported"); }
break;
case 17:
/* Line 1455 of yacc.c */
-#line 270 "asn1parse.y"
+#line 270 "heimdal/lib/asn1/asn1parse.y"
{
struct string_list *sl;
for(sl = (yyvsp[(1) - (4)].sl); sl != NULL; sl = sl->next) {
@@ -1820,7 +1820,7 @@ yyreduce:
case 22:
/* Line 1455 of yacc.c */
-#line 289 "asn1parse.y"
+#line 289 "heimdal/lib/asn1/asn1parse.y"
{
(yyval.sl) = emalloc(sizeof(*(yyval.sl)));
(yyval.sl)->string = (yyvsp[(1) - (3)].name);
@@ -1831,7 +1831,7 @@ yyreduce:
case 23:
/* Line 1455 of yacc.c */
-#line 295 "asn1parse.y"
+#line 295 "heimdal/lib/asn1/asn1parse.y"
{
(yyval.sl) = emalloc(sizeof(*(yyval.sl)));
(yyval.sl)->string = (yyvsp[(1) - (1)].name);
@@ -1842,7 +1842,7 @@ yyreduce:
case 24:
/* Line 1455 of yacc.c */
-#line 303 "asn1parse.y"
+#line 303 "heimdal/lib/asn1/asn1parse.y"
{
Symbol *s = addsym ((yyvsp[(1) - (3)].name));
s->stype = Stype;
@@ -1855,7 +1855,7 @@ yyreduce:
case 42:
/* Line 1455 of yacc.c */
-#line 334 "asn1parse.y"
+#line 334 "heimdal/lib/asn1/asn1parse.y"
{
(yyval.type) = new_tag(ASN1_C_UNIV, UT_Boolean,
TE_EXPLICIT, new_type(TBoolean));
@@ -1865,7 +1865,7 @@ yyreduce:
case 43:
/* Line 1455 of yacc.c */
-#line 341 "asn1parse.y"
+#line 341 "heimdal/lib/asn1/asn1parse.y"
{
if((yyvsp[(2) - (5)].value)->type != integervalue)
error_message("Non-integer used in first part of range");
@@ -1880,7 +1880,7 @@ yyreduce:
case 44:
/* Line 1455 of yacc.c */
-#line 351 "asn1parse.y"
+#line 351 "heimdal/lib/asn1/asn1parse.y"
{
if((yyvsp[(2) - (5)].value)->type != integervalue)
error_message("Non-integer in first part of range");
@@ -1893,7 +1893,7 @@ yyreduce:
case 45:
/* Line 1455 of yacc.c */
-#line 359 "asn1parse.y"
+#line 359 "heimdal/lib/asn1/asn1parse.y"
{
if((yyvsp[(4) - (5)].value)->type != integervalue)
error_message("Non-integer in second part of range");
@@ -1906,7 +1906,7 @@ yyreduce:
case 46:
/* Line 1455 of yacc.c */
-#line 367 "asn1parse.y"
+#line 367 "heimdal/lib/asn1/asn1parse.y"
{
if((yyvsp[(2) - (3)].value)->type != integervalue)
error_message("Non-integer used in limit");
@@ -1919,7 +1919,7 @@ yyreduce:
case 47:
/* Line 1455 of yacc.c */
-#line 378 "asn1parse.y"
+#line 378 "heimdal/lib/asn1/asn1parse.y"
{
(yyval.type) = new_tag(ASN1_C_UNIV, UT_Integer,
TE_EXPLICIT, new_type(TInteger));
@@ -1929,7 +1929,7 @@ yyreduce:
case 48:
/* Line 1455 of yacc.c */
-#line 383 "asn1parse.y"
+#line 383 "heimdal/lib/asn1/asn1parse.y"
{
(yyval.type) = new_type(TInteger);
(yyval.type)->range = (yyvsp[(2) - (2)].range);
@@ -1940,7 +1940,7 @@ yyreduce:
case 49:
/* Line 1455 of yacc.c */
-#line 389 "asn1parse.y"
+#line 389 "heimdal/lib/asn1/asn1parse.y"
{
(yyval.type) = new_type(TInteger);
(yyval.type)->members = (yyvsp[(3) - (4)].members);
@@ -1951,7 +1951,7 @@ yyreduce:
case 50:
/* Line 1455 of yacc.c */
-#line 397 "asn1parse.y"
+#line 397 "heimdal/lib/asn1/asn1parse.y"
{
(yyval.members) = emalloc(sizeof(*(yyval.members)));
ASN1_TAILQ_INIT((yyval.members));
@@ -1962,7 +1962,7 @@ yyreduce:
case 51:
/* Line 1455 of yacc.c */
-#line 403 "asn1parse.y"
+#line 403 "heimdal/lib/asn1/asn1parse.y"
{
ASN1_TAILQ_INSERT_TAIL((yyvsp[(1) - (3)].members), (yyvsp[(3) - (3)].member), members);
(yyval.members) = (yyvsp[(1) - (3)].members);
@@ -1972,14 +1972,14 @@ yyreduce:
case 52:
/* Line 1455 of yacc.c */
-#line 408 "asn1parse.y"
+#line 408 "heimdal/lib/asn1/asn1parse.y"
{ (yyval.members) = (yyvsp[(1) - (3)].members); }
break;
case 53:
/* Line 1455 of yacc.c */
-#line 412 "asn1parse.y"
+#line 412 "heimdal/lib/asn1/asn1parse.y"
{
(yyval.member) = emalloc(sizeof(*(yyval.member)));
(yyval.member)->name = (yyvsp[(1) - (4)].name);
@@ -1995,7 +1995,7 @@ yyreduce:
case 54:
/* Line 1455 of yacc.c */
-#line 425 "asn1parse.y"
+#line 425 "heimdal/lib/asn1/asn1parse.y"
{
(yyval.type) = new_type(TInteger);
(yyval.type)->members = (yyvsp[(3) - (4)].members);
@@ -2006,7 +2006,7 @@ yyreduce:
case 56:
/* Line 1455 of yacc.c */
-#line 436 "asn1parse.y"
+#line 436 "heimdal/lib/asn1/asn1parse.y"
{
(yyval.type) = new_type(TBitString);
(yyval.type)->members = emalloc(sizeof(*(yyval.type)->members));
@@ -2018,7 +2018,7 @@ yyreduce:
case 57:
/* Line 1455 of yacc.c */
-#line 443 "asn1parse.y"
+#line 443 "heimdal/lib/asn1/asn1parse.y"
{
(yyval.type) = new_type(TBitString);
(yyval.type)->members = (yyvsp[(4) - (5)].members);
@@ -2029,7 +2029,7 @@ yyreduce:
case 58:
/* Line 1455 of yacc.c */
-#line 451 "asn1parse.y"
+#line 451 "heimdal/lib/asn1/asn1parse.y"
{
(yyval.type) = new_tag(ASN1_C_UNIV, UT_OID,
TE_EXPLICIT, new_type(TOID));
@@ -2039,7 +2039,7 @@ yyreduce:
case 59:
/* Line 1455 of yacc.c */
-#line 457 "asn1parse.y"
+#line 457 "heimdal/lib/asn1/asn1parse.y"
{
Type *t = new_type(TOctetString);
t->range = (yyvsp[(3) - (3)].range);
@@ -2051,7 +2051,7 @@ yyreduce:
case 60:
/* Line 1455 of yacc.c */
-#line 466 "asn1parse.y"
+#line 466 "heimdal/lib/asn1/asn1parse.y"
{
(yyval.type) = new_tag(ASN1_C_UNIV, UT_Null,
TE_EXPLICIT, new_type(TNull));
@@ -2061,21 +2061,21 @@ yyreduce:
case 61:
/* Line 1455 of yacc.c */
-#line 473 "asn1parse.y"
+#line 473 "heimdal/lib/asn1/asn1parse.y"
{ (yyval.range) = NULL; }
break;
case 62:
/* Line 1455 of yacc.c */
-#line 475 "asn1parse.y"
+#line 475 "heimdal/lib/asn1/asn1parse.y"
{ (yyval.range) = (yyvsp[(2) - (2)].range); }
break;
case 63:
/* Line 1455 of yacc.c */
-#line 480 "asn1parse.y"
+#line 480 "heimdal/lib/asn1/asn1parse.y"
{
(yyval.type) = new_type(TSequence);
(yyval.type)->members = (yyvsp[(3) - (4)].members);
@@ -2086,7 +2086,7 @@ yyreduce:
case 64:
/* Line 1455 of yacc.c */
-#line 486 "asn1parse.y"
+#line 486 "heimdal/lib/asn1/asn1parse.y"
{
(yyval.type) = new_type(TSequence);
(yyval.type)->members = NULL;
@@ -2097,7 +2097,7 @@ yyreduce:
case 65:
/* Line 1455 of yacc.c */
-#line 494 "asn1parse.y"
+#line 494 "heimdal/lib/asn1/asn1parse.y"
{
(yyval.type) = new_type(TSequenceOf);
(yyval.type)->range = (yyvsp[(2) - (4)].range);
@@ -2109,7 +2109,7 @@ yyreduce:
case 66:
/* Line 1455 of yacc.c */
-#line 503 "asn1parse.y"
+#line 503 "heimdal/lib/asn1/asn1parse.y"
{
(yyval.type) = new_type(TSet);
(yyval.type)->members = (yyvsp[(3) - (4)].members);
@@ -2120,7 +2120,7 @@ yyreduce:
case 67:
/* Line 1455 of yacc.c */
-#line 509 "asn1parse.y"
+#line 509 "heimdal/lib/asn1/asn1parse.y"
{
(yyval.type) = new_type(TSet);
(yyval.type)->members = NULL;
@@ -2131,7 +2131,7 @@ yyreduce:
case 68:
/* Line 1455 of yacc.c */
-#line 517 "asn1parse.y"
+#line 517 "heimdal/lib/asn1/asn1parse.y"
{
(yyval.type) = new_type(TSetOf);
(yyval.type)->subtype = (yyvsp[(3) - (3)].type);
@@ -2142,7 +2142,7 @@ yyreduce:
case 69:
/* Line 1455 of yacc.c */
-#line 525 "asn1parse.y"
+#line 525 "heimdal/lib/asn1/asn1parse.y"
{
(yyval.type) = new_type(TChoice);
(yyval.type)->members = (yyvsp[(3) - (4)].members);
@@ -2152,7 +2152,7 @@ yyreduce:
case 72:
/* Line 1455 of yacc.c */
-#line 536 "asn1parse.y"
+#line 536 "heimdal/lib/asn1/asn1parse.y"
{
Symbol *s = addsym((yyvsp[(1) - (1)].name));
(yyval.type) = new_type(TType);
@@ -2166,7 +2166,7 @@ yyreduce:
case 73:
/* Line 1455 of yacc.c */
-#line 547 "asn1parse.y"
+#line 547 "heimdal/lib/asn1/asn1parse.y"
{
(yyval.type) = new_tag(ASN1_C_UNIV, UT_GeneralizedTime,
TE_EXPLICIT, new_type(TGeneralizedTime));
@@ -2176,7 +2176,7 @@ yyreduce:
case 74:
/* Line 1455 of yacc.c */
-#line 552 "asn1parse.y"
+#line 552 "heimdal/lib/asn1/asn1parse.y"
{
(yyval.type) = new_tag(ASN1_C_UNIV, UT_UTCTime,
TE_EXPLICIT, new_type(TUTCTime));
@@ -2186,7 +2186,7 @@ yyreduce:
case 75:
/* Line 1455 of yacc.c */
-#line 559 "asn1parse.y"
+#line 559 "heimdal/lib/asn1/asn1parse.y"
{
/* if (Constraint.type == contentConstrant) {
assert(Constraint.u.constraint.type == octetstring|bitstring-w/o-NamedBitList); // remember to check type reference too
@@ -2204,7 +2204,7 @@ yyreduce:
case 76:
/* Line 1455 of yacc.c */
-#line 575 "asn1parse.y"
+#line 575 "heimdal/lib/asn1/asn1parse.y"
{
(yyval.constraint_spec) = (yyvsp[(2) - (3)].constraint_spec);
}
@@ -2213,7 +2213,7 @@ yyreduce:
case 80:
/* Line 1455 of yacc.c */
-#line 588 "asn1parse.y"
+#line 588 "heimdal/lib/asn1/asn1parse.y"
{
(yyval.constraint_spec) = new_constraint_spec(CT_CONTENTS);
(yyval.constraint_spec)->u.content.type = (yyvsp[(2) - (2)].type);
@@ -2224,7 +2224,7 @@ yyreduce:
case 81:
/* Line 1455 of yacc.c */
-#line 594 "asn1parse.y"
+#line 594 "heimdal/lib/asn1/asn1parse.y"
{
if ((yyvsp[(3) - (3)].value)->type != objectidentifiervalue)
error_message("Non-OID used in ENCODED BY constraint");
@@ -2237,7 +2237,7 @@ yyreduce:
case 82:
/* Line 1455 of yacc.c */
-#line 602 "asn1parse.y"
+#line 602 "heimdal/lib/asn1/asn1parse.y"
{
if ((yyvsp[(5) - (5)].value)->type != objectidentifiervalue)
error_message("Non-OID used in ENCODED BY constraint");
@@ -2250,7 +2250,7 @@ yyreduce:
case 83:
/* Line 1455 of yacc.c */
-#line 612 "asn1parse.y"
+#line 612 "heimdal/lib/asn1/asn1parse.y"
{
(yyval.constraint_spec) = new_constraint_spec(CT_USER);
}
@@ -2259,7 +2259,7 @@ yyreduce:
--
Samba Shared Repository
More information about the samba-cvs
mailing list