r7166: Move replacement stuff to seperate directory

(easier to add win32-specific bits later)
Trim LIBBASIC a bit more

diff --git a/source/lib/basic.mk b/source/lib/basic.mk
index 5c094a69730c6d98ee423fc64429b62b041401c6..02783366ca828100eaf4fa1099a6084f67eb9fa2 100644 (file)
--- a/source/lib/basic.mk
+++ b/source/lib/basic.mk
@@ -3,9 +3,9 @@
 ##############################
 # Start SUBSYSTEM LIBREPLACE
 [SUBSYSTEM::LIBREPLACE]
-INIT_OBJ_FILES = lib/replace.o
+INIT_OBJ_FILES = lib/replace/replace.o
 ADD_OBJ_FILES = \
-               lib/snprintf.o
+               lib/replace/snprintf.o
 # End SUBSYSTEM LIBREPLACE
 ##############################
 
@@ -49,11 +49,19 @@ INIT_OBJ_FILES = \
 # End SUBSYSTEM LIBSAMBA3
 ################################################
 
+[SUBSYSTEM::PAM_ERRORS]
+OBJ_FILES = lib/pam_errors.o
+
+[SUBSYSTEM::GENCACHE]
+OBJ_FILES = \
+               lib/gencache.o \
+
 ##############################
 # Start SUBSYSTEM LIBBASIC
 [SUBSYSTEM::LIBBASIC]
 INIT_OBJ_FILES = lib/version.o
 ADD_OBJ_FILES = \
+               lib/xfile.o \
                lib/debug.o \
                lib/fault.o \
                lib/pidfile.o \
@@ -62,7 +70,6 @@ ADD_OBJ_FILES = \
                lib/time.o \
                lib/genrand.o \
                lib/dprintf.o \
-               lib/xfile.o \
                lib/util_str.o \
                lib/util_strlist.o \
                lib/util_unistr.o \
@@ -74,14 +81,11 @@ ADD_OBJ_FILES = \
                lib/fsusage.o \
                lib/ms_fnmatch.o \
                lib/select.o \
-               lib/pam_errors.o \
-               intl/lang_tdb.o \
                lib/mutex.o \
                lib/server_mutex.o \
                lib/idtree.o \
                lib/unix_privs.o \
                lib/db_wrap.o \
-               lib/gencache.o \
                lib/gendb.o \
                lib/credentials.o
 REQUIRED_SUBSYSTEMS = \

diff --git a/source/lib/dprintf.c b/source/lib/dprintf.c
index 5538c490ce6b19a46eb26f34eeabf6d5d1fc24dd..6653fa4242f33b1f1c31e77c0bfa74559ab473c4 100644 (file)
--- a/source/lib/dprintf.c
+++ b/source/lib/dprintf.c
@@ -38,16 +38,10 @@ int d_vfprintf(FILE *f, const char *format, va_list ap) _PRINTF_ATTRIBUTE(2,0)
        char *msgstr;
        va_list ap2;
 
-       /* do any message translations */
-       msgstr = lang_msg(format);
-       if (!msgstr) return -1;
-
        VA_COPY(ap2, ap);
 
        ret = vasprintf(&p, msgstr, ap2);
 
-       lang_msg_free(msgstr);
-
        if (ret <= 0) return ret;
 
        /* now we have the string in unix format, convert it to the display

diff --git a/source/lib/replace.c b/source/lib/replace/replace.c
similarity index 100%
rename from source/lib/replace.c
rename to source/lib/replace/replace.c

diff --git a/source/lib/snprintf.c b/source/lib/replace/snprintf.c
similarity index 100%
rename from source/lib/snprintf.c
rename to source/lib/replace/snprintf.c

diff --git a/source/lib/util_file.c b/source/lib/util_file.c
index e02198754d5a71098ab75677e4c39cbedfc891b5..557baa716dce8a7403593776a8318fd7dd2182ad 100644 (file)
--- a/source/lib/util_file.c
+++ b/source/lib/util_file.c
@@ -115,7 +115,7 @@ read a line from a file with possible \ continuation chars.
 Blanks at the start or end of a line are stripped.
 The string will be allocated if s2 is NULL
 ****************************************************************************/
-char *fgets_slash(char *s2,int maxlen,XFILE *f)
+char *fgets_slash(char *s2,int maxlen,FILE *f)
 {
   char *s=s2;
   int len = 0;

diff --git a/source/web_server/config.mk b/source/web_server/config.mk
index 5f59e415028a3625c9d2dd09a1de8fa318d73c8b..8c83dceb4c908e1ed3183f95b12c88367a108df5 100644 (file)
--- a/source/web_server/config.mk
+++ b/source/web_server/config.mk
@@ -24,6 +24,6 @@ ADD_OBJ_FILES = \
                web_server/tls.o \
                web_server/tlscert.o \
                web_server/pam.o
-REQUIRED_SUBSYSTEMS = ESP EXT_LIB_GNUTLS EXT_LIB_PAM SMBCALLS
+REQUIRED_SUBSYSTEMS = ESP EXT_LIB_GNUTLS EXT_LIB_PAM SMBCALLS PAM_ERRORS
 # End SUBSYSTEM WEB
 #######################