r13658: More moving around of files:
authorJelmer Vernooij <jelmer@samba.org>
Thu, 23 Feb 2006 15:52:24 +0000 (15:52 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 18:52:05 +0000 (13:52 -0500)
 - Collect the generic utility functions into a lib/util/ (a la GLib is
for the GNOME folks)
 - Remove even more files from include/
(This used to be commit ba62880f5b05c2a505dc7f54676b231197a7e707)

66 files changed:
source4/dynconfig.c
source4/dynconfig.h [moved from source4/include/dynconfig.h with 100% similarity]
source4/heimdal_build/config.mk
source4/include/core.h
source4/include/enums.h [deleted file]
source4/include/includes.h
source4/include/structs.h
source4/lib/basic.mk
source4/lib/gencache/gencache.c [moved from source4/lib/gencache.c with 100% similarity]
source4/lib/util/README [new file with mode: 0644]
source4/lib/util/byteorder.h [moved from source4/include/byteorder.h with 100% similarity]
source4/lib/util/capability.c [moved from source4/lib/capability.c with 100% similarity]
source4/lib/util/config.mk [new file with mode: 0644]
source4/lib/util/data_blob.c [moved from source4/lib/data_blob.c with 100% similarity]
source4/lib/util/debug.c [moved from source4/lib/debug.c with 100% similarity]
source4/lib/util/debug.h [moved from source4/lib/debug.h with 100% similarity]
source4/lib/util/dprintf.c [moved from source4/lib/dprintf.c with 100% similarity]
source4/lib/util/fault.c [moved from source4/lib/fault.c with 100% similarity]
source4/lib/util/fsusage.c [moved from source4/lib/fsusage.c with 100% similarity]
source4/lib/util/genrand.c [moved from source4/lib/genrand.c with 100% similarity]
source4/lib/util/idtree.c [moved from source4/lib/idtree.c with 100% similarity]
source4/lib/util/module.c [moved from source4/lib/module.c with 100% similarity]
source4/lib/util/ms_fnmatch.c [moved from source4/lib/ms_fnmatch.c with 100% similarity]
source4/lib/util/mutex.c [moved from source4/lib/mutex.c with 100% similarity]
source4/lib/util/mutex.h [moved from source4/lib/mutex.h with 99% similarity]
source4/lib/util/pidfile.c [moved from source4/lib/pidfile.c with 100% similarity]
source4/lib/util/safe_string.h [moved from source4/include/safe_string.h with 100% similarity]
source4/lib/util/select.c [moved from source4/lib/select.c with 100% similarity]
source4/lib/util/signal.c [moved from source4/lib/signal.c with 100% similarity]
source4/lib/util/substitute.c [moved from source4/lib/substitute.c with 100% similarity]
source4/lib/util/system.c [moved from source4/lib/system.c with 100% similarity]
source4/lib/util/time.c [moved from source4/lib/time.c with 100% similarity]
source4/lib/util/unix_privs.c [moved from source4/lib/unix_privs.c with 100% similarity]
source4/lib/util/util.c [moved from source4/lib/util.c with 100% similarity]
source4/lib/util/util.h [moved from source4/include/smb_macros.h with 89% similarity]
source4/lib/util/util_file.c [moved from source4/lib/util_file.c with 100% similarity]
source4/lib/util/util_getent.c [moved from source4/lib/util_getent.c with 100% similarity]
source4/lib/util/util_pw.c [moved from source4/lib/util_pw.c with 100% similarity]
source4/lib/util/util_sock.c [moved from source4/lib/util_sock.c with 100% similarity]
source4/lib/util/util_str.c [moved from source4/lib/util_str.c with 100% similarity]
source4/lib/util/util_strlist.c [moved from source4/lib/util_strlist.c with 100% similarity]
source4/lib/util/util_unistr.c [moved from source4/lib/util_unistr.c with 100% similarity]
source4/lib/util/xfile.c [moved from source4/lib/xfile.c with 100% similarity]
source4/lib/util/xfile.h [moved from source4/lib/xfile.h with 100% similarity]
source4/lib/version.c [deleted file]
source4/libcli/clifile.c
source4/libcli/raw/interfaces.h
source4/libcli/raw/ioctl.h [moved from source4/include/ioctl.h with 100% similarity]
source4/libcli/raw/signing.h
source4/libcli/raw/trans2.h [moved from source4/include/trans2.h with 100% similarity]
source4/librpc/rpc/dcerpc_smb2.c
source4/main.mk
source4/ntvfs/common/brlock.c
source4/ntvfs/config.mk
source4/ntvfs/posix/config.mk
source4/ntvfs/posix/pvfs_ioctl.c
source4/ntvfs/print/vfs_print.c
source4/ntvfs/unixuid/config.mk
source4/param/loadparm.c
source4/rpc_server/lsa/dcesrv_lsa.c
source4/rpc_server/unixinfo/dcesrv_unixinfo.c
source4/script/mkversion.sh
source4/smb_server/smb_server.h
source4/torture/raw/ioctl.c
source4/torture/torture.c
source4/winbind/wb_samba3_cmd.c

index 742c96df2a2221fdf9ba67e89652479f449cb875..c72b64bcac65930f84b6953ea64651f4d12c319a 100644 (file)
@@ -2,6 +2,7 @@
    Unix SMB/CIFS implementation.
    Copyright (C) 2001 by Martin Pool <mbp@samba.org>
    Copyright (C) Jim McDonough (jmcd@us.ibm.com)  2003.
+   Copyright (C) Stefan Metzmacher     2003
    
    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
@@ -18,6 +19,9 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include "includes.h"
+#include "version.h"
+
 /**
  * @file dynconfig.c
  *
@@ -90,3 +94,42 @@ const char *dyn_JSDIR = JSDIR;
 
 const char *dyn_WINBINDD_SOCKET_DIR = WINBINDD_SOCKET_DIR;
 
+const char *samba_version_string(void)
+{
+       const char *official_string = SAMBA_VERSION_OFFICIAL_STRING;
+#ifdef SAMBA_VERSION_RELEASE_NICKNAME
+       const char *release_nickname = SAMBA_VERSION_RELEASE_NICKNAME;
+#else
+       const char *release_nickname = NULL;
+#endif
+#ifdef SAMBA_VERSION_VENDOR_SUFFIX
+       const char *vendor_suffix = SAMBA_VERSION_VENDOR_SUFFIX;
+#else
+       const char *vendor_suffix = NULL;
+#endif
+#ifdef SAMBA_VERSION_VENDOR_PATCH
+       const char *vendor_patch = SAMBA_VERSION_VENDOR_PATCH;
+#else
+       const char *vendor_patch = NULL;
+#endif
+       static char *samba_version;
+       static BOOL init_samba_version;
+
+       if (init_samba_version) {
+               return samba_version;
+       }
+
+       samba_version = talloc_asprintf(talloc_autofree_context(),
+                                       "%s%s%s%s%s%s%s%s",
+                                       official_string,
+                                       (vendor_suffix?"-":""),
+                                       (vendor_suffix?vendor_suffix:""),
+                                       (vendor_patch?"-":""),
+                                       (vendor_patch?vendor_patch:""),
+                                       (release_nickname?" (":""),
+                                       (release_nickname?release_nickname:""),
+                                       (release_nickname?")":""));
+
+       init_samba_version = True;
+       return samba_version;
+}
index 0e65266526807b1945da001fc41d5ce4755b4623..a9d49f6082f0d496f4708e5ae75018ce27e4aecb 100644 (file)
@@ -345,6 +345,7 @@ NOPROTO = YES
 # Start SUBSYSTEM HEIMDAL_GLUE
 [SUBSYSTEM::HEIMDAL_GLUE]
 OBJ_FILES = glue.o
+REQUIRED_SUBSYSTEMS = LIBNETIF
 # End SUBSYSTEM HEIMDAL_GLUE
 #######################
 
index d0c92880de0f51deda79b5303ba39eff487a805a..0ffbeea6a4081bb09ade7452678848eaae21e629 100644 (file)
 #ifndef _SAMBA_CORE_H
 #define _SAMBA_CORE_H
 
-/*
- * Define VOLATILE if needed.
- */
-
 #define False (0)
 #define True (1)
 #define Auto (2)
@@ -54,4 +50,4 @@ typedef uint64_t NTTIME;
 
 typedef NTSTATUS (*init_module_fn) (void);
 
-#endif /* _SMB_H */
+#endif /* _SAMBA_CORE_H */
diff --git a/source4/include/enums.h b/source4/include/enums.h
deleted file mode 100644 (file)
index 6003dfc..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-   
-   Copyright (C) Andrew Tridgell              2003
-   
-   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 2 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, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-/*
-  this header declares basic enumerated types
-*/
-
-/* protocol types. It assumes that higher protocols include lower protocols
-   as subsets */
-enum protocol_types {PROTOCOL_NONE,PROTOCOL_CORE,PROTOCOL_COREPLUS,PROTOCOL_LANMAN1,PROTOCOL_LANMAN2,PROTOCOL_NT1};
-
-/* security levels */
-enum security_types {SEC_SHARE,SEC_USER};
-
-/* passed to br lock code */
-enum brl_type {READ_LOCK, WRITE_LOCK, PENDING_READ_LOCK, PENDING_WRITE_LOCK};
-
-enum smb_signing_state {SMB_SIGNING_OFF, SMB_SIGNING_SUPPORTED, 
-                       SMB_SIGNING_REQUIRED, SMB_SIGNING_AUTO};
-
-
index 444feab6fcf928eda8460873d76579a97d8d9585..8bede51721e3acea4da0775d850dd7498110a370 100644 (file)
@@ -86,28 +86,31 @@ struct ipv4_addr {
        uint32_t addr;
 };
 
+/* protocol types. It assumes that higher protocols include lower protocols
+   as subsets. FIXME: Move to one of the smb-specific headers */
+enum protocol_types {PROTOCOL_NONE,PROTOCOL_CORE,PROTOCOL_COREPLUS,PROTOCOL_LANMAN1,PROTOCOL_LANMAN2,PROTOCOL_NT1};
+
+/* passed to br lock code. FIXME: Move to one of the smb-specific headers */
+enum brl_type {READ_LOCK, WRITE_LOCK, PENDING_READ_LOCK, PENDING_WRITE_LOCK};
+
 #define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2)
 #include "lib/replace/replace.h"
 
 /* Lists, trees, caching, database... */
-#include "xfile.h"
-#include "talloc/talloc.h"
 #include "nt_status.h"
+#include "talloc/talloc.h"
+#include "core.h"
+#include "charset/charset.h"
 #include "structs.h"
-#include "trans2.h"
+#include "util/util.h"
 #include "libcli/util/nterr.h"
-#include "charset/charset.h"
-#include "core.h"
-#include "debug.h"
 #include "libcli/util/doserr.h"
-#include "enums.h"
-#include "smb_macros.h"
-#include "byteorder.h"
 #include "librpc/ndr/libndr.h"
 #include "librpc/gen_ndr/dcerpc.h"
 #include "librpc/ndr/ndr_orpc.h"
 #include "librpc/gen_ndr/orpc.h"
 #include "librpc/rpc/dcerpc.h"
+#include "libcli/raw/trans2.h"
 #include "libcli/raw/interfaces.h"
 #include "auth/credentials/credentials.h"
 #include "libcli/nbt/libnbt.h"
@@ -116,12 +119,11 @@ struct ipv4_addr {
 #define _PRINTF_ATTRIBUTE(a1, a2)
 
 /***** automatically generated prototypes *****/
-#include "basic.h"
 #include "include/proto.h"
 
 /* String routines */
 
-#include "safe_string.h"
+#include "util/safe_string.h"
 
 #ifndef HAVE_PIPE
 #define SYNC_DNS 1
index 60ec1eae6723b3675e53a7ad22760ed507d9cf6b..7bfe3262341a6a8bae35264a25c0c99567aea94f 100644 (file)
@@ -133,8 +133,6 @@ struct wb_sid_object;
 struct cldap_socket;
 struct cldapd_server;
 
-struct mutex_ops;
-
 struct websrv_context;
 
 struct wbsrv_call;
@@ -161,6 +159,4 @@ struct nbtd_interface;
 struct smbcli_session;
 struct smbcli_state;
 
-struct substitute_context;
-
 struct model_ops;
index d5bff95f01249999caabd18b9296262080437e2b..51ca3378a24a58c8f07075de2b3beb51d6ae1d45 100644 (file)
@@ -16,6 +16,7 @@ include socket_wrapper/config.mk
 include appweb/config.mk
 include replace/config.mk
 include stream/config.mk
+include util/config.mk
 
 ##############################
 # Start SUBSYSTEM LIBNETIF
@@ -57,50 +58,13 @@ OBJ_FILES = \
 ################################################
 
 [SUBSYSTEM::GENCACHE]
-PRIVATE_PROTO_HEADER = gencache.h
+PRIVATE_PROTO_HEADER = gencache/gencache.h
 OBJ_FILES = \
-               gencache.o \
-
-##############################
-# Start SUBSYSTEM LIBBASIC
-[SUBSYSTEM::LIBBASIC]
-PRIVATE_PROTO_HEADER = basic.h
-OBJ_FILES = version.o \
-               xfile.o \
-               debug.o \
-               fault.o \
-               signal.o \
-               system.o \
-               time.o \
-               genrand.o \
-               dprintf.o \
-               util_str.o \
-               util_strlist.o \
-               util_unistr.o \
-               util_file.o \
-               data_blob.o \
-               util.o \
-               util_sock.o \
-               substitute.o \
-               fsusage.o \
-               ms_fnmatch.o \
-               select.o \
-               mutex.o \
-               idtree.o \
-               module.o
-REQUIRED_SUBSYSTEMS = \
-               CHARSET LIBREPLACE LIBNETIF LIBCRYPTO EXT_LIB_DL LIBTALLOC \
-               SOCKET_WRAPPER CONFIG
-# End SUBSYSTEM LIBBASIC
-##############################
+               gencache/gencache.o \
 
 [SUBSYSTEM::DB_WRAP]
 OBJ_FILES = db_wrap.o \
                gendb.o
 REQUIRED_SUBSYSTEMS = LIBLDB LIBTDB
 
-[SUBSYSTEM::PIDFILE]
-OBJ_FILES = pidfile.o
 
-[SUBSYSTEM::UNIX_PRIVS]
-OBJ_FILES = unix_privs.o
diff --git a/source4/lib/util/README b/source4/lib/util/README
new file mode 100644 (file)
index 0000000..e52e04e
--- /dev/null
@@ -0,0 +1,296 @@
+This directory contains convenience functions that are used heavily 
+throughout Samba.  None of these functions are SMB or Samba-specific.
+It's a bit to Samba what GLib is to the GNOME folks.
+
+(This file should be migrated to doxygen sometime.. )
+
+Also TODO: Remove dependency on loadparm
+
+XFILE wrapper functions
+=======================
+The XFILE implementation contains a clone of the standard UNIX stdio 
+functions 
+
+Debug functions
+===============
+DEBUG()
+
+Crash handlers
+==============
+void smb_panic(const char *why);
+
+Signal handling
+========================
+void BlockSignals(BOOL block,int signum);
+void (*CatchSignal(int signum,void (*handler)(int )))(int);
+void CatchChild(void);
+void CatchChildLeaveStatus(void);
+
+Wrappers
+========
+struct hostent *sys_gethostbyname(const char *name);
+const char *sys_inet_ntoa(struct ipv4_addr in);
+struct ipv4_addr sys_inet_makeaddr(int net, int host);
+void sys_select_signal(void);
+int sys_select(int maxfd, fd_set *readfds, fd_set *writefds, fd_set *errorfds, struct timeval *tval);
+int sys_select_intr(int maxfd, fd_set *readfds, fd_set *writefds, fd_set *errorfds, struct timeval *tval);
+
+Time datastructures
+===================
+time_t get_time_t_max(void);
+void GetTimeOfDay(struct timeval *tval);
+time_t nt_time_to_unix(NTTIME nt);
+void unix_to_nt_time(NTTIME *nt, time_t t);
+BOOL null_time(time_t t);
+BOOL null_nttime(NTTIME t);
+void push_dos_date(uint8_t *buf, int offset, time_t unixdate, int zone_offset);
+void push_dos_date2(uint8_t *buf,int offset,time_t unixdate, int zone_offset);
+void push_dos_date3(uint8_t *buf,int offset,time_t unixdate, int zone_offset);
+time_t pull_dos_date(const uint8_t *date_ptr, int zone_offset);
+time_t pull_dos_date2(const uint8_t *date_ptr, int zone_offset);
+time_t pull_dos_date3(const uint8_t *date_ptr, int zone_offset);
+char *http_timestring(TALLOC_CTX *mem_ctx, time_t t);
+char *timestring(TALLOC_CTX *mem_ctx, time_t t);
+const char *nt_time_string(TALLOC_CTX *mem_ctx, NTTIME nt);
+void push_nttime(uint8_t *base, uint16_t offset, NTTIME t);
+NTTIME pull_nttime(uint8_t *base, uint16_t offset);
+NTTIME nttime_from_string(const char *s);
+int64_t usec_time_diff(struct timeval *tv1, struct timeval *tv2);
+struct timeval timeval_zero(void);
+BOOL timeval_is_zero(const struct timeval *tv);
+struct timeval timeval_current(void);
+struct timeval timeval_set(uint32_t secs, uint32_t usecs);
+struct timeval timeval_add(const struct timeval *tv,
+                          uint32_t secs, uint32_t usecs);
+struct timeval timeval_sum(const struct timeval *tv1,
+                          const struct timeval *tv2);
+struct timeval timeval_current_ofs(uint32_t secs, uint32_t usecs);
+int timeval_compare(const struct timeval *tv1, const struct timeval *tv2);
+BOOL timeval_expired(const struct timeval *tv);
+double timeval_elapsed2(const struct timeval *tv1, const struct timeval *tv2);
+double timeval_elapsed(const struct timeval *tv);
+struct timeval timeval_min(const struct timeval *tv1,
+                          const struct timeval *tv2);
+struct timeval timeval_max(const struct timeval *tv1,
+                          const struct timeval *tv2);
+struct timeval timeval_until(const struct timeval *tv1,
+                            const struct timeval *tv2);
+NTTIME timeval_to_nttime(const struct timeval *tv);
+int get_time_zone(time_t t);
+
+Random number generation
+========================
+void set_rand_reseed_callback(void (*fn)(int *));
+void set_need_random_reseed(void);
+void generate_random_buffer(uint8_t *out, int len);
+uint32_t generate_random(void);
+BOOL check_password_quality(const char *s);
+char *generate_random_str_list(TALLOC_CTX *mem_ctx, size_t len, const char *list);
+char *generate_random_str(TALLOC_CTX *mem_ctx, size_t len);
+
+String manipulation
+===================
+BOOL next_token(const char **ptr,char *buff, const char *sep, size_t bufsize);
+int strcasecmp_m(const char *s1, const char *s2);
+BOOL strequal(const char *s1, const char *s2);
+BOOL strcsequal(const char *s1,const char *s2);
+int strwicmp(const char *psz1, const char *psz2);
+void string_replace(char *s, char oldc, char newc);
+BOOL trim_string(char *s,const char *front,const char *back);
+size_t count_chars(const char *s, char c);
+char *safe_strcpy(char *dest,const char *src, size_t maxlength);
+char *safe_strcat(char *dest, const char *src, size_t maxlength);
+char *alpha_strcpy(char *dest, const char *src, const char *other_safe_chars, size_t maxlength);
+char *StrnCpy(char *dest,const char *src,size_t n);
+size_t strhex_to_str(char *p, size_t len, const char *strhex);
+DATA_BLOB strhex_to_data_blob(const char *strhex) ;
+void hex_encode(const unsigned char *buff_in, size_t len, char **out_hex_buffer);
+BOOL in_list(const char *s, const char *list, BOOL casesensitive);
+void string_free(char **s);
+BOOL string_set(char **dest, const char *src);
+void string_sub(char *s,const char *pattern, const char *insert, size_t len);
+void all_string_sub(char *s,const char *pattern,const char *insert, size_t len);
+char *strchr_m(const char *s, char c);
+char *strrchr_m(const char *s, char c);
+BOOL strhaslower(const char *string);
+BOOL strhasupper(const char *string);
+char *strlower_talloc(TALLOC_CTX *ctx, const char *src);
+char *strupper_talloc(TALLOC_CTX *ctx, const char *src);
+void strlower_m(char *s);
+void strupper_m(char *s);
+size_t strlen_m(const char *s);
+size_t strlen_m_term(const char *s);
+void rfc1738_unescape(char *buf);
+DATA_BLOB base64_decode_data_blob(TALLOC_CTX *mem_ctx, const char *s);
+void base64_decode_inplace(char *s);
+char *base64_encode_data_blob(TALLOC_CTX *mem_ctx, DATA_BLOB data);
+size_t valgrind_strlen(const char *s);
+const char *str_format_nbt_domain(TALLOC_CTX *mem_ctx, const char *s);
+BOOL add_string_to_array(TALLOC_CTX *mem_ctx,
+                        const char *str, const char ***strings, int *num);
+int strcmp_safe(const char *s1, const char *s2);
+size_t ascii_len_n(const char *src, size_t n);
+char *attrib_string(TALLOC_CTX *mem_ctx, uint32_t attrib);
+BOOL set_boolean(const char *boolean_string, BOOL *boolean);
+BOOL conv_str_bool(const char * str, BOOL * val);
+BOOL conv_str_size(const char * str, uint64_t * val);
+BOOL conv_str_u64(const char * str, uint64_t * val);
+
+String list manipulation
+========================
+const char **str_list_make(TALLOC_CTX *mem_ctx, const char *string, const char *sep);
+const char **str_list_make_shell(TALLOC_CTX *mem_ctx, const char *string, const char *sep);
+char *str_list_join(TALLOC_CTX *mem_ctx, const char **list, char seperator);
+char *str_list_join_shell(TALLOC_CTX *mem_ctx, const char **list, char sep);
+size_t str_list_length(const char **list);
+const char **str_list_copy(TALLOC_CTX *mem_ctx, const char **list);
+BOOL str_list_equal(const char **list1, const char **list2);
+const char **str_list_add(const char **list, const char *s);
+void str_list_remove(const char **list, const char *s);
+BOOL str_list_check(const char **list, const char *s);
+BOOL str_list_check_ci(const char **list, const char *s);
+
+Unicode string manipulation
+===========================
+codepoint_t toupper_w(codepoint_t val);
+codepoint_t tolower_w(codepoint_t val);
+size_t utf16_len(const void *buf);
+size_t utf16_len_n(const void *src, size_t n);
+size_t ucs2_align(const void *base_ptr, const void *p, int flags);
+int codepoint_cmpi(codepoint_t c1, codepoint_t c2);
+
+File manipulation
+=================
+char *fgets_slash(char *s2,int maxlen,XFILE *f);
+char *afdgets(int fd, TALLOC_CTX *mem_ctx, size_t hint);
+char *fd_load(int fd, size_t *size, TALLOC_CTX *mem_ctx);
+char *file_load(const char *fname, size_t *size, TALLOC_CTX *mem_ctx);
+void *map_file(const char *fname, size_t size);
+char **file_lines_load(const char *fname, int *numlines, TALLOC_CTX *mem_ctx);
+char **fd_lines_load(int fd, int *numlines, TALLOC_CTX *mem_ctx);
+void file_lines_slashcont(char **lines);
+BOOL file_save(const char *fname, const void *packet, size_t length);
+BOOL file_exists(const char *path);
+int vfdprintf(int fd, const char *format, va_list ap) _PRINTF_ATTRIBUTE(2,0);
+int fdprintf(int fd, const char *format, ...) _PRINTF_ATTRIBUTE(2,3);
+
+Data Blob
+=========
+DATA_BLOB data_blob_named(const void *p, size_t length, const char *name);
+DATA_BLOB data_blob_talloc_named(TALLOC_CTX *mem_ctx, const void *p, size_t length, const char *name);
+DATA_BLOB data_blob_talloc_reference(TALLOC_CTX *mem_ctx, DATA_BLOB *blob);
+DATA_BLOB data_blob_talloc_zero(TALLOC_CTX *mem_ctx, size_t length);
+void data_blob_free(DATA_BLOB *d);
+void data_blob_clear(DATA_BLOB *d);
+void data_blob_clear_free(DATA_BLOB *d);
+BOOL data_blob_equal(const DATA_BLOB *d1, const DATA_BLOB *d2);
+char *data_blob_hex_string(TALLOC_CTX *mem_ctx, DATA_BLOB *blob);
+DATA_BLOB data_blob_string_const(const char *str);
+DATA_BLOB data_blob_const(const void *p, size_t length);
+NTSTATUS data_blob_realloc(TALLOC_CTX *mem_ctx, DATA_BLOB *blob, size_t length);
+NTSTATUS data_blob_append(TALLOC_CTX *mem_ctx, DATA_BLOB *blob,
+                         const void *p, size_t length);
+
+Random Utility functions
+========================
+const char *tmpdir(void);
+BOOL file_exist(const char *fname);
+time_t file_modtime(const char *fname);
+BOOL directory_exist(const char *dname);
+BOOL directory_create_or_exist(const char *dname, uid_t uid, 
+                              mode_t dir_perms);
+int set_blocking(int fd, BOOL set);
+void msleep(uint_t t);
+void become_daemon(BOOL Fork);
+void safe_free(void *p);
+BOOL is_myname(const char *name);
+char* get_myname(void);
+BOOL is_ipaddress(const char *str);
+uint32_t interpret_addr(const char *str);
+struct ipv4_addr interpret_addr2(const char *str);
+BOOL is_zero_ip(struct ipv4_addr ip);
+BOOL same_net(struct ipv4_addr ip1,struct ipv4_addr ip2,struct ipv4_addr mask);
+BOOL process_exists(pid_t pid);
+BOOL fcntl_lock(int fd, int op, off_t offset, off_t count, int type);
+void dump_data(int level, const uint8_t *buf,int len);
+void *smb_xmalloc(size_t size);
+void *smb_xmemdup(const void *p, size_t size);
+char *smb_xstrdup(const char *s);
+void *memdup(const void *p, size_t size);
+char *lock_path(TALLOC_CTX* mem_ctx, const char *name);
+char *lib_path(TALLOC_CTX* mem_ctx, const char *name);
+char *private_path(TALLOC_CTX* mem_ctx, const char *name);
+char *smbd_tmp_path(TALLOC_CTX *mem_ctx, const char *name);
+init_module_fn *load_samba_modules(TALLOC_CTX *mem_ctx, const char *subsystem);
+void dump_data_pw(const char *msg, const uint8_t * data, size_t len);
+BOOL all_zero(const uint8_t *ptr, uint_t size);
+void *realloc_array(void *ptr, size_t el_size, unsigned count);
+
+/* The following definitions come from lib/util/util_sock.c  */
+
+void set_socket_options(int fd, const char *options);
+
+Variable substitution
+=====================
+void sub_set_context(struct substitute_context *subptr);
+void sub_set_remote_proto(const char *str);
+void sub_set_remote_arch(const char *str);
+void sub_set_user_name(const char *name);
+void standard_sub_basic(char *str,size_t len);
+char *talloc_sub_basic(TALLOC_CTX *mem_ctx, const char *smb_name, const char *str);
+char *alloc_sub_basic(const char *smb_name, const char *str);
+char *talloc_sub_specified(TALLOC_CTX *mem_ctx,
+                       const char *input_string,
+                       const char *username,
+                       const char *domain,
+                       uid_t uid,
+                       gid_t gid);
+char *alloc_sub_specified(const char *input_string,
+                       const char *username,
+                       const char *domain,
+                       uid_t uid,
+                       gid_t gid);
+char *talloc_sub_advanced(TALLOC_CTX *mem_ctx,
+                       int snum,
+                       const char *user,
+                       const char *connectpath,
+                       gid_t gid,
+                       const char *smb_name,
+                       char *str);
+char *alloc_sub_advanced(int snum, const char *user, 
+                                 const char *connectpath, gid_t gid, 
+                                 const char *smb_name, char *str);
+void standard_sub_tcon(struct smbsrv_tcon *tcon, char *str, size_t len);
+char *talloc_sub_tcon(TALLOC_CTX *mem_ctx, struct smbsrv_tcon *tcon, char *str);
+char *alloc_sub_tcon(struct smbsrv_tcon *tcon, char *str);
+void standard_sub_snum(int snum, char *str, size_t len);
+
+/* The following definitions come from lib/util/fsusage.c  */
+
+int sys_fsusage(const char *path, uint64_t *dfree, uint64_t *dsize);
+
+Microsoft-style filename matching
+=================================
+int ms_fnmatch(const char *pattern, const char *string, enum protocol_types protocol);
+int gen_fnmatch(const char *pattern, const char *string);
+
+Mutexes
+=======
+BOOL register_mutex_handlers(const char *name, struct mutex_ops *ops);
+
+Idtree
+======
+very efficient functions to manage mapping a id (such as a fnum) to
+a pointer. This is used for fnum and search id allocation.
+
+struct idr_context *idr_init(TALLOC_CTX *mem_ctx);
+int idr_get_new(struct idr_context *idp, void *ptr, int limit);
+int idr_get_new_above(struct idr_context *idp, void *ptr, int starting_id, int limit);
+int idr_get_new_random(struct idr_context *idp, void *ptr, int limit);
+void *idr_find(struct idr_context *idp, int id);
+int idr_remove(struct idr_context *idp, int id);
+
+Module loading
+==============
+init_module_fn *load_modules(TALLOC_CTX *mem_ctx, const char *path);
+BOOL run_init_functions(NTSTATUS (**fns) (void));
diff --git a/source4/lib/util/config.mk b/source4/lib/util/config.mk
new file mode 100644 (file)
index 0000000..79e1457
--- /dev/null
@@ -0,0 +1,34 @@
+[SUBSYSTEM::LIBBASIC]
+PRIVATE_PROTO_HEADER = util_proto.h
+PUBLIC_HEADERS = util.h
+OBJ_FILES = xfile.o \
+               debug.o \
+               fault.o \
+               signal.o \
+               system.o \
+               time.o \
+               genrand.o \
+               dprintf.o \
+               util_str.o \
+               util_strlist.o \
+               util_unistr.o \
+               util_file.o \
+               data_blob.o \
+               util.o \
+               util_sock.o \
+               substitute.o \
+               fsusage.o \
+               ms_fnmatch.o \
+               select.o \
+               mutex.o \
+               idtree.o \
+               module.o
+REQUIRED_SUBSYSTEMS = \
+               CHARSET LIBREPLACE LIBCRYPTO EXT_LIB_DL LIBTALLOC \
+               SOCKET_WRAPPER CONFIG
+
+[SUBSYSTEM::PIDFILE]
+OBJ_FILES = pidfile.o
+
+[SUBSYSTEM::UNIX_PRIVS]
+OBJ_FILES = unix_privs.o
similarity index 100%
rename from source4/lib/debug.c
rename to source4/lib/util/debug.c
similarity index 100%
rename from source4/lib/debug.h
rename to source4/lib/util/debug.h
similarity index 100%
rename from source4/lib/fault.c
rename to source4/lib/util/fault.c
similarity index 100%
rename from source4/lib/mutex.c
rename to source4/lib/util/mutex.c
similarity index 99%
rename from source4/lib/mutex.h
rename to source4/lib/util/mutex.h
index bb26c84f5dcb077d7a6705c3a2b91e51c89f12eb..018c134bcb8904c18c1647d89bdd3ed4f88808e4 100644 (file)
@@ -21,6 +21,8 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+struct mutex_ops;
+
 /* To add a new read/write lock, add it to enum rwlock_id
  */
 enum rwlock_id { RWLOCK_SMBD,          /* global smbd lock */
similarity index 100%
rename from source4/lib/time.c
rename to source4/lib/util/time.c
similarity index 100%
rename from source4/lib/util.c
rename to source4/lib/util/util.c
similarity index 89%
rename from source4/include/smb_macros.h
rename to source4/lib/util/util.h
index 956b0709ca7af048e73970ebd08678e40fd0dace..55d775e25c6273c53c61383c17b1b90feba214b5 100644 (file)
@@ -1,11 +1,11 @@
 /* 
    Unix SMB/CIFS implementation.
-   Some convenient macros
+   Utility functions for Samba
    Copyright (C) Andrew Tridgell 1992-1999
    Copyright (C) John H Terpstra 1996-1999
    Copyright (C) Luke Kenneth Casson Leighton 1996-1999
    Copyright (C) Paul Ashton 1998 - 1999
-   
+    
    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 2 of the License, or
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#ifndef _SMB_MACROS_H
-#define _SMB_MACROS_H
+#ifndef _SAMBA_UTIL_H_
+#define _SAMBA_UTIL_H_
+
+struct substitute_context;
+
+#include "util/xfile.h"
+#include "util/debug.h"
+#include "util/mutex.h"
+#include "util/byteorder.h"
+#include "util/util_proto.h"
 
 /* zero a structure */
 #define ZERO_STRUCT(x) memset((char *)&(x), 0, sizeof(x))
@@ -70,4 +78,4 @@
 #define malloc_array_p(type, count) (type *)realloc_array(NULL, sizeof(type), count)
 #define realloc_p(p, type, count) (type *)realloc_array(p, sizeof(type), count)
 
-#endif /* _SMB_MACROS_H */
+#endif /* _SAMBA_UTIL_H_ */
similarity index 100%
rename from source4/lib/xfile.c
rename to source4/lib/util/xfile.c
similarity index 100%
rename from source4/lib/xfile.h
rename to source4/lib/util/xfile.h
diff --git a/source4/lib/version.c b/source4/lib/version.c
deleted file mode 100644 (file)
index b7aa81a..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-   Samba Version functions
-   
-   Copyright (C) Stefan Metzmacher     2003
-   
-   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 2 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, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include "includes.h"
-#include "version.h"
-
-const char *samba_version_string(void)
-{
-       const char *official_string = SAMBA_VERSION_OFFICIAL_STRING;
-#ifdef SAMBA_VERSION_RELEASE_NICKNAME
-       const char *release_nickname = SAMBA_VERSION_RELEASE_NICKNAME;
-#else
-       const char *release_nickname = NULL;
-#endif
-#ifdef SAMBA_VERSION_VENDOR_SUFFIX
-       const char *vendor_suffix = SAMBA_VERSION_VENDOR_SUFFIX;
-#else
-       const char *vendor_suffix = NULL;
-#endif
-#ifdef SAMBA_VERSION_VENDOR_PATCH
-       const char *vendor_patch = SAMBA_VERSION_VENDOR_PATCH;
-#else
-       const char *vendor_patch = NULL;
-#endif
-       static char *samba_version;
-       static BOOL init_samba_version;
-
-       if (init_samba_version) {
-               return samba_version;
-       }
-
-       samba_version = talloc_asprintf(talloc_autofree_context(),
-                                       "%s%s%s%s%s%s%s%s",
-                                       official_string,
-                                       (vendor_suffix?"-":""),
-                                       (vendor_suffix?vendor_suffix:""),
-                                       (vendor_patch?"-":""),
-                                       (vendor_patch?vendor_patch:""),
-                                       (release_nickname?" (":""),
-                                       (release_nickname?release_nickname:""),
-                                       (release_nickname?")":""));
-
-       init_samba_version = True;
-       return samba_version;
-}
index 0b9cac4c07c7014fa69b40a346b7198136f47dc0..e8cb5480075765f3f43a1a94708c9bfddaac1340 100644 (file)
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 /****************************************************************************
  Hard/Symlink a file (UNIX extensions).
index 49fe085f2cfde6dff1dcfffc67ce15f8586bd6bd..034878a464ab09b2a5ab378e8d432d45ea1ee643 100644 (file)
@@ -19,8 +19,6 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-
-
 /* this structure is just a wrapper for a string, the only reason we
    bother with this is that it allows us to check the length provided
    on the wire in testsuite test code to ensure that we are
index dfc5a4bd7e1577ec9fe2f25fc97384cc684b72c0..cea8556c2c4bce42bb1ef1266143c675b686b75c 100644 (file)
@@ -27,6 +27,10 @@ enum smb_signing_engine_state {
        SMB_SIGNING_ENGINE_ON
 };
 
+enum smb_signing_state {
+       SMB_SIGNING_OFF, SMB_SIGNING_SUPPORTED, 
+       SMB_SIGNING_REQUIRED, SMB_SIGNING_AUTO};
+
 struct smb_signing_context {
        enum smb_signing_engine_state signing_state;
        DATA_BLOB mac_key;
index 90882bd95ea394c3d7e9cc4ab41ad9a32bb9db43..d22ef6a9f24ef45621228df64a23208ceb4f6f5c 100644 (file)
@@ -25,7 +25,7 @@
 #include "libcli/composite/composite.h"
 #include "libcli/smb2/smb2.h"
 #include "libcli/smb2/smb2_calls.h"
-#include "ioctl.h"
+#include "libcli/raw/ioctl.h"
 
 /* transport private information used by SMB2 pipe transport */
 struct smb2_private {
index 8f67e6ad9e0b267ab75305654ab9aa94243ac0b0..98ee46cc7e5fcd72d8aa95bccf36e368bc7aa872 100644 (file)
@@ -246,7 +246,7 @@ include/includes.h: \
                librpc/rpc/dcerpc.h \
                auth/credentials/credentials_proto.h \
                libcli/nbt/libnbt.h \
-               lib/basic.h \
+               lib/util/util_proto.h \
                lib/charset/charset.h
 
 clean_pch: 
index 3fc3c09316a6d39e8ddb225ae020e9a3aa2fd3f3..6548a2c19933c70778664960f5207d33dfc5bd2e 100644 (file)
@@ -31,6 +31,7 @@
 #include "messaging/messaging.h"
 #include "db_wrap.h"
 #include "lib/messaging/irpc.h"
+#include "libcli/libcli.h"
 
 /*
   in this module a "DATA_BLOB *file_key" is a blob that uniquely identifies
@@ -237,7 +238,7 @@ NTSTATUS brl_lock(struct brl_context *brl,
        struct lock_struct lock, *locks=NULL;
        NTSTATUS status;
 
-       kbuf.dptr = (char *)file_key->data;
+       kbuf.dptr = (uint8_t *)file_key->data;
        kbuf.dsize = file_key->length;
 
        if (tdb_chainlock(brl->w->tdb, kbuf) != 0) {
@@ -287,7 +288,7 @@ NTSTATUS brl_lock(struct brl_context *brl,
                status = NT_STATUS_NO_MEMORY;
                goto fail;
        } else {
-               dbuf.dptr = (char *)locks;
+               dbuf.dptr = (uint8_t *)locks;
        }
        locks[count] = lock;
        dbuf.dsize += sizeof(lock);
@@ -382,7 +383,7 @@ NTSTATUS brl_unlock(struct brl_context *brl,
        struct lock_context context;
        NTSTATUS status;
 
-       kbuf.dptr = (char *)file_key->data;
+       kbuf.dptr = (uint8_t *)file_key->data;
        kbuf.dsize = file_key->length;
 
        if (tdb_chainlock(brl->w->tdb, kbuf) != 0) {
index 74b62809f7e55bac6581d5bf4b63498c76fa9d59..8194fc1963be39a4fae79b09b97f13307d1a87d2 100644 (file)
@@ -59,16 +59,6 @@ OBJ_FILES = \
 # End MODULE ntvfs_nbench
 ################################################
 
-################################################
-# Start SUBSYSTEM ntvfs_common
-[SUBSYSTEM::ntvfs_common]
-OBJ_FILES = \
-               common/brlock.o \
-               common/opendb.o \
-               common/sidmap.o
-# End SUBSYSTEM ntvfs_common
-################################################
-
 
 ################################################
 # Start SUBSYSTEM NTVFS
@@ -83,7 +73,10 @@ OBJ_FILES = \
                ntvfs_base.o \
                ntvfs_generic.o \
                ntvfs_interface.o \
-               ntvfs_util.o
+               ntvfs_util.o \
+               common/brlock.o \
+               common/opendb.o \
+               common/sidmap.o
 #
 # End SUBSYSTEM NTVFS
 ################################################
index a2a4685d8c74b68b99abd748f953f8ea5eafe28e..85fcc10e06015a2070d50ab571766aac41b2bded 100644 (file)
@@ -31,6 +31,6 @@ OBJ_FILES = \
                pvfs_acl.o \
                xattr_system.o \
                xattr_tdb.o
-REQUIRED_SUBSYSTEMS = NDR_XATTR ntvfs_common EXT_LIB_XATTR EXT_LIB_BLKID
+REQUIRED_SUBSYSTEMS = NDR_XATTR EXT_LIB_XATTR EXT_LIB_BLKID
 # End MODULE ntvfs_posix
 ################################################
index abf575aa3df7cc181a392f9bffcbf4c2ce2e0a64..b35a98fa8752fcb82b01b179ae96f6136c789e90 100644 (file)
@@ -22,7 +22,7 @@
 
 #include "includes.h"
 #include "vfs_posix.h"
-#include "ioctl.h"
+#include "libcli/raw/ioctl.h"
 
 /*
   old ioctl interface 
index e933f5502bba062fb7667741af3ffe3ba3a9d8b9..b0c34b2abed8b0421b7ca623573fd4c498ed09f1 100644 (file)
@@ -23,7 +23,7 @@
 */
 
 #include "includes.h"
-#include "ioctl.h"
+#include "libcli/raw/ioctl.h"
 #include "smb_server/smb_server.h"
 #include "ntvfs/ntvfs.h"
 
index d99229729c588eb58b2721dc4bd41fda68075beb..bb811bca2bd3711f62a8d5033a38edc08107d2a6 100644 (file)
@@ -5,7 +5,5 @@ INIT_FUNCTION = ntvfs_unixuid_init
 SUBSYSTEM = NTVFS
 OBJ_FILES = \
                vfs_unixuid.o
-REQUIRED_SUBSYSTEMS = \
-               ntvfs_common
 # End MODULE ntvfs_unixuid
 ################################################
index 96ba2bbc736795b7dfa1dcbe26cbb328d82835ea..8fc061b53fdbb8910a1e698a5d3e86dd44cb4f63 100644 (file)
@@ -61,6 +61,8 @@
 #include "system/iconv.h"
 #include "librpc/gen_ndr/ndr_svcctl.h"
 #include "librpc/gen_ndr/ndr_samr.h"
+#include "smb_server/smb_server.h"
+#include "libcli/raw/signing.h"
 #include "dlinklist.h"
 #include "param/loadparm.h"
 
index 914bb98eda027ac8d658a04b498af9fc626ff587..b62e1abaefc19b92756f7a814d34ff972a23821b 100644 (file)
@@ -27,6 +27,7 @@
 #include "auth/auth.h"
 #include "dsdb/samdb/samdb.h"
 #include "libcli/ldap/ldap.h"
+#include "ntvfs/ntvfs.h"
 
 /*
   this type allows us to distinguish handle types
index b85d3f144ed8d703c30dda205c4bfd60ea5d707d..1224daa76ab10ee18abbb2f4df7fce311f761540 100644 (file)
@@ -25,6 +25,7 @@
 #include "rpc_server/common/common.h"
 #include "librpc/gen_ndr/ndr_unixinfo.h"
 #include "lib/events/events.h"
+#include "ntvfs/ntvfs.h"
 
 #include <sys/types.h>
 #include <pwd.h>
index 7f42eded2387d6bb0dbb157ea8052573acec9ef5..7995027998fd583ddbb4b3221047945d2bee9467 100755 (executable)
@@ -8,7 +8,7 @@ if test -z "$VERSION_FILE";then
 fi
 
 if test -z "$OUTPUT_FILE";then
-       OUTPUT_FILE="include/version.h"
+       OUTPUT_FILE="version.h"
 fi
 
 SOURCE_DIR=$3
@@ -114,7 +114,7 @@ echo "#define SAMBA_VERSION_OFFICIAL_STRING \"${SAMBA_VERSION_STRING}\"" >> $OUT
 
 echo "#define SAMBA_VERSION_STRING samba_version_string()" >> $OUTPUT_FILE
 
-echo "$0: 'include/version.h' created for Samba(\"${SAMBA_VERSION_STRING}\")"
+echo "$0: 'version.h' created for Samba(\"${SAMBA_VERSION_STRING}\")"
 
 if test -n "${SAMBA_VERSION_RELEASE_NICKNAME}";then
     echo "$0: with RELEASE_NICKNAME = ${SAMBA_VERSION_RELEASE_NICKNAME}"
index 0c201b2b1d0038c767ef07e23f44a17f0d73fa20..5ba179986846e20d2547374f592cc63c8f899297 100644 (file)
@@ -206,6 +206,8 @@ struct substitute_context {
 /* Remote architectures we know about. */
 enum remote_arch_types {RA_UNKNOWN, RA_WFWG, RA_OS2, RA_WIN95, RA_WINNT, RA_WIN2K, RA_WINXP, RA_SAMBA};
 
+enum security_types {SEC_SHARE,SEC_USER} security;
+
 /* smb server context structure. This should contain all the state
  * information associated with a SMB server connection 
  */
index 0fb48c292b32d20c2cee91b5ec537a07bc62ca88..2c51e4d7b41a63c3d9b2e85e808071bdb92fee08 100644 (file)
@@ -21,7 +21,7 @@
 
 #include "includes.h"
 #include "torture/torture.h"
-#include "ioctl.h"
+#include "libcli/raw/ioctl.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/libcli.h"
 
index aad44e4a160ecb6b67e33780e8b617ad0484bf4e..26137b18908820016ca03a652adafe2c3deb054d 100644 (file)
@@ -24,7 +24,7 @@
 #include "system/time.h"
 #include "system/wait.h"
 #include "system/filesys.h"
-#include "ioctl.h"
+#include "libcli/raw/ioctl.h"
 #include "libcli/libcli.h"
 #include "librpc/rpc/dcerpc_table.h"
 
index f930a6052d2b8598063a43d13c5ecad9e76c2b0e..fd36dde16dc19b993d7fd49bb332675bb9500f66 100644 (file)
@@ -26,7 +26,7 @@
 #include "winbind/wb_server.h"
 #include "winbind/wb_async_helpers.h"
 #include "libcli/composite/composite.h"
-#include "include/version.h"
+#include "version.h"
 #include "librpc/gen_ndr/ndr_netlogon.h"
 
 /*