summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Sharpe <sharpe@samba.org>1998-09-27 08:29:50 +0000
committerRichard Sharpe <sharpe@samba.org>1998-09-27 08:29:50 +0000
commitecd8ca2431ef949a66433b3a72217dd485b1b300 (patch)
treeb9bb30d9c2e943f2ac429e4907f573cc23ea902e
parent6da95a6f1d17ad69ab572fbc627167f5edb593fb (diff)
downloadsamba-ecd8ca2431ef949a66433b3a72217dd485b1b300.tar.gz
samba-ecd8ca2431ef949a66433b3a72217dd485b1b300.tar.bz2
samba-ecd8ca2431ef949a66433b3a72217dd485b1b300.zip
Fixed up more possibly uninitialized variables.
Now only two compilation warnings seem to be left. Luke may want to check the changes I made. (This used to be commit 2456c95c1664a57aa939695c884ec666ec8168ec)
-rw-r--r--source3/client/client.c6
-rw-r--r--source3/rpcclient/cmd_samr.c2
-rw-r--r--source3/rpcclient/rpcclient.c5
-rw-r--r--source3/utils/smbpasswd.c2
4 files changed, 9 insertions, 6 deletions
diff --git a/source3/client/client.c b/source3/client/client.c
index 1d3623aef2..5d3f497ab1 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -3371,7 +3371,7 @@ static void cmd_help(char *dum_in, char *dum_out)
}
}
-
+#ifdef 0
/****************************************************************************
wait for keyboard activity, swallowing network packets
@@ -3406,7 +3406,7 @@ static void wait_keyboard(char *buffer)
chkpath("\\",False);
}
}
-
+#endif
#ifdef HAVE_LIBREADLINE
/****************************************************************************
@@ -3837,7 +3837,7 @@ static void usage(char *pname)
if (getenv("PASSWD_FD") || getenv("PASSWD_FILE")) {
int fd = -1;
- BOOL close_it;
+ BOOL close_it = False;
pstring spec;
char pass[128];
diff --git a/source3/rpcclient/cmd_samr.c b/source3/rpcclient/cmd_samr.c
index 6f7cdcada1..c90b0baf25 100644
--- a/source3/rpcclient/cmd_samr.c
+++ b/source3/rpcclient/cmd_samr.c
@@ -265,7 +265,7 @@ void cmd_sam_query_user(struct client_info *info)
fstring domain;
fstring sid;
DOM_SID sid1;
- int user_idx;
+ int user_idx = 0; /* FIXME maybe ... */
BOOL res = True;
uint32 admin_rid = 0x304; /* absolutely no idea. */
fstring rid_str ;
diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c
index a994fc27fc..203b2c00bf 100644
--- a/source3/rpcclient/rpcclient.c
+++ b/source3/rpcclient/rpcclient.c
@@ -546,7 +546,10 @@ enum client_action
{
case 'm':
{
- int max_protocol = interpret_protocol(optarg,max_protocol);
+ /* FIXME ... max_protocol seems to be funny here */
+
+ int max_protocol = 0;
+ max_protocol = interpret_protocol(optarg,max_protocol);
fprintf(stderr, "max protocol not currently supported\n");
break;
}
diff --git a/source3/utils/smbpasswd.c b/source3/utils/smbpasswd.c
index 2ac44fbdec..e5e5424a2b 100644
--- a/source3/utils/smbpasswd.c
+++ b/source3/utils/smbpasswd.c
@@ -173,7 +173,7 @@ int main(int argc, char **argv)
extern int optind;
extern int DEBUGLEVEL;
int real_uid;
- struct passwd *pwd;
+ struct passwd *pwd = NULL;
fstring old_passwd;
fstring new_passwd;
uchar new_p16[16];