svn commit: samba r26012 - in branches/4.0-python: .
source/lib/socket source/libcli source/libcli/nbt
source/librpc source/scripting/swig
jelmer at samba.org
jelmer at samba.org
Sat Nov 17 22:34:29 GMT 2007
Author: jelmer
Date: 2007-11-17 22:34:28 +0000 (Sat, 17 Nov 2007)
New Revision: 26012
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26012
Log:
Fix more ldb modules - only partition, samldb and password_hash are broken now.
Added:
branches/4.0-python/source/libcli/nbt/nbtname.h
Modified:
branches/4.0-python/
branches/4.0-python/source/lib/socket/config.mk
branches/4.0-python/source/libcli/config.mk
branches/4.0-python/source/librpc/config.mk
branches/4.0-python/source/scripting/swig/config.mk
Changeset:
Property changes on: branches/4.0-python
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:file-ids
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/4.0-python/source/lib/socket/config.mk
===================================================================
--- branches/4.0-python/source/lib/socket/config.mk 2007-11-17 00:18:56 UTC (rev 26011)
+++ branches/4.0-python/source/lib/socket/config.mk 2007-11-17 22:34:28 UTC (rev 26012)
@@ -1,47 +1,30 @@
-##############################
-# Start SUBSYSTEM LIBNETIF
[SUBSYSTEM::LIBNETIF]
PRIVATE_PROTO_HEADER = netif_proto.h
OBJ_FILES = \
interface.o \
netif.o
PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL EXT_SOCKET EXT_NSL
-# End SUBSYSTEM LIBNETIF
-##############################
-################################################
-# Start MODULE socket_ip
[MODULE::socket_ip]
SUBSYSTEM = samba-socket
OUTPUT_TYPE = INTEGRATED
OBJ_FILES = \
socket_ip.o
PRIVATE_DEPENDENCIES = EXT_SOCKET EXT_NSL LIBSAMBA-ERRORS
-# End MODULE socket_ip
-################################################
-################################################
-# Start MODULE socket_unix
[MODULE::socket_unix]
SUBSYSTEM = samba-socket
OUTPUT_TYPE = INTEGRATED
OBJ_FILES = \
socket_unix.o
PRIVATE_DEPENDENCIES = EXT_SOCKET EXT_NSL
-# End MODULE socket_unix
-################################################
-################################################
-# Start SUBSYSTEM SOCKET
[SUBSYSTEM::samba-socket]
OBJ_FILES = \
socket.o \
access.o \
connect_multi.o \
connect.o
-LDFLAGS = $(SUBSYSTEM_LIBCLI_RESOLVE_OUTPUT) $(SUBSYSTEM_LIBCLI_NBT_OUTPUT) $(SUBSYSTEM_NDR_NBT_OUTPUT) $(LIBRARY_NDR_SVCCTL_OUTPUT)
PUBLIC_DEPENDENCIES = LIBTALLOC
-PRIVATE_DEPENDENCIES = SOCKET_WRAPPER LIBCLI_COMPOSITE
-#LIBCLI_RESOLVE
-# End SUBSYSTEM SOCKET
-################################################
+LDFLAGS = $(SUBSYSTEM_LIBCLI_RESOLVE_OUTPUT) $(SUBSYSTEM_LIBCLI_NBT_OUTPUT) $(SUBSYSTEM_NDR_NBT_OUTPUT) $(SUBSYSTEM_NDR_NBT_OUTPUT) $(SUBSYSTEM_NDR_SVCCTL_OUTPUT)
+PRIVATE_DEPENDENCIES = SOCKET_WRAPPER LIBCLI_COMPOSITE
Modified: branches/4.0-python/source/libcli/config.mk
===================================================================
--- branches/4.0-python/source/libcli/config.mk 2007-11-17 00:18:56 UTC (rev 26011)
+++ branches/4.0-python/source/libcli/config.mk 2007-11-17 22:34:28 UTC (rev 26012)
@@ -36,14 +36,7 @@
smb_composite/fsinfo.o
PUBLIC_DEPENDENCIES = LIBCLI_COMPOSITE CREDENTIALS
-[SUBSYSTEM::NDR_NBT_BUF]
-PRIVATE_PROTO_HEADER = nbt/nbtname.h
-OBJ_FILES = nbt/nbtname.o
-
[SUBSYSTEM::LIBCLI_NBT]
-#VERSION = 0.0.1
-#SO_VERSION = 0
-#DESCRIPTION = NetBios over TCP/IP client library
PRIVATE_PROTO_HEADER = nbt/nbt_proto.h
OBJ_FILES = \
nbt/nbtsocket.o \
Added: branches/4.0-python/source/libcli/nbt/nbtname.h
===================================================================
--- branches/4.0-python/source/libcli/nbt/nbtname.h 2007-11-17 00:18:56 UTC (rev 26011)
+++ branches/4.0-python/source/libcli/nbt/nbtname.h 2007-11-17 22:34:28 UTC (rev 26012)
@@ -0,0 +1,69 @@
+#ifndef __LIBCLI_NBT_NBTNAME_H__
+#define __LIBCLI_NBT_NBTNAME_H__
+
+/**
+ print a nbt string
+*/
+_PUBLIC_ void ndr_print_nbt_string(struct ndr_print *ndr, const char *name, const char *s);
+
+/**
+ pull a nbt_string from the wire
+*/
+_PUBLIC_ enum ndr_err_code ndr_pull_nbt_string(struct ndr_pull *ndr, int ndr_flags, const char **s);
+
+/**
+ push a nbt string to the wire
+*/
+_PUBLIC_ enum ndr_err_code ndr_push_nbt_string(struct ndr_push *ndr, int ndr_flags, const char *s);
+
+/**
+ pull a nbt name from the wire
+*/
+_PUBLIC_ enum ndr_err_code ndr_pull_nbt_name(struct ndr_pull *ndr, int ndr_flags, struct nbt_name *r);
+
+/**
+ push a nbt name to the wire
+*/
+_PUBLIC_ enum ndr_err_code ndr_push_nbt_name(struct ndr_push *ndr, int ndr_flags, const struct nbt_name *r);
+
+/**
+ copy a nbt name structure
+*/
+_PUBLIC_ NTSTATUS nbt_name_dup(TALLOC_CTX *mem_ctx, struct nbt_name *name, struct nbt_name *newname);
+
+/**
+ push a nbt name into a blob
+*/
+_PUBLIC_ NTSTATUS nbt_name_to_blob(TALLOC_CTX *mem_ctx, DATA_BLOB *blob, struct nbt_name *name);
+
+/**
+ pull a nbt name from a blob
+*/
+_PUBLIC_ NTSTATUS nbt_name_from_blob(TALLOC_CTX *mem_ctx, const DATA_BLOB *blob, struct nbt_name *name);
+
+/**
+ choose a name to use when calling a server in a NBT session request.
+ we use heuristics to see if the name we have been given is a IP
+ address, or a too-long name. If it is then use *SMBSERVER, or a
+ truncated name
+*/
+_PUBLIC_ void nbt_choose_called_name(TALLOC_CTX *mem_ctx,
+ struct nbt_name *n, const char *name, int type);
+
+/**
+ form a string for a NBT name
+*/
+_PUBLIC_ char *nbt_name_string(TALLOC_CTX *mem_ctx, const struct nbt_name *name);
+
+/**
+ pull a nbt name, WINS Replication uses another on wire format for nbt name
+*/
+_PUBLIC_ enum ndr_err_code ndr_pull_wrepl_nbt_name(struct ndr_pull *ndr, int ndr_flags, struct nbt_name **_r);
+
+/**
+ push a nbt name, WINS Replication uses another on wire format for nbt name
+*/
+_PUBLIC_ enum ndr_err_code ndr_push_wrepl_nbt_name(struct ndr_push *ndr, int ndr_flags, const struct nbt_name *r);
+_PUBLIC_ void ndr_print_wrepl_nbt_name(struct ndr_print *ndr, const char *name, const struct nbt_name *r);
+
+#endif /* __LIBCLI_NBT_NBTNAME_H__ */
Modified: branches/4.0-python/source/librpc/config.mk
===================================================================
--- branches/4.0-python/source/librpc/config.mk 2007-11-17 00:18:56 UTC (rev 26011)
+++ branches/4.0-python/source/librpc/config.mk 2007-11-17 22:34:28 UTC (rev 26012)
@@ -267,9 +267,9 @@
PUBLIC_DEPENDENCIES = LIBNDR NDR_NBT
[SUBSYSTEM::NDR_NBT]
-OBJ_FILES = gen_ndr/ndr_nbt.o
+OBJ_FILES = gen_ndr/ndr_nbt.o ../libcli/nbt/nbtname.o
PUBLIC_HEADERS = gen_ndr/nbt.h
-PUBLIC_DEPENDENCIES = LIBNDR NDR_MISC NDR_NBT_BUF NDR_SVCCTL NDR_SECURITY
+PUBLIC_DEPENDENCIES = LIBNDR NDR_MISC NDR_SVCCTL NDR_SECURITY
[SUBSYSTEM::NDR_WINSREPL]
OBJ_FILES = gen_ndr/ndr_winsrepl.o
Modified: branches/4.0-python/source/scripting/swig/config.mk
===================================================================
--- branches/4.0-python/source/scripting/swig/config.mk 2007-11-17 00:18:56 UTC (rev 26011)
+++ branches/4.0-python/source/scripting/swig/config.mk 2007-11-17 22:34:28 UTC (rev 26012)
@@ -1,6 +1,7 @@
#######################
# Start LIBRARY swig_dcerpc
[PYTHON::swig_dcerpc]
+ENABLE = NO
SWIG_FILE = dcerpc.i
PUBLIC_DEPENDENCIES = LIBCLI_SMB NDR_MISC LIBSAMBA-UTIL LIBSAMBA-CONFIG dcerpc_samr RPC_NDR_LSA DYNCONFIG
# End LIBRARY swig_dcerpc
More information about the samba-cvs
mailing list