[SCM] Samba Shared Repository - branch master updated
Jelmer Vernooij
jelmer at samba.org
Thu Aug 18 08:55:03 MDT 2011
The branch, master has been updated
via 97afeac smb_common: Fix include paths.
via 9ee1e1f cli-raw: Add public libsmbclient-raw library.
via 6fefd21 libcliraw: Install more header files.
via f0d15e8 smb_common: Install some more headers.
via 9fc20f4 libcliraw: Install request.h and signing.h.
via 6e8f6da smb_composite: Remove unnecessary include of signing header.
via 56f7beb smb_composite: Integrate prototypes in header file.
via eeee09d Use public pytalloc header file.
from dcb5720 s3/ldap: don't continue if we couldn't get the domain info on startup
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 97afeaceda784f6ac56131b544e045be6804a44b
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Aug 18 15:21:02 2011 +0200
smb_common: Fix include paths.
Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
Autobuild-Date: Thu Aug 18 16:54:01 CEST 2011 on sn-devel-104
commit 9ee1e1f0ac28a3af22c796e729e559ae10784c8e
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Aug 18 14:19:18 2011 +0200
cli-raw: Add public libsmbclient-raw library.
commit 6fefd217ca36a2d91b779a1bb26b970340ee7602
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Aug 18 14:01:12 2011 +0200
libcliraw: Install more header files.
commit f0d15e8ffa0b7ab8d25f7593779aac8264a2a59d
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Aug 18 13:43:42 2011 +0200
smb_common: Install some more headers.
commit 9fc20f4d267b31a47ab95af9f271531fbf871933
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Aug 18 13:31:03 2011 +0200
libcliraw: Install request.h and signing.h.
commit 6e8f6da31abebfdf8a3601ad9d7bc614f558c65a
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Aug 18 13:08:34 2011 +0200
smb_composite: Remove unnecessary include of signing header.
commit 56f7bebd3a45e444136fcf2d3168b90042a4b9f7
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Aug 18 12:59:25 2011 +0200
smb_composite: Integrate prototypes in header file.
commit eeee09d27368a55bcdb56e3b0f40b303a6de2e3e
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Aug 14 15:34:08 2011 +0200
Use public pytalloc header file.
-----------------------------------------------------------------------
Summary of changes:
libcli/smb/smb_common.h | 10 ++--
libcli/smb/wscript_build | 3 +-
source4/client/wscript_build | 2 +-
source4/libcli/rap/wscript_build | 2 +-
source4/libcli/raw/interfaces.h | 2 +-
source4/libcli/raw/libcliraw.h | 4 +-
source4/libcli/raw/smb.h | 2 +-
.../samdb.pc.in => libcli/raw/smbclient-raw.pc.in} | 6 +-
source4/libcli/smb2/wscript_build | 2 +-
source4/libcli/smb_composite/sesssetup.c | 1 -
source4/libcli/smb_composite/smb_composite.h | 72 +++++++++++++++++++-
source4/libcli/wscript_build | 10 ++-
source4/librpc/wscript_build | 2 +-
source4/ntvfs/wscript_build | 4 +-
source4/torture/wscript_build | 6 +-
15 files changed, 98 insertions(+), 30 deletions(-)
copy source4/{dsdb/samdb.pc.in => libcli/raw/smbclient-raw.pc.in} (64%)
Changeset truncated at 500 lines:
diff --git a/libcli/smb/smb_common.h b/libcli/smb/smb_common.h
index d8339cb..83f7db2 100644
--- a/libcli/smb/smb_common.h
+++ b/libcli/smb/smb_common.h
@@ -22,10 +22,10 @@
#ifndef __LIBCLI_SMB_SMB_COMMON_H__
#define __LIBCLI_SMB_SMB_COMMON_H__
-#include "../libcli/smb/smb2_constants.h"
-#include "../libcli/smb/smb2_create_blob.h"
-#include "../libcli/smb/smb_constants.h"
-#include "../libcli/smb/smb_util.h"
-#include "../libcli/smb/smb_unix_ext.h"
+#include "libcli/smb/smb2_constants.h"
+#include "libcli/smb/smb2_create_blob.h"
+#include "libcli/smb/smb_constants.h"
+#include "libcli/smb/smb_util.h"
+#include "libcli/smb/smb_unix_ext.h"
#endif
diff --git a/libcli/smb/wscript_build b/libcli/smb/wscript_build
index 84ca225..89ecf51 100644
--- a/libcli/smb/wscript_build
+++ b/libcli/smb/wscript_build
@@ -5,5 +5,6 @@ bld.SAMBA_LIBRARY('cli_smb_common',
source='smb2_create_blob.c util.c',
autoproto='smb_common_proto.h',
public_deps='talloc samba-util',
- private_library=True
+ private_library=True,
+ public_headers='smb_common.h smb2_constants.h smb2_create_blob.h',
)
diff --git a/source4/client/wscript_build b/source4/client/wscript_build
index 94b579c..d1622b3 100644
--- a/source4/client/wscript_build
+++ b/source4/client/wscript_build
@@ -2,7 +2,7 @@
bld.SAMBA_BINARY('smbclient',
source='client.c',
- deps='samba-hostconfig SMBREADLINE samba-util LIBCLI_SMB RPC_NDR_SRVSVC LIBCLI_LSA popt POPT_SAMBA POPT_CREDENTIALS cli_raw'
+ deps='samba-hostconfig SMBREADLINE samba-util LIBCLI_SMB RPC_NDR_SRVSVC LIBCLI_LSA popt POPT_SAMBA POPT_CREDENTIALS smbclient-raw'
)
diff --git a/source4/libcli/rap/wscript_build b/source4/libcli/rap/wscript_build
index eac7b90..b58e3ac 100644
--- a/source4/libcli/rap/wscript_build
+++ b/source4/libcli/rap/wscript_build
@@ -2,6 +2,6 @@
bld.SAMBA_SUBSYSTEM('LIBCLI_RAP',
source='rap.c',
- public_deps='cli_raw NDR_RAP',
+ public_deps='smbclient-raw NDR_RAP',
autoproto='proto.h'
)
diff --git a/source4/libcli/raw/interfaces.h b/source4/libcli/raw/interfaces.h
index d203674..13586c3 100644
--- a/source4/libcli/raw/interfaces.h
+++ b/source4/libcli/raw/interfaces.h
@@ -22,7 +22,7 @@
#ifndef __LIBCLI_RAW_INTERFACES_H__
#define __LIBCLI_RAW_INTERFACES_H__
-#include "libcli/raw/smb.h"
+#include "source4/libcli/raw/smb.h"
#include "../libcli/smb/smb_common.h"
#include "librpc/gen_ndr/misc.h" /* for struct GUID */
diff --git a/source4/libcli/raw/libcliraw.h b/source4/libcli/raw/libcliraw.h
index cb8e81c..7846854 100644
--- a/source4/libcli/raw/libcliraw.h
+++ b/source4/libcli/raw/libcliraw.h
@@ -22,7 +22,7 @@
#ifndef __LIBCLI_RAW_H__
#define __LIBCLI_RAW_H__
-#include "libcli/smb/smb_common.h"
+#include "../libcli/smb/smb_common.h"
#include "libcli/raw/request.h"
#include "librpc/gen_ndr/nbt.h"
@@ -305,7 +305,7 @@ struct smbcli_request {
goto failed; \
}
-#include "libcli/raw/interfaces.h"
+#include "libcli/raw/interfaces.h"
NTSTATUS smb_raw_read_recv(struct smbcli_request *req, union smb_read *parms);
struct smbcli_request *smb_raw_read_send(struct smbcli_tree *tree, union smb_read *parms);
diff --git a/source4/libcli/raw/smb.h b/source4/libcli/raw/smb.h
index b9b6584..fdf3a15 100644
--- a/source4/libcli/raw/smb.h
+++ b/source4/libcli/raw/smb.h
@@ -569,7 +569,7 @@
#define _smb2_setlen(buf,len) do {(buf)[0] = 0; (buf)[1] = ((len)&0xFF0000)>>16; \
(buf)[2] = ((len)&0xFF00)>>8; (buf)[3] = (len)&0xFF;} while (0)
-#include "libcli/raw/trans2.h"
+#include "source4/libcli/raw/trans2.h"
#include "libcli/raw/interfaces.h"
#include "libcli/smb/smb_common.h"
diff --git a/source4/dsdb/samdb.pc.in b/source4/libcli/raw/smbclient-raw.pc.in
similarity index 64%
copy from source4/dsdb/samdb.pc.in
copy to source4/libcli/raw/smbclient-raw.pc.in
index 691f73e..3c0c791 100644
--- a/source4/dsdb/samdb.pc.in
+++ b/source4/libcli/raw/smbclient-raw.pc.in
@@ -3,8 +3,8 @@ exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
-Name: samdb
-Description: Sam Database
+Name: smbclient-raw
+Description: SMB client
Version: @PACKAGE_VERSION@
-Libs: @LIB_RPATH@ -L${libdir} -lsamdb
+Libs: @LIB_RPATH@ -L${libdir} -lsmbclient-raw
Cflags: -I${includedir} -DHAVE_IMMEDIATE_STRUCTURES=1
diff --git a/source4/libcli/smb2/wscript_build b/source4/libcli/smb2/wscript_build
index 1f3d7ef..8aac827 100644
--- a/source4/libcli/smb2/wscript_build
+++ b/source4/libcli/smb2/wscript_build
@@ -4,6 +4,6 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_SMB2',
source='transport.c request.c negprot.c session.c tcon.c create.c close.c connect.c getinfo.c write.c read.c setinfo.c find.c ioctl.c logoff.c tdis.c flush.c lock.c notify.c cancel.c keepalive.c break.c util.c signing.c lease_break.c',
autoproto='smb2_proto.h',
deps='tevent-util',
- public_deps='cli_raw LIBPACKET gensec tevent'
+ public_deps='smbclient-raw LIBPACKET gensec tevent'
)
diff --git a/source4/libcli/smb_composite/sesssetup.c b/source4/libcli/smb_composite/sesssetup.c
index d617055..9023ef9 100644
--- a/source4/libcli/smb_composite/sesssetup.c
+++ b/source4/libcli/smb_composite/sesssetup.c
@@ -25,7 +25,6 @@
#include "libcli/raw/raw_proto.h"
#include "libcli/composite/composite.h"
#include "libcli/smb_composite/smb_composite.h"
-#include "libcli/smb_composite/proto.h"
#include "libcli/auth/libcli_auth.h"
#include "auth/auth.h"
#include "auth/gensec/gensec.h"
diff --git a/source4/libcli/smb_composite/smb_composite.h b/source4/libcli/smb_composite/smb_composite.h
index 84d9e78..54ee1ca 100644
--- a/source4/libcli/smb_composite/smb_composite.h
+++ b/source4/libcli/smb_composite/smb_composite.h
@@ -27,11 +27,12 @@
particularly designed to be used in async applications
*/
-#include "libcli/raw/signing.h"
+#ifndef __SMB_COMPOSITE_H__
+#define __SMB_COMPOSITE_H__
+
#include "libcli/raw/libcliraw.h"
#include "libcli/smb2/smb2.h"
-
/*
a composite open/read(s)/close request that loads a whole file
into memory. Used as a demo of the composite system.
@@ -46,6 +47,13 @@ struct smb_composite_loadfile {
} out;
};
+struct composite_context *smb_composite_loadfile_send(struct smbcli_tree *tree,
+ struct smb_composite_loadfile *io);
+NTSTATUS smb_composite_loadfile_recv(struct composite_context *c, TALLOC_CTX *mem_ctx);
+NTSTATUS smb_composite_loadfile(struct smbcli_tree *tree,
+ TALLOC_CTX *mem_ctx,
+ struct smb_composite_loadfile *io);
+
struct smb_composite_fetchfile {
struct {
const char *dest_host;
@@ -68,6 +76,13 @@ struct smb_composite_fetchfile {
} out;
};
+struct composite_context *smb_composite_fetchfile_send(struct smb_composite_fetchfile *io,
+ struct tevent_context *event_ctx);
+NTSTATUS smb_composite_fetchfile_recv(struct composite_context *c,
+ TALLOC_CTX *mem_ctx);
+NTSTATUS smb_composite_fetchfile(struct smb_composite_fetchfile *io,
+ TALLOC_CTX *mem_ctx);
+
/*
a composite open/write(s)/close request that saves a whole file from
memory. Used as a demo of the composite system.
@@ -80,6 +95,11 @@ struct smb_composite_savefile {
} in;
};
+struct composite_context *smb_composite_savefile_send(struct smbcli_tree *tree,
+ struct smb_composite_savefile *io);
+NTSTATUS smb_composite_savefile_recv(struct composite_context *c);
+NTSTATUS smb_composite_savefile(struct smbcli_tree *tree,
+ struct smb_composite_savefile *io);
/*
a composite request for a full connection to a remote server. Includes
@@ -111,6 +131,15 @@ struct smb_composite_connect {
} out;
};
+struct composite_context *smb_composite_connect_send(struct smb_composite_connect *io,
+ TALLOC_CTX *mem_ctx,
+ struct resolve_context *resolve_ctx,
+ struct tevent_context *event_ctx);
+NTSTATUS smb_composite_connect_recv(struct composite_context *c, TALLOC_CTX *mem_ctx);
+NTSTATUS smb_composite_connect(struct smb_composite_connect *io, TALLOC_CTX *mem_ctx,
+ struct resolve_context *resolve_ctx,
+ struct tevent_context *ev);
+
/*
generic session setup interface that takes care of which
@@ -129,6 +158,11 @@ struct smb_composite_sesssetup {
} out;
};
+struct composite_context *smb_composite_sesssetup_send(struct smbcli_session *session,
+ struct smb_composite_sesssetup *io);
+NTSTATUS smb_composite_sesssetup_recv(struct composite_context *c);
+NTSTATUS smb_composite_sesssetup(struct smbcli_session *session, struct smb_composite_sesssetup *io);
+
/*
query file system info
*/
@@ -151,6 +185,15 @@ struct smb_composite_fsinfo {
} out;
};
+struct composite_context *smb_composite_fsinfo_send(struct smbcli_tree *tree,
+ struct smb_composite_fsinfo *io,
+ struct resolve_context *resolve_ctx);
+NTSTATUS smb_composite_fsinfo_recv(struct composite_context *c, TALLOC_CTX *mem_ctx);
+NTSTATUS smb_composite_fsinfo(struct smbcli_tree *tree,
+ TALLOC_CTX *mem_ctx,
+ struct smb_composite_fsinfo *io,
+ struct resolve_context *resolve_ctx);
+
/*
composite call for appending new acl to the file's security descriptor and get
new full acl
@@ -168,6 +211,13 @@ struct smb_composite_appendacl {
} out;
};
+struct composite_context *smb_composite_appendacl_send(struct smbcli_tree *tree,
+ struct smb_composite_appendacl *io);
+NTSTATUS smb_composite_appendacl_recv(struct composite_context *c, TALLOC_CTX *mem_ctx);
+NTSTATUS smb_composite_appendacl(struct smbcli_tree *tree,
+ TALLOC_CTX *mem_ctx,
+ struct smb_composite_appendacl *io);
+
/*
a composite API to fire connect() calls to multiple targets, picking the
first one.
@@ -189,4 +239,20 @@ struct smb_composite_connectmulti {
struct smbcli_session;
struct resolve_context;
-#include "libcli/smb_composite/proto.h"
+struct composite_context *smb2_composite_unlink_send(struct smb2_tree *tree,
+ union smb_unlink *io);
+NTSTATUS smb2_composite_unlink(struct smb2_tree *tree, union smb_unlink *io);
+struct composite_context *smb2_composite_mkdir_send(struct smb2_tree *tree,
+ union smb_mkdir *io);
+NTSTATUS smb2_composite_mkdir(struct smb2_tree *tree, union smb_mkdir *io);
+struct composite_context *smb2_composite_rmdir_send(struct smb2_tree *tree,
+ struct smb_rmdir *io);
+NTSTATUS smb2_composite_rmdir(struct smb2_tree *tree, struct smb_rmdir *io);
+struct tevent_req *smb2_composite_setpathinfo_send(TALLOC_CTX *mem_ctx,
+ struct tevent_context *ev,
+ struct smb2_tree *tree,
+ const union smb_setfileinfo *io);
+NTSTATUS smb2_composite_setpathinfo_recv(struct tevent_req *req);
+NTSTATUS smb2_composite_setpathinfo(struct smb2_tree *tree, union smb_setfileinfo *io);
+
+#endif /* __SMB_COMPOSITE_H__ */
diff --git a/source4/libcli/wscript_build b/source4/libcli/wscript_build
index 3184a19..a2bd3a6 100644
--- a/source4/libcli/wscript_build
+++ b/source4/libcli/wscript_build
@@ -26,7 +26,6 @@ bld.SAMBA_SUBSYSTEM('cli_composite',
bld.SAMBA_SUBSYSTEM('LIBCLI_SMB_COMPOSITE',
source='smb_composite/loadfile.c smb_composite/savefile.c smb_composite/connect.c smb_composite/sesssetup.c smb_composite/fetchfile.c smb_composite/appendacl.c smb_composite/fsinfo.c smb_composite/smb2.c',
- autoproto='smb_composite/proto.h',
deps='LIBCLI_SMB2 tevent-util',
public_deps='cli_composite credentials gensec LIBCLI_RESOLVE tevent'
)
@@ -76,16 +75,19 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_FINDDCS',
bld.SAMBA_SUBSYSTEM('LIBCLI_SMB',
source='clireadwrite.c cliconnect.c clifile.c clilist.c clitrans2.c climessage.c clideltree.c',
autoproto='libcli_proto.h',
- public_deps='cli_raw errors LIBCLI_AUTH LIBCLI_SMB_COMPOSITE cli-nbt security LIBCLI_RESOLVE LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS samba_socket'
+ public_deps='smbclient-raw errors LIBCLI_AUTH LIBCLI_SMB_COMPOSITE cli-nbt security LIBCLI_RESOLVE LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS samba_socket'
)
-bld.SAMBA_LIBRARY('cli_raw',
+bld.SAMBA_LIBRARY('smbclient-raw',
source='raw/rawfile.c raw/smb_signing.c raw/clisocket.c raw/clitransport.c raw/clisession.c raw/clitree.c raw/clierror.c raw/rawrequest.c raw/rawreadwrite.c raw/rawsearch.c raw/rawsetfileinfo.c raw/raweas.c raw/rawtrans.c raw/clioplock.c raw/rawnegotiate.c raw/rawfsinfo.c raw/rawfileinfo.c raw/rawnotify.c raw/rawioctl.c raw/rawacl.c raw/rawdate.c raw/rawlpq.c raw/rawshadow.c',
autoproto='raw/raw_proto.h',
public_deps='samba_socket LIBPACKET LIBCRYPTO',
deps='cli_composite LIBCLI_RESOLVE security ndr samba-util errors charset talloc LIBCLI_SMB_COMPOSITE tevent NDR_NBT_BUF cli_smb_common',
- private_library=True
+ public_headers='raw/request.h:smb_request.h raw/signing.h:smb_signing.h raw/libcliraw.h:smb_cliraw.h raw/interfaces.h:smb_raw_interfaces.h raw/smb.h:smb_raw.h raw/trans2.h:smb_raw_trans2.h',
+ private_library=False,
+ pc_files='raw/smbclient-raw.pc',
+ vnum='0.0.1'
)
bld.RECURSE('smb2')
diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index e695c4e..8a17b6a 100755
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -138,7 +138,7 @@ bld.SAMBA_LIBRARY('dcerpc',
rpc/dcerpc_util.c rpc/dcerpc_smb.c rpc/dcerpc_smb2.c rpc/dcerpc_sock.c
rpc/dcerpc_connect.c rpc/dcerpc_secondary.c''',
pc_files='dcerpc.pc',
- deps='samba_socket LIBCLI_RESOLVE LIBCLI_SMB LIBCLI_SMB2 ndr NDR_DCERPC RPC_NDR_EPMAPPER NDR_SCHANNEL RPC_NDR_NETLOGON RPC_NDR_MGMT gensec LIBCLI_AUTH cli_raw LP_RESOLVE tevent-util dcerpc-binding',
+ deps='samba_socket LIBCLI_RESOLVE LIBCLI_SMB LIBCLI_SMB2 ndr NDR_DCERPC RPC_NDR_EPMAPPER NDR_SCHANNEL RPC_NDR_NETLOGON RPC_NDR_MGMT gensec LIBCLI_AUTH smbclient-raw LP_RESOLVE tevent-util dcerpc-binding',
autoproto='rpc/dcerpc_proto.h',
public_deps='credentials tevent talloc',
public_headers='''rpc/dcerpc.h ../../librpc/gen_ndr/mgmt.h
diff --git a/source4/ntvfs/wscript_build b/source4/ntvfs/wscript_build
index 24ce18f..fa1e071 100644
--- a/source4/ntvfs/wscript_build
+++ b/source4/ntvfs/wscript_build
@@ -9,7 +9,7 @@ bld.SAMBA_MODULE('ntvfs_cifs',
source='cifs/vfs_cifs.c',
subsystem='ntvfs',
init_function='ntvfs_cifs_init',
- deps='LIBCLI_SMB cli_raw'
+ deps='LIBCLI_SMB smbclient-raw'
)
@@ -17,7 +17,7 @@ bld.SAMBA_MODULE('ntvfs_smb2',
source='smb2/vfs_smb2.c',
subsystem='ntvfs',
init_function='ntvfs_smb2_init',
- deps='LIBCLI_SMB cli_raw'
+ deps='LIBCLI_SMB smbclient-raw'
)
diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build
index b3826d6..704f26f 100644
--- a/source4/torture/wscript_build
+++ b/source4/torture/wscript_build
@@ -4,14 +4,14 @@
bld.SAMBA_SUBSYSTEM('TORTURE_UTIL',
source='util_smb.c',
public_deps='torture POPT_CREDENTIALS',
- deps='cli_raw'
+ deps='smbclient-raw'
)
bld.SAMBA_MODULE('TORTURE_BASIC',
source='basic/base.c basic/misc.c basic/scanner.c basic/utable.c basic/charset.c basic/mangle_test.c basic/denytest.c basic/aliases.c basic/locking.c basic/secleak.c basic/rename.c basic/dir.c basic/delete.c basic/unlink.c basic/disconnect.c basic/delaywrite.c basic/attr.c basic/properties.c',
subsystem='smbtorture',
- deps='LIBCLI_SMB POPT_CREDENTIALS TORTURE_UTIL cli_raw TORTURE_RAW',
+ deps='LIBCLI_SMB POPT_CREDENTIALS TORTURE_UTIL smbclient-raw TORTURE_RAW',
internal_module=True,
autoproto='basic/proto.h',
init_function='torture_base_init'
@@ -157,7 +157,7 @@ bld.SAMBA_BINARY('smbtorture',
bld.SAMBA_BINARY('gentest',
source='gentest.c',
manpages='man/gentest.1',
- deps='samba-hostconfig samba-util popt POPT_SAMBA POPT_CREDENTIALS LIBCLI_SMB cli_raw'
+ deps='samba-hostconfig samba-util popt POPT_SAMBA POPT_CREDENTIALS LIBCLI_SMB smbclient-raw'
)
--
Samba Shared Repository
More information about the samba-cvs
mailing list