summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2003-06-26 17:29:09 +0000
committerJelmer Vernooij <jelmer@samba.org>2003-06-26 17:29:09 +0000
commit29674c7fa6742a322801c1604ce63a752d9fe922 (patch)
tree8b470ff3458242b394aba3b46c7bf4b5267b199f
parentd4ec9799489f52ff1b31707b6a90f7e0d757435f (diff)
downloadsamba-29674c7fa6742a322801c1604ce63a752d9fe922.tar.gz
samba-29674c7fa6742a322801c1604ce63a752d9fe922.tar.bz2
samba-29674c7fa6742a322801c1604ce63a752d9fe922.zip
Move up intialisation of logging, so we catch errors in handling 'preload modules'
(This used to be commit 13b81d0d92b9e28eaab18f5437060e79f6075f9e)
-rw-r--r--source3/torture/smbiconv.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/torture/smbiconv.c b/source3/torture/smbiconv.c
index ce21a09025..3524136fb1 100644
--- a/source3/torture/smbiconv.c
+++ b/source3/torture/smbiconv.c
@@ -198,6 +198,10 @@ int main(int argc, char *argv[])
while(poptGetNextOpt(pc) != -1);
+ /* the following functions are part of the Samba debugging
+ facilities. See lib/debug.c */
+ setup_logging("smbiconv", True);
+
if(preload)smb_load_modules(str_list_make(preload, NULL));
if(output) {
@@ -209,10 +213,6 @@ int main(int argc, char *argv[])
}
}
- /* the following functions are part of the Samba debugging
- facilities. See lib/debug.c */
- setup_logging("smbiconv", True);
-
cd = smb_iconv_open(to, from);
if((int)cd == -1) {
DEBUG(0,("unable to find from or to encoding, exiting...\n"));