diff options
author | David O'Neill <dmo@samba.org> | 2001-01-11 20:41:19 +0000 |
---|---|---|
committer | David O'Neill <dmo@samba.org> | 2001-01-11 20:41:19 +0000 |
commit | 376601d17d53ef7bfaafa576bd770e554516e808 (patch) | |
tree | e5bb9efa7d26af9c31393db72224fbfeb13e962c /testsuite | |
parent | 6dc83a8c665dd6774ce597cf7269ad4d8c5380cf (diff) | |
download | samba-376601d17d53ef7bfaafa576bd770e554516e808.tar.gz samba-376601d17d53ef7bfaafa576bd770e554516e808.tar.xz samba-376601d17d53ef7bfaafa576bd770e554516e808.zip |
Changes from APPLIANCE_HEAD:
testsuite/printing/psec.c
- Use lock directory from smb.conf parameter when peeking at the
ntdrivers.tdb file.
source/rpc_parse/parse_sec.c
- fix typo in debug message
source/script/installbin.sh
- create private directory as part of 'make install'.
source/nsswitch/winbindd_cache.c
source/nsswitch/winbindd_idmap.c
source/passdb/secrets.c
source/smbd/connection.c
- always convert tdb key to unix code-page when generating.
source/printing/nt_printing.c
- always convert tdb key to unix code-page when generating.
- don't prepend path to a filename that is NULL in
add_a_printer_driver_3().
source/rpc_server/srv_spoolss_nt.c
- always convert tdb key to unix code-page when generating.
- don't prepend server name to a path/filename that is NULL in the
fill_printer_driver_info functions.
source/printing/printing.c
- always convert tdb key to unix code-page when generating.
- move access check for print_queue_purge() outside of job delete
loop.
source/smbd/unix_acls.c
- fix for setting ACLs (this got missed earlier)
source/lib/messages.c
- trivial sync with appliance_head
Diffstat (limited to 'testsuite')
-rw-r--r-- | testsuite/printing/psec.c | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/testsuite/printing/psec.c b/testsuite/printing/psec.c index 88a111404c9..9d38b9b10ae 100644 --- a/testsuite/printing/psec.c +++ b/testsuite/printing/psec.c @@ -169,7 +169,9 @@ int psec_getsec(char *printer) /* Open tdb for reading */ - slprintf(tdb_path, sizeof(tdb_path) - 1, "%s/ntdrivers.tdb", LOCKDIR); + slprintf(tdb_path, sizeof(tdb_path) - 1, "%s/ntdrivers.tdb", + lp_lockdir()); + tdb = tdb_open(tdb_path, 0, 0, O_RDONLY, 0600); if (!tdb) { @@ -268,7 +270,9 @@ int psec_setsec(char *printer) /* Open tdb for reading */ - slprintf(tdb_path, sizeof(tdb_path) - 1, "%s/ntdrivers.tdb", LOCKDIR); + slprintf(tdb_path, sizeof(tdb_path) - 1, "%s/ntdrivers.tdb", + lp_lockdir()); + tdb = tdb_open(tdb_path, 0, 0, O_RDWR, 0600); if (!tdb) { @@ -381,6 +385,8 @@ void usage(void) int main(int argc, char **argv) { + pstring servicesf = CONFIGFILE; + /* Argument check */ if (argc == 1) { @@ -388,6 +394,16 @@ int main(int argc, char **argv) return 1; } + /* Load smb.conf file */ + + charset_initialise(); + + if (!lp_load(servicesf,False,False,True)) { + fprintf(stderr, "Couldn't load confiuration file %s\n", + servicesf); + return 1; + } + /* Do commands */ if (strcmp(argv[1], "setsec") == 0) { |