[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-454-gd352d3c

[Michael Adam]

The branch, master has been updated
       via  d352d3c713d86e2657f91fb86686392224764770 (commit)
       via  a23719babb7fd117ed2d4d2355748d00e415d561 (commit)
      from  e89e739e22c5c3ac88f7290fb98c678c3846b755 (commit)

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


- Log -----------------------------------------------------------------
commit d352d3c713d86e2657f91fb86686392224764770
Author: Michael Adam <obnox at samba.org>
Date:   Tue Mar 17 15:51:13 2009 +0100

    .gitignore source4/torture/ldb/proto.h
    
    Michael

commit a23719babb7fd117ed2d4d2355748d00e415d561
Author: Björn Jacke <bj at sernet.de>
Date:   Sun Mar 15 17:26:21 2009 +0100

    fix build on sles8 and other old popt installations
    
    Signed-off-by: Michael Adam <obnox at samba.org>

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

Summary of changes:
 .gitignore                        |    1 +
 source4/lib/cmdline/popt_common.h |    4 ++++
 2 files changed, 5 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/.gitignore b/.gitignore
index f1440ca..7a2462c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -280,6 +280,7 @@ source4/tests
 source4/torture/auth/proto.h
 source4/torture/basic/proto.h
 source4/torture/ldap/proto.h
+source4/torture/ldb/proto.h
 source4/torture/libnet/proto.h
 source4/torture/local/proto.h
 source4/torture/nbench/proto.h
diff --git a/source4/lib/cmdline/popt_common.h b/source4/lib/cmdline/popt_common.h
index 733d12a..2f4ab2c 100644
--- a/source4/lib/cmdline/popt_common.h
+++ b/source4/lib/cmdline/popt_common.h
@@ -28,6 +28,10 @@ extern struct poptOption popt_common_connection[];
 extern struct poptOption popt_common_version[];
 extern struct poptOption popt_common_credentials[];
 
+#ifndef POPT_TABLEEND
+#define POPT_TABLEEND { NULL, '\0', 0, 0, 0, NULL, NULL }
+#endif
+
 #define POPT_COMMON_SAMBA { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_samba, 0, "Common samba options:", NULL },
 #define POPT_COMMON_CONNECTION { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_connection, 0, "Connection options:", NULL },
 #define POPT_COMMON_VERSION { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version, 0, "Common samba options:", NULL },


-- 
Samba Shared Repository