r13662: Typo fix, add more public headers

(This used to be commit d98948716f237c3a501b283a0bbc3837bb3fd3c8)

diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk
index 51ca3378a24a58c8f07075de2b3beb51d6ae1d45..fef6077a991d87a9109a68d97a566408e239b018 100644 (file)
--- a/source4/lib/basic.mk
+++ b/source4/lib/basic.mk
@@ -66,5 +66,3 @@ OBJ_FILES = \
 OBJ_FILES = db_wrap.o \
                gendb.o
 REQUIRED_SUBSYSTEMS = LIBLDB LIBTDB
-
-

diff --git a/source4/lib/socket/config.mk b/source4/lib/socket/config.mk
index c76c91ba8c95e28c0d889d17de7b28000ddfaaf7..e9f29b07905f908b9fcfc009fe7a423ff245c72f 100644 (file)
--- a/source4/lib/socket/config.mk
+++ b/source4/lib/socket/config.mk
@@ -44,6 +44,6 @@ OBJ_FILES = \
                connect_multi.o \
                connect.o
 NOPROTO=YES
-REQUIRED_SUBSYSTEMS = LIBCLI_RESOLVE
+REQUIRED_SUBSYSTEMS = LIBCLI_RESOLVE SOCKET_WRAPPER LIBTALLOC
 # End SUBSYSTEM SOCKET
 ################################################

diff --git a/source4/lib/util/config.mk b/source4/lib/util/config.mk
index 79e145775d748b601e133a3c79e333bc5686e687..81614ed64705ef3cfff8a9bc301022f9e583ba9c 100644 (file)
--- a/source4/lib/util/config.mk
+++ b/source4/lib/util/config.mk
@@ -1,6 +1,15 @@
-[SUBSYSTEM::LIBBASIC]
+[LIBRARY::LIBBASIC]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION = Generic utility functions
 PRIVATE_PROTO_HEADER = util_proto.h
-PUBLIC_HEADERS = util.h
+PUBLIC_HEADERS = util.h \
+                                byteorder.h \
+                                debug.h \
+                                mutex.h \
+                                safe_string.h \
+                                xfile.h
 OBJ_FILES = xfile.o \
                debug.o \
                fault.o \

diff --git a/source4/lib/util/ms_fnmatch.c b/source4/lib/util/ms_fnmatch.c
index 699341bede5a386ac1f4c0786ffc19099b0e00dd..d44c8b87da130f22265b8f30868c2c5a88d24c54 100644 (file)
--- a/source4/lib/util/ms_fnmatch.c
+++ b/source4/lib/util/ms_fnmatch.c
@@ -161,7 +161,7 @@ int ms_fnmatch(const char *pattern, const char *string, enum protocol_types prot
        }
 
        if (strpbrk(pattern, "<>*?\"") == NULL) {
-               /* this is not just an optmisation - it is essential
+               /* this is not just an optimisation - it is essential
                   for LANMAN1 correctness */
                return strcasecmp_m(pattern, string);
        }