[SCM] Samba Shared Repository - branch v3-6-test updated
Günther Deschner
gd at samba.org
Wed Mar 23 13:47:53 MDT 2011
The branch, v3-6-test has been updated
via c42a05a s3-rpc_client: actually call lsa_open_policy2() in rpccli_lsa_open_policy2().
via 47bdb43 s3-smbta-util: fix some buildwarnings.
via 308630a s3-globals: silence build warning in smbd_messaging_context().
via ced762c s3-proto: remove some duplicate prototypes.
via a9c5507 s3-includes: remove unused cmdline_lp_ctx.
via c361c37 wafsamba: add -Wcast-qual only to the toplevel (s4) build.
via 890c449 s3-waf: use HAVE_ADS env to decide whether to build libads.so
via 043d943 s3-build: use HAVE_ADS define in some more places.
from 3dc411c s3: Fix Coverity ID 2201, NULL_RETURNS
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit c42a05a64047d3ba393446fca864a3d9e794347f
Author: Günther Deschner <gd at samba.org>
Date: Wed Mar 23 16:47:26 2011 +0100
s3-rpc_client: actually call lsa_open_policy2() in rpccli_lsa_open_policy2().
Found by Sumit Bose <sbose at redhat.com>, thanks!
Guenther
Autobuild-User: Günther Deschner <gd at samba.org>
Autobuild-Date: Wed Mar 23 20:12:38 CET 2011 on sn-devel-104
(cherry picked from commit d2d3ac66eccbd5d1141f90b791704acf26f0227e)
commit 47bdb435b020c2daa63f6ebf2a00356dbaaf1c07
Author: Günther Deschner <gd at samba.org>
Date: Tue Mar 22 22:02:13 2011 +0100
s3-smbta-util: fix some buildwarnings.
Guenther
(cherry picked from commit 48c604a3b72caa79069d3d32b47e0a03090e3687)
commit 308630a14e80b4d40173e2e121f297abcb0d46a9
Author: Günther Deschner <gd at samba.org>
Date: Wed Mar 23 13:00:32 2011 +0100
s3-globals: silence build warning in smbd_messaging_context().
Guenther
(cherry picked from commit 6c8b820b9bf6d50330f23d9da76a143866afbdbd)
commit ced762ce657bd9eebb3724040641278af74af941
Author: Günther Deschner <gd at samba.org>
Date: Wed Mar 23 00:08:13 2011 +0100
s3-proto: remove some duplicate prototypes.
Guenther
(cherry picked from commit d53aac5baa045fe5875d7d32261dde83fec63ac8)
commit a9c55075e50d902a52448f222b4156a8181c0e9b
Author: Günther Deschner <gd at samba.org>
Date: Tue Mar 22 23:50:26 2011 +0100
s3-includes: remove unused cmdline_lp_ctx.
Guenther
(cherry picked from commit 8fe4a68da73f69cb491aa2d79a1d263a8c3069a9)
commit c361c3767cd9636199bf4a6b5d2d9fc25942edff
Author: Günther Deschner <gd at samba.org>
Date: Sat Mar 19 00:10:08 2011 +0100
wafsamba: add -Wcast-qual only to the toplevel (s4) build.
In samba3 there are a lot of warnings generated that make it a bit hard to track
and monitor other build warnings.
Guenther
Autobuild-User: Günther Deschner <gd at samba.org>
Autobuild-Date: Sat Mar 19 00:58:25 CET 2011 on sn-devel-104
(cherry picked from commit a252ded937db2e8e4c81b608fbbf18714a900032)
commit 890c449bb48e71008f650fb8c4203db746b0d8ac
Author: Günther Deschner <gd at samba.org>
Date: Fri Mar 18 15:19:25 2011 +0100
s3-waf: use HAVE_ADS env to decide whether to build libads.so
Guenther
(cherry picked from commit 33b8d0a6ff51800bfadf47286584b0895b6b3e65)
commit 043d94354f7dcd325b7c89425255369d3f07f189
Author: Günther Deschner <gd at samba.org>
Date: Fri Mar 18 15:18:29 2011 +0100
s3-build: use HAVE_ADS define in some more places.
Guenther
(cherry picked from commit c53e7f8d58c9a38aad3890df7f54da8996a95ce4)
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/samba_autoconf.py | 4 +++-
source3/include/includes.h | 3 ---
source3/include/proto.h | 11 -----------
source3/lib/netapi/joindomain.c | 2 +-
source3/rpc_client/cli_lsarpc.c | 13 +++++++------
source3/smbd/globals.c | 1 +
source3/utils/smbta-util.c | 4 ++--
source3/winbindd/winbindd_cm.c | 2 +-
source3/wscript | 2 ++
source3/wscript_build | 5 +++--
10 files changed, 20 insertions(+), 27 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py
index 02b52df..174ca14 100644
--- a/buildtools/wafsamba/samba_autoconf.py
+++ b/buildtools/wafsamba/samba_autoconf.py
@@ -597,8 +597,10 @@ def SAMBA_CONFIG_H(conf, path=None):
if Options.options.developer:
# we add these here to ensure that -Wstrict-prototypes is not set during configure
- conf.ADD_CFLAGS('-Wall -g -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Werror-implicit-function-declaration -Wformat=2 -Wno-format-y2k -Wmissing-prototypes',
+ conf.ADD_CFLAGS('-Wall -g -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-align -Wwrite-strings -Werror-implicit-function-declaration -Wformat=2 -Wno-format-y2k -Wmissing-prototypes',
testflags=True)
+ if os.getenv('TOPLEVEL_BUILD'):
+ conf.ADD_CFLAGS('-Wcast-qual', testflags=True)
conf.env.DEVELOPER_MODE = True
if Options.options.picky_developer:
diff --git a/source3/include/includes.h b/source3/include/includes.h
index cda366f..2c9bfb7 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -517,9 +517,6 @@ enum timestamp_set_resolution {
typedef char fstring[FSTRING_LEN];
#endif
-/* Samba 3 doesn't use iconv_convenience: */
-extern void *cmdline_lp_ctx;
-
/* Lists, trees, caching, database... */
#include "../lib/util/util.h"
#include "../lib/util/util_net.h"
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 742716f..47914d4 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1339,14 +1339,6 @@ ssize_t tstream_read_packet_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
/* The following definitions come from lib/util_str.c */
bool next_token(const char **ptr, char *buff, const char *sep, size_t bufsize);
-bool next_token_talloc(TALLOC_CTX *ctx,
- const char **ptr,
- char **pp_buff,
- const char *sep);
-bool next_token_no_ltrim_talloc(TALLOC_CTX *ctx,
- const char **ptr,
- char **pp_buff,
- const char *sep);
int StrCaseCmp(const char *s, const char *t);
int StrnCaseCmp(const char *s, const char *t, size_t len);
bool strnequal(const char *s1,const char *s2,size_t n);
@@ -1429,15 +1421,12 @@ int fstr_sprintf(fstring s, const char *fmt, ...);
bool str_list_sub_basic( char **list, const char *smb_name,
const char *domain_name );
bool str_list_substitute(char **list, const char *pattern, const char *insert);
-bool str_list_check(const char **list, const char *s);
-bool str_list_check_ci(const char **list, const char *s);
char *ipstr_list_make(char **ipstr_list,
const struct ip_service *ip_list,
int ip_count);
int ipstr_list_parse(const char *ipstr_list, struct ip_service **ip_list);
void ipstr_list_free(char* ipstr_list);
-void rfc1738_unescape(char *buf);
DATA_BLOB base64_decode_data_blob(const char *s);
void base64_decode_inplace(char *s);
char *base64_encode_data_blob(TALLOC_CTX *mem_ctx, DATA_BLOB data);
diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index d6fa5d6..6bae363 100644
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -362,7 +362,7 @@ WERROR NetGetJoinInformation_l(struct libnetapi_ctx *ctx,
WERROR NetGetJoinableOUs_l(struct libnetapi_ctx *ctx,
struct NetGetJoinableOUs *r)
{
-#ifdef WITH_ADS
+#ifdef HAVE_ADS
NTSTATUS status;
ADS_STATUS ads_status;
ADS_STRUCT *ads = NULL;
diff --git a/source3/rpc_client/cli_lsarpc.c b/source3/rpc_client/cli_lsarpc.c
index 0e87d92..88534e6 100644
--- a/source3/rpc_client/cli_lsarpc.c
+++ b/source3/rpc_client/cli_lsarpc.c
@@ -144,12 +144,13 @@ NTSTATUS rpccli_lsa_open_policy2(struct rpc_pipe_client *cli,
NTSTATUS status;
NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
- status = dcerpc_lsa_open_policy(cli->binding_handle,
- mem_ctx,
- sec_qos,
- des_access,
- pol,
- &result);
+ status = dcerpc_lsa_open_policy2(cli->binding_handle,
+ cli->srv_name_slash,
+ mem_ctx,
+ sec_qos,
+ des_access,
+ pol,
+ &result);
if (!NT_STATUS_IS_OK(status)) {
return status;
}
diff --git a/source3/smbd/globals.c b/source3/smbd/globals.c
index ca97884..b1a0d7e 100644
--- a/source3/smbd/globals.c
+++ b/source3/smbd/globals.c
@@ -121,6 +121,7 @@ struct messaging_context *smbd_messaging_context(void)
return msg_ctx;
}
smb_panic("Could not init smbd's messaging context.\n");
+ return NULL;
}
struct memcache *smbd_memcache(void)
diff --git a/source3/utils/smbta-util.c b/source3/utils/smbta-util.c
index cf90974..5b08165 100644
--- a/source3/utils/smbta-util.c
+++ b/source3/utils/smbta-util.c
@@ -22,7 +22,7 @@
static void delete_key(void);
-static void help()
+static void help(void)
{
printf("-h print this help message.\n");
printf("-f <file> install the key from a file and activate\n");
@@ -34,7 +34,7 @@ printf("-s check if a key is installed, and print the key to stdout.\n");
printf("\n");
}
-static void check_key()
+static void check_key(void)
{ size_t size;
char *akey;
if (!secrets_init()) {
diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 55e9266..cfd60aa 100644
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -1117,7 +1117,7 @@ static bool dcip_to_name(TALLOC_CTX *mem_ctx,
ip_list.ss = *pss;
ip_list.port = 0;
-#ifdef WITH_ADS
+#ifdef HAVE_ADS
/* For active directory servers, try to get the ldap server name.
None of these failures should be considered critical for now */
diff --git a/source3/wscript b/source3/wscript
index 56d4db4..e8bd625 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -910,6 +910,8 @@ return krb5_kt_resolve(context, "WRFILE:api", &keytab);
conf.DEFINE('HAVE_KRB5', '1')
if have_gssapi:
conf.DEFINE('HAVE_GSSAPI', '1')
+ if conf.CONFIG_SET('HAVE_LDAP'):
+ conf.env['HAVE_ADS'] = '1'
else:
Logs.warn("krb5 libs don't have all features required for Active Directory support")
conf.undefine('HAVE_KRB5_H')
diff --git a/source3/wscript_build b/source3/wscript_build
index 3f7e3b6..b5aa2b7 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -819,9 +819,10 @@ bld.SAMBA3_SUBSYSTEM('SMBLDAP',
bld.SAMBA3_LIBRARY('ads',
source=LIBADS_SRC,
- deps='LIBCLI_LDAP_NDR krb5',
+ deps='LIBCLI_LDAP_NDR krb5 gssapi gssapi_krb5 ldap lber',
private_library=True,
- vars=locals())
+ vars=locals(),
+ enabled=bld.env.HAVE_ADS)
bld.SAMBA3_SUBSYSTEM('LIBADS_SERVER',
source=LIBADS_SERVER_SRC,
--
Samba Shared Repository
More information about the samba-cvs
mailing list