summaryrefslogtreecommitdiff
path: root/source4/libcli
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2004-11-14 22:47:39 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:05:48 -0500
commit3757bf5c5bd1e218ea8153964d69c00a164a17e5 (patch)
tree187e157a19728d97a7568ee58c399a352c7a0b99 /source4/libcli
parent7cc0966f513d5ce6b51ef083cdaf7f88d841101a (diff)
downloadsamba-3757bf5c5bd1e218ea8153964d69c00a164a17e5.tar.gz
samba-3757bf5c5bd1e218ea8153964d69c00a164a17e5.tar.bz2
samba-3757bf5c5bd1e218ea8153964d69c00a164a17e5.zip
r3739: Remove a bunch of unused m4 macros
(This used to be commit 2a38b77a1d8674b46028214896e37747c4082f13)
Diffstat (limited to 'source4/libcli')
-rw-r--r--source4/libcli/auth/gensec_krb5.c4
-rw-r--r--source4/libcli/libsmb.m412
-rw-r--r--source4/libcli/libsmb.mk11
3 files changed, 13 insertions, 14 deletions
diff --git a/source4/libcli/auth/gensec_krb5.c b/source4/libcli/auth/gensec_krb5.c
index feb78a016b..97025fa6c4 100644
--- a/source4/libcli/auth/gensec_krb5.c
+++ b/source4/libcli/auth/gensec_krb5.c
@@ -772,14 +772,14 @@ NTSTATUS gensec_krb5_init(void)
{
NTSTATUS ret;
- ret = register_backend("gensec", &gensec_krb5_security_ops);
+ ret = gensec_register(&gensec_krb5_security_ops);
if (!NT_STATUS_IS_OK(ret)) {
DEBUG(0,("Failed to register '%s' gensec backend!\n",
gensec_krb5_security_ops.name));
return ret;
}
- ret = register_backend("gensec", &gensec_ms_krb5_security_ops);
+ ret = gensec_register(&gensec_ms_krb5_security_ops);
if (!NT_STATUS_IS_OK(ret)) {
DEBUG(0,("Failed to register '%s' gensec backend!\n",
gensec_krb5_security_ops.name));
diff --git a/source4/libcli/libsmb.m4 b/source4/libcli/libsmb.m4
deleted file mode 100644
index 9293ea2038..0000000000
--- a/source4/libcli/libsmb.m4
+++ /dev/null
@@ -1,12 +0,0 @@
-dnl # LIBSMB subsystem
-
-SMB_SUBSYSTEM(LIBSMB,[],
- [libcli/clireadwrite.o
- libcli/cliconnect.o
- libcli/clifile.o
- libcli/clilist.o
- libcli/clitrans2.o
- libcli/climessage.o
- libcli/clideltree.o],
- [],
- [LIBCLI LIBRPC SOCKET])
diff --git a/source4/libcli/libsmb.mk b/source4/libcli/libsmb.mk
new file mode 100644
index 0000000000..8d70888d5e
--- /dev/null
+++ b/source4/libcli/libsmb.mk
@@ -0,0 +1,11 @@
+dnl # LIBSMB subsystem
+
+[SUBSYSTEM::LIBSMB]
+REQUIRED_SUBSYSTEMS = LIBCLI LIBRPC SOCKET
+ADD_OBJ_LIST = libcli/clireadwrite.o \
+ libcli/cliconnect.o \
+ libcli/clifile.o \
+ libcli/clilist.o \
+ libcli/clitrans2.o \
+ libcli/climessage.o \
+ libcli/clideltree.o