From cf3a9741dc7427efb97eff09a3c197a906ce6767 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Mon, 28 Sep 1998 21:43:48 +0000
Subject: Changes to test in configure if capabilities are enabled on a system.
 Changes to get Samba to compile cleanly with the IRIX compiler with the
 options : -fullwarn -woff 1209,1174 (the -woff options are to turn off
 warnings about unused function parameters and controlling loop expressions
 being constants). Split prototype generation as we hit a limit in IRIX nawk.
 Removed "." code in smbd/filename.c (yet again :-). Jeremy. (This used to be
 commit e0567433bd72aec17bf5a54cc292701095d25f09)

---
 source3/rpcclient/cmd_samr.c  |  8 ++++----
 source3/rpcclient/rpcclient.c | 23 +++++------------------
 2 files changed, 9 insertions(+), 22 deletions(-)

(limited to 'source3/rpcclient')

diff --git a/source3/rpcclient/cmd_samr.c b/source3/rpcclient/cmd_samr.c
index c90b0baf25..c45c4c7c23 100644
--- a/source3/rpcclient/cmd_samr.c
+++ b/source3/rpcclient/cmd_samr.c
@@ -132,22 +132,22 @@ void cmd_sam_enum_users(struct client_info *info)
 #ifdef DEBUG_TESTING
 	if (next_token(NULL, tmp, NULL, sizeof(tmp)))
 	{
-		num_entries = strtoul(tmp, (char**)NULL, 16);
+		num_entries = (uint16)strtoul(tmp, (char**)NULL, 16);
 	}
 
 	if (next_token(NULL, tmp, NULL, sizeof(tmp)))
 	{
-		unk_0 = strtoul(tmp, (char**)NULL, 16);
+		unk_0 = (uint16)strtoul(tmp, (char**)NULL, 16);
 	}
 
 	if (next_token(NULL, tmp, NULL, sizeof(tmp)))
 	{
-		acb_mask = strtoul(tmp, (char**)NULL, 16);
+		acb_mask = (uint16)strtoul(tmp, (char**)NULL, 16);
 	}
 
 	if (next_token(NULL, tmp, NULL, sizeof(tmp)))
 	{
-		unk_1 = strtoul(tmp, (char**)NULL, 16);
+		unk_1 = (uint16)strtoul(tmp, (char**)NULL, 16);
 	}
 #endif
 
diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c
index 203b2c00bf..2921144108 100644
--- a/source3/rpcclient/rpcclient.c
+++ b/source3/rpcclient/rpcclient.c
@@ -215,7 +215,6 @@ wait for keyboard activity, swallowing network packets
 static void wait_keyboard(struct cli_state *cli)
 {
   fd_set fds;
-  int selrtn;
   struct timeval timeout;
   
   while (1) 
@@ -226,7 +225,7 @@ static void wait_keyboard(struct cli_state *cli)
 
       timeout.tv_sec = 20;
       timeout.tv_usec = 0;
-      selrtn = sys_select(MAX(cli->fd,fileno(stdin))+1,&fds,&timeout);
+      sys_select(MAX(cli->fd,fileno(stdin))+1,&fds,&timeout);
       
       if (FD_ISSET(fileno(stdin),&fds))
   	return;
@@ -357,11 +356,10 @@ usage on the program
 ****************************************************************************/
 static void usage(char *pname)
 {
-  fprintf(out_hnd, "Usage: %s service <password> [-p port] [-d debuglevel] [-l log] ",
+  fprintf(out_hnd, "Usage: %s service <password> [-d debuglevel] [-l log] ",
 	   pname);
 
   fprintf(out_hnd, "\nVersion %s\n",VERSION);
-  fprintf(out_hnd, "\t-p port               connect to the specified port\n");
   fprintf(out_hnd, "\t-d debuglevel         set the debuglevel\n");
   fprintf(out_hnd, "\t-l log basename.      Basename for log/debug files\n");
   fprintf(out_hnd, "\t-n netbios name.      Use this name as my netbios name\n");
@@ -389,7 +387,6 @@ enum client_action
  int main(int argc,char *argv[])
 {
 	char *pname = argv[0];
-	int port = SMB_PORT;
 	int opt;
 	extern FILE *dbf;
 	extern char *optarg;
@@ -399,9 +396,8 @@ enum client_action
 	char *p;
 	BOOL got_pass = False;
 	char *cmd_str="";
-	int myumask = 0755;
+	mode_t myumask = 0755;
 	enum client_action cli_action = CLIENT_NONE;
-	int ret = 0;
 
 	struct client_info cli_info;
 
@@ -540,7 +536,7 @@ enum client_action
 		cli_action = CLIENT_SVC;
 	}
 
-	while ((opt = getopt(argc, argv,"s:B:O:M:S:i:N:d:Pp:l:hI:EB:U:L:t:m:W:T:D:c:")) != EOF)
+	while ((opt = getopt(argc, argv,"s:B:O:M:S:i:N:d:l:hI:EB:U:L:t:m:W:T:D:c:")) != EOF)
 	{
 		switch (opt)
 		{
@@ -638,12 +634,6 @@ enum client_action
 				break;
 			}
 
-			case 'p':
-			{
-				port = atoi(optarg);
-				break;
-			}
-
 			case 'c':
 			{
 				cmd_str = optarg;
@@ -745,20 +735,17 @@ enum client_action
 		exit(-1);
 	}
 
-	ret = 0;
-
 	switch (cli_action)
 	{
 		case CLIENT_IPC:
 		{
-			ret = process(&cli_info, cmd_str) ? 0 : 1;
+			process(&cli_info, cmd_str) ? 0 : 1;
 			break;
 		}
 
 		default:
 		{
 			fprintf(stderr, "unknown client action requested\n");
-			ret = 1;
 			break;
 		}
 	}
-- 
cgit