diff options
author | Andrew Tridgell <tridge@samba.org> | 1996-07-24 06:14:23 +0000 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 1996-07-24 06:14:23 +0000 |
commit | 1924f08d8404d5e71bee93449ea9b5edd791f473 (patch) | |
tree | c1fc36c77c863c4232a485b1276caece0f547f9e | |
parent | 8d9143cbcfd930bf0c2cb3073beb6b27104df915 (diff) | |
download | samba-1924f08d8404d5e71bee93449ea9b5edd791f473.tar.gz samba-1924f08d8404d5e71bee93449ea9b5edd791f473.tar.bz2 samba-1924f08d8404d5e71bee93449ea9b5edd791f473.zip |
the client now loads the smb.conf config file so it can get the
interfaces info, and the workgroup right.
(This used to be commit fabd4230f17726743a0fde0a37ce3c09a3dec8a3)
-rw-r--r-- | source3/client/client.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/source3/client/client.c b/source3/client/client.c index 1bd91d3d7a..fde79c6e1b 100644 --- a/source3/client/client.c +++ b/source3/client/client.c @@ -4171,6 +4171,7 @@ static void usage(char *pname) pstring query_host; BOOL message = False; extern char tar_type; + static pstring servicesf = CONFIGFILE; *query_host = 0; *base_directory = 0; @@ -4244,7 +4245,7 @@ static void usage(char *pname) setup_term_code (KANJI); #endif while ((opt = - getopt(argc, argv,"B:O:M:i:Nn:d:Pp:l:hI:EB:U:L:t:m:W:T:D:c:")) != EOF) + getopt(argc, argv,"s:B:O:M:i:Nn:d:Pp:l:hI:EB:U:L:t:m:W:T:D:c:")) != EOF) switch (opt) { case 'm': @@ -4334,6 +4335,9 @@ static void usage(char *pname) usage(pname); exit(0); break; + case 's': + strcpy(servicesf, optarg); + break; case 't': #ifdef KANJI if (!setup_term_code (optarg)) { @@ -4357,6 +4361,11 @@ static void usage(char *pname) DEBUG(3,("%s client started (version %s)\n",timestring(),VERSION)); + if (!lp_load(servicesf,True)) { + fprintf(stderr, "Can't load %s - run testparm to debug it\n", servicesf); + return (-1); + } + load_interfaces(); get_myname(*myname?NULL:myname,NULL); strupper(myname); |