3 files changed, 6 insertions, 28 deletions

diff --git a/source3/rpcclient/cmd_lsarpc.c b/source3/rpcclient/cmd_lsarpc.c
index 77b61c8a2f..a574f2e128 100644
--- a/source3/rpcclient/cmd_lsarpc.c
+++ b/source3/rpcclient/cmd_lsarpc.c
@@ -235,7 +235,9 @@ static uint32 cmd_lsa_enum_trust_dom(struct cli_state *cli, int argc, char **arg
 	BOOL got_policy_hnd = False;
 	DOM_SID *domain_sids;
 	char **domain_names;
-	int num_domains, enum_ctx = 0, i;
+	uint32 enum_ctx = 0;
+	uint32 num_domains;
+	int i;
 
 	if (argc != 1) {
 		printf("Usage: %s\n", argv[0]);
diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c
index 9934808c77..8cc740f072 100644
--- a/source3/rpcclient/rpcclient.c
+++ b/source3/rpcclient/rpcclient.c
@@ -436,11 +436,9 @@ static void usage(char *pname)
 {
 	extern char 		*optarg;
 	extern int 		optind;
-	struct in_addr 		dest_ip;
 	extern pstring 		global_myname;
 	BOOL 			got_pass = False;
 	BOOL 			interactive = True;
-	BOOL 			have_ip = False;
 	int 			opt;
 	int 			olddebug;
 	pstring 		cmdstr = "", 
@@ -468,7 +466,7 @@ static void usage(char *pname)
 	argv++;
 	argc--;
 
-	while ((opt = getopt(argc, argv, "A:s:Nd:I:U:W:c:l:")) != EOF) {
+	while ((opt = getopt(argc, argv, "A:s:Nd:U:W:c:l:")) != EOF) {
 		switch (opt) {
 		case 'A':
 			/* only get the username, password, and domain from the file */
@@ -485,11 +483,6 @@ static void usage(char *pname)
 			DEBUGLEVEL = atoi(optarg);
 			break;
 
-		case 'I':
-			dest_ip = *interpret_addr2(optarg);
-			have_ip = True;
-			break;
-			
 		case 'l':
 			slprintf(debugf, sizeof(debugf) - 1, "%s.client", optarg);
 			interactive = False;
@@ -592,10 +585,9 @@ static void usage(char *pname)
 	if (cmdstr[0]) {
 		char 	*cmd;
 		char 	*p = cmdstr;
-		uint32 	result;
 
 		while((cmd=next_command(&p)) != NULL) {
-			result = process_cmd(&cli, cmd);
+			process_cmd(&cli, cmd);
 		}
 
 		return 0;
@@ -606,7 +598,6 @@ static void usage(char *pname)
 	while(1) {
 		pstring prompt, cmd;
 		char *line;
-		uint32 result;
 
 		ZERO_STRUCT(cmd);
 		
@@ -614,9 +605,8 @@ static void usage(char *pname)
 
 		line = smb_readline(prompt, NULL, NULL);
 
-		result = process_cmd(&cli, line);
+		process_cmd(&cli, line);
 	}
 	
 	return 0;
 }
-
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index fe1c02e46c..54973d17a7 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -1428,9 +1428,6 @@ static canon_ace *canonicalise_acl( files_struct *fsp, SMB_ACL_T posix_acl, SMB_
 	canon_ace *list_head = NULL;
 	canon_ace *ace = NULL;
 	canon_ace *next_ace = NULL;
-	canon_ace *owner_ace = NULL;
-	canon_ace *group_ace = NULL;
-	canon_ace *other_ace = NULL;
 	int entry_id = SMB_ACL_FIRST_ENTRY;
 	SMB_ACL_ENTRY_T entry;
 	size_t ace_count;
@@ -1523,17 +1520,6 @@ static canon_ace *canonicalise_acl( files_struct *fsp, SMB_ACL_T posix_acl, SMB_
 		ace->unix_ug = unix_ug;
 		ace->owner_type = owner_type;
 
-		/*
-		 * Remember the user/group/other ACE entries.
-		 */
-
-		if (tagtype == SMB_ACL_USER_OBJ)
-			owner_ace = ace;
-		else if (tagtype == SMB_ACL_GROUP_OBJ)
-			group_ace = ace;
-		else if (tagtype == SMB_ACL_OTHER)
-			other_ace = ace;
-
 		DLIST_ADD(list_head, ace);
 	}