Changes from APPLIANCE_HEAD:

[ira/wip.git] / testsuite / printing / psec.c

diff --git a/testsuite/printing/psec.c b/testsuite/printing/psec.c
index 88a111404c9fdf5e66e11413f94f2743a60fb814..9d38b9b10aed60273077bc460d2bfb1cbba5bc66 100644 (file)
--- a/testsuite/printing/psec.c
+++ b/testsuite/printing/psec.c
@@ -169,7 +169,9 @@ int psec_getsec(char *printer)
 
        /* Open tdb for reading */
 
 
        /* 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) {
        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 */
 
 
        /* 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) {
        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)
 {
 
 int main(int argc, char **argv)
 {

+       pstring servicesf = CONFIGFILE;
+

        /* Argument check */
 
        if (argc == 1) {
        /* Argument check */
 
        if (argc == 1) {


@@ -388,6 +394,16 @@ int main(int argc, char **argv)
                return 1;
        }
 
                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) {
        /* Do commands */
 
        if (strcmp(argv[1], "setsec") == 0) {