diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2003-04-28 08:54:51 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2003-04-28 08:54:51 +0000 |
| commit | d031ba5c83d3243a7509692097c3a1a25aa34553 (patch) | |
| tree | 2acdc279c9e497cb31d7ce703ba6fc696cb063ce /source3/utils | |
| parent | d31cb1b4684e7b3288d5841bf206379ba8149e8a (diff) | |
| download | samba-d031ba5c83d3243a7509692097c3a1a25aa34553.tar.gz samba-d031ba5c83d3243a7509692097c3a1a25aa34553.tar.bz2 samba-d031ba5c83d3243a7509692097c3a1a25aa34553.zip | |
Merge compile and other fixes from 3.0 to HEAD.
Including smbtorture bugfixes, and a better TCONDEV test.
Andrew Bartlett
(This used to be commit 52c5806004022f153af7d022afdb3ec7cc0d2548)
Diffstat (limited to 'source3/utils')
| -rw-r--r-- | source3/utils/ntlm_auth.c | 2 | ||||
| -rw-r--r-- | source3/utils/smbcontrol.c | 2 | ||||
| -rw-r--r-- | source3/utils/smbcquotas.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c index ddb7053cdb..42490190f3 100644 --- a/source3/utils/ntlm_auth.c +++ b/source3/utils/ntlm_auth.c @@ -464,7 +464,7 @@ static BOOL check_auth_crap(void) and valid authentication types */ -static const DATA_BLOB get_challenge(void) +static DATA_BLOB get_challenge(void) { static DATA_BLOB chal; if (opt_challenge.length) diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c index 8b984d9bd1..06add6af22 100644 --- a/source3/utils/smbcontrol.c +++ b/source3/utils/smbcontrol.c @@ -674,7 +674,7 @@ int main(int argc, char **argv) poptContext pc; int opt; - struct poptOption wbinfo_options[] = { + static struct poptOption wbinfo_options[] = { { "timeout", 't', POPT_ARG_INT, &timeout, 't', "Set timeout value in seconds", "TIMEOUT" }, diff --git a/source3/utils/smbcquotas.c b/source3/utils/smbcquotas.c index c5d0aa869b..9c7379ca2a 100644 --- a/source3/utils/smbcquotas.c +++ b/source3/utils/smbcquotas.c @@ -393,7 +393,7 @@ static struct cli_state *connect_one(const char *share) pstring set_str = {0}; enum SMB_QUOTA_TYPE qtype; int cmd = 0; - BOOL test_args = False; + static BOOL test_args = False; struct cli_state *cli; BOOL fix_user = False; SMB_NTQUOTA_STRUCT qt; |