mirror of
https://github.com/samba-team/samba.git
synced 2025-12-03 04:23:50 +03:00
r10001: adding in libmsrpc from Chris Nicholls (SoC project). not built by default per conversation with Jeremy until the rpc changes from trunk are merged back
This commit is contained in:
committed by
Gerald (Jerry) Carter
parent
554c22faee
commit
e813de1e52
@@ -137,7 +137,7 @@ BIN_PROGS = $(BIN_PROGS1) $(BIN_PROGS2) $(BIN_PROGS3) @EXTRA_BIN_PROGS@
|
|||||||
EVERYTHING_PROGS = bin/debug2html@EXEEXT@ bin/smbfilter@EXEEXT@ bin/talloctort@EXEEXT@ \
|
EVERYTHING_PROGS = bin/debug2html@EXEEXT@ bin/smbfilter@EXEEXT@ bin/talloctort@EXEEXT@ \
|
||||||
bin/log2pcap@EXEEXT@
|
bin/log2pcap@EXEEXT@
|
||||||
|
|
||||||
SHLIBS = @SHLIB_PROGS@ @LIBSMBCLIENT@
|
SHLIBS = @SHLIB_PROGS@ @LIBSMBCLIENT@
|
||||||
|
|
||||||
SCRIPTS = $(srcdir)/script/smbtar $(builddir)/script/findsmb
|
SCRIPTS = $(srcdir)/script/smbtar $(builddir)/script/findsmb
|
||||||
|
|
||||||
@@ -513,6 +513,11 @@ LIBSMBCLIENT_OBJ = libsmb/libsmbclient.o libsmb/libsmb_compat.o \
|
|||||||
$(LIBMSRPC_OBJ) $(RPC_PARSE_OBJ) \
|
$(LIBMSRPC_OBJ) $(RPC_PARSE_OBJ) \
|
||||||
$(SECRETS_OBJ) $(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ)
|
$(SECRETS_OBJ) $(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ)
|
||||||
|
|
||||||
|
CAC_OBJ = $(LIBSMBCLIENT_OBJ) \
|
||||||
|
libmsrpc/libmsrpc.o libmsrpc/libmsrpc_internal.o \
|
||||||
|
libmsrpc/cac_lsarpc.o libmsrpc/cac_winreg.o libmsrpc/cac_samr.o \
|
||||||
|
libmsrpc/cac_svcctl.o
|
||||||
|
|
||||||
# This shared library is intended for linking with unit test programs
|
# This shared library is intended for linking with unit test programs
|
||||||
# to test Samba internals. It's called libbigballofmud.so to
|
# to test Samba internals. It's called libbigballofmud.so to
|
||||||
# discourage casual usage.
|
# discourage casual usage.
|
||||||
@@ -637,6 +642,8 @@ WINBIND_WINS_NSS_PICOBJS = $(WINBIND_WINS_NSS_OBJ:.o=.@PICSUFFIX@)
|
|||||||
PICOBJS = $(SMBWRAPPER_OBJ:.o=.@PICSUFFIX@)
|
PICOBJS = $(SMBWRAPPER_OBJ:.o=.@PICSUFFIX@)
|
||||||
LIBSMBCLIENT_PICOBJS = $(LIBSMBCLIENT_OBJ:.o=.@PICSUFFIX@)
|
LIBSMBCLIENT_PICOBJS = $(LIBSMBCLIENT_OBJ:.o=.@PICSUFFIX@)
|
||||||
|
|
||||||
|
CAC_PICOBJS = $(CAC_OBJ:.o=.@PICSUFFIX@)
|
||||||
|
|
||||||
PAM_SMBPASS_OBJ_0 = pam_smbpass/pam_smb_auth.o pam_smbpass/pam_smb_passwd.o \
|
PAM_SMBPASS_OBJ_0 = pam_smbpass/pam_smb_auth.o pam_smbpass/pam_smb_passwd.o \
|
||||||
pam_smbpass/pam_smb_acct.o pam_smbpass/support.o \
|
pam_smbpass/pam_smb_acct.o pam_smbpass/support.o \
|
||||||
$(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
|
$(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
|
||||||
@@ -738,7 +745,9 @@ wins : SHOWFLAGS @WINBIND_WINS_NSS@
|
|||||||
|
|
||||||
modules: SHOWFLAGS proto_exists $(MODULES)
|
modules: SHOWFLAGS proto_exists $(MODULES)
|
||||||
|
|
||||||
everything: all libsmbclient debug2html smbfilter talloctort modules torture \
|
cac: SHOWFLAGS bin/libmsrpc.@SHLIBEXT@ bin/libmsrpc.a
|
||||||
|
|
||||||
|
everything: all libsmbclient debug2html smbfilter talloctort modules torture cac \
|
||||||
$(EVERYTHING_PROGS)
|
$(EVERYTHING_PROGS)
|
||||||
|
|
||||||
.SUFFIXES:
|
.SUFFIXES:
|
||||||
@@ -1007,6 +1016,17 @@ bin/libsmbclient.a: $(LIBSMBCLIENT_PICOBJS)
|
|||||||
@echo Linking libsmbclient non-shared library $@
|
@echo Linking libsmbclient non-shared library $@
|
||||||
@-$(AR) -rc $@ $(LIBSMBCLIENT_PICOBJS)
|
@-$(AR) -rc $@ $(LIBSMBCLIENT_PICOBJS)
|
||||||
|
|
||||||
|
|
||||||
|
bin/libmsrpc.@SHLIBEXT@: $(CAC_PICOBJS)
|
||||||
|
@echo Linking libmsrpc shared library $@
|
||||||
|
@$(SHLD) $(LDSHFLAGS) -o $@ $(CAC_PICOBJS) $(LDFLAGS) $(LIBS) \
|
||||||
|
@SONAMEFLAG@`basename $@`
|
||||||
|
|
||||||
|
bin/libmsrpc.a: $(CAC_PICOBJS)
|
||||||
|
@echo Linking libmsrpc non-shared library $@
|
||||||
|
@-$(AR) -rc $@ $(CAC_PICOBJS)
|
||||||
|
|
||||||
|
|
||||||
# This is probably wrong for anything other than the GNU linker.
|
# This is probably wrong for anything other than the GNU linker.
|
||||||
bin/libbigballofmud.@SHLIBEXT@: $(LIBBIGBALLOFMUD_PICOBJS)
|
bin/libbigballofmud.@SHLIBEXT@: $(LIBBIGBALLOFMUD_PICOBJS)
|
||||||
@echo Linking bigballofmud shared library $@
|
@echo Linking bigballofmud shared library $@
|
||||||
@@ -1275,9 +1295,6 @@ bin/pam_smbpass.@SHLIBEXT@: $(PAM_SMBPASS_PICOOBJ)
|
|||||||
@echo "Linking shared library $@"
|
@echo "Linking shared library $@"
|
||||||
@$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_PICOOBJ) -lpam $(DYNEXP) $(LIBS) -lc $(LDAP_LIBS) $(KRB5LIBS)
|
@$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_PICOOBJ) -lpam $(DYNEXP) $(LIBS) -lc $(LDAP_LIBS) $(KRB5LIBS)
|
||||||
|
|
||||||
bin/libmsrpc.a: $(LIBMSRPC_PICOBJ)
|
|
||||||
@-$(AR) -rc $@ $(LIBMSRPC_PICOBJ)
|
|
||||||
|
|
||||||
bin/tdbbackup@EXEEXT@: $(TDBBACKUP_OBJ) bin/.dummy
|
bin/tdbbackup@EXEEXT@: $(TDBBACKUP_OBJ) bin/.dummy
|
||||||
@echo Linking $@
|
@echo Linking $@
|
||||||
@$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) $(LIBS) $(TDBBACKUP_OBJ) @SOCKWRAP@
|
@$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) $(LIBS) $(TDBBACKUP_OBJ) @SOCKWRAP@
|
||||||
|
|||||||
@@ -835,26 +835,29 @@ SMBCSRV *smbc_attr_server(SMBCCTX *context,
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!cli_nt_session_open(ipc_cli, PI_LSARPC)) {
|
if(pol) {
|
||||||
DEBUG(1, ("cli_nt_session_open fail!\n"));
|
|
||||||
errno = ENOTSUP;
|
|
||||||
cli_shutdown(ipc_cli);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Some systems don't support SEC_RIGHTS_MAXIMUM_ALLOWED,
|
if (!cli_nt_session_open(ipc_cli, PI_LSARPC)) {
|
||||||
but NT sends 0x2000000 so we might as well do it too. */
|
DEBUG(1, ("cli_nt_session_open fail!\n"));
|
||||||
|
errno = ENOTSUP;
|
||||||
nt_status = cli_lsa_open_policy(ipc_cli,
|
cli_shutdown(ipc_cli);
|
||||||
ipc_cli->mem_ctx,
|
return NULL;
|
||||||
True,
|
}
|
||||||
GENERIC_EXECUTE_ACCESS,
|
|
||||||
pol);
|
/* Some systems don't support SEC_RIGHTS_MAXIMUM_ALLOWED,
|
||||||
|
but NT sends 0x2000000 so we might as well do it too. */
|
||||||
if (!NT_STATUS_IS_OK(nt_status)) {
|
|
||||||
errno = smbc_errno(context, ipc_cli);
|
nt_status = cli_lsa_open_policy(ipc_cli,
|
||||||
cli_shutdown(ipc_cli);
|
ipc_cli->mem_ctx,
|
||||||
return NULL;
|
True,
|
||||||
|
GENERIC_EXECUTE_ACCESS,
|
||||||
|
pol);
|
||||||
|
|
||||||
|
if (!NT_STATUS_IS_OK(nt_status)) {
|
||||||
|
errno = smbc_errno(context, ipc_cli);
|
||||||
|
cli_shutdown(ipc_cli);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ipc_srv = SMB_MALLOC_P(SMBCSRV);
|
ipc_srv = SMB_MALLOC_P(SMBCSRV);
|
||||||
|
|||||||
Reference in New Issue
Block a user