summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-06-01 10:16:35 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:17:22 -0500
commite4a505192d23c7d77a6ee68e6e2946bab983ae43 (patch)
tree80f37f7689bb54fc81838ca1d973abdb0d5e90d2
parentb2b886e38b4dcf1ec509b040340a5b0377fa143a (diff)
downloadsamba-e4a505192d23c7d77a6ee68e6e2946bab983ae43.tar.gz
samba-e4a505192d23c7d77a6ee68e6e2946bab983ae43.tar.bz2
samba-e4a505192d23c7d77a6ee68e6e2946bab983ae43.zip
r7166: Move replacement stuff to seperate directory
(easier to add win32-specific bits later) Trim LIBBASIC a bit more (This used to be commit fc7f519e4ae2051e9515df5f549c8e1842b7e70b)
-rw-r--r--source4/lib/basic.mk16
-rw-r--r--source4/lib/dprintf.c6
-rw-r--r--source4/lib/replace/replace.c (renamed from source4/lib/replace.c)0
-rw-r--r--source4/lib/replace/snprintf.c (renamed from source4/lib/snprintf.c)0
-rw-r--r--source4/lib/util_file.c2
-rw-r--r--source4/web_server/config.mk2
6 files changed, 12 insertions, 14 deletions
diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk
index 5c094a6973..02783366ca 100644
--- a/source4/lib/basic.mk
+++ b/source4/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/source4/lib/dprintf.c b/source4/lib/dprintf.c
index 5538c490ce..6653fa4242 100644
--- a/source4/lib/dprintf.c
+++ b/source4/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/source4/lib/replace.c b/source4/lib/replace/replace.c
index 89612912b7..89612912b7 100644
--- a/source4/lib/replace.c
+++ b/source4/lib/replace/replace.c
diff --git a/source4/lib/snprintf.c b/source4/lib/replace/snprintf.c
index adfd3c4d78..adfd3c4d78 100644
--- a/source4/lib/snprintf.c
+++ b/source4/lib/replace/snprintf.c
diff --git a/source4/lib/util_file.c b/source4/lib/util_file.c
index e02198754d..557baa716d 100644
--- a/source4/lib/util_file.c
+++ b/source4/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/source4/web_server/config.mk b/source4/web_server/config.mk
index 5f59e41502..8c83dceb4c 100644
--- a/source4/web_server/config.mk
+++ b/source4/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
#######################