summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-05-03 09:07:38 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:05:33 -0500
commit72a5cbadc1498b58bc7873a450de4b50e322a676 (patch)
tree6f369b9d1ff46e0c7b662873e9aea697bb14635b
parent9177f9cf0961468342dded643be535fc427d2667 (diff)
downloadsamba-72a5cbadc1498b58bc7873a450de4b50e322a676.tar.gz
samba-72a5cbadc1498b58bc7873a450de4b50e322a676.tar.bz2
samba-72a5cbadc1498b58bc7873a450de4b50e322a676.zip
r15406: Move 'smbreadline' out of libreplace as it doesn't replace functionality
not available on some platforms but is a Samba-specific library. (This used to be commit e9d3660fa6678424e5159708a1aa572824926c8e)
-rw-r--r--source4/client/client.c2
-rw-r--r--source4/lib/registry/tools/regshell.c2
-rw-r--r--source4/lib/replace/README1
-rw-r--r--source4/lib/replace/config.m41
-rw-r--r--source4/lib/smbreadline/readline.m4 (renamed from source4/lib/replace/readline.m4)4
-rw-r--r--source4/lib/smbreadline/smbreadline.c (renamed from source4/lib/replace/readline.c)0
-rw-r--r--source4/lib/smbreadline/smbreadline.h (renamed from source4/lib/replace/smbreadline.h)0
7 files changed, 5 insertions, 5 deletions
diff --git a/source4/client/client.c b/source4/client/client.c
index a90e597b0b..2646332d03 100644
--- a/source4/client/client.c
+++ b/source4/client/client.c
@@ -38,7 +38,7 @@
#include "system/time.h" /* needed by some systems for asctime() */
#include "libcli/resolve/resolve.h"
#include "libcli/security/security.h"
-#include "lib/replace/smbreadline.h"
+#include "lib/smbreadline/smbreadline.h"
#include "librpc/gen_ndr/ndr_nbt.h"
static int io_bufsize = 64512;
diff --git a/source4/lib/registry/tools/regshell.c b/source4/lib/registry/tools/regshell.c
index 6da64d14a8..a1a88378c9 100644
--- a/source4/lib/registry/tools/regshell.c
+++ b/source4/lib/registry/tools/regshell.c
@@ -25,7 +25,7 @@
#include "lib/events/events.h"
#include "lib/registry/reg_backend_rpc.h"
#include "system/time.h"
-#include "lib/replace/smbreadline.h"
+#include "lib/smbreadline/smbreadline.h"
#include "librpc/gen_ndr/ndr_security.h"
/*
diff --git a/source4/lib/replace/README b/source4/lib/replace/README
index a3e9d87072..9760c75b80 100644
--- a/source4/lib/replace/README
+++ b/source4/lib/replace/README
@@ -50,6 +50,7 @@ pread
pwrite
getpass
readline (the library)
+inet_ntoa
Types:
bool
diff --git a/source4/lib/replace/config.m4 b/source4/lib/replace/config.m4
index 12e3607bb4..aec9f5805c 100644
--- a/source4/lib/replace/config.m4
+++ b/source4/lib/replace/config.m4
@@ -140,7 +140,6 @@ AC_INCLUDES_DEFAULT
#endif]
)
-sinclude(lib/replace/readline.m4)
sinclude(lib/replace/getpass.m4)
dnl VA_COPY
diff --git a/source4/lib/replace/readline.m4 b/source4/lib/smbreadline/readline.m4
index 34b538f10a..cff7ece126 100644
--- a/source4/lib/replace/readline.m4
+++ b/source4/lib/smbreadline/readline.m4
@@ -72,10 +72,10 @@ AC_MSG_CHECKING(whether to use extern readline)
if test x"$EXTERNAL_READLINE" = x"yes"; then
AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_LIBREADLINE,1,[Whether the system has readline])
- SMB_SUBSYSTEM(SMBREADLINE, [lib/replace/readline.o], [READLINE])
+ SMB_SUBSYSTEM(SMBREADLINE, [lib/smbreadline/smbreadline.o], [READLINE])
SMB_EXT_LIB(READLINE, [${TERMLIBS}])
SMB_ENABLE(READLINE,YES)
else
- SMB_SUBSYSTEM(SMBREADLINE, [lib/replace/readline.o], [])
+ SMB_SUBSYSTEM(SMBREADLINE, [lib/smbreadline/smbreadline.o], [])
AC_MSG_RESULT(no)
fi
diff --git a/source4/lib/replace/readline.c b/source4/lib/smbreadline/smbreadline.c
index 78febf5000..78febf5000 100644
--- a/source4/lib/replace/readline.c
+++ b/source4/lib/smbreadline/smbreadline.c
diff --git a/source4/lib/replace/smbreadline.h b/source4/lib/smbreadline/smbreadline.h
index cde2b47a24..cde2b47a24 100644
--- a/source4/lib/replace/smbreadline.h
+++ b/source4/lib/smbreadline/smbreadline.h