diff options
author | Andrew Tridgell <tridge@samba.org> | 2001-04-22 03:16:04 +0000 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2001-04-22 03:16:04 +0000 |
commit | d3e438d54ff05a3678f712bacf5c702ebf7b2a06 (patch) | |
tree | 8f9336573bfc8063b666602afabb69c275c3a940 /source3/client/client.c | |
parent | ac9e221c3e6bc892e0f73a403c89434ae13a8eec (diff) | |
download | samba-d3e438d54ff05a3678f712bacf5c702ebf7b2a06.tar.gz samba-d3e438d54ff05a3678f712bacf5c702ebf7b2a06.tar.bz2 samba-d3e438d54ff05a3678f712bacf5c702ebf7b2a06.zip |
a couple of minor merges from 2_2
(This used to be commit 67aa587eb2ee9044574ee212dfd7d52895f868c0)
Diffstat (limited to 'source3/client/client.c')
-rw-r--r-- | source3/client/client.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source3/client/client.c b/source3/client/client.c index 1d48ac0f71..9c167e20c2 100644 --- a/source3/client/client.c +++ b/source3/client/client.c @@ -2201,6 +2201,7 @@ static int do_message_op(void) extern FILE *dbf; extern char *optarg; extern int optind; + int old_debug; pstring query_host; BOOL message = False; extern char tar_type; @@ -2253,9 +2254,11 @@ static int do_message_op(void) in_client = True; /* Make sure that we tell lp_load we are */ + old_debug = DEBUGLEVEL; if (!lp_load(servicesf,True,False,False)) { fprintf(stderr, "Can't load %s - run testparm to debug it\n", servicesf); } + DEBUGLEVEL = old_debug; codepage_initialise(lp_client_code_page()); |