svn commit: samba r10001 - in branches/SAMBA_3_0/source: . libsmb

jerry at samba.org jerry at samba.org
Sat Sep 3 16:40:08 GMT 2005


Author: jerry
Date: 2005-09-03 16:40:05 +0000 (Sat, 03 Sep 2005)
New Revision: 10001

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10001

Log:
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
Modified:
   branches/SAMBA_3_0/source/Makefile.in
   branches/SAMBA_3_0/source/libsmb/libsmbclient.c


Changeset:
Modified: branches/SAMBA_3_0/source/Makefile.in
===================================================================
--- branches/SAMBA_3_0/source/Makefile.in	2005-09-03 16:39:47 UTC (rev 10000)
+++ branches/SAMBA_3_0/source/Makefile.in	2005-09-03 16:40:05 UTC (rev 10001)
@@ -137,7 +137,7 @@
 EVERYTHING_PROGS = bin/debug2html at EXEEXT@ bin/smbfilter at EXEEXT@ bin/talloctort at EXEEXT@ \
 	bin/log2pcap at EXEEXT@
 
-SHLIBS = @SHLIB_PROGS@ @LIBSMBCLIENT@
+SHLIBS = @SHLIB_PROGS@ @LIBSMBCLIENT@ 
 
 SCRIPTS = $(srcdir)/script/smbtar $(builddir)/script/findsmb
 
@@ -513,6 +513,11 @@
 		   $(LIBMSRPC_OBJ) $(RPC_PARSE_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
 # to test Samba internals.  It's called libbigballofmud.so to
 # discourage casual usage.
@@ -637,6 +642,8 @@
 PICOBJS = $(SMBWRAPPER_OBJ:.o=. at PICSUFFIX@)
 LIBSMBCLIENT_PICOBJS = $(LIBSMBCLIENT_OBJ:.o=. at PICSUFFIX@)
 
+CAC_PICOBJS = $(CAC_OBJ:.o=. at PICSUFFIX@)
+
 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 \
                $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
@@ -738,7 +745,9 @@
 
 modules: SHOWFLAGS proto_exists $(MODULES)
 
-everything: all libsmbclient debug2html smbfilter talloctort modules torture \
+cac: SHOWFLAGS bin/libmsrpc. at SHLIBEXT@ bin/libmsrpc.a
+
+everything: all libsmbclient debug2html smbfilter talloctort modules torture cac \
 	$(EVERYTHING_PROGS)
 
 .SUFFIXES:
@@ -1007,6 +1016,17 @@
 	@echo Linking libsmbclient non-shared library $@
 	@-$(AR) -rc $@ $(LIBSMBCLIENT_PICOBJS)
 
+
+bin/libmsrpc. at 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. 
 bin/libbigballofmud. at SHLIBEXT@: $(LIBBIGBALLOFMUD_PICOBJS)
 	@echo Linking bigballofmud shared library $@
@@ -1275,9 +1295,6 @@
 	@echo "Linking shared library $@"
 	@$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_PICOOBJ) -lpam $(DYNEXP) $(LIBS) -lc $(LDAP_LIBS) $(KRB5LIBS)
 
-bin/libmsrpc.a: $(LIBMSRPC_PICOBJ)
-	@-$(AR) -rc $@ $(LIBMSRPC_PICOBJ) 
-
 bin/tdbbackup at EXEEXT@: $(TDBBACKUP_OBJ) bin/.dummy
 	@echo Linking $@
 	@$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) $(LIBS) $(TDBBACKUP_OBJ) @SOCKWRAP@

Modified: branches/SAMBA_3_0/source/libsmb/libsmbclient.c
===================================================================
--- branches/SAMBA_3_0/source/libsmb/libsmbclient.c	2005-09-03 16:39:47 UTC (rev 10000)
+++ branches/SAMBA_3_0/source/libsmb/libsmbclient.c	2005-09-03 16:40:05 UTC (rev 10001)
@@ -835,26 +835,29 @@
                         return NULL;
                 }
 
-                if (!cli_nt_session_open(ipc_cli, PI_LSARPC)) {
-                        DEBUG(1, ("cli_nt_session_open fail!\n"));
-                        errno = ENOTSUP;
-                        cli_shutdown(ipc_cli);
-                        return NULL;
-                }
+                if(pol) {
 
-                /* Some systems don't support SEC_RIGHTS_MAXIMUM_ALLOWED,
-                   but NT sends 0x2000000 so we might as well do it too. */
-        
-                nt_status = cli_lsa_open_policy(ipc_cli,
-                                                ipc_cli->mem_ctx,
-                                                True, 
-                                                GENERIC_EXECUTE_ACCESS,
-                                                pol);
-        
-                if (!NT_STATUS_IS_OK(nt_status)) {
-                        errno = smbc_errno(context, ipc_cli);
-                        cli_shutdown(ipc_cli);
-                        return NULL;
+                       if (!cli_nt_session_open(ipc_cli, PI_LSARPC)) {
+                         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,
+                         but NT sends 0x2000000 so we might as well do it too. */
+
+                      nt_status = cli_lsa_open_policy(ipc_cli,
+                            ipc_cli->mem_ctx,
+                            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);



More information about the samba-cvs mailing list