From 8e4ab747b02207671203d40cd2a78692da78faef Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 15 Aug 2003 18:33:43 +0000 Subject: more fixes from the IRIX compiler (thanks herb!) (This used to be commit 4cf3839b727c77a727abb558bd9473119a092913) --- source4/client/client.c | 2 +- source4/client/smbmount.c | 4 ++-- source4/client/smbspool.c | 2 +- source4/libcli/clifile.c | 4 ++-- source4/libcli/clilist.c | 2 +- source4/libcli/raw/clitree.c | 2 -- source4/libcli/raw/rawfileinfo.c | 2 -- source4/libcli/raw/rawnegotiate.c | 2 +- source4/nmbd/nmbd.c | 2 +- source4/nsswitch/winbindd.c | 2 +- source4/nsswitch/wins.c | 2 +- source4/pam_smbpass/pam_smb_acct.c | 2 +- source4/pam_smbpass/pam_smb_auth.c | 2 +- source4/pam_smbpass/pam_smb_passwd.c | 2 +- source4/python/py_common.c | 4 ++-- source4/python/py_lsa.c | 2 +- source4/python/py_samr.c | 2 +- source4/python/py_smb.c | 2 +- source4/smbd/server.c | 2 +- source4/smbwrapper/smbw.c | 2 +- source4/torture/gentest.c | 4 ++-- source4/torture/locktest.c | 2 +- source4/torture/locktest2.c | 2 +- source4/torture/masktest.c | 2 +- source4/torture/msgtest.c | 2 +- source4/torture/rpctorture.c | 2 +- source4/torture/torture.c | 2 +- source4/utils/nmblookup.c | 2 +- source4/utils/pdbedit.c | 2 +- source4/utils/rpccheck.c | 2 +- source4/utils/smbcacls.c | 2 +- source4/utils/smbcontrol.c | 2 +- source4/utils/smbfilter.c | 2 +- source4/utils/smbgroupedit.c | 2 +- source4/utils/smbpasswd.c | 2 +- source4/utils/smbtree.c | 2 +- source4/utils/status.c | 2 +- source4/utils/testparm.c | 2 +- source4/utils/testprns.c | 2 +- source4/web/swat.c | 2 +- source4/wrepld/server.c | 2 +- 41 files changed, 43 insertions(+), 47 deletions(-) diff --git a/source4/client/client.c b/source4/client/client.c index 7f05774836..e418f3b456 100644 --- a/source4/client/client.c +++ b/source4/client/client.c @@ -2896,7 +2896,7 @@ static void remember_query_host(const char *arg, *query_host = 0; *base_directory = 0; - setup_logging(argv[0],True); + setup_logging(argv[0],DEBUG_STDOUT); mem_ctx = talloc_init("client.c/main"); if (!mem_ctx) { d_printf("\nclient.c: Not enough memory\n"); diff --git a/source4/client/smbmount.c b/source4/client/smbmount.c index da340144fc..ac1a742ab7 100644 --- a/source4/client/smbmount.c +++ b/source4/client/smbmount.c @@ -396,7 +396,7 @@ static void send_fs_socket(char *the_service, char *mount_point, struct cli_stat /* here we are no longer interactive */ set_remote_machine_name("smbmount"); /* sneaky ... */ - setup_logging("mount.smbfs", False); + setup_logging("mount.smbfs", DEBUG_STDERR); reopen_logs(); DEBUG(0, ("mount.smbfs: entering daemon mode for service %s, pid=%d\n", the_service, sys_getpid())); @@ -857,7 +857,7 @@ static void parse_mount_smb(int argc, char **argv) DEBUGLEVEL = 1; /* here we are interactive, even if run from autofs */ - setup_logging("mount.smbfs",True); + setup_logging("mount.smbfs",DEBUG_STDERR); #if 0 /* JRA - Urban says not needed ? */ /* CLI_FORCE_ASCII=false makes smbmount negotiate unicode. The default diff --git a/source4/client/smbspool.c b/source4/client/smbspool.c index 43046bbad7..24d40114f0 100644 --- a/source4/client/smbspool.c +++ b/source4/client/smbspool.c @@ -182,7 +182,7 @@ static int smb_print(struct cli_state *, char *, FILE *); * Setup the SAMBA server state... */ - setup_logging("smbspool", True); + setup_logging("smbspool", DEBUG_STDOUT); in_client = True; /* Make sure that we tell lp_load we are */ diff --git a/source4/libcli/clifile.c b/source4/libcli/clifile.c index d37a68c1e1..27ead40740 100644 --- a/source4/libcli/clifile.c +++ b/source4/libcli/clifile.c @@ -34,11 +34,11 @@ static BOOL cli_link_internal(struct cli_state *cli, NTSTATUS status; if (hard_link) { - parms.generic.level = SMB_SFILEINFO_UNIX_HLINK; + parms.generic.level = RAW_SFILEINFO_UNIX_HLINK; parms.unix_hlink.file.fname = fname_src; parms.unix_hlink.in.link_dest = fname_dst; } else { - parms.generic.level = SMB_SFILEINFO_UNIX_LINK; + parms.generic.level = RAW_SFILEINFO_UNIX_LINK; parms.unix_link.file.fname = fname_src; parms.unix_link.in.link_dest = fname_dst; } diff --git a/source4/libcli/clilist.c b/source4/libcli/clilist.c index 620e4382f4..425a6002cc 100644 --- a/source4/libcli/clilist.c +++ b/source4/libcli/clilist.c @@ -94,7 +94,7 @@ int cli_list_new(struct cli_state *cli, const char *Mask, uint16 attribute, char *mask; int ff_eos = 0, i, ff_searchcount; int ff_dir_handle=0; - int level; + enum search_level level; /* initialize state for search */ state.dirlist = NULL; diff --git a/source4/libcli/raw/clitree.c b/source4/libcli/raw/clitree.c index a088ae7023..1e9104308e 100644 --- a/source4/libcli/raw/clitree.c +++ b/source4/libcli/raw/clitree.c @@ -121,7 +121,6 @@ NTSTATUS smb_tree_connect_recv(struct cli_request *req, TALLOC_CTX *mem_ctx, uni case RAW_TCON_TCONX: ZERO_STRUCT(parms->tconx.out); - CLI_CHECK_MIN_WCT(req, 0); /* this depends on the protocol level */ parms->tconx.out.cnum = SVAL(req->in.hdr, HDR_TID); if (req->in.wct >= 4) { parms->tconx.out.options = SVAL(req->in.vwv, VWV(3)); @@ -245,7 +244,6 @@ NTSTATUS cli_tree_full_connection(struct cli_tree **ret_tree, mem_ctx = talloc_init("tcon"); if (!mem_ctx) { - cli_tree_close(tree); return NT_STATUS_NO_MEMORY; } diff --git a/source4/libcli/raw/rawfileinfo.c b/source4/libcli/raw/rawfileinfo.c index 70121025d0..41fe1225cc 100644 --- a/source4/libcli/raw/rawfileinfo.c +++ b/source4/libcli/raw/rawfileinfo.c @@ -146,7 +146,6 @@ static NTSTATUS smb_raw_info_backend(struct cli_session *session, case RAW_FILEINFO_STREAM_INFO: case RAW_FILEINFO_STREAM_INFORMATION: - FINFO_CHECK_MIN_SIZE(0); ofs = 0; parms->stream_info.out.num_streams = 0; parms->stream_info.out.streams = NULL; @@ -228,7 +227,6 @@ static NTSTATUS smb_raw_info_backend(struct cli_session *session, return NT_STATUS_OK; case RAW_FILEINFO_UNIX_LINK: - FINFO_CHECK_MIN_SIZE(0); cli_blob_pull_string(session, mem_ctx, blob, &parms->unix_link_info.out.link_dest, 0, 4, STR_UNICODE); return NT_STATUS_OK; diff --git a/source4/libcli/raw/rawnegotiate.c b/source4/libcli/raw/rawnegotiate.c index 78b2e00706..04941f6118 100644 --- a/source4/libcli/raw/rawnegotiate.c +++ b/source4/libcli/raw/rawnegotiate.c @@ -22,7 +22,7 @@ #include "includes.h" static const struct { - int prot; + enum protocol_types prot; const char *name; } prots[] = { {PROTOCOL_CORE,"PC NETWORK PROGRAM 1.0"}, diff --git a/source4/nmbd/nmbd.c b/source4/nmbd/nmbd.c index 2b7d8033a2..166e84bfbe 100644 --- a/source4/nmbd/nmbd.c +++ b/source4/nmbd/nmbd.c @@ -658,7 +658,7 @@ static BOOL open_sockets(BOOL isdaemon, int port) exit(1); } - setup_logging( argv[0], log_stdout ); + setup_logging( argv[0], log_stdout?DEBUG_STDOUT : DEBUG_FILE ); reopen_logs(); diff --git a/source4/nsswitch/winbindd.c b/source4/nsswitch/winbindd.c index ad37768c09..23394f5e8c 100644 --- a/source4/nsswitch/winbindd.c +++ b/source4/nsswitch/winbindd.c @@ -892,7 +892,7 @@ static void usage(void) snprintf(logfile, sizeof(logfile), "%s/log.winbindd", dyn_LOGFILEBASE); lp_set_logfile(logfile); - setup_logging("winbindd", log_stdout); + setup_logging("winbindd", log_stdout?DEBUG_STDOUT:DEBUG_FILE); reopen_logs(); DEBUG(1, ("winbindd version %s started.\n", VERSION ) ); diff --git a/source4/nsswitch/wins.c b/source4/nsswitch/wins.c index 187748d285..d5791d7af5 100644 --- a/source4/nsswitch/wins.c +++ b/source4/nsswitch/wins.c @@ -79,7 +79,7 @@ static void nss_wins_init(void) AllowDebugChange = False; TimeInit(); - setup_logging("nss_wins",False); + setup_logging("nss_wins",DEBUG_FILE); lp_load(dyn_CONFIGFILE,True,False,False); load_interfaces(); } diff --git a/source4/pam_smbpass/pam_smb_acct.c b/source4/pam_smbpass/pam_smb_acct.c index 0803ef82a2..aa3386d517 100644 --- a/source4/pam_smbpass/pam_smb_acct.c +++ b/source4/pam_smbpass/pam_smb_acct.c @@ -51,7 +51,7 @@ int pam_sm_acct_mgmt( pam_handle_t *pamh, int flags, extern BOOL in_client; /* Samba initialization. */ - setup_logging( "pam_smbpass", False ); + setup_logging( "pam_smbpass", DEBUG_FILE); in_client = True; ctrl = set_ctrl( flags, argc, argv ); diff --git a/source4/pam_smbpass/pam_smb_auth.c b/source4/pam_smbpass/pam_smb_auth.c index e5cc12e2f6..fa38ba042c 100644 --- a/source4/pam_smbpass/pam_smb_auth.c +++ b/source4/pam_smbpass/pam_smb_auth.c @@ -72,7 +72,7 @@ int pam_sm_authenticate(pam_handle_t *pamh, int flags, /* Samba initialization. */ - setup_logging("pam_smbpass",False); + setup_logging("pam_smbpass",DEBUG_FILE); in_client = True; ctrl = set_ctrl(flags, argc, argv); diff --git a/source4/pam_smbpass/pam_smb_passwd.c b/source4/pam_smbpass/pam_smb_passwd.c index 91eae3c7a1..5e6d6060a4 100644 --- a/source4/pam_smbpass/pam_smb_passwd.c +++ b/source4/pam_smbpass/pam_smb_passwd.c @@ -99,7 +99,7 @@ int pam_sm_chauthtok(pam_handle_t *pamh, int flags, NTSTATUS nt_status; /* Samba initialization. */ - setup_logging( "pam_smbpass", False ); + setup_logging( "pam_smbpass", DEBUG_FILE ); in_client = True; ctrl = set_ctrl(flags, argc, argv); diff --git a/source4/python/py_common.c b/source4/python/py_common.c index ea092d9370..d42b54e533 100644 --- a/source4/python/py_common.c +++ b/source4/python/py_common.c @@ -104,11 +104,11 @@ PyObject *py_setup_logging(PyObject *self, PyObject *args, PyObject *kw) } if (interactive) - setup_logging("spoolss", True); + setup_logging("spoolss", DEBUG_STDOUT); if (logfilename) { lp_set_logfile(logfilename); - setup_logging(logfilename, False); + setup_logging(logfilename, DEBUG_FILE ); reopen_logs(); } diff --git a/source4/python/py_lsa.c b/source4/python/py_lsa.c index 22db29665a..2ea7be3645 100644 --- a/source4/python/py_lsa.c +++ b/source4/python/py_lsa.c @@ -463,6 +463,6 @@ void initlsa(void) py_samba_init(); - setup_logging("lsa", True); + setup_logging("lsa", DEBUG_STDOUT); DEBUGLEVEL = 10; } diff --git a/source4/python/py_samr.c b/source4/python/py_samr.c index 182671d047..39cfb3e60c 100644 --- a/source4/python/py_samr.c +++ b/source4/python/py_samr.c @@ -492,6 +492,6 @@ void initsamr(void) py_samba_init(); - setup_logging("samr", True); + setup_logging("samr", DEBUG_STDOUT); DEBUGLEVEL = 10; } diff --git a/source4/python/py_smb.c b/source4/python/py_smb.c index 3f05b5d7c6..52de768558 100644 --- a/source4/python/py_smb.c +++ b/source4/python/py_smb.c @@ -394,6 +394,6 @@ void initsmb(void) py_samba_init(); - setup_logging("smb", True); + setup_logging("smb", DEBUG_STDOUT); DEBUGLEVEL = 10; } diff --git a/source4/smbd/server.c b/source4/smbd/server.c index e33a13e75d..ae1566b5ac 100644 --- a/source4/smbd/server.c +++ b/source4/smbd/server.c @@ -259,7 +259,7 @@ static void setup_process_model(struct event_context *events, DEBUG(0,("ERROR: Can't log to stdout (-S) unless daemon is in foreground (-F) or interactive (-i)\n")); exit(1); } - setup_logging(argv[0], log_stdout); + setup_logging(argv[0], log_stdout?DEBUG_STDOUT:DEBUG_FILE); fault_setup((void (*)(void *))exit_server); diff --git a/source4/smbwrapper/smbw.c b/source4/smbwrapper/smbw.c index fbc69b2371..c62533dc2a 100644 --- a/source4/smbwrapper/smbw.c +++ b/source4/smbwrapper/smbw.c @@ -55,7 +55,7 @@ void smbw_init(void) smbw_busy++; DEBUGLEVEL = 0; - setup_logging("smbsh",True); + setup_logging("smbsh", DEBUG_STDOUT); dbf = x_stderr; diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c index 4711ea91ae..e914f98588 100644 --- a/source4/torture/gentest.c +++ b/source4/torture/gentest.c @@ -2113,7 +2113,7 @@ static void usage(void) exit(1); } - setup_logging(argv[0],True); + setup_logging(argv[0], DEBUG_STDOUT); for (i=0;int_pipe_fnum = 0xffff; - setup_logging(pname, True); + setup_logging(pname, DEBUG_STDOUT); password[0] = 0; diff --git a/source4/torture/torture.c b/source4/torture/torture.c index bf46c888b2..1ec73e0dff 100644 --- a/source4/torture/torture.c +++ b/source4/torture/torture.c @@ -4113,7 +4113,7 @@ static void usage(void) break; case 'd': lp_set_cmdline("debug level", optarg); - setup_logging(NULL,True); + setup_logging(NULL, DEBUG_STDOUT); break; case 'O': lp_set_cmdline("socket options", optarg); diff --git a/source4/utils/nmblookup.c b/source4/utils/nmblookup.c index 143d2ddd12..a2ec19d74d 100644 --- a/source4/utils/nmblookup.c +++ b/source4/utils/nmblookup.c @@ -222,7 +222,7 @@ int main(int argc,char *argv[]) *lookup = 0; - setup_logging(argv[0],True); + setup_logging(argv[0], DEBUG_STDOUT); while ((opt = getopt(argc, argv, "d:fB:U:i:s:SMrhART")) != EOF) switch (opt) diff --git a/source4/utils/pdbedit.c b/source4/utils/pdbedit.c index cec3e70687..15e0b50fa9 100644 --- a/source4/utils/pdbedit.c +++ b/source4/utils/pdbedit.c @@ -513,7 +513,7 @@ int main (int argc, char **argv) {0,0,0,0} }; - setup_logging("pdbedit", True); + setup_logging("pdbedit", DEBUG_STDOUT); pc = poptGetContext(NULL, argc, (const char **) argv, long_options, POPT_CONTEXT_KEEP_FIRST); diff --git a/source4/utils/rpccheck.c b/source4/utils/rpccheck.c index ae109f69b6..dd357794fe 100644 --- a/source4/utils/rpccheck.c +++ b/source4/utils/rpccheck.c @@ -35,7 +35,7 @@ main() ZERO_STRUCT(rpc_stub); - setup_logging("", True); + setup_logging("", DEBUG_STDOUT); DEBUGLEVEL=10; ctx=talloc_init("main"); diff --git a/source4/utils/smbcacls.c b/source4/utils/smbcacls.c index 4c85ea58c2..41dc24f846 100644 --- a/source4/utils/smbcacls.c +++ b/source4/utils/smbcacls.c @@ -789,7 +789,7 @@ You can string acls together with spaces, commas or newlines\n\ exit(EXIT_PARSE_ERROR); } - setup_logging(argv[0],True); + setup_logging(argv[0], DEBUG_STDOUT); share = argv[1]; pstrcpy(filename, argv[2]); diff --git a/source4/utils/smbcontrol.c b/source4/utils/smbcontrol.c index 0861eb5c5a..d715163ebb 100644 --- a/source4/utils/smbcontrol.c +++ b/source4/utils/smbcontrol.c @@ -656,7 +656,7 @@ static BOOL do_command(char *dest, char *msg_name, int iparams, char **params) AllowDebugChange = False; DEBUGLEVEL = 0; - setup_logging(argv[0],True); + setup_logging(argv[0], DEBUG_STDOUT); if (argc < 2) usage(True); diff --git a/source4/utils/smbfilter.c b/source4/utils/smbfilter.c index 1a0d639f02..9f240c31ca 100644 --- a/source4/utils/smbfilter.c +++ b/source4/utils/smbfilter.c @@ -222,7 +222,7 @@ int main(int argc, char *argv[]) char *desthost; pstring configfile; - setup_logging(argv[0],True); + setup_logging(argv[0], DEBUG_STDOUT); pstrcpy(configfile,dyn_CONFIGFILE); diff --git a/source4/utils/smbgroupedit.c b/source4/utils/smbgroupedit.c index 69f69aea5d..edbee6cef2 100644 --- a/source4/utils/smbgroupedit.c +++ b/source4/utils/smbgroupedit.c @@ -271,7 +271,7 @@ int main (int argc, char **argv) enum SID_NAME_USE sid_type; uint32 rid = -1; - setup_logging("groupedit", True); + setup_logging("groupedit", DEBUG_STDOUT); if (argc < 2) { usage(); diff --git a/source4/utils/smbpasswd.c b/source4/utils/smbpasswd.c index 577e467fbd..743023afd7 100644 --- a/source4/utils/smbpasswd.c +++ b/source4/utils/smbpasswd.c @@ -580,7 +580,7 @@ int main(int argc, char **argv) local_flags = process_options(argc, argv, local_flags); - setup_logging("smbpasswd", True); + setup_logging("smbpasswd", DEBUG_STDOUT); /* * Set the machine NETBIOS name if not already diff --git a/source4/utils/smbtree.c b/source4/utils/smbtree.c index ff6120ee90..eeb7b318cb 100644 --- a/source4/utils/smbtree.c +++ b/source4/utils/smbtree.c @@ -281,7 +281,7 @@ static BOOL print_tree(struct user_auth_info *user_info) dbf = x_stderr; - setup_logging(argv[0],True); + setup_logging(argv[0], DEBUG_STDOUT); lp_load(dyn_CONFIGFILE,True,False,False); load_interfaces(); diff --git a/source4/utils/status.c b/source4/utils/status.c index 76b9253646..c28b0a41fd 100644 --- a/source4/utils/status.c +++ b/source4/utils/status.c @@ -567,7 +567,7 @@ static int traverse_sessionid(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, vo POPT_TABLEEND }; - setup_logging(argv[0],True); + setup_logging(argv[0], DEBUG_STDOUT); dbf = x_stderr; diff --git a/source4/utils/testparm.c b/source4/utils/testparm.c index b68deaaa5d..fdfb6cb426 100644 --- a/source4/utils/testparm.c +++ b/source4/utils/testparm.c @@ -218,7 +218,7 @@ int main(int argc, const char *argv[]) while((opt = poptGetNextOpt(pc)) != -1); - setup_logging(poptGetArg(pc), True); + setup_logging(poptGetArg(pc), DEBUG_STDOUT); if (poptPeekArg(pc)) config_file = poptGetArg(pc); diff --git a/source4/utils/testprns.c b/source4/utils/testprns.c index 7e52b86afb..07c4498038 100644 --- a/source4/utils/testprns.c +++ b/source4/utils/testprns.c @@ -36,7 +36,7 @@ int main(int argc, char *argv[]) { const char *pszTemp; - setup_logging(argv[0],True); + setup_logging(argv[0], DEBUG_STDOUT); if (argc < 2 || argc > 3) printf("Usage: testprns printername [printcapfile]\n"); diff --git a/source4/web/swat.c b/source4/web/swat.c index db48cbbb54..9e91543317 100644 --- a/source4/web/swat.c +++ b/source4/web/swat.c @@ -1286,7 +1286,7 @@ static void printers_page(void) } } - setup_logging(argv[0],False); + setup_logging(argv[0],DEBUG_FILE); load_config(True); iNumNonAutoPrintServices = lp_numservices(); load_printers(); diff --git a/source4/wrepld/server.c b/source4/wrepld/server.c index afeec3402b..f49596dc41 100644 --- a/source4/wrepld/server.c +++ b/source4/wrepld/server.c @@ -619,7 +619,7 @@ static void process(void) set_remote_machine_name("wrepld"); - setup_logging(argv[0],log_stdout); + setup_logging(argv[0],log_stdout?DEBUG_STDOUT:DEBUG_FILE); /* we want to re-seed early to prevent time delays causing client problems at a later date. (tridge) */ -- cgit