[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  2c99eef... s3-build: remove pointless RPC_PARSE_OBJ2.
       via  0f26493... s3-waf: remove pointless RPC_PARSE_SRC2.
      from  734f581... s3: Replace some cli_errstr calls by nt_errstr

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 2c99eef35561cf83b3e75d5d56d4fb03311c4aa8
Author: Günther Deschner <gd at samba.org>
Date:   Fri Aug 13 16:01:56 2010 +0200

    s3-build: remove pointless RPC_PARSE_OBJ2.
    
    Guenther

commit 0f264935e0946f5d369df643028d1cf4b408cf76
Author: Günther Deschner <gd at samba.org>
Date:   Fri Aug 13 16:02:28 2010 +0200

    s3-waf: remove pointless RPC_PARSE_SRC2.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source3/Makefile.in   |   10 ++++------
 source3/wscript_build |    6 ++----
 2 files changed, 6 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 3599114..ea00b75 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -359,7 +359,7 @@ LIBNDR_GEN_OBJ = librpc/gen_ndr/ndr_wkssvc.o \
 # that requires knowledge of security contexts
 REG_PARSE_PRS_OBJ = registry/reg_parse_prs.o
 
-RPC_PARSE_OBJ2 = rpc_client/init_netlogon.o \
+RPC_PARSE_OBJ = rpc_client/init_netlogon.o \
 		 rpc_client/init_lsa.o
 
 LIBREPLACE_OBJ = @LIBREPLACE_OBJS@
@@ -700,8 +700,6 @@ RPC_ECHO_OBJ = rpc_server/srv_echo_nt.o librpc/gen_ndr/srv_echo.o
 
 RPC_SERVER_OBJ = @RPC_STATIC@ $(RPC_PIPE_OBJ) $(NPA_TSTREAM_OBJ)
 
-RPC_PARSE_OBJ = $(RPC_PARSE_OBJ2)
-
 RPC_CLIENT_OBJ = rpc_client/cli_pipe.o \
 		 librpc/rpc/dcerpc_gssapi.o \
 		 librpc/rpc/dcerpc_spnego.o \
@@ -937,7 +935,7 @@ SMBCONTROL_OBJ = utils/smbcontrol.o $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
 SMBTREE_OBJ = utils/smbtree.o $(PARAM_OBJ) \
              $(PROFILE_OBJ) $(LIB_NONSMBD_OBJ) $(LIBSMB_OBJ) \
 	     $(KRBCLIENT_OBJ) $(POPT_LIB_OBJ) \
-             $(RPC_CLIENT_OBJ) ../librpc/rpc/binding.o $(RPC_PARSE_OBJ2) \
+             $(RPC_CLIENT_OBJ) ../librpc/rpc/binding.o $(RPC_PARSE_OBJ) \
              $(RPC_CLIENT_OBJ1) \
 	     $(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ) \
 	     $(LIBMSRPC_GEN_OBJ)
@@ -1031,7 +1029,7 @@ CLIENT_OBJ1 = client/client.o client/clitar.o $(RPC_CLIENT_OBJ) \
 	      ../librpc/rpc/binding.o \
 	      client/dnsbrowse.o \
 	      $(RPC_CLIENT_OBJ1) \
-	      $(RPC_PARSE_OBJ2)
+	      $(RPC_PARSE_OBJ)
 
 CLIENT_OBJ = $(CLIENT_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) \
 	     $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) $(LIBMSRPC_GEN_OBJ) \
@@ -1383,7 +1381,7 @@ RPC_OPEN_TCP_OBJ = torture/rpc_open_tcp.o \
 		   $(SMBLDAP_OBJ) $(GROUPDB_OBJ) \
 		   $(LIB_NONSMBD_OBJ) \
 		   $(KRBCLIENT_OBJ) \
-		   $(RPC_PARSE_OBJ2) \
+		   $(RPC_PARSE_OBJ) \
 		   $(RPC_CLIENT_OBJ1) \
 		   librpc/rpc/rpc_common.o \
 		   rpc_client/cli_pipe.o \
diff --git a/source3/wscript_build b/source3/wscript_build
index 68875de..59d84d7 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -92,7 +92,7 @@ LIBNDR_GEN_SRC = '''../librpc/gen_ndr/ndr_wkssvc.c
 # that requires knowledge of security contexts
 REG_PARSE_PRS_SRC = '''registry/reg_parse_prs.c'''
 
-RPC_PARSE_SRC2 = '''rpc_client/init_netlogon.c
+RPC_PARSE_SRC = '''rpc_client/init_netlogon.c
                  rpc_client/init_lsa.c'''
 
 LIBREPLACE_SRC = '''${LIBREPLACE_SRCS}'''
@@ -439,8 +439,6 @@ RPC_ECHO_SRC = '''rpc_server/srv_echo_nt.c ../librpc/gen_ndr/srv_echo.c'''
 #TODO: RPC_SERVER_SRC used to include RPC_STATIC modules
 RPC_SERVER_SRC = '''${RPC_PIPE_SRC} ${NPA_TSTREAM_SRC}'''
 
-RPC_PARSE_SRC = '''${RPC_PARSE_SRC2}'''
-
 RPC_CLIENT_SRC = '''rpc_client/cli_pipe.c
                     librpc/rpc/rpc_common.c
                     librpc/rpc/dcerpc_gssapi.c
@@ -831,7 +829,7 @@ DISPLAY_SEC_SRC= '../libcli/security/display_sec.c'
 
 CLIENT_SRC1 = '''client/client.c client/clitar.c ${RPC_CLIENT_SRC}
                  ../librpc/rpc/binding.c client/dnsbrowse.c
-                 ${RPC_CLIENT_SRC1} ${RPC_PARSE_SRC2}'''
+                 ${RPC_CLIENT_SRC1} ${RPC_PARSE_SRC}'''
 
 CLIENT_SRC = '''${CLIENT_SRC1} ${LIBMSRPC_GEN_SRC}
                 ${READLINE_SRC} ${DISPLAY_SEC_SRC}'''


-- 
Samba Shared Repository