few cleanups to bring in line with 2.2

diff --git a/source/lib/cmd_interp.c b/source/lib/cmd_interp.c
index 7d40a381361b8a276598424a6c6f54c7ce5672ba..7934dd0ce9b90425758c9b0d7583e667adcb60da 100644 (file)
--- a/source/lib/cmd_interp.c
+++ b/source/lib/cmd_interp.c
@@ -27,7 +27,6 @@
 
 #include "includes.h"
 #include "rpc_parse.h"
-#include "rpc_client.h"
 
 #ifndef REGISTER
 #define REGISTER 0

diff --git a/source/passdb/pdb_smbpasswd.c b/source/passdb/pdb_smbpasswd.c
index 8432a4cc230615e2d12ff1266e02732199a535e0..57253d9b78c8496243719df97f45d1b1d79c7aab 100644 (file)
--- a/source/passdb/pdb_smbpasswd.c
+++ b/source/passdb/pdb_smbpasswd.c
@@ -1160,8 +1160,6 @@ Error was %s\n", pwd->smb_name, pfile2, strerror(errno)));
  ********************************************************************/
 static BOOL build_smb_pass (struct smb_passwd *smb_pw, SAM_ACCOUNT *sampass)
 {
-       uint8   *ptr;
-       
         if (sampass == NULL) 
                return False;
 

diff --git a/source/rpc_client/cli_connect.c b/source/rpc_client/cli_connect.c
index 0eceda4c4cff224d30faa225bb47d75201709be0..ed0112238368c99aec7cc7594803441db6eb6a5c 100644 (file)
--- a/source/rpc_client/cli_connect.c
+++ b/source/rpc_client/cli_connect.c
@@ -24,7 +24,6 @@
 
 #include "includes.h"
 #include "rpc_parse.h"
-#include "rpc_client.h"
 
 
 static struct cli_connection **con_list = NULL;

diff --git a/source/rpc_client/cli_spoolss.c b/source/rpc_client/cli_spoolss.c
index c17db2be85ab63465f0c82bb220f2c13f5f50734..2dd492364b727ec843ae14ee02c4ae9a8ca7cc15 100644 (file)
--- a/source/rpc_client/cli_spoolss.c
+++ b/source/rpc_client/cli_spoolss.c
@@ -24,7 +24,6 @@
 
 #include "includes.h"
 #include "rpc_parse.h"
-#include "rpc_client.h"
 #include "nterr.h"
 
 extern int DEBUGLEVEL;

diff --git a/source/rpc_client/cli_spoolss_notify.c b/source/rpc_client/cli_spoolss_notify.c
index 879a4f129fc50cbbee355b7c42f3e7472d862349..a67b56adc55f95a28e1833181beae7b1a25ad8a8 100644 (file)
--- a/source/rpc_client/cli_spoolss_notify.c
+++ b/source/rpc_client/cli_spoolss_notify.c
@@ -22,7 +22,6 @@
 
 #include "includes.h"
 #include "rpc_parse.h"
-#include "rpc_client.h"
 #include "nterr.h"
 
 extern int DEBUGLEVEL;

diff --git a/source/rpc_client/cli_use.c b/source/rpc_client/cli_use.c
index 93560e9772b5dc350c7815ec5337a5cc8675a78d..5cd50ca5b00519e443604476bc5504e7bc4cfbfb 100644 (file)
--- a/source/rpc_client/cli_use.c
+++ b/source/rpc_client/cli_use.c
@@ -24,7 +24,6 @@
 
 #include "includes.h"
 #include "trans2.h"
-#include "rpc_client.h"
 
 extern int DEBUGLEVEL;
 extern pstring scope;

diff --git a/source/rpc_client/msrpc_spoolss.c b/source/rpc_client/msrpc_spoolss.c
index bee30de8541c72a780dbfc74deb4054c421112e6..4938178352443a1108ebc7eedf2d06784058012c 100644 (file)
--- a/source/rpc_client/msrpc_spoolss.c
+++ b/source/rpc_client/msrpc_spoolss.c
@@ -24,7 +24,6 @@
 #include "includes.h"
 #include "nterr.h"
 #include "rpc_parse.h"
-#include "rpc_client.h"
 #include "rpcclient.h"
 
 extern int DEBUGLEVEL;

diff --git a/source/rpc_client/ncacn_np_use.c b/source/rpc_client/ncacn_np_use.c
index 1a3938b6e9d731b1b75b30cd0808f0e2fcda8b22..cb55feb655b28c3bc1ef7ddfc4e7952338fe1aca 100644 (file)
--- a/source/rpc_client/ncacn_np_use.c
+++ b/source/rpc_client/ncacn_np_use.c
@@ -25,7 +25,6 @@
 
 #include "includes.h"
 #include "rpc_parse.h"
-#include "rpc_client.h"
 #include "trans2.h"
 
 extern int DEBUGLEVEL;

diff --git a/source/rpc_parse/parse_samr.c b/source/rpc_parse/parse_samr.c
index 6600ecca862b642f657807e134858df0860a6a21..7d023d54fc9c14c7c9a2da0c8cf8fa7772f0cc91 100644 (file)
--- a/source/rpc_parse/parse_samr.c
+++ b/source/rpc_parse/parse_samr.c
@@ -26,7 +26,6 @@
 
 #include "includes.h"
 #include "rpc_parse.h"
-#include "rpc_client.h"
 #include "nterr.h"
 
 extern int DEBUGLEVEL;