From b038240ac72fa34a132eb52bda28bbb80f82c29e Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 4 Dec 2007 00:12:13 +0100 Subject: r26275: return loadparm context in lp_load. (This used to be commit d01f0f4c2037b531b3fd088060717f90e60471e9) --- source4/client/smbspool.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'source4/client/smbspool.c') diff --git a/source4/client/smbspool.c b/source4/client/smbspool.c index 7270942037..6a7454b6b2 100644 --- a/source4/client/smbspool.c +++ b/source4/client/smbspool.c @@ -50,6 +50,7 @@ static int smb_print(struct smbcli_state *, char *, FILE *); FILE *fp; /* File to print */ int status=0; /* Status of LPD job */ struct smbcli_state *cli; /* SMB interface */ + struct loadparm_context *lp_ctx; /* we expect the URI in argv[0]. Detect the case where it is in argv[1] and cope */ if (argc > 2 && strncmp(argv[0],"smb://", 6) && !strncmp(argv[1],"smb://", 6)) { @@ -176,13 +177,13 @@ static int smb_print(struct smbcli_state *, char *, FILE *); setup_logging(argv[0], DEBUG_STDOUT); - if (!lp_load(dyn_CONFIGFILE)) { + if (!lp_load(dyn_CONFIGFILE, &lp_ctx)) { fprintf(stderr, "ERROR: Can't load %s - run testparm to debug it\n", lp_config_file()); return (1); } if (workgroup == NULL) - workgroup = lp_workgroup(); + workgroup = lp_workgroup(lp_ctx); do { -- cgit