[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  bff935b wafsamba: try to fix the build on AIX with xlc_r
       via  0eeaf10 heimdal:lib/asn1: try to fix the build on IRIX
      from  c48e307 Revert "s3:smbd: set req->smb2req->compat_chain_fsp in file_fsp()"

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit bff935b814355b8b75b422857c56aced0a6b1388
Author: Stefan Metzmacher <metze at samba.org>
Date:   Sun Jun 10 17:48:15 2012 +0200

    wafsamba: try to fix the build on AIX with xlc_r
    
    bld.env['CPP'] can be 'None' or '[]', bld.CONFIG_SET("CPP") should return False
    
    File "./buildtools/wafsamba/samba_pidl.py", line 131, in SAMBA_PIDL_LIST
        bld.SAMBA_PIDL(name, p, options=options, output_dir=output_dir, symlink=symlink, generate_tables=generate_tables)
      File "./buildtools/wafsamba/samba_pidl.py", line 65, in SAMBA_PIDL
        cpp = 'CPP="%s"' % bld.CONFIG_GET("CPP")[0]
    IndexError: list index out of range
    
    metze
    
    Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
    Autobuild-Date(master): Sun Jun 10 20:18:49 CEST 2012 on sn-devel-104

commit 0eeaf10fd0ef37c2db497bfe39ed97d761593946
Author: Stefan Metzmacher <metze at samba.org>
Date:   Sun Jun 10 16:21:12 2012 +0200

    heimdal:lib/asn1: try to fix the build on IRIX
    
    cc-1028 cc: ERROR File = ../source4/heimdal/lib/asn1/gen_template.c, Line = 548
      The expression used must have a constant value.
    
      struct templatehead template = { 0L, &(template). tqh_first };
                                             ^
    If this really fixes the IRIX build, we'll propose this for heimdal upstream.
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 buildtools/wafsamba/samba_autoconf.py   |   11 ++++++++++-
 source4/heimdal/lib/asn1/gen_template.c |    8 ++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py
index 4da5df8..be5e926 100644
--- a/buildtools/wafsamba/samba_autoconf.py
+++ b/buildtools/wafsamba/samba_autoconf.py
@@ -467,7 +467,16 @@ def CONFIG_GET(conf, option):
 @conf
 def CONFIG_SET(conf, option):
     '''return True if a configuration option was found'''
-    return (option in conf.env) and (conf.env[option] != ())
+    if option not in conf.env:
+        return False
+    v = conf.env[option]
+    if v == None:
+        return False
+    if v == []:
+        return False
+    if v == ():
+        return False
+    return True
 Build.BuildContext.CONFIG_SET = CONFIG_SET
 Build.BuildContext.CONFIG_GET = CONFIG_GET
 
diff --git a/source4/heimdal/lib/asn1/gen_template.c b/source4/heimdal/lib/asn1/gen_template.c
index edd68e1..06e48e2 100644
--- a/source4/heimdal/lib/asn1/gen_template.c
+++ b/source4/heimdal/lib/asn1/gen_template.c
@@ -545,13 +545,15 @@ template_members(struct templatehead *temp, const char *basetype, const char *na
     case TNull:
 	break;
     case TBitString: {
-	struct templatehead template = ASN1_TAILQ_HEAD_INITIALIZER(template);
+	struct templatehead template;
 	struct template *q;
 	Member *m;
 	size_t count = 0, i;
 	char *bname = NULL;
 	FILE *f = get_code_file();
 
+	ASN1_TAILQ_INIT(&template);
+
 	if (ASN1_TAILQ_EMPTY(t->members)) {
 	    add_line(temp, "{ A1_PARSE_T(A1T_HEIM_BIT_STRING), %s, NULL }", poffset);
 	    break;
@@ -681,7 +683,7 @@ template_members(struct templatehead *temp, const char *basetype, const char *na
 	break;
     }
     case TChoice: {
-	struct templatehead template = ASN1_TAILQ_HEAD_INITIALIZER(template);
+	struct templatehead template;
 	struct template *q;
 	size_t count = 0, i;
 	char *tname = NULL;
@@ -690,6 +692,8 @@ template_members(struct templatehead *temp, const char *basetype, const char *na
 	int ellipsis = 0;
 	char *e;
 
+	ASN1_TAILQ_INIT(&template);
+
 	if (asprintf(&tname, "asn1_choice_%s_%s%x",
 		     basetype, name ? name : "", (unsigned int)(uintptr_t)t) < 0 || tname == NULL)
 	    errx(1, "malloc");


-- 
Samba Shared Repository