sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-28 01:58:17 +03:00
Code

r7166: Move replacement stuff to seperate directory

Browse Source 
(easier to add win32-specific bits later)
Trim LIBBASIC a bit more
(This used to be commit fc7f519e4ae2051e9515df5f549c8e1842b7e70b)
This commit is contained in:
Jelmer Vernooij 2005-06-01 10:16:35 +00:00 committed by Gerald (Jerry) Carter
parent b2b886e38b
commit e4a505192d
6 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source4/lib/basic.mk
View File

@ -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 = \

6
source4/lib/dprintf.c
View File

@ -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

0
source4/lib/replace.c → source4/lib/replace/replace.c
View File

0
source4/lib/snprintf.c → source4/lib/replace/snprintf.c
View File

2
source4/lib/util_file.c
View File

@ -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;

2
source4/web_server/config.mk
View File

@ -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
#######################