[SCM] Samba Shared Repository - branch master updated -
release-4-0-0alpha7-750-g494e471
Jelmer Vernooij
jelmer at samba.org
Thu Mar 26 16:19:52 GMT 2009
The branch, master has been updated
via 494e471d747c1e858481fad16cb33574d3e7f985 (commit)
via 50189e81d04edd313f707fc3bb7f18e46389e9e6 (commit)
via ef10b40338a98f1700b1a8d24a445715d846a5a6 (commit)
via 1e200c1952adab450909ac35252be4636c3e1053 (commit)
via 30a3dec549dc408940710409c80276077b4d9701 (commit)
via c42fc5e103d9d210c2f370e237a952e6df361792 (commit)
via 9a61758c1e3b3893fda1aca5dae291d86cec82e3 (commit)
via ea907a7144beb29cb5c823851a98ceac8166994b (commit)
via ca202cf464aec82e63be4b2160f394f56b8c195e (commit)
via 44787565715f0622cc1d049854427d735ca1c14b (commit)
via e548ec9c24d7f05fea81910b8c7cf3fc0bd137db (commit)
from 853f9283fb8fbcd2078e3cf8e99d6c8e24d77346 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 494e471d747c1e858481fad16cb33574d3e7f985
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Mar 26 16:28:45 2009 +0100
configure: Use m4 defines for minimum library versions rather than shell
variables, so the values rather than the variable names show up in
configure output.
commit 50189e81d04edd313f707fc3bb7f18e46389e9e6
Merge: ef10b40338a98f1700b1a8d24a445715d846a5a6 ea907a7144beb29cb5c823851a98ceac8166994b
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Mar 26 15:31:35 2009 +0100
Merge branch 'copyright' of /home/jelmer/samba4
commit ef10b40338a98f1700b1a8d24a445715d846a5a6
Merge: 1e200c1952adab450909ac35252be4636c3e1053 30a3dec549dc408940710409c80276077b4d9701
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Mar 26 15:31:27 2009 +0100
Merge branch 'displaysec' of /home/jelmer/samba4
commit 1e200c1952adab450909ac35252be4636c3e1053
Merge: ca202cf464aec82e63be4b2160f394f56b8c195e 853f9283fb8fbcd2078e3cf8e99d6c8e24d77346
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Mar 26 15:31:02 2009 +0100
Merge branch 'master' of git://git.samba.org/samba
commit 30a3dec549dc408940710409c80276077b4d9701
Merge: c42fc5e103d9d210c2f370e237a952e6df361792 853f9283fb8fbcd2078e3cf8e99d6c8e24d77346
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Mar 26 15:28:18 2009 +0100
Merge branch 'master' of ssh://git.samba.org/data/git/samba into displaysec
commit c42fc5e103d9d210c2f370e237a952e6df361792
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Mar 25 21:29:13 2009 +0100
display_sec: Move to common libcli/security directory.
commit 9a61758c1e3b3893fda1aca5dae291d86cec82e3
Merge: ca202cf464aec82e63be4b2160f394f56b8c195e 365b5cfcbeb041ce84718717f30ac02183c9af7f
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Mar 25 20:51:29 2009 +0100
Merge branch 'master' of ssh://git.samba.org/data/git/samba into displaysec
commit ea907a7144beb29cb5c823851a98ceac8166994b
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Mar 25 15:40:39 2009 +0100
selftest: Add copyright headers
commit ca202cf464aec82e63be4b2160f394f56b8c195e
Merge: 44787565715f0622cc1d049854427d735ca1c14b 2de464a7658f91d2d01087080b984d52c3483426
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Mar 20 16:40:09 2009 +0100
Merge branch 'master' of ssh://git.samba.org/data/git/samba into displaysec
commit 44787565715f0622cc1d049854427d735ca1c14b
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Mar 15 18:10:20 2009 +0100
Strip /usr/include from include flags, so we don't end up including
the system tevent if it's too old.
commit e548ec9c24d7f05fea81910b8c7cf3fc0bd137db
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Mar 15 17:14:25 2009 +0100
display_sec: Remove use of samba3-specific data types.
-----------------------------------------------------------------------
Summary of changes:
lib/util/fault.m4 | 2 +
libcli/security/config.mk | 2 +-
{source3/lib => libcli/security}/display_sec.c | 91 +++++++++++++-----------
selftest/SocketWrapper.pm | 16 ++++-
selftest/Subunit.pm | 16 ++++
selftest/output/buildfarm.pm | 15 ++++
selftest/output/html.pm | 16 ++++-
selftest/output/plain.pm | 14 ++++
selftest/selftest.pl | 14 ++++-
source3/Makefile.in | 2 +-
source3/samba4.m4 | 8 +-
source4/auth/config.m4 | 2 +
source4/build/m4/public.m4 | 4 +-
source4/configure.ac | 6 +-
source4/libcli/security/config.mk | 2 -
source4/min_versions.m4 | 8 +-
16 files changed, 156 insertions(+), 62 deletions(-)
rename {source3/lib => libcli/security}/display_sec.c (80%)
Changeset truncated at 500 lines:
diff --git a/lib/util/fault.m4 b/lib/util/fault.m4
index bac553a..c229769 100644
--- a/lib/util/fault.m4
+++ b/lib/util/fault.m4
@@ -9,6 +9,8 @@ if test x"$ac_cv_header_execinfo_h" = x"yes" -a x"$ac_cv_func_ext_backtrace" = x
EXECINFO_CPPFLAGS="$CPPFLAGS"
EXECINFO_LDFLAGS="$LDFLAGS"
LIB_REMOVE_USR_LIB(EXECINFO_LDFLAGS)
+ CFLAGS_REMOVE_USR_INCLUDE(EXECINFO_CFLAGS)
+ CFLAGS_REMOVE_USR_INCLUDE(EXECINFO_CPPFLAGS)
else
SMB_ENABLE(EXECINFO,NO)
fi
diff --git a/libcli/security/config.mk b/libcli/security/config.mk
index 56d8e13..7ade015 100644
--- a/libcli/security/config.mk
+++ b/libcli/security/config.mk
@@ -2,4 +2,4 @@
PRIVATE_DEPENDENCIES = TALLOC
LIBSECURITY_COMMON_OBJ_FILES = $(addprefix $(libclicommonsrcdir)/security/, \
- dom_sid.o)
+ dom_sid.o display_sec.o secace.o secacl.o)
diff --git a/source3/lib/display_sec.c b/libcli/security/display_sec.c
similarity index 80%
rename from source3/lib/display_sec.c
rename to libcli/security/display_sec.c
index fe1ae77..bec657d 100644
--- a/source3/lib/display_sec.c
+++ b/libcli/security/display_sec.c
@@ -19,12 +19,16 @@
*/
#include "includes.h"
+#include "librpc/gen_ndr/security.h"
+#include "libcli/security/secace.h"
+#include "libcli/security/dom_sid.h"
+#include "librpc/ndr/libndr.h"
/****************************************************************************
convert a security permissions into a string
****************************************************************************/
-char *get_sec_mask_str(TALLOC_CTX *ctx, uint32 type)
+char *get_sec_mask_str(TALLOC_CTX *ctx, uint32_t type)
{
char *typestr = talloc_strdup(ctx, "");
@@ -32,77 +36,77 @@ char *get_sec_mask_str(TALLOC_CTX *ctx, uint32 type)
return NULL;
}
- if (type & GENERIC_ALL_ACCESS) {
+ if (type & SEC_GENERIC_ALL) {
typestr = talloc_asprintf_append(typestr,
"Generic all access ");
if (!typestr) {
return NULL;
}
}
- if (type & GENERIC_EXECUTE_ACCESS) {
+ if (type & SEC_GENERIC_EXECUTE) {
typestr = talloc_asprintf_append(typestr,
"Generic execute access");
if (!typestr) {
return NULL;
}
}
- if (type & GENERIC_WRITE_ACCESS) {
+ if (type & SEC_GENERIC_WRITE) {
typestr = talloc_asprintf_append(typestr,
"Generic write access ");
if (!typestr) {
return NULL;
}
}
- if (type & GENERIC_READ_ACCESS) {
+ if (type & SEC_GENERIC_READ) {
typestr = talloc_asprintf_append(typestr,
"Generic read access ");
if (!typestr) {
return NULL;
}
}
- if (type & MAXIMUM_ALLOWED_ACCESS) {
+ if (type & SEC_FLAG_MAXIMUM_ALLOWED) {
typestr = talloc_asprintf_append(typestr,
"MAXIMUM_ALLOWED_ACCESS ");
if (!typestr) {
return NULL;
}
}
- if (type & SYSTEM_SECURITY_ACCESS) {
+ if (type & SEC_FLAG_SYSTEM_SECURITY) {
typestr = talloc_asprintf_append(typestr,
"SYSTEM_SECURITY_ACCESS ");
if (!typestr) {
return NULL;
}
}
- if (type & SYNCHRONIZE_ACCESS) {
+ if (type & SEC_STD_SYNCHRONIZE) {
typestr = talloc_asprintf_append(typestr,
"SYNCHRONIZE_ACCESS ");
if (!typestr) {
return NULL;
}
}
- if (type & WRITE_OWNER_ACCESS) {
+ if (type & SEC_STD_WRITE_OWNER) {
typestr = talloc_asprintf_append(typestr,
"WRITE_OWNER_ACCESS ");
if (!typestr) {
return NULL;
}
}
- if (type & WRITE_DAC_ACCESS) {
+ if (type & SEC_STD_WRITE_DAC) {
typestr = talloc_asprintf_append(typestr,
"WRITE_DAC_ACCESS ");
if (!typestr) {
return NULL;
}
}
- if (type & READ_CONTROL_ACCESS) {
+ if (type & SEC_STD_READ_CONTROL) {
typestr = talloc_asprintf_append(typestr,
"READ_CONTROL_ACCESS ");
if (!typestr) {
return NULL;
}
}
- if (type & DELETE_ACCESS) {
+ if (type & SEC_STD_DELETE) {
typestr = talloc_asprintf_append(typestr,
"DELETE_ACCESS ");
if (!typestr) {
@@ -110,7 +114,7 @@ char *get_sec_mask_str(TALLOC_CTX *ctx, uint32 type)
}
}
- printf("\t\tSpecific bits: 0x%lx\n", (unsigned long)type&SPECIFIC_RIGHTS_MASK);
+ printf("\t\tSpecific bits: 0x%lx\n", (unsigned long)type&SEC_MASK_SPECIFIC);
return typestr;
}
@@ -122,7 +126,7 @@ void display_sec_access(uint32_t *info)
{
char *mask_str = get_sec_mask_str(NULL, *info);
printf("\t\tPermissions: 0x%x: %s\n", *info, mask_str ? mask_str : "");
- TALLOC_FREE(mask_str);
+ talloc_free(mask_str);
}
/****************************************************************************
@@ -170,9 +174,9 @@ static void disp_sec_ace_object(struct security_ace_object *object)
/****************************************************************************
display sec_ace structure
****************************************************************************/
-void display_sec_ace(SEC_ACE *ace)
+void display_sec_ace(struct security_ace *ace)
{
- fstring sid_str;
+ char *sid_str;
printf("\tACE\n\t\ttype: ");
switch (ace->type) {
@@ -211,8 +215,9 @@ void display_sec_ace(SEC_ACE *ace)
printf(" (%d) flags: 0x%02x ", ace->type, ace->flags);
display_sec_ace_flags(ace->flags);
display_sec_access(&ace->access_mask);
- sid_to_fstring(sid_str, &ace->trustee);
+ sid_str = dom_sid_string(NULL, &ace->trustee);
printf("\t\tSID: %s\n\n", sid_str);
+ talloc_free(sid_str);
if (sec_ace_object(ace->type)) {
disp_sec_ace_object(&ace->object.object);
@@ -223,7 +228,7 @@ void display_sec_ace(SEC_ACE *ace)
/****************************************************************************
display sec_acl structure
****************************************************************************/
-void display_sec_acl(SEC_ACL *sec_acl)
+void display_sec_acl(struct security_acl *sec_acl)
{
int i;
@@ -238,54 +243,52 @@ void display_sec_acl(SEC_ACL *sec_acl)
}
}
-void display_acl_type(uint16 type)
+void display_acl_type(uint16_t type)
{
- fstring typestr="";
-
- typestr[0] = 0;
+ printf("type: 0x%04x: ", type);
if (type & SEC_DESC_OWNER_DEFAULTED) /* 0x0001 */
- fstrcat(typestr, "SEC_DESC_OWNER_DEFAULTED ");
+ printf("SEC_DESC_OWNER_DEFAULTED ");
if (type & SEC_DESC_GROUP_DEFAULTED) /* 0x0002 */
- fstrcat(typestr, "SEC_DESC_GROUP_DEFAULTED ");
+ printf("SEC_DESC_GROUP_DEFAULTED ");
if (type & SEC_DESC_DACL_PRESENT) /* 0x0004 */
- fstrcat(typestr, "SEC_DESC_DACL_PRESENT ");
+ printf("SEC_DESC_DACL_PRESENT ");
if (type & SEC_DESC_DACL_DEFAULTED) /* 0x0008 */
- fstrcat(typestr, "SEC_DESC_DACL_DEFAULTED ");
+ printf("SEC_DESC_DACL_DEFAULTED ");
if (type & SEC_DESC_SACL_PRESENT) /* 0x0010 */
- fstrcat(typestr, "SEC_DESC_SACL_PRESENT ");
+ printf("SEC_DESC_SACL_PRESENT ");
if (type & SEC_DESC_SACL_DEFAULTED) /* 0x0020 */
- fstrcat(typestr, "SEC_DESC_SACL_DEFAULTED ");
+ printf("SEC_DESC_SACL_DEFAULTED ");
if (type & SEC_DESC_DACL_TRUSTED) /* 0x0040 */
- fstrcat(typestr, "SEC_DESC_DACL_TRUSTED ");
+ printf("SEC_DESC_DACL_TRUSTED ");
if (type & SEC_DESC_SERVER_SECURITY) /* 0x0080 */
- fstrcat(typestr, "SEC_DESC_SERVER_SECURITY ");
+ printf("SEC_DESC_SERVER_SECURITY ");
if (type & SEC_DESC_DACL_AUTO_INHERIT_REQ) /* 0x0100 */
- fstrcat(typestr, "SEC_DESC_DACL_AUTO_INHERIT_REQ ");
+ printf("SEC_DESC_DACL_AUTO_INHERIT_REQ ");
if (type & SEC_DESC_SACL_AUTO_INHERIT_REQ) /* 0x0200 */
- fstrcat(typestr, "SEC_DESC_SACL_AUTO_INHERIT_REQ ");
+ printf("SEC_DESC_SACL_AUTO_INHERIT_REQ ");
if (type & SEC_DESC_DACL_AUTO_INHERITED) /* 0x0400 */
- fstrcat(typestr, "SEC_DESC_DACL_AUTO_INHERITED ");
+ printf("SEC_DESC_DACL_AUTO_INHERITED ");
if (type & SEC_DESC_SACL_AUTO_INHERITED) /* 0x0800 */
- fstrcat(typestr, "SEC_DESC_SACL_AUTO_INHERITED ");
+ printf("SEC_DESC_SACL_AUTO_INHERITED ");
if (type & SEC_DESC_DACL_PROTECTED) /* 0x1000 */
- fstrcat(typestr, "SEC_DESC_DACL_PROTECTED ");
+ printf("SEC_DESC_DACL_PROTECTED ");
if (type & SEC_DESC_SACL_PROTECTED) /* 0x2000 */
- fstrcat(typestr, "SEC_DESC_SACL_PROTECTED ");
+ printf("SEC_DESC_SACL_PROTECTED ");
if (type & SEC_DESC_RM_CONTROL_VALID) /* 0x4000 */
- fstrcat(typestr, "SEC_DESC_RM_CONTROL_VALID ");
+ printf("SEC_DESC_RM_CONTROL_VALID ");
if (type & SEC_DESC_SELF_RELATIVE) /* 0x8000 */
- fstrcat(typestr, "SEC_DESC_SELF_RELATIVE ");
+ printf("SEC_DESC_SELF_RELATIVE ");
- printf("type: 0x%04x: %s\n", type, typestr);
+ printf("\n");
}
/****************************************************************************
display sec_desc structure
****************************************************************************/
-void display_sec_desc(SEC_DESC *sec)
+void display_sec_desc(struct security_descriptor *sec)
{
- fstring sid_str;
+ char *sid_str;
if (!sec) {
printf("NULL\n");
@@ -306,12 +309,14 @@ void display_sec_desc(SEC_DESC *sec)
}
if (sec->owner_sid) {
- sid_to_fstring(sid_str, sec->owner_sid);
+ sid_str = dom_sid_string(NULL, sec->owner_sid);
printf("\tOwner SID:\t%s\n", sid_str);
+ talloc_free(sid_str);
}
if (sec->group_sid) {
- sid_to_fstring(sid_str, sec->group_sid);
+ sid_str = dom_sid_string(NULL, sec->group_sid);
printf("\tGroup SID:\t%s\n", sid_str);
+ talloc_free(sid_str);
}
}
diff --git a/selftest/SocketWrapper.pm b/selftest/SocketWrapper.pm
index e63605b..ef8058d 100644
--- a/selftest/SocketWrapper.pm
+++ b/selftest/SocketWrapper.pm
@@ -1,7 +1,21 @@
#!/usr/bin/perl
# Bootstrap Samba and run a number of tests against it.
# Copyright (C) 2005-2007 Jelmer Vernooij <jelmer at samba.org>
-# Published under the GNU GPL, v3 or later.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+
package SocketWrapper;
diff --git a/selftest/Subunit.pm b/selftest/Subunit.pm
index 05e51da..19af636 100644
--- a/selftest/Subunit.pm
+++ b/selftest/Subunit.pm
@@ -1,3 +1,19 @@
+# Simple Perl module for parsing the Subunit protocol
+# Copyright (C) 2008 Jelmer Vernooij <jelmer at samba.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
package Subunit;
require Exporter;
diff --git a/selftest/output/buildfarm.pm b/selftest/output/buildfarm.pm
index cee6c1e..77ea266 100644
--- a/selftest/output/buildfarm.pm
+++ b/selftest/output/buildfarm.pm
@@ -1,4 +1,19 @@
#!/usr/bin/perl
+# Buildfarm output for selftest
+# Copyright (C) 2008 Jelmer Vernooij <jelmer at samba.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
package output::buildfarm;
diff --git a/selftest/output/html.pm b/selftest/output/html.pm
index 1049527..e490765 100644
--- a/selftest/output/html.pm
+++ b/selftest/output/html.pm
@@ -1,5 +1,19 @@
#!/usr/bin/perl
-
+# HTML output for selftest
+# Copyright (C) 2008 Jelmer Vernooij <jelmer at samba.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
package output::html;
use Exporter;
@ISA = qw(Exporter);
diff --git a/selftest/output/plain.pm b/selftest/output/plain.pm
index 82a73ab..5312a9e 100644
--- a/selftest/output/plain.pm
+++ b/selftest/output/plain.pm
@@ -1,5 +1,19 @@
#!/usr/bin/perl
-
+# Plain text output for selftest
+# Copyright (C) 2008 Jelmer Vernooij <jelmer at samba.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
package output::plain;
use Exporter;
@ISA = qw(Exporter);
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index ef4c385..3653523 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -2,7 +2,19 @@
# Bootstrap Samba and run a number of tests against it.
# Copyright (C) 2005-2008 Jelmer Vernooij <jelmer at samba.org>
# Copyright (C) 2007-2009 Stefan Metzmacher <metze at samba.org>
-# Published under the GNU GPL, v3 or later.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
=pod
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 1c9c0c1..fd75312 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -831,7 +831,7 @@ PDBEDIT_OBJ = utils/pdbedit.o $(PASSWD_UTIL_OBJ) $(PARAM_OBJ) $(PASSDB_OBJ) @LIB
SMBGET_OBJ = utils/smbget.o $(POPT_LIB_OBJ) $(LIBSMBCLIENT_OBJ1) @LIBWBCLIENT_STATIC@
-DISPLAY_SEC_OBJ= lib/display_sec.o
+DISPLAY_SEC_OBJ= ../libcli/security/display_sec.o
RPCCLIENT_OBJ1 = rpcclient/rpcclient.o rpcclient/cmd_lsarpc.o \
rpcclient/cmd_samr.o rpcclient/cmd_spoolss.o \
diff --git a/source3/samba4.m4 b/source3/samba4.m4
index b5c7c74..568283c 100644
--- a/source3/samba4.m4
+++ b/source3/samba4.m4
@@ -69,14 +69,14 @@ AC_CONFIG_FILES(../source4/librpc/dcerpc_atsvc.pc)
m4_include(../source4/min_versions.m4)
-SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= $TALLOC_MIN_VERSION,
+SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= TALLOC_MIN_VERSION,
[],
[
SMB_INCLUDE_MK(../lib/talloc/config.mk)
]
)
-SMB_EXT_LIB_FROM_PKGCONFIG(LIBTDB, tdb >= $TDB_MIN_VERSION,
+SMB_EXT_LIB_FROM_PKGCONFIG(LIBTDB, tdb >= TDB_MIN_VERSION,
[],
[
m4_include(../lib/tdb/libtdb.m4)
@@ -86,13 +86,13 @@ SMB_EXT_LIB_FROM_PKGCONFIG(LIBTDB, tdb >= $TDB_MIN_VERSION,
SMB_INCLUDE_MK(../lib/tdb/python.mk)
-SMB_EXT_LIB_FROM_PKGCONFIG(LIBTEVENT, tevent = $TEVENT_REQUIRED_VERSION,
+SMB_EXT_LIB_FROM_PKGCONFIG(LIBTEVENT, tevent = TEVENT_REQUIRED_VERSION,
[],[m4_include(../lib/tevent/samba.m4)]
)
SMB_INCLUDE_MK(../lib/tevent/python.mk)
-SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb = $LDB_REQUIRED_VERSION,
+SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb = LDB_REQUIRED_VERSION,
[
SMB_INCLUDE_MK(lib/ldb/ldb_ildap/config.mk)
SMB_INCLUDE_MK(lib/ldb/tools/config.mk)
diff --git a/source4/auth/config.m4 b/source4/auth/config.m4
index fb9ee58..9735b17 100644
--- a/source4/auth/config.m4
+++ b/source4/auth/config.m4
@@ -28,6 +28,8 @@ if test x"$ac_cv_header_sasl_sasl_h" = x"yes" -a x"$ac_cv_lib_ext_sasl2_sasl_cli
SASL_CPPFLAGS="$CPPFLAGS"
SASL_LDFLAGS="$LDFLAGS"
LIB_REMOVE_USR_LIB(SASL_LDFLAGS)
+ CFLAGS_REMOVE_USR_INCLUDE(SASL_CPPFLAGS)
+ CFLAGS_REMOVE_USR_INCLUDE(SASL_CFLAGS)
else
SMB_ENABLE(cyrus_sasl,NO)
fi
diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4
index bd98a40..2bf63f0 100644
--- a/source4/build/m4/public.m4
+++ b/source4/build/m4/public.m4
@@ -102,10 +102,12 @@ AC_DEFUN([SMB_EXT_LIB_FROM_PKGCONFIG],
ac_cv_$1_libs_only_other="`$PKG_CONFIG --libs-only-other '$2'` `$PKG_CONFIG --libs-only-L '$2'`"
--
Samba Shared Repository
More information about the samba-cvs
mailing list