summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Leighton <lkcl@samba.org>2000-03-06 18:23:36 +0000
committerLuke Leighton <lkcl@samba.org>2000-03-06 18:23:36 +0000
commit10e5544f387bb74ea72cf8cb181636e7166862d9 (patch)
tree1468cf8569e4f6a7b874f3a4975a254daebcde10
parent20d780cb4fa2980686dfe7c84d1c76f168b68615 (diff)
downloadsamba-10e5544f387bb74ea72cf8cb181636e7166862d9.tar.gz
patch from elrond for libtool hack
-rw-r--r--source/Makefile.in31
-rw-r--r--source/ltmain.sh4
-rw-r--r--source/rpc_server/srv_pipe_srv.c14
3 files changed, 35 insertions, 14 deletions
diff --git a/source/Makefile.in b/source/Makefile.in
index 1956e2aa21d..d68375c69cc 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -314,7 +314,7 @@ SAMRNT5LDAPLIB_OBJ = lib/util_pwdb.o lib/domain_namemap.o \
samrd/samr_util.o
# samrd/srv_samr_sam_nt5ldap.o \
# samrd/srv_samr_grp_nt5ldap.o \
-# samrd/srv_samr_als_nt5ldap.o \
+# samrd/srv_samr_als_nt5ldap.o
SAMRPASSLIB_OBJ = rpc_server/srv_lookup.o \
samrd/srv_samr_passdb.o \
@@ -392,14 +392,17 @@ NETLOGOND_OBJ = $(MSRPCD_OBJ) $(NETLOGOND_OBJ1) \
$(SIDDB_OBJ) \
$(UNIXPASSDB_OBJ) $(LIBSTATUS_OBJ) $(PROFILE_OBJ)
-NETLOGOND_LIBS = $(SAMBA_LIBS) $(UBIQXLIB) $(SAM_PWDB_LIB) $(LIBSURS)
+NETLOGOND_LIBS = $(SAMBA_LIBS) $(SAM_PWDB_LIB) \
+ $(LIBSURS) $(UBIQXLIB)
-NETLOGONPASSD_LIBS = $(SAMBA_LIBS) $(UBIQXLIB) $(SAMRPASSLIB) $(SMBPWLIB) \
- $(LIBSURS)
+NETLOGONPASSD_LIBS = $(SAMBA_LIBS) $(SAMRPASSLIB) $(SMBPWLIB) \
+ $(LIBSURS) $(UBIQXLIB)
-NETLOGONTDBD_LIBS = $(SAMBA_LIBS) $(UBIQXLIB) $(SAMRTDBLIB) $(LIBSURS)
+NETLOGONTDBD_LIBS = $(SAMBA_LIBS) $(SAMRTDBLIB) \
+ $(LIBSURS) $(UBIQXLIB)
-NETLOGONNT5LDAPD_LIBS = $(SAMBA_LIBS) $(UBIQXLIB) $(SAMRNT5LDAPLIB) $(LIBSURS)
+NETLOGONNT5LDAPD_LIBS = $(SAMBA_LIBS) $(SAMRNT5LDAPLIB) \
+ $(LIBSURS) $(UBIQXLIB)
SAMRD_OBJ = $(MSRPCD_OBJ) $(SAMRD_OBJ1) \
$(RPC_SRVUTIL_OBJ) \
@@ -411,17 +414,17 @@ LIBSURS_OBJ = lib/surs.o lib/sursalgdomonly.o \
lib/sursalgnt5ldap.o \
lib/surstdb.o
-SAMRD_LIBS = $(SAMBA_LIBS) $(UBIQXLIB) $(SAM_PWDB_LIB) \
- $(LIBSURS)
+SAMRD_LIBS = $(SAMBA_LIBS) $(SAM_PWDB_LIB) \
+ $(LIBSURS) $(UBIQXLIB)
-SAMRPASSD_LIBS = $(SAMBA_LIBS) $(UBIQXLIB) $(SAMRPASSLIB) $(SMBPWLIB) \
- $(LIBSURS)
+SAMRPASSD_LIBS = $(SAMBA_LIBS) $(SAMRPASSLIB) $(SMBPWLIB) \
+ $(LIBSURS) $(UBIQXLIB)
-SAMRTDBD_LIBS = $(SAMBA_LIBS) $(UBIQXLIB) $(SAMRTDBLIB) \
- $(LIBSURS)
+SAMRTDBD_LIBS = $(SAMBA_LIBS) $(SAMRTDBLIB) \
+ $(LIBSURS) $(UBIQXLIB)
-SAMRNT5LDAPD_LIBS = $(SAMBA_LIBS) $(UBIQXLIB) $(SAMRNT5LDAPLIB) \
- $(LIBSURS)
+SAMRNT5LDAPD_LIBS = $(SAMBA_LIBS) $(SAMRNT5LDAPLIB) \
+ $(LIBSURS) $(UBIQXLIB)
NMBD_OBJ1 = nmbd/asyncdns.o nmbd/nmbd.o nmbd/nmbd_become_dmb.o \
nmbd/nmbd_become_lmb.o nmbd/nmbd_browserdb.o \
diff --git a/source/ltmain.sh b/source/ltmain.sh
index ba7a15576f9..25d3870e926 100644
--- a/source/ltmain.sh
+++ b/source/ltmain.sh
@@ -3462,6 +3462,10 @@ libdir='$install_libdir'\
$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
continue
fi
+ # quick and dirty hack by Elrond <Elrond@Wunder-Nett.org>
+ # to get libtool work with paths in its
+ # output names.
+ file=`$echo "X$file" | $Xsed -e 's%/%_%g'`
outputname="$tmpdir/$file"
# Replace the output file specification.
relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
diff --git a/source/rpc_server/srv_pipe_srv.c b/source/rpc_server/srv_pipe_srv.c
index 8eb9f9fc889..2c48723557a 100644
--- a/source/rpc_server/srv_pipe_srv.c
+++ b/source/rpc_server/srv_pipe_srv.c
@@ -452,8 +452,18 @@ static BOOL api_pipe_request(rpcsrv_struct * l, const char *name,
return False;
}
+ if (num_cmds == 0)
+ {
+ DEBUG(0,("no commands to process!\n"));
+ }
+ else
+ {
+ DEBUG(10,("pipe name: %s\n", name));
+ }
+
for (i = 0; i < num_cmds; i++)
{
+ DEBUG(10,("search name: %s\n", api_fd_commands[i]->pipe_clnt_name));
if (strequal(api_fd_commands[i]->pipe_clnt_name, name) &&
api_fd_commands[i]->fn != NULL)
{
@@ -594,6 +604,10 @@ static BOOL rpc_redir_local(rpcsrv_struct * l, prs_struct * req,
api_pipe_request(l, name,
resp);
}
+ if (!reply)
+ {
+ DEBUG(10,("dce/rpc request failed\n"));
+ }
}
break;
}